X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=9c63fe7eb20c0288accf0117bec662985492af28;hb=66f3671c9a07777edc19d8efdea0e162a68f9838;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..9c63fe7eb 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -16,106 +16,129 @@
 	</properties>
 	<build>
 		<plugins>
+
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<configuration>
-					<includeTypes>war</includeTypes>
-					<stripVersion>true</stripVersion>
-					<overWriteReleases>true</overWriteReleases>
-					<overWriteSnapshots>true</overWriteSnapshots>
-				</configuration>
+				<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>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<configuration>
-					<webApp>${project.build.directory}/dependency/org.argeo.slc.webapp.war</webApp>
-					<scanIntervalSeconds>0</scanIntervalSeconds>
-					<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-					<jettyConfig>src/test/config/jetty/jetty.xml</jettyConfig>
-					<systemProperties>
-						<systemProperty>
-							<!-- Archiva home -->
-							<name>appserver.base</name>
-							<value>target</value>
-						</systemProperty>
-						<systemProperty>
-							<!-- Archiva home -->
-							<name>appserver.home</name>
-							<value>target</value>
-						</systemProperty>
-					</systemProperties>
-
-				</configuration>
-			</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="equinoxDir" location="${project.build.directory}/equinox" />
+
+						<path id="slc.osgi.locations.raw">
+							<dirset dir="${user.dir}/bundles">
+								<include name="*" />
+								<exclude name=".svn" />
+							</dirset>
+							<dirset dir="${user.dir}/../../demo/site">
+								<include name="*" />
+								<exclude name=".svn" />
+							</dirset>
+							<!-- Old ASM for Hibernate: -->
+							<pathelement
+								location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
+							<pathelement
+								location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
+							<!-- Dev for Argeo RIA: -->
+							<!--
+								<pathelement
+								location="../../org.argeo.slc.webapp/src/main/webapp" />
+							-->
+							<path refid="maven.compile.classpath" />
+						</path>
+						<pathconvert dirsep="/" property="slc.osgi.locations"
+							refid="slc.osgi.locations.raw">
+						</pathconvert>
+
+						<property name="slc.osgi.start"
+							value="org.argeo.dep.osgi.catalina.start,org.springframework.osgi.extender,org.springframework.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="bundles.dir" location="bundles" />
+						<property name="javaCommand"
+							location="${java.home}${file.separator}bin${file.separator}java -Xmx256m" />
+						<ant antfile="${equinoxDir}/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>
+			-->
+			<!--
+				<plugin> <groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId> <configuration>
+				<webApp>${project.build.directory}/dependency/org.argeo.slc.webapp.war</webApp>
+				<scanIntervalSeconds>0</scanIntervalSeconds>
+				<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
+				<jettyConfig>src/test/config/jetty/jetty.xml</jettyConfig>
+				<systemProperties> <systemProperty> <name>appserver.base</name>
+				<value>target</value> </systemProperty> <systemProperty>
+				<name>appserver.home</name> <value>target</value> </systemProperty>
+				</systemProperties> </configuration> </plugin>
+			-->
 		</plugins>
 	</build>
 	<dependencies>
-		<!--
-			<dependency> <groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.webapp</artifactId> <type>war</type>
-			</dependency> <dependency> <groupId>org.apache.archiva</groupId>
-			<artifactId>archiva-webapp</artifactId> <type>war</type>
-			</dependency>
-		-->
-
-		<!--  OSGI TESTS -->
-
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.server</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.argeo.slc.server</groupId>
+			<artifactId>org.argeo.slc.ria</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -150,129 +173,70 @@
 			<artifactId>com.springsource.org.aopalliance</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+
 		<!--
-			<dependency> <groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
-			</dependency> <dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
-			</dependency> <dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
-		-->
-		<!--
-			Using springsource repo <dependency>
+			Using springsource repo -->
+		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.web.extender</artifactId>
-			</dependency> <dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
-			</dependency> <dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
-			<dependency> <groupId>org.apache.catalina</groupId>
-			<artifactId>com.springsource.org.apache.catalina</artifactId>
-			</dependency> <dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-			</dependency> <dependency> <groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
-			</dependency> <dependency> <groupId>javax.el</groupId>
-			<artifactId>com.springsource.javax.el</artifactId> </dependency>
-			<dependency> <groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-			</dependency> <dependency> <groupId>org.apache.taglibs</groupId>
-			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-			</dependency>
-		-->
-
-		<!-- Using spring osgi repo -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.log4j</groupId>
-			<artifactId>
-					com.springsource.org.apache.log4j
-				</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>catalina.osgi</artifactId>
-			<version>5.5.23-SNAPSHOT</version>
+			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>catalina.start.osgi</artifactId>
-			<version>1.0.0</version>
+			<artifactId>org.springframework.osgi.web</artifactId>
 		</dependency>
+
+		<!-- Tomcat -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jasper.osgi</artifactId>
-			<version>5.5.23-SNAPSHOT</version>
+			<groupId>org.apache.catalina</groupId>
+			<artifactId>com.springsource.org.apache.catalina</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>commons-el.osgi</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<groupId>org.argeo.slc.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jstl.osgi</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<groupId>org.apache.jasper</groupId>
+			<artifactId>com.springsource.org.apache.jasper</artifactId>
+			<version>6.0.18</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>servlet-api.osgi</artifactId>
-			<version>2.5-SNAPSHOT</version>
-			<type>jar</type>
+			<groupId>org.apache.el</groupId>
+			<artifactId>com.springsource.org.apache.el</artifactId>
+			<version>6.0.18</version>
 		</dependency>
+
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jsp-api.osgi</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<type>jar</type>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
 		</dependency>
-
-		<!-- -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-web</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>javax.el</groupId>
+			<artifactId>com.springsource.javax.el</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-web-extender</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-extender</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>org.apache.taglibs</groupId>
+			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
 		</dependency>
 
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>
+					com.springsource.org.apache.log4j
+				</artifactId>
 		</dependency>
 
 		<!-- Required in JDK 1.5 -->
@@ -295,16 +259,28 @@
 			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
 			<version>1.2.2</version>
 		</dependency>
-		
-		<!-- To launch OSGi -->
+
+		<!-- 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</groupId>
-			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<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>
 		<repository>
 			<id>spring-osgified-artifacts</id>
@@ -315,4 +291,5 @@
 			<url>http://maven.springframework.org/osgi</url>
 		</repository>
 	</repositories>
+	 -->
 </project>
\ No newline at end of file