X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=9c63fe7eb20c0288accf0117bec662985492af28;hb=fc482f660799a31c62a29b9333c6f3c458dde8d2;hp=7b8c291ad65d15eec66631a3fe6458ab6ad8b5d0;hpb=8e097b1470aab6e956108acdbc5ddcd78488beec;p=gpl%2Fargeo-slc.git
diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 7b8c291ad..9c63fe7eb 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -16,37 +16,6 @@
-
-
- org.mortbay.jetty
- maven-jetty-plugin
-
- ${project.build.directory}/dependency/org.argeo.slc.webapp.war
- 0
- ../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml
- src/test/config/jetty/jetty.xml
-
-
-
- appserver.base
- target
-
-
-
- appserver.home
- target
-
-
-
-
-
maven-dependency-plugin
@@ -101,73 +70,75 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ value="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" />
+ location="${java.home}${file.separator}bin${file.separator}java -Xmx256m" />
-
- maven-dependency-plugin
-
-
- manager
- initialize
-
- list
-
-
- target/server.maven
-
-
-
-
-
+
+
-
-
-
-
org.argeo.slc.runtime
org.argeo.slc.server
+
+ org.argeo.slc.server
+ org.argeo.slc.ria
+ ${project.version}
+
+
org.hsqldb
@@ -203,22 +174,6 @@
1.0.0
-
-
-
@@ -234,10 +189,16 @@
org.springframework.osgi.web
+
org.apache.catalina
com.springsource.org.apache.catalina
+
+ org.argeo.slc.dep.osgi
+ org.argeo.dep.osgi.catalina.start
+
+
org.apache.jasper
com.springsource.org.apache.jasper
@@ -248,7 +209,7 @@
com.springsource.org.apache.el
6.0.18
-
+
javax.servlet
com.springsource.javax.servlet.jsp
@@ -267,7 +228,6 @@
-
org.apache.commons
com.springsource.org.apache.commons.logging
@@ -279,85 +239,6 @@
-
- org.springframework.osgi
- catalina.start.osgi
- 1.0.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
com.sun.xml
@@ -379,12 +260,6 @@
1.2.2
-
-
org.argeo.slc.runtime
@@ -405,7 +280,7 @@
-
+
\ No newline at end of file