Start ADS server

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

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index 8a3573402e1334156415d980c98654feab64762d..db113ebf1f3ab0b6211993f446837263ad24adfe 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -1,9 +1,10 @@
-<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>
                <artifactId>integration-tests</artifactId>
-               <version>0.11.5-SNAPSHOT</version>
+               <version>0.12.2-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc.it</groupId>
        <artifactId>org.argeo.slc.it.webapp</artifactId>
@@ -20,19 +21,32 @@
                                                <arg>-clean</arg>
                                        </argsToAppend>
                                        <systemProperties>
-                                               <slc.osgi.bundles>
-                                                       ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml,
-                                                       ${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml,
-                                                       ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml
-                                               </slc.osgi.bundles>
-                                               <slc.osgi.start>
+                                               <argeo.osgi.bundles>
+                                                       ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
+                                               </argeo.osgi.bundles>
+                                               <!--
+                                                       <argeo.osgi.bundles>
+                                                       ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
+                                                       ${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml;ex=.*,
+                                                       ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml;ex=.*
+                                                       </argeo.osgi.bundles>
+                                               -->
+                                               <!--
+                                                       <argeo.osgi.start> org.springframework.osgi.extender,
+                                                       org.argeo.slc.server.main, org.argeo.slc.server.hsqldb,
+                                                       org.argeo.slc.server.hibernate, org.argeo.slc.ria,
+                                                       org.argeo.slc.agent, org.argeo.slc.agent.jms </argeo.osgi.start>
+                                               -->
+                                               <argeo.osgi.start>
                                                        org.springframework.osgi.extender,
+                                                       org.argeo.server.ads.server,
+                                                       org.argeo.slc.server.jackrabbit.derby,
+                                                       org.argeo.slc.server.jcr,
                                                        org.argeo.slc.server.main,
-                                                       org.argeo.slc.server.hsqldb,
                                                        org.argeo.slc.ria,
-                                                       org.argeo.slc.agent,                                                            
+                                                       org.argeo.slc.agent,
                                                        org.argeo.slc.agent.jms                                                 
-                                               </slc.osgi.start>
+                                               </argeo.osgi.start>
                                        </systemProperties>
                                </configuration>
                                <executions>
@@ -79,20 +93,9 @@
        <dependencies>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.server</artifactId>
+                       <artifactId>org.argeo.slc.dep.sdk</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.agent</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <!-- RIA -->
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>org.argeo.slc.ria</artifactId>
-               </dependency>
-
                <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>