From 67b6879543ebc7c60d72976bca6c572932133a57 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 25 Apr 2009 08:01:49 +0000
Subject: [PATCH] Equinox execution

git-svn-id: https://svn.argeo.org/slc/trunk@2348 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/exec/server/conf/config.ini              | 10 ++--
 demo/pom.xml                                  | 56 +++++++++----------
 server/org.argeo.slc.ria/pom.xml              |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../org.argeo.slc.siteserver/bundles/pom.xml  |  2 +-
 .../simple-webapp.war/META-INF/MANIFEST.MF    | 21 ++++---
 7 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/demo/exec/server/conf/config.ini b/demo/exec/server/conf/config.ini
index 9c4c3d585..11951e331 100644
--- a/demo/exec/server/conf/config.ini
+++ b/demo/exec/server/conf/config.ini
@@ -10,11 +10,9 @@ slc.osgi.start=org.argeo.dep.osgi.catalina.start,\
 	org.argeo.slc.server.services,\
 	org.argeo.slc.server.jms,\
 	org.argeo.slc.webapp,\
+	org.argeo.slc.ria,\
 	org.argeo.slc.support.equinox,\
-	com.capco.sparta.demo.environments,\
-	com.capco.sparta.demo.filediff,\
-	com.capco.sparta.demo.tablediff,\
-	com.capco.sparta.demo.autoui,\
-	com.capco.sparta.demo.manager
-	
+	org.argeo.slc.demo.basic,\
+	org.argeo.slc.demo.manager
+
 
diff --git a/demo/pom.xml b/demo/pom.xml
index 00feace89..454a03e0f 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -13,38 +13,34 @@
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<phase>initialize</phase>
-						<configuration>
-							<outputDirectory>lib</outputDirectory>
-							<includeTypes>jar</includeTypes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.1</version>
+				<groupId>org.argeo.slc.maven</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<version>0.1.5</version>
 				<configuration>
-					<executable>java</executable>
-					<workingDirectory>exec/server</workingDirectory>
-					<arguments>
-						<argument>-Dmyproperty=myvalue</argument>
-						<argument>-jar</argument>
-						<argument>../../lib/org.eclipse.osgi-3.4.2.R34x_v20080826-1230.jar</argument>
-						<argument>-clean</argument>
-						<argument>-console</argument>
-						<argument>-configuration</argument>
-						<argument>conf</argument>
-					</arguments>
+					<execDir>exec/server</execDir>
+					<jvmArgs>
+						<jvmArg>-Xmx256m</jvmArg>
+						<jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
+					</jvmArgs>
 				</configuration>
 			</plugin>
+			<!--
+				<plugin> <artifactId>maven-dependency-plugin</artifactId>
+				<executions> <execution> <goals> <goal>copy-dependencies</goal>
+				</goals> <phase>initialize</phase> <configuration>
+				<outputDirectory>lib</outputDirectory>
+				<includeTypes>jar</includeTypes> </configuration> </execution>
+				</executions> </plugin> <plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId> <version>1.1</version>
+				<configuration> <executable>java</executable>
+				<workingDirectory>exec/server</workingDirectory> <arguments>
+				<argument>-Dmyproperty=myvalue</argument> <argument>-jar</argument>
+				<argument>../../lib/org.eclipse.osgi-3.4.2.R34x_v20080826-1230.jar</argument>
+				<argument>-clean</argument> <argument>-console</argument>
+				<argument>-configuration</argument> <argument>conf</argument>
+				</arguments> </configuration> </plugin>
+			-->
 
 		</plugins>
 	</build>
@@ -62,7 +58,7 @@
 		<!--  Server -->
 		<dependency>
 			<groupId>org.argeo.slc.server</groupId>
-			<artifactId>deploy</artifactId>
+			<artifactId>bundles</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index da74eadca..2b449aa8f 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-				<version>0.8.1.4</version>
+				<version>0.8.1.5</version>
 				<executions>
 					<execution>
 						<id>env</id>
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
index a1879c8da..600490a54 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.catalina/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.slc.server.catalina
 Bundle-Version: 0.11.3.qualifier
-Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6.0.16,7.0.0)"
\ No newline at end of file
+Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6.0.16,7.0.0)"
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
index 6f09b39cc..faad35f3e 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.tomcat/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.argeo.slc.server.tomcat
 Bundle-Version: 0.11.3.qualifier
-Fragment-Host: org.argeo.dep.osgi.catalina.start
\ No newline at end of file
+Fragment-Host: org.argeo.dep.osgi.catalina.start
diff --git a/server/org.argeo.slc.siteserver/bundles/pom.xml b/server/org.argeo.slc.siteserver/bundles/pom.xml
index 4c48fd04e..ef7848500 100644
--- a/server/org.argeo.slc.siteserver/bundles/pom.xml
+++ b/server/org.argeo.slc.siteserver/bundles/pom.xml
@@ -18,7 +18,7 @@
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>0.1.4</version>
+				<version>0.1.5</version>
 				<extensions>true</extensions>
 			</plugin>
 		</plugins>
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
index b0c882f94..ed6219951 100644
--- a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
@@ -3,12 +3,15 @@ Bundle-Name: Simple OSGi War
 Bundle-SymbolicName: org.springframework.osgi.samples.simplewebapp
 Bundle-Version: 0.1.0.qualifier
 Bundle-ClassPath: WEB-INF/classes
-Import-Package: javax.servlet,javax.servlet.http,
- javax.servlet.resources,javax.servlet.jsp,
- javax.servlet.jsp.jstl.core,javax.ser
- vlet.jsp.jstl.fmt,javax.servlet.jsp.jstl.tlv,
- org.apache.taglibs.standard.resources,org.apa
- che.taglibs.standard.tag.common.core,org.apache.tagli
- bs.standard.tag.rt.core,org.apache.taglibs.standard.t
- ei,org.apache.taglibs.standard.tlv
-
+Import-Package: javax.servlet,
+ javax.servlet.http,
+ javax.servlet.jsp,
+ javax.servlet.jsp.jstl.core,
+ javax.servlet.jsp.jstl.fmt,
+ javax.servlet.jsp.jstl.tlv,
+ javax.servlet.resources,
+ org.apache.taglibs.standard.resources,
+ org.apache.taglibs.standard.tag.common.core,
+ org.apache.taglibs.standard.tag.rt.core,
+ org.apache.taglibs.standard.tei,
+ org.apache.taglibs.standard.tlv
-- 
2.39.2