Adapt to OSGi on the server side

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

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index 5dd781fbbb6c2543057de3c4986538d493539a39..4e2fcf708d887a06507acf2ed06a9749da199023 100644 (file)
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.11.2-SNAPSHOT</version>
+               <version>0.11.3-SNAPSHOT</version>
                <relativePath>../../org.argeo.slc</relativePath>
        </parent>
        <groupId>org.argeo.slc.runtime</groupId>
@@ -29,11 +29,13 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                                <Export-Package>
-                                                       org.argeo.slc.*
+                                                       org.argeo.slc.*,org.argeo.slc.server,org.argeo.slc.server.spring
                                                </Export-Package>
+                                               <Import-Package>org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",org.argeo.slc.activemq,*</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
@@ -45,24 +47,49 @@
                                                ../../org.argeo.slc.webapp/src/main/webapp
                                        </webAppSourceDirectory>
                                        <jettyConfig>
-                                               ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test.xml
+                                               ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml
                                        </jettyConfig>
+                                       <webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
+                                       <systemProperties>
+                                               <systemProperty>
+                                                       <name>activemq.base</name>
+                                                       <value>${user.home}/share/apache-activemq-5.2.0</value>
+                                               </systemProperty>
+                                       </systemProperties>
                                </configuration>
                        </plugin>
                </plugins>
        </build>
        <dependencies>
+               <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.hibernate</artifactId>
-                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
-                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.activemq</artifactId>
                </dependency>
 
+               <!-- Spring -->
+               <dependency>
+                       <groupId>org.springframework.ws</groupId>
+                       <artifactId>org.springframework.ws</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.web.servlet</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.aop</artifactId>
+               </dependency>
+
+               <!-- J2EE -->
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>
@@ -81,17 +108,17 @@
                        <scope>provided</scope>
                </dependency>
                <dependency>
-                       <groupId>org.springframework.ws</groupId>
-                       <artifactId>org.springframework.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.web.servlet</artifactId>
+                       <groupId>javax.wsdl</groupId>
+                       <artifactId>com.springsource.javax.wsdl</artifactId>
                </dependency>
+
+               <!-- ActiveMQ
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>org.springframework.aop</artifactId>
-               </dependency>
+                       <groupId>org.apache.activemq</groupId>
+                       <artifactId>com.springsource.org.apache.activemq.web</artifactId>
+               </dependency> -->
+
+               <!-- Various -->
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>com.springsource.org.aspectj.weaver</artifactId>
@@ -104,9 +131,13 @@
                        <groupId>com.lowagie.text</groupId>
                        <artifactId>com.springsource.com.lowagie.text</artifactId>
                </dependency>
+
+               <!-- Required in JDK 1.5 -->
                <dependency>
-                       <groupId>javax.wsdl</groupId>
-                       <artifactId>com.springsource.javax.wsdl</artifactId>
+                       <groupId>com.sun.xml</groupId>
+                       <artifactId>
+                               com.springsource.com.sun.xml.messaging.saaj
+                               </artifactId>
                </dependency>
 
        </dependencies>