X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=e81a7480039601b905699be6b427fefae5c18af8;hb=370e17b89b62de8a5af827a209a9aaf07e2f0842;hp=28e3c033c9a4c1a5321719a3a90afb608f6c67a7;hpb=2ad1acc6a405415f6456c5547ad6ec2a87438fec;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 28e3c033c..e81a74800 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -11,7 +11,7 @@
 	<packaging>pom</packaging>
 	<name>Argeo SLC Site server</name>
 	<properties>
-		<spring-osgi.version>1.1.3</spring-osgi.version>
+		<spring-osgi.version>1.1.2</spring-osgi.version>
 		<spring.version>2.5.5</spring.version>
 	</properties>
 	<build>
@@ -50,52 +50,81 @@
 				</configuration>
 			</plugin>
 
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/equinox</outputDirectory>
+							<stripVersion>true</stripVersion>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.eclipse.osgi</groupId>
+									<artifactId>org.eclipse.osgi</artifactId>
+									<version>${version.equinox}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.argeo.slc.runtime</groupId>
+									<artifactId>org.argeo.slc.osgiboot</artifactId>
+									<version>${project.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.argeo.slc.runtime</groupId>
+									<artifactId>org.argeo.slc.osgiboot</artifactId>
+									<version>${project.version}</version>
+									<type>xml</type>
+									<classifier>osgiboot</classifier>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<configuration>
 					<tasks>
-						<property name="xmlcommons.jar"
-							location="${settings.localRepository}/org/apache/xmlcommons/com.springsource.org.apache.xmlcommons/1.3.3/com.springsource.org.apache.xmlcommons-1.3.3.jar" />
-						<property name="xerces.jar"
-							location="${settings.localRepository}/org/apache/xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-2.8.1.jar" />
-						<property name="xalan.jar"
-							location="${settings.localRepository}/org/apache/xalan/com.springsource.org.apache.xalan/2.7.0/com.springsource.org.apache.xalan-2.7.0.jar" />
-
-						<echo message="${xmlcommons.jar}" />
-						<echo message="${xerces.jar}" />
-						<echo message="${xalan.jar}" />
+					
+						<property name="mavenClasspath" refid="maven.compile.classpath" />
+						<property name="jar.asm.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm/1.5.3/com.springsource.org.objectweb.asm-1.5.3.jar" />
+						<property name="jar.asm.attrs.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar" />
+						<property name="slc.osgi.locations" value="${jar.asm.153}${path.separator}${jar.asm.attrs.153}${path.separator}${mavenClasspath}" />
+						
+						<property name="slc.osgi.devBases"
+							value="${user.dir}/bundles" />
+						<property name="slc.osgi.devPatterns"
+							value="*" />
+						<property name="slc.osgi.start"
+							value="org.springframework.osgi.catalina.start.osgi,org.springframework.bundle.osgi.extender,org.springframework.bundle.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp" />
 
-						<property name="bundles.dir" location="bundles" />
+						<property name="javaCommand"
+							location="${java.home}${file.separator}bin${file.separator}java" />
+						<ant
+							antfile="${project.build.directory}/equinox/org.argeo.slc.osgiboot-osgiboot.xml" />
 
-						<java classname="org.argeo.slc.detached.launcher.Main" fork="true"
-							dir="exec" jvm="${java.home}/bin/java">
-							<jvmarg
-								value="-Xbootclasspath/p:${xmlcommons.jar}${path.separator}${xerces.jar}${path.separator}${xalan.jar}" />
-							<classpath>
-								<path refid="maven.compile.classpath" />
-							</classpath>
-							<sysproperty key="slc.osgi.scanClasspath" value="true" />
-							<sysproperty key="slc.osgi.start" value="*" />
-							<sysproperty key="slc.osgi.devbundle.logging"
-								value="reference:file:${bundles.dir}/logging" />
-							<sysproperty key="slc.osgi.devbundle.simple-webapp"
-								value="reference:file:${bundles.dir}/simple-webapp.war" />
-							<sysproperty key="slc.osgi.devbundle.org.argeo.slc.webapp"
-								value="reference:file:${bundles.dir}/org.argeo.slc.webapp.war" />
-							<sysproperty key="slc.osgi.devbundle.org.argeo.slc.server.hibernate"
-								value="reference:file:${bundles.dir}/org.argeo.slc.server.hibernate" />
-							<sysproperty key="slc.osgi.devbundle.org.argeo.slc.server.activemq"
-								value="reference:file:${bundles.dir}/org.argeo.slc.server.activemq" />
-							<sysproperty
-								key="slc.osgi.devbundle.com.springsource.org.objectweb.asm."
-								value="reference:file:${settings.localRepository}/org/objectweb/asm/com.springsource.org.objectweb.asm/2.2.0/com.springsource.org.objectweb.asm-2.2.0.jar" />
-							<sysproperty
-								key="slc.osgi.devbundle.com.springsource.org.objectweb.asm.attrs"
-								value="reference:file:${settings.localRepository}/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar" />
-						</java>
 					</tasks>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>manager</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>list</goal>
+						</goals>
+						<configuration>
+							<outputFile>target/server.maven</outputFile>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
 
 		</plugins>
@@ -144,6 +173,36 @@
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>com.springsource.javax.xml.bind</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.aopalliance</groupId>
+			<artifactId>com.springsource.org.aopalliance</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		
+		
+
+		<dependency>
+			<groupId>org.objectweb.asm</groupId>
+			<artifactId>com.springsource.org.objectweb.asm</artifactId>
+			<version>1.5.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.objectweb.asm</groupId>
+			<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+			<version>1.5.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.objectweb.asm</groupId>
+			<artifactId>com.springsource.org.objectweb.asm</artifactId>
+			<version>2.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.objectweb.asm</groupId>
+			<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+			<version>2.2.0</version>
+		</dependency>
+		
 		<!--
 			<dependency> <groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.web.extender</artifactId>
@@ -154,7 +213,6 @@
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
 		-->
-
 		<!--
 			Using springsource repo <dependency>
 			<groupId>org.springframework.osgi</groupId>
@@ -233,6 +291,7 @@
 			<type>jar</type>
 		</dependency>
 
+		<!-- -->
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>spring-osgi-web</artifactId>
@@ -251,11 +310,6 @@
 			<version>${spring-osgi.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.aopalliance</groupId>
-			<artifactId>com.springsource.org.aopalliance</artifactId>
-			<version>1.0.0</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -274,7 +328,6 @@
 			<version>${spring.version}</version>
 		</dependency>
 
-
 		<!-- Required in JDK 1.5 -->
 		<dependency>
 			<groupId>com.sun.xml</groupId>
@@ -290,6 +343,12 @@
 			<version>6.1.9</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+
 		<!-- To launch OSGi -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>