X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=cf0815f5b1bea7d2ddcf858007c7da0d5a9f8efb;hb=bdd200301868c0a86f9ea578778247740c8c2ea0;hp=870d5717dda1db82111e172099bd6e10b60e9115;hpb=a8ec37fa9b7c8d0c1d071b4b9309f59dc0e1e930;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 870d5717d..cf0815f5b 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -16,6 +16,7 @@
 	</properties>
 	<build>
 		<plugins>
+		<!-- 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -26,6 +27,7 @@
 					<overWriteSnapshots>true</overWriteSnapshots>
 				</configuration>
 			</plugin>
+			 -->
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>maven-jetty-plugin</artifactId>
@@ -50,52 +52,101 @@
 				</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>
+								<!--  For Hibernate -->
+								<artifactItem>
+									<groupId>org.objectweb.asm</groupId>
+									<artifactId>com.springsource.org.objectweb.asm</artifactId>
+									<version>1.5.3</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.objectweb.asm</groupId>
+									<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+									<version>1.5.3</version>
+								</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="bundles.dir" location="bundles" />
-
-						<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>
+					
+						<property name="equinoxDir" location="${project.build.directory}/equinox" />
+						
+						<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="jar.asm.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
+						<property name="jar.asm.attrs.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
+						
+						<property name="bundle.argeo.ria" location="../../org.argeo.slc.webapp/src/main/webapp" />
+				
+						<property name="slc.osgi.locations" value="${bundle.argeo.ria}${path.separator}${jar.asm.153}${path.separator}${jar.asm.attrs.153}${path.separator}${mavenClasspath}" />
+						
+						<property name="slc.osgi.devBases"
+							value="${user.dir}/bundles,${user.dir}/../../demo/site" />
+						<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,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" />
+
+						<property name="javaCommand"
+							location="${java.home}${file.separator}bin${file.separator}java" />
+						<ant
+							antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
+
 					</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>
@@ -150,6 +201,30 @@
 			<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>
@@ -295,7 +370,7 @@
 			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
 			<version>1.2.2</version>
 		</dependency>
-		
+
 		<!-- To launch OSGi -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
@@ -303,6 +378,26 @@
 			<version>${project.version}</version>
 		</dependency>
 
+
+	<!-- For demo -->
+			<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.activemq</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.castor</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.maven</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	
 	</dependencies>
 
 	<repositories>