X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=37d37e8355e0e45b8142ce88fc38893441153bca;hb=27c92a7e65dc2d52426dd3cbf9030da42285e862;hp=be172aaa21d908cd37315c71edf1a41a6744310e;hpb=5ca0831fd91542776d1d4a8b51e07b9982bd634e;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index be172aaa2..37d37e835 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -2,224 +2,82 @@
 	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>
-		<bundlesToStart>
-			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
-		</bundlesToStart>
-	</properties>
-	<build>
-		<plugins>
-
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<phase>initialize</phase>
-						<configuration>
-							<outputDirectory>target/equinox</outputDirectory>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.argeo.slc.runtime</groupId>
-									<artifactId>org.argeo.slc.osgiboot</artifactId>
-									<version>${project.version}</version>
-									<type>tar.gz</type>
-									<classifier>osgiboot</classifier>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<configuration>
-					<tasks>
-						<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>
-							<!-- 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" />
-
-						<property name="slc.osgi.start" value="${bundlesToStart}" />
-
-						<property name="javaCommand" value="java -Xmx256m" />
-						<ant antfile="target/equinox/osgiboot.xml" />
-					</tasks>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+	<name>Argeo SLC Server Deploy</name>
+	<modules>
+		<module>bundles</module>
+	</modules>
 	<dependencies>
 		<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>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.server</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<!--
+			<dependency> <groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.server</artifactId> </dependency>
 
-
-		<dependency>
+			<dependency> <groupId>org.argeo.slc.server</groupId>
+			<artifactId>org.argeo.slc.ria</artifactId> </dependency> <dependency>
 			<groupId>org.hsqldb</groupId>
-			<artifactId>com.springsource.org.hsqldb</artifactId>
-		</dependency>
+			<artifactId>com.springsource.org.hsqldb</artifactId> </dependency>
 
-		<!-- OSGi integration -->
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
-
-		<dependency>
+			<dependency> <groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId> </dependency> <dependency>
 			<groupId>javax.annotation</groupId>
 			<artifactId>com.springsource.javax.annotation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
+			</dependency> <dependency> <groupId>javax.persistence</groupId>
 			<artifactId>com.springsource.javax.persistence</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.ws</groupId>
-			<artifactId>com.springsource.javax.xml.ws</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
+			</dependency> <dependency> <groupId>javax.xml.ws</groupId>
+			<artifactId>com.springsource.javax.xml.ws</artifactId> </dependency>
+			<dependency> <groupId>javax.xml.bind</groupId>
 			<artifactId>com.springsource.javax.xml.bind</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.aopalliance</groupId>
+			</dependency> <dependency> <groupId>org.aopalliance</groupId>
 			<artifactId>com.springsource.org.aopalliance</artifactId>
-			<version>1.0.0</version>
-		</dependency>
-
-		<!--
-			Using springsource repo -->
-		<dependency>
+			</dependency> <dependency> <groupId>javax.ejb</groupId>
+			<artifactId>com.springsource.javax.ejb</artifactId> </dependency>
+			<dependency> <groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
+			</dependency> <dependency> <groupId>javax.xml.rpc</groupId>
+			<artifactId>com.springsource.javax.xml.rpc</artifactId> </dependency>
+			<dependency> <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>
+			</dependency> <dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.extender</artifactId>
-		</dependency>
-		<dependency>
+			</dependency> <dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
-		</dependency>
+			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
 
-		<!-- Tomcat -->
-		<dependency>
-			<groupId>org.apache.catalina</groupId>
+			<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>org.apache.jasper</groupId>
+			</dependency> <dependency> <groupId>org.apache.jasper</groupId>
 			<artifactId>com.springsource.org.apache.jasper</artifactId>
-			<version>6.0.18</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.el</groupId>
-			<artifactId>com.springsource.org.apache.el</artifactId>
-			<version>6.0.18</version>
-		</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>
-
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
+			</dependency> <dependency> <groupId>org.apache.el</groupId>
+			<artifactId>com.springsource.org.apache.el</artifactId> </dependency>
+			<dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+			</dependency> <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>
-
-		<!-- Required in JDK 1.5 -->
-		<dependency>
-			<groupId>com.sun.xml</groupId>
-			<artifactId>
-				com.springsource.com.sun.xml.messaging.saaj
-				</artifactId>
-		</dependency>
-
-		<!-- For ActiveMQ Ajax -->
-		<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>
-
-		<!-- For demo -->
-		<dependency>
-			<groupId>org.argeo.slc.demo</groupId>
-			<artifactId>org.argeo.slc.demo.deploy</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
+			</dependency> <dependency> <groupId>org.apache.log4j</groupId>
+			<artifactId> com.springsource.org.apache.log4j </artifactId>
+			</dependency> <dependency> <groupId>net.sourceforge.jtds</groupId>
+			<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
+			</dependency> <dependency> <groupId>com.mysql.jdbc</groupId>
+			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
+			</dependency> <dependency> <groupId>com.sun.xml</groupId>
+			<artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
+			</dependency>
+		-->
 	</dependencies>
 </project>
\ No newline at end of file