X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=3bc3388b16236bde5d3c2f78b545e56f8b59f4d1;hb=c6364b9aa6850577994224419364658595dd9b7b;hp=587c6e6902d4bdd93abf4e6c6bb39db8eb36d4cf;hpb=5ec2895100c0f8dc1b47f7ffaff8ce164902714a;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 587c6e690..3bc3388b1 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -2,9 +2,9 @@
 	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.server</groupId>
-		<artifactId>argeo-slc-server</artifactId>
-		<version>0.11.3-SNAPSHOT</version>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>server</artifactId>
+		<version>0.11.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.server</groupId>
@@ -16,131 +16,68 @@
 	</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>
-
-		<!-- OSGi integration -->
-		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
+			<artifactId>com.springsource.org.hsqldb</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>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>com.springsource.javax.ejb</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
+			</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>
+			</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>
-		<!--
-			Using springsource repo -->
-		<dependency>
+			</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.apache.jasper</groupId>
+			</dependency> <dependency> <groupId>org.apache.jasper</groupId>
 			<artifactId>com.springsource.org.apache.jasper</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.el</groupId>
-			<artifactId>com.springsource.org.apache.el</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep.osgi</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>
+			</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>
-
-		<dependency>
-			<groupId>net.sourceforge.jtds</groupId>
+			</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>
+			</dependency> <dependency> <groupId>com.mysql.jdbc</groupId>
 			<artifactId>com.springsource.com.mysql.jdbc</artifactId>
-		</dependency>
-
-		<!-- For WS -->
-		<dependency>
-			<groupId>com.sun.xml</groupId>
+			</dependency> <dependency> <groupId>com.sun.xml</groupId>
 			<artifactId>com.springsource.com.sun.xml.messaging.saaj</artifactId>
-		</dependency>
-
-		<!-- For ActiveMQ Web
-		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-		</dependency> -->
-
+			</dependency>
+		-->
 	</dependencies>
 </project>
\ No newline at end of file