Improve server structure

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / pom.xml

diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index be172aaa21d908cd37315c71edf1a41a6744310e..1f68b72b302cb8458b7293c213d0755005c536af 100644 (file)
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -17,7 +17,10 @@
                        org.springframework.osgi.web.extender,
                        org.springframework.osgi.samples.simplewebapp,
                        org.argeo.slc.server.activemq,
+                       org.argeo.slc.server.hsqldb,
                        org.argeo.slc.server.hibernate,
+                       org.argeo.slc.server.services,
+                       org.argeo.slc.server.jms,
                        org.argeo.slc.webapp,
                        org.argeo.slc.demo.basic,
                        org.argeo.slc.demo.manager
@@ -125,9 +128,24 @@
                <dependency>
                        <groupId>org.aopalliance</groupId>
                        <artifactId>com.springsource.org.aopalliance</artifactId>
-                       <version>1.0.0</version>
                </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>
                <!--
                        Using springsource repo -->
                <dependency>
@@ -148,37 +166,17 @@
                        <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>
                        <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>
+                       <groupId>org.argeo.slc.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                </dependency>
 
 
@@ -193,25 +191,10 @@
                                </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>
-
+               <!-- For ActiveMQ Web -->
                <dependency>
-                       <groupId>com.thoughtworks.xstream</groupId>
-                       <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-                       <version>1.2.2</version>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
                </dependency>
 
                <!-- For demo -->
@@ -219,6 +202,7 @@
                        <groupId>org.argeo.slc.demo</groupId>
                        <artifactId>org.argeo.slc.demo.deploy</artifactId>
                        <version>${project.version}</version>
+                       <type>pom</type>
                </dependency>
 
        </dependencies>