Start migrating to an OSGi server

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

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index f09ad93bca7cfe3ac31c92b6daac4e3db1c06a1e..7bc940f106fd530d9d2a2a8bbb0fb6a184469abf 100644 (file)
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -54,18 +55,11 @@
                                                        <job>slc-build</job>
                                                </configuration>
                                        </execution>
-                                       <!-- 
-                                       <execution>
-                                               <id>slc-test</id>
-                                               <phase>integration-test</phase>
-                                               <goals>
-                                                       <goal>generate</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <job>slc-test</job>
-                                               </configuration>
-                                       </execution>
-                                        -->
+                                       <!--
+                                               <execution> <id>slc-test</id> <phase>integration-test</phase>
+                                               <goals> <goal>generate</goal> </goals> <configuration>
+                                               <job>slc-test</job> </configuration> </execution>
+                                       -->
                                        <execution>
                                                <id>slc-api</id>
                                                <phase>site</phase>
@@ -116,6 +110,68 @@
                        <artifactId>org.argeo.slc.server</artifactId>
                </dependency>
 
+               <!-- OSGi integration -->
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.web.extender</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.catalina</groupId>
+                       <artifactId>com.springsource.org.apache.catalina</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.web</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.annotation</groupId>
+                       <artifactId>com.springsource.javax.annotation</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.persistence</groupId>
+                       <artifactId>com.springsource.javax.persistence</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.ws</groupId>
+                       <artifactId>com.springsource.javax.xml.ws</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.bind</groupId>
+                       <artifactId>com.springsource.javax.xml.bind</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+               </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>
+               </dependency>
+               <dependency>
+                       <groupId>org.hsqldb</groupId>
+                       <artifactId>com.springsource.org.hsqldb</artifactId>
+               </dependency>
+
                <!-- Required in JDK 1.5 -->
                <dependency>
                        <groupId>com.sun.xml</groupId>