Reintroduce Spring WS

git-svn-id: https://svn.argeo.org/slc/trunk@3155 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index 8f2ce3e4d17e004d206713a0bc8c518a0b95e17f..5c51a899986864c65730db3a44e544f9eb0eec11 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -103,6 +103,22 @@
                        <type>pom</type>
                </dependency>
 
+               <!-- Apache Directory -->
+
+               <!-- Apache DS -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.ads</artifactId>
+                       <type>pom</type>
+               </dependency>
+
+               <!-- Used to start the Apache Directory server -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.ads</artifactId>
+                       <version>0.1.2-SNAPSHOT</version>
+               </dependency>
+
                <!-- DB Drivers -->
                <dependency>
                        <groupId>org.hsqldb</groupId>

diff --git a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
index 393d4dbe8d6bc40299a9fe5835594eeaeb85650b..a992015aefb784721f6e1814adf2781af5027f48 100644 (file)
--- a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
+++ b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
@@ -12,9 +12,11 @@
        <bundle id="security.services" symbolic-name="org.argeo.security.core"
                action="start" />
 
-       <!-- SLC Middleware -->
+       <!-- Servers -->
        <bundle id="activemq.broker" symbolic-name="org.argeo.server.activemq.broker"
                action="start" />
+
+       <!-- SLC Middleware -->
        <bundle id="castor" symbolic-name="org.argeo.slc.server.castor"
                action="start" />
        <bundle id="activemq" symbolic-name="org.argeo.slc.server.activemq"

diff --git a/pom.xml b/pom.xml
index 75b2796360c0fd796a8fd2d00e774db965a81fea..28f56704124b6991e27f77e095b1a16e48cee951 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
                <version.argeo-commons>0.1.2-SNAPSHOT</version.argeo-commons>
                <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-               <version.maven-argeo-osgi>0.1.22</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.23</version.maven-argeo-osgi>
                <version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
@@ -257,11 +257,6 @@ limitations under the License.
                                <artifactId>org.argeo.slc.server</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.osgiboot</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.osgi</artifactId>

diff --git a/runtime/org.argeo.slc.launcher/pom.xml b/runtime/org.argeo.slc.launcher/pom.xml
index 4ca814912059b92569e1ca9d4d8cf0bafc62920d..acaa19abc0b97ecd438442f746e17bed6d0ac03b 100644 (file)
--- a/runtime/org.argeo.slc.launcher/pom.xml
+++ b/runtime/org.argeo.slc.launcher/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>
@@ -88,8 +89,8 @@
                        <artifactId>org.argeo.slc.core</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
                </dependency>
 
                <dependency>

diff --git a/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini b/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini
index 14b541c1e1cec1f4c5fe4130bdbd0b8dfbad046e..cc32c30f795acfe6d82482734d690b105aa9f1e8 100644 (file)
--- a/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini
+++ b/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini
@@ -1,6 +1,6 @@
-osgi.bundles=org.argeo.slc.osgiboot-${project.version}.jar@start
-slc.osgi.bundles=${osgi.install.area};in=*.jar
-slc.osgi.start=org.springframework.osgi.extender,\
+osgi.bundles=org.argeo.osgi.boot-${version.argeo-commons}.jar@start
+argeo.osgi.bundles=${osgi.install.area};in=*.jar
+argeo.osgi.start=org.springframework.osgi.extender,\
        org.argeo.slc.agent,\
        org.argeo.slc.agent.jms,\
        org.argeo.slc.support.equinox

diff --git a/runtime/org.argeo.slc.support.ws.client/pom.xml b/runtime/org.argeo.slc.support.ws.client/pom.xml
index 84f1bf47e516a02bce6a1712cd3b1892e17688c8..a63720a02c95a0dbb303a36463e27719bf285e94 100644 (file)
--- a/runtime/org.argeo.slc.support.ws.client/pom.xml
+++ b/runtime/org.argeo.slc.support.ws.client/pom.xml
@@ -10,7 +10,7 @@
        <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.ws.client</artifactId>
        <packaging>jar</packaging>
-       <name>SLC Support Web Services Client</name>
+       <name>SLC Support Web Services Client (deprecated)</name>
        <build>
                <plugins>
                        <!-- Look to parent pom for inheritances -->

diff --git a/runtime/pom.xml b/runtime/pom.xml
index d4e54f2afa06c1084d9747694bbf089e5eb4f92d..ec622cc237614f5898b7055f9dc2e20ed571c176 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -29,6 +29,7 @@
                <module>org.argeo.slc.detached.launcher</module>
                <module>org.argeo.slc.launcher</module>
                <module>org.argeo.slc.lib.detached</module>
+               <module>org.argeo.slc.support.ws.client</module>
        </modules>
        <build>
                <pluginManagement>