X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=4e2fcf708d887a06507acf2ed06a9749da199023;hb=0f9c0c9e360c65cbc5afac6dc530cc4477298b7f;hp=5dd781fbbb6c2543057de3c4986538d493539a39;hpb=27ce6bc00a1553eb855a3880a7e99e96a1c9ef00;p=gpl%2Fargeo-slc.git
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 5dd781fbb..4e2fcf708 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -4,7 +4,7 @@
org.argeo.slc
argeo-slc
- 0.11.2-SNAPSHOT
+ 0.11.3-SNAPSHOT
../../org.argeo.slc
org.argeo.slc.runtime
@@ -29,11 +29,13 @@
org.apache.felix
maven-bundle-plugin
+ ${version.maven-bundle-plugin}
- org.argeo.slc.*
+ org.argeo.slc.*,org.argeo.slc.server,org.argeo.slc.server.spring
+ org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",org.argeo.slc.activemq,*
@@ -45,24 +47,49 @@
../../org.argeo.slc.webapp/src/main/webapp
- ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+ ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml
+ ../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml
+
+
+ activemq.base
+ ${user.home}/share/apache-activemq-5.2.0
+
+
+
org.argeo.slc.runtime
org.argeo.slc.support.hibernate
- ${project.version}
org.argeo.slc.runtime
org.argeo.slc.support.castor
- ${project.version}
+
+
+ org.argeo.slc.runtime
+ org.argeo.slc.support.activemq
+
+
+ org.springframework.ws
+ org.springframework.ws
+
+
+ org.springframework
+ org.springframework.web.servlet
+
+
+ org.springframework
+ org.springframework.aop
+
+
+
javax.servlet
@@ -81,17 +108,17 @@
provided
- org.springframework.ws
- org.springframework.ws
-
-
- org.springframework
- org.springframework.web.servlet
+ javax.wsdl
+ com.springsource.javax.wsdl
+
+
+
+
org.aspectj
com.springsource.org.aspectj.weaver
@@ -104,9 +131,13 @@
com.lowagie.text
com.springsource.com.lowagie.text
+
+
- javax.wsdl
- com.springsource.javax.wsdl
+ com.sun.xml
+
+ com.springsource.com.sun.xml.messaging.saaj
+