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

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index e81a74800..f2591a576 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -1,150 +1,29 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
-		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<groupId>org.argeo.slc.server</groupId>
+		<artifactId>argeo-slc-server</artifactId>
+		<version>0.11.4-SNAPSHOT</version>
+		<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.2</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-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="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="javaCommand"
-							location="${java.home}${file.separator}bin${file.separator}java" />
-						<ant
-							antfile="${project.build.directory}/equinox/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>
-	</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>
+		</dependency>
+
 
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -177,195 +56,89 @@
 		<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>
+			<groupId>javax.ejb</groupId>
+			<artifactId>com.springsource.javax.ejb</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.objectweb.asm</groupId>
-			<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-			<version>1.5.3</version>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.objectweb.asm</groupId>
-			<artifactId>com.springsource.org.objectweb.asm</artifactId>
-			<version>2.2.0</version>
+			<groupId>javax.xml.rpc</groupId>
+			<artifactId>com.springsource.javax.xml.rpc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.objectweb.asm</groupId>
-			<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-			<version>2.2.0</version>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>com.springsource.javax.xml.soap</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>
-		</dependency>
-
+			Using springsource repo -->
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>catalina.osgi</artifactId>
-			<version>5.5.23-SNAPSHOT</version>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>catalina.start.osgi</artifactId>
-			<version>1.0.0</version>
+			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jasper.osgi</artifactId>
-			<version>5.5.23-SNAPSHOT</version>
+			<artifactId>org.springframework.osgi.web</artifactId>
 		</dependency>
 
+		<!-- Tomcat -->
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>commons-el.osgi</artifactId>
-			<version>1.0-SNAPSHOT</version>
+			<groupId>org.apache.catalina</groupId>
+			<artifactId>com.springsource.org.apache.catalina</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>
 		</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>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>jsp-api.osgi</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<type>jar</type>
+			<groupId>org.argeo.slc.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
 		</dependency>
 
-		<!-- -->
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-web</artifactId>
-			<version>${spring-osgi.version}</version>
-		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-web-extender</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>spring-osgi-extender</artifactId>
-			<version>${spring-osgi.version}</version>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>
+					com.springsource.org.apache.log4j
+				</artifactId>
 		</dependency>
 
-
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${spring.version}</version>
+			<groupId>net.sourceforge.jtds</groupId>
+			<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${spring.version}</version>
+			<groupId>com.mysql.jdbc</groupId>
+			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-
-		<!-- Required in JDK 1.5 -->
+		<!-- For WS -->
 		<dependency>
 			<groupId>com.sun.xml</groupId>
-			<artifactId>
-				com.springsource.com.sun.xml.messaging.saaj
-				</artifactId>
+			<artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
 		</dependency>
 
-		<!-- For ActiveMQ Ajax -->
+		<!-- For ActiveMQ Web
 		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>com.springsource.org.mortbay.util</artifactId>
-			<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>
-			<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