Properly build OSGI Boot

[lgpl/argeo-commons.git] / server / demo / pom.xml

diff --git a/server/demo/pom.xml b/server/demo/pom.xml
index a4b22ff5eed2de5f9376f134ba9e11030ddba30b..8c80ce2e473a49189cdfaae1e236d481b5934a58 100644 (file)
--- a/server/demo/pom.xml
+++ b/server/demo/pom.xml
@@ -26,9 +26,12 @@
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <configuration>
                                        <execDir>target/exec/server</execDir>
+                                       <osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
                                        <systemProperties>
                                                <slc.osgi.start>
                                                        org.springframework.osgi.extender,
+                                                       org.springframework.osgi.web.extender,
+                                                       org.argeo.dep.osgi.catalina.start,
                                                        org.argeo.server.demo.miniwebapp
                                                </slc.osgi.start>
                                                <slc.osgi.bundles>
@@ -49,9 +52,9 @@
                        <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.osgiboot</artifactId>
-                       <version>${version.slc}</version>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>0.1.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Logging -->
@@ -123,8 +126,6 @@
                        <groupId>javax.xml.stream</groupId>
                        <artifactId>com.springsource.javax.xml.stream</artifactId>
                </dependency>
-
-               <!-- JSP -->
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>com.springsource.javax.servlet.jsp</artifactId>
@@ -138,13 +139,20 @@
                        <artifactId>com.springsource.javax.el</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
+                       <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>
+
+               <!-- Taglibs
                <dependency>
                        <groupId>org.apache.taglibs</groupId>
                        <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-               </dependency>
+               </dependency> -->
+
 
                <!-- Tomcat -->
                <dependency>
@@ -160,12 +168,13 @@
                        <artifactId>com.springsource.org.apache.jasper</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>
+                       <groupId>org.apache.el</groupId>
+                       <artifactId>com.springsource.org.apache.el</artifactId>
                </dependency>
+
+               <!--
+                       ActiveMQ <dependency> <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.activemq</artifactId> </dependency>
+               -->
        </dependencies>
 </project>
\ No newline at end of file