X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fpom.xml;h=9c63fe7eb20c0288accf0117bec662985492af28;hb=fc482f660799a31c62a29b9333c6f3c458dde8d2;hp=6611adab2a42eb7854ea8dbdbdbfddbc30f7f0f3;hpb=4810532845c8a54c04a850c7db3a9fe00e8ebc6a;p=gpl%2Fargeo-slc.git
diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 6611adab2..9c63fe7eb 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -16,39 +16,6 @@
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
- war
- true
- true
- true
-
-
-
- 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
@@ -100,71 +67,78 @@
maven-antrun-plugin
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
@@ -199,153 +173,70 @@
com.springsource.org.aopalliance
1.0.0
-
-
-
- org.objectweb.asm
- com.springsource.org.objectweb.asm
- 1.5.3
-
-
- org.objectweb.asm
- com.springsource.org.objectweb.asm.attrs
- 1.5.3
-
-
- org.objectweb.asm
- com.springsource.org.objectweb.asm
- 2.2.0
-
-
- org.objectweb.asm
- com.springsource.org.objectweb.asm.attrs
- 2.2.0
-
-
-
+
org.springframework.osgi
org.springframework.osgi.web.extender
-
- org.springframework.osgi
- org.springframework.osgi.extender
-
- org.springframework.osgi
- org.springframework.osgi.web
- org.apache.catalina
- com.springsource.org.apache.catalina
- org.argeo.slc.dep.osgi
- org.argeo.dep.osgi.catalina.start
- javax.servlet
- com.springsource.javax.servlet.jsp
- javax.el
- com.springsource.javax.el
- javax.servlet
- com.springsource.javax.servlet.jsp.jstl
- org.apache.taglibs
- com.springsource.org.apache.taglibs.standard
-
- -->
-
-
-
- org.apache.commons
- com.springsource.org.apache.commons.logging
-
-
- org.apache.log4j
-
- com.springsource.org.apache.log4j
-
-
org.springframework.osgi
- catalina.osgi
- 5.5.23-SNAPSHOT
+ org.springframework.osgi.extender
-
org.springframework.osgi
- catalina.start.osgi
- 1.0.0
+ org.springframework.osgi.web
+
+
- org.springframework.osgi
- jasper.osgi
- 5.5.23-SNAPSHOT
+ org.apache.catalina
+ com.springsource.org.apache.catalina
-
- org.springframework.osgi
- commons-el.osgi
- 1.0-SNAPSHOT
+ org.argeo.slc.dep.osgi
+ org.argeo.dep.osgi.catalina.start
- org.springframework.osgi
- jstl.osgi
- 1.1.2-SNAPSHOT
+ org.apache.jasper
+ com.springsource.org.apache.jasper
+ 6.0.18
- org.springframework.osgi
- servlet-api.osgi
- 2.5-SNAPSHOT
- jar
+ org.apache.el
+ com.springsource.org.apache.el
+ 6.0.18
+
- org.springframework.osgi
- jsp-api.osgi
- 2.0-SNAPSHOT
- jar
+ javax.servlet
+ com.springsource.javax.servlet.jsp
-
-
- org.springframework.osgi
- spring-osgi-web
- ${spring-osgi.version}
+ javax.el
+ com.springsource.javax.el
-
- org.springframework.osgi
- spring-osgi-web-extender
- ${spring-osgi.version}
+ javax.servlet
+ com.springsource.javax.servlet.jsp.jstl
-
- org.springframework.osgi
- spring-osgi-extender
- ${spring-osgi.version}
+ org.apache.taglibs
+ com.springsource.org.apache.taglibs.standard
- org.springframework
- spring-web
- ${spring.version}
-
-
- org.springframework
- spring-context
- ${spring.version}
+ org.apache.commons
+ com.springsource.org.apache.commons.logging
-
- org.springframework
- spring-webmvc
- ${spring.version}
+ org.apache.log4j
+
+ com.springsource.org.apache.log4j
+
@@ -369,16 +260,8 @@
1.2.2
-
+
- org.argeo.slc
- org.argeo.slc.detached.launcher
- ${project.version}
-
-
-
-
-
org.argeo.slc.runtime
org.argeo.slc.support.equinox
@@ -395,9 +278,9 @@
org.argeo.slc.support.maven
${project.version}
-
-
+
+
\ No newline at end of file