X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=587c6e6902d4bdd93abf4e6c6bb39db8eb36d4cf;hb=18f1bba4685e714a9bcc7ce7cf7baa6cae13030b;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..587c6e690 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -2,120 +2,30 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
+		<groupId>org.argeo.slc.server</groupId>
+		<artifactId>argeo-slc-server</artifactId>
 		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
-	<artifactId>org.argeo.slc.siteserver</artifactId>
+	<groupId>org.argeo.slc.server</groupId>
+	<artifactId>deploy</artifactId>
 	<packaging>pom</packaging>
-	<name>Argeo SLC Site server</name>
-	<properties>
-		<spring-osgi.version>1.1.3</spring-osgi.version>
-		<spring.version>2.5.5</spring.version>
-	</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>
-			</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="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>
-					</tasks>
-				</configuration>
-			</plugin>
-
-
-		</plugins>
-	</build>
+	<name>Argeo SLC Server Deploy</name>
+	<modules>
+		<module>bundles</module>
+	</modules>
 	<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>
@@ -144,169 +54,93 @@
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>com.springsource.javax.xml.bind</artifactId>
 		</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>
-			<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>
+			<groupId>org.aopalliance</groupId>
+			<artifactId>com.springsource.org.aopalliance</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>catalina.osgi</artifactId>
-			<version>5.5.23-SNAPSHOT</version>
+			<groupId>javax.ejb</groupId>
+			<artifactId>com.springsource.javax.ejb</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>catalina.start.osgi</artifactId>
-			<version>1.0.0</version>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jasper.osgi</artifactId>
-			<version>5.5.23-SNAPSHOT</version>
+			<groupId>javax.xml.rpc</groupId>
+			<artifactId>com.springsource.javax.xml.rpc</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>commons-el.osgi</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>com.springsource.javax.xml.soap</artifactId>
 		</dependency>
-
+		<!--
+			Using springsource repo -->
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jstl.osgi</artifactId>
-			<version>1.1.2-SNAPSHOT</version>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>servlet-api.osgi</artifactId>
-			<version>2.5-SNAPSHOT</version>
-			<type>jar</type>
+			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jsp-api.osgi</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<type>jar</type>
+			<artifactId>org.springframework.osgi.web</artifactId>
 		</dependency>
 
+		<!-- Tomcat -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-web</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>org.apache.catalina</groupId>
+			<artifactId>com.springsource.org.apache.catalina</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-web-extender</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>org.apache.jasper</groupId>
+			<artifactId>com.springsource.org.apache.jasper</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-extender</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>org.apache.el</groupId>
+			<artifactId>com.springsource.org.apache.el</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.aopalliance</groupId>
-			<artifactId>com.springsource.org.aopalliance</artifactId>
-			<version>1.0.0</version>
+			<groupId>org.argeo.slc.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
 		</dependency>
 
+
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</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-context</artifactId>
-			<version>${spring.version}</version>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>
+					com.springsource.org.apache.log4j
+				</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
+			<groupId>net.sourceforge.jtds</groupId>
+			<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
 		</dependency>
-
-
-		<!-- Required in JDK 1.5 -->
 		<dependency>
-			<groupId>com.sun.xml</groupId>
-			<artifactId>
-				com.springsource.com.sun.xml.messaging.saaj
-				</artifactId>
+			<groupId>com.mysql.jdbc</groupId>
+			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
 		</dependency>
 
-		<!-- For ActiveMQ Ajax -->
+		<!-- For WS -->
 		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>com.springsource.org.mortbay.util</artifactId>
-			<version>6.1.9</version>
+			<groupId>com.sun.xml</groupId>
+			<artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
 		</dependency>
 
-		<!-- To launch OSGi -->
+		<!-- For ActiveMQ Web
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.detached.launcher</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+		</dependency> -->
 
 	</dependencies>
-
-	<repositories>
-		<repository>
-			<id>spring-osgified-artifacts</id>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<name>Springframework Maven OSGified Artifacts Repository</name>
-			<url>http://maven.springframework.org/osgi</url>
-		</repository>
-	</repositories>
 </project>
\ No newline at end of file