cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1139830 [1/2] - in /cxf/dosgi/trunk: ./ discovery/distributed/cxf-discovery/ discovery/distributed/zookeeper-server-config/ discovery/distributed/zookeeper-server/ discovery/distributed/zookeeper-wrapper/ discovery/local/ discovery/local/s...
Date Sun, 26 Jun 2011 16:13:54 GMT
Author: sergeyb
Date: Sun Jun 26 16:13:52 2011
New Revision: 1139830

URL: http://svn.apache.org/viewvc?rev=1139830&view=rev
Log:
[DOSGI-96] Applying a patch on behalf of Ancoron Luciferis - thanks

Modified:
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
    cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
    cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
    cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/pom.xml
    cxf/dosgi/trunk/discovery/local/pom.xml
    cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java
    cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
    cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml
    cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
    cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
    cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
    cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
    cxf/dosgi/trunk/distribution/single-bundle/pom.xml
    cxf/dosgi/trunk/distribution/sources/pom.xml
    cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml
    cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceadminFactory.java
    cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml
    cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManagerImport.java
    cxf/dosgi/trunk/felix/profiles/pom.xml
    cxf/dosgi/trunk/felix/profiles/src/main/resources/client_bundles.txt
    cxf/dosgi/trunk/felix/profiles/src/main/resources/dosgi_bundles.txt
    cxf/dosgi/trunk/felix/profiles/src/main/resources/server_bundles.txt
    cxf/dosgi/trunk/felix/shell.tui/pom.xml
    cxf/dosgi/trunk/parent/pom.xml
    cxf/dosgi/trunk/pom.xml
    cxf/dosgi/trunk/samples/discovery/client/pom.xml
    cxf/dosgi/trunk/samples/discovery/impl/pom.xml
    cxf/dosgi/trunk/samples/discovery/interface/pom.xml
    cxf/dosgi/trunk/samples/ds/client/pom.xml
    cxf/dosgi/trunk/samples/ds/impl/pom.xml
    cxf/dosgi/trunk/samples/ds/interface/pom.xml
    cxf/dosgi/trunk/samples/greeter/client/pom.xml
    cxf/dosgi/trunk/samples/greeter/impl/pom.xml
    cxf/dosgi/trunk/samples/greeter/interface/pom.xml
    cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml
    cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml
    cxf/dosgi/trunk/samples/greeter_rest/interface/pom.xml
    cxf/dosgi/trunk/samples/security_filter/pom.xml
    cxf/dosgi/trunk/samples/spring_dm/client/pom.xml
    cxf/dosgi/trunk/samples/spring_dm/impl/pom.xml
    cxf/dosgi/trunk/samples/spring_dm/interface/pom.xml
    cxf/dosgi/trunk/systests/common/pom.xml
    cxf/dosgi/trunk/systests/common_rest/pom.xml
    cxf/dosgi/trunk/systests2/common/pom.xml
    cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java
    cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/MyServiceTracker.java
    cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/test1/StartServiceTracker.java
    cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
    cxf/dosgi/trunk/systests2/single-bundle/pom.xml

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Sun Jun 26 16:13:52 2011
@@ -38,7 +38,14 @@
     </properties>
     
     <dependencies>
-        <dependency> 
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>${osgi.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${felix.version}</version>
@@ -53,19 +60,19 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -98,21 +105,20 @@
                     <instructions>
                         <Bundle-Name>CXF Zookeeper-based Discovery Service Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains an implementation of the Distributed OSGi Discovery Service using Zookeeper</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-Activator>org.apache.cxf.dosgi.discovery.zookeeper.Activator</Bundle-Activator>
                         <Import-Package>
                             org.apache.zookeeper.*;version="[3.0.0,4.0.0)",
                             org.apache.cxf.dosgi.discovery.local.*,
                             org.osgi.framework;version="[1.4.0,2.0.0)",
-                            org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}",
+                            org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2)",
                             org.osgi.util.tracker;version="[1.3.0,2.0.0)",
                             *
                         </Import-Package>
-                        <Private-Package>org.apache.cxf.dosgi.discovery.zookeeper,org.apache.cxf.dosgi.discovery.zookeeper</Private-Package>
-                        <Export-Package>
-                            org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}"
-                        </Export-Package>
+                        <Private-Package>
+                            org.apache.cxf.dosgi.discovery.zookeeper
+                        </Private-Package>
                     </instructions>
                 </configuration>
             </plugin> 

Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml Sun Jun 26 16:13:52 2011
@@ -39,6 +39,13 @@
     </properties>
     
     <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>${osgi.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency> 
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
@@ -61,7 +68,7 @@
                     <instructions>
                         <Bundle-Name>ZooKeeper server configuration bundle</Bundle-Name>
                         <Bundle-Description>This bundle can configure the ZooKeeper server in an OSGi Framework</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.discovery.zookeeper.server.config.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.cxf.dosgi.discovery.zookeeper.server.config</Private-Package>

Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml Sun Jun 26 16:13:52 2011
@@ -38,6 +38,13 @@
     </properties>
     
     <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>${osgi.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency> 
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
@@ -53,7 +60,7 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- This is a zookeeper dependency that we apparently have to list here -->
@@ -85,7 +92,7 @@
                     <instructions>
                         <Bundle-Name>ZooKeeper server control bundle</Bundle-Name>
                         <Bundle-Description>This bundle can run the ZooKeeper server in an OSGi Framework</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.discovery.zookeeper.server.Activator</Bundle-Activator>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.cxf.dosgi.discovery.zookeeper.server</Private-Package>

Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/pom.xml Sun Jun 26 16:13:52 2011
@@ -61,12 +61,15 @@
                     <instructions>
                         <Bundle-Name>ZooKeeper wrapper bundle</Bundle-Name>
                         <Bundle-Description>This bundle wraps the ZooKeeper library</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
                             !jline*,
+                            com.sun.jdmk.comm*;resolution:=optional,
+                            javax.jms*;resolution:=optional,
+                            javax.mail*;resolution:=optional,
                             *
                         </Import-Package>
-                        <Export-Package>*;version=${zookeeper.version}</Export-Package> 
+                        <Export-Package>*;-split-package:=merge-last;version=${zookeeper.version}</Export-Package> 
                     </instructions>
                 </configuration>
             </plugin> 

Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Sun Jun 26 16:13:52 2011
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>  
             <groupId>org.jdom</groupId>  
             <artifactId>com.springsource.org.jdom</artifactId>  
-            <version>1.0.0</version> 
+            <version>1.1.0</version> 
         </dependency>
 
         <dependency>
@@ -83,12 +83,14 @@
                     <instructions>
                         <Bundle-Name>CXF Local Discovery Service Bundle</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation required by the CXF Local Discovery Service Bundle</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.cxf.dosgi.discovery.local.internal.Activator</Bundle-Activator>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>
+                            org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2.0)",
+                            *
+                        </Import-Package>
                         <Private-Package>org.apache.cxf.dosgi.discovery.local.internal</Private-Package>
                         <Export-Package>
-                            org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}",
                             org.apache.cxf.dosgi.discovery.local
                         </Export-Package> 
                     </instructions>

Modified: cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java (original)
+++ cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java Sun Jun 26 16:13:52 2011
@@ -18,17 +18,23 @@
   */
 package org.apache.cxf.dosgi.discovery.local.internal;
 
+import java.util.logging.Logger;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 public class Activator implements BundleActivator {
+
+    private static final Logger LOG = Logger.getLogger(Activator.class.getName());
+
     LocalDiscovery localDiscovery;
     
     public synchronized void start(BundleContext context) {
         localDiscovery = new LocalDiscovery(context);
+        LOG.info("Local D-OSGi service discovery started");
     }
 
     public synchronized void stop(BundleContext context) {
         localDiscovery.shutDown();
+        LOG.info("Local D-OSGi service discovery stopped");
     }
 }

Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Sun Jun 26 16:13:52 2011
@@ -33,7 +33,7 @@
   </parent>
 
   <properties>
-    <dosgi.version>${pom.version}</dosgi.version>
+    <dosgi.version>${project.version}</dosgi.version>
     <topDirectoryLocation>../..</topDirectoryLocation>
   </properties>
 
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-activation_1.1_spec</artifactId>
-      <version>1.0.2</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -56,7 +56,12 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -77,7 +82,7 @@
     <dependency>
       <groupId>org.jdom</groupId>
       <artifactId>com.springsource.org.jdom</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -105,6 +110,16 @@
       <version>${spring.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-io</artifactId>
       <version>${spring.osgi.version}</version>
@@ -120,9 +135,24 @@
       <version>${spring.osgi.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all-server</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.ops4j.pax.web</groupId>
-      <artifactId>pax-web-service</artifactId>
-      <version>0.5.1</version>
+      <artifactId>pax-web-spi</artifactId>
+      <version>1.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.web</groupId>
+      <artifactId>pax-web-runtime</artifactId>
+      <version>1.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.web</groupId>
+      <artifactId>pax-web-jetty</artifactId>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.specs</groupId>
@@ -146,12 +176,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.specs</groupId>
-      <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
+      <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
       <version>${servicemix.specs.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId> 
+      <groupId>org.apache.ws.xmlschema</groupId>
+      <artifactId>xmlschema-core</artifactId>
       <version>${xmlschema.bundle.version}</version> 
     </dependency>
     <dependency>
@@ -160,8 +190,8 @@
       <version>${xmlresolver.bundle.version}</version> 
     </dependency>
     <dependency>
-       <groupId>org.apache.servicemix.bundles</groupId> 
-       <artifactId>org.apache.servicemix.bundles.neethi</artifactId> 
+       <groupId>org.apache.neethi</groupId> 
+       <artifactId>neethi</artifactId> 
        <version>${neethi.bundle.version}</version> 
     </dependency>
     <dependency>
@@ -185,10 +215,15 @@
        <artifactId>org.apache.servicemix.bundles.asm</artifactId> 
        <version>${asm.bundle.version}</version> 
     </dependency>
-            
+
     <dependency>
-       <groupId>org.apache.servicemix.bundles</groupId> 
-       <artifactId>org.apache.servicemix.bundles.woodstox</artifactId> 
+       <groupId>org.codehaus.woodstox</groupId> 
+       <artifactId>stax2-api</artifactId> 
+       <version>3.1.1</version> 
+    </dependency>
+    <dependency>
+       <groupId>org.codehaus.woodstox</groupId> 
+       <artifactId>woodstox-core-asl</artifactId> 
        <version>${woodstox.bundle.version}</version> 
     </dependency>
     <dependency>
@@ -197,12 +232,27 @@
        <version>${commons.pool.bundle.version}</version> 
     </dependency>
     <dependency>
+       <groupId>org.apache.servicemix.bundles</groupId> 
+       <artifactId>org.apache.servicemix.bundles.joda-time</artifactId>
+       <version>1.5.2_4</version>
+    </dependency>
+    <dependency>
+       <groupId>org.apache.servicemix.bundles</groupId> 
+       <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
+       <version>2.4.1_1</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-bundle-minimal</artifactId>
       <version>${cxf.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf.dosgi</groupId>
+      <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf.dosgi</groupId>
       <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -221,12 +271,12 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.configadmin</artifactId>
-      <version>1.0.10</version>
+      <version>1.2.8</version>
     </dependency>      
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.fileinstall</artifactId>
-      <version>1.0.0</version>
+      <version>3.1.10</version>
     </dependency>      
 
     <dependency> 
@@ -324,7 +374,7 @@
           <execution>
             <phase>compile</phase>
             <configuration>
-              <tasks>
+              <target>
                 <path id="current.dir.path">
                   <pathelement location="." />
                 </path>
@@ -365,7 +415,7 @@
                 <xslt processor="trax" in="target/classes/distro_discovery_bundles.xml" out="target/equinox.discovery.config.ini.append" style="src/main/xsl/equinox_buildsystem_config.xslt">
                       <param name="TargetDir" expression="${current.dir}/target/" />
                 </xslt>
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>

Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml Sun Jun 26 16:13:52 2011
@@ -1,4 +1,6 @@
-<assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -17,6 +19,7 @@
   specific language governing permissions and limitations
   under the License.
 -->
+  <id>dir</id>
   <formats>
     <format>tar.gz</format>
     <format>zip</format>

Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_bundles.xml Sun Jun 26 16:13:52 2011
@@ -1,39 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bundles>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-activation_1.1_spec-1.0.2.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.2.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.jdom-1.0.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-context-${spring.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.api-1.5.10.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.jcl-1.5.10.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-extender-${spring.osgi.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-service-0.5.1.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.neethi-${neethi.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.woodstox-${woodstox.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.commons-pool-${commons.pool.bundle.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jsr311-api-1.0-${servicemix.specs.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-activation_1.1_spec-1.1.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-javamail_1.4_spec-1.2.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-servlet_3.0_spec-1.0.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/geronimo-ws-metadata_2.0_spec-1.1.3.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.commons.logging-1.1.1.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.jdom-1.1.0.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-core-${spring.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-beans-${spring.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-context-${spring.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.aopalliance-1.0.0.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.api-1.5.10.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.slf4j.jcl-1.5.10.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-aop-${spring.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-asm-${spring.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-expression-${spring.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-io-${spring.osgi.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-core-${spring.osgi.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/spring-osgi-extender-${spring.osgi.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/jetty-all-server-${jetty.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-spi-1.0.3.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-runtime-1.0.3.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/pax-web-jetty-1.0.3.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.jaxb-impl-${jaxbimpl.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/xmlschema-core-${xmlschema.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.xmlresolver-${xmlresolver.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/neethi-${neethi.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/stax2-api-3.1.1.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/woodstox-core-asl-${woodstox.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.commons-pool-${commons.pool.bundle.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxb-api-2.1-${servicemix.specs.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jaxws-api-2.1-${servicemix.specs.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.specs.jsr311-api-1.1.1-${servicemix.specs.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.joda-time-1.5.2_4.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.servicemix.bundles.opensaml-2.4.1_1.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-bundle-minimal-${cxf.version}.jar</bundle>
 
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-local-${pom.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${pom.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-topology-manager-${pom.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-remote-service-admin-interfaces-${project.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-local-${project.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-dsw-cxf-${project.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-topology-manager-${project.version}.jar</bundle>
 </bundles>

Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/resources/distro_discovery_bundles.xml Sun Jun 26 16:13:52 2011
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bundles>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.configadmin-1.0.10.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.fileinstall-1.0.0.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.log4j-${log4j.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper-${project.version}.jar</bundle>
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-${project.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.configadmin-1.2.8.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.fileinstall-3.1.10.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/com.springsource.org.apache.log4j-${log4j.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-remote-service-admin-interfaces-${project.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper-${project.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-${project.version}.jar</bundle>
 </bundles>

Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/equinox_distro_config.xslt Sun Jun 26 16:13:52 2011
@@ -2,7 +2,7 @@
 <xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
   <xsl:param name="Version"/>
-  <xsl:variable name = "Basename">.dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>
+  <xsl:variable name = "Basename">-dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>
   <xsl:template match="/">
 org.ops4j.pax.web.session.timeout=30
 

Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/xsl/felix_distro_config.xslt Sun Jun 26 16:13:52 2011
@@ -3,7 +3,7 @@
   <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
   <xsl:param name="Version"/>
   <xsl:param name="Offset"/>
-  <xsl:variable name = "Basename">.dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>
+  <xsl:variable name = "Basename">-dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>
   <xsl:template match="/">
 org.ops4j.pax.web.session.timeout=30
 org.osgi.framework.startlevel.beginning=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + $Offset"/>

Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Sun Jun 26 16:13:52 2011
@@ -47,17 +47,17 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-activation_1.1_spec</artifactId>
-      <version>1.0.2</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-javamail_1.4_spec</artifactId>
-      <version>1.2</version>
+      <version>1.7.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.jdom</groupId>
       <artifactId>com.springsource.org.jdom</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -105,6 +105,16 @@
       <version>${spring.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-io</artifactId>
       <version>${spring.osgi.version}</version>
@@ -120,9 +130,24 @@
       <version>${spring.osgi.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
       <groupId>org.ops4j.pax.web</groupId>
-      <artifactId>pax-web-service</artifactId>
-      <version>0.5.1</version>
+      <artifactId>pax-web-runtime</artifactId>
+      <version>1.0.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all-server</artifactId>
+      <version>8.0.0.M3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.web</groupId>
+      <artifactId>pax-web-jetty</artifactId>
+      <version>1.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.specs</groupId>
@@ -146,12 +171,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix.specs</groupId>
-      <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
+      <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
       <version>${servicemix.specs.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId> 
-      <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId> 
+      <groupId>org.apache.ws.xmlschema</groupId>
+      <artifactId>xmlschema-core</artifactId>
       <version>${xmlschema.bundle.version}</version> 
     </dependency>
     <dependency>
@@ -160,8 +185,8 @@
       <version>${xmlresolver.bundle.version}</version> 
     </dependency>
     <dependency>
-       <groupId>org.apache.servicemix.bundles</groupId> 
-       <artifactId>org.apache.servicemix.bundles.neethi</artifactId> 
+       <groupId>org.apache.neethi</groupId> 
+       <artifactId>neethi</artifactId> 
        <version>${neethi.bundle.version}</version> 
     </dependency>
     <dependency>
@@ -193,20 +218,26 @@
     </dependency>
 
     <dependency>
-       <groupId>org.apache.servicemix.bundles</groupId> 
-       <artifactId>org.apache.servicemix.bundles.woodstox</artifactId> 
+       <groupId>org.codehaus.woodstox</groupId> 
+       <artifactId>stax2-api</artifactId> 
+       <version>3.1.1</version> 
+    </dependency>
+
+    <dependency>
+       <groupId>org.codehaus.woodstox</groupId> 
+       <artifactId>woodstox-core-asl</artifactId> 
        <version>${woodstox.bundle.version}</version> 
     </dependency>
 
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.configadmin</artifactId>
-      <version>1.0.10</version>
+      <version>1.2.8</version>
     </dependency>      
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.fileinstall</artifactId>
-      <version>1.0.0</version>
+      <version>3.1.10</version>
     </dependency>      
 
     <dependency> 
@@ -220,6 +251,12 @@
       <artifactId>cxf-bundle-minimal</artifactId>
       <version>${cxf.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.cxf.dosgi</groupId>
+      <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.cxf.dosgi</groupId>
       <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
@@ -268,7 +305,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>Distributed OSGi Distribution Software Single-Bundle Distribution</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Activator>org.apache.cxf.dosgi.singlebundle.AggregatedActivator</Bundle-Activator>
             <Include-Resource>
@@ -277,12 +314,14 @@
               {maven-resources}
             </Include-Resource>
             <Import-Package>
-              javax.servlet.*;version="[2.3.0,2.6.0)",
-              org.osgi.*
+              javax.servlet.descriptor;resolution:=optional,
+              javax.servlet.*;version="[2.3.0,4.0)",
+              org.osgi.service.blueprint*;resolution:=optional,
+              org.osgi.*,
             </Import-Package>
             <Export-Package>
               '=META-INF.cxf',
-              org.apache.cxf.dosgi.singlebundle;version="${pom.version}"
+              org.apache.cxf.dosgi.singlebundle;version="${project.version}"
             </Export-Package>
             <Embed-Dependency>*;scope=compile;inline=false</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
@@ -292,13 +331,10 @@
               javax.jws.*;version="2.0.0", 
               javax.xml.bind.annotation.*;version="2.1",
               javax.servlet.*;version="2.5.0",
-              org.apache.cxf.dosgi.*;version="${pom.version}",
+              org.apache.cxf.dosgi.*;version="${project.version}",
               org.apache.cxf.*;version="${cxf.version}",
-              org.jdom.*;version="1.0.0",
+              org.jdom.*;version="1.1.0",
               org.osgi.service.cm;version="1.2",
-              org.osgi.service.distribution;version="1.0.0",
-              org.osgi.service.discovery;version="1.0.0",
-              org.osgi.service.log;version="1.3",
               org.osgi.service.remoteserviceadmin;version="1.0.0",
               !*
             </_exportcontents> 
@@ -327,9 +363,9 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.felix</groupId>
+                  <groupId>org.osgi</groupId>
                   <artifactId>org.osgi.compendium</artifactId>
-                  <version>1.2.0</version>
+                  <version>${osgi.version}</version>
                   <type>jar</type>
                   <outputDirectory>target/deps</outputDirectory>
                 </artifactItem>
@@ -345,7 +381,7 @@
           <execution>
             <phase>package</phase>
             <configuration>
-              <tasks>
+              <target>
                 <!-- removing this directory as it confuses Eclipse when importing the bundle as a plugin -->
                 <delete dir="target/classes" />
 
@@ -376,7 +412,7 @@ osgi.bundles=org.eclipse.osgi.services@s
                 </echo>
                 <echo message="${bundle}@start" file="target/equinox.config.ini.append" append="true" />
                 <replace file="target/equinox.config.ini.append" token="\" value="/" />
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>

Modified: cxf/dosgi/trunk/distribution/sources/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/sources/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/sources/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/sources/pom.xml Sun Jun 26 16:13:52 2011
@@ -34,7 +34,7 @@
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
-        <dosgi.version>${pom.version}</dosgi.version>
+        <dosgi.version>${project.version}</dosgi.version>
         <topDirectoryLocation>../..</topDirectoryLocation>
     </properties>
 

Modified: cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml (original)
+++ cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml Sun Jun 26 16:13:52 2011
@@ -18,7 +18,7 @@
  * under the License.
 -->
 <assembly>
-    <id></id>
+    <id>dist</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <formats>
         <format>tar.gz</format>

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Sun Jun 26 16:13:52 2011
@@ -35,13 +35,14 @@
     <properties>
         <topDirectoryLocation>../..</topDirectoryLocation>
         <bundle.import.package>
-            org.apache.cxf.ws.security.*,
             org.apache.cxf.ws.policy.*,
+            org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2.0)",
+            javax.servlet*;version="[0.0,4)",
+            javax.xml.ws*;version="[2.1,3)",
             *
         </bundle.import.package>
         <bundle.export.package>
-            org.apache.cxf.dosgi.*;version="${pom.version}",
-            org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}"
+            org.apache.cxf.dosgi.*;version="${project.version}"
         </bundle.export.package>
     </properties>
     
@@ -49,7 +50,7 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -68,10 +69,15 @@
                 </exclusion>
             </exclusions>
         </dependency> 
-        <dependency>  
+        <dependency>
+            <groupId>org.osgi</groupId>  
+            <artifactId>org.osgi.compendium</artifactId>  
+            <version>${osgi.version}</version> 
+        </dependency>
+        <dependency>
             <groupId>org.jdom</groupId>  
             <artifactId>com.springsource.org.jdom</artifactId>  
-            <version>1.0.0</version> 
+            <version>1.1.0</version> 
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -100,12 +106,12 @@
                     <instructions>
                         <Bundle-Name>CXF dOSGi Remote Service Admin Implementation</Bundle-Name>
                         <Bundle-Description>This bundle contains the implementation required by the CXF Distributed Software Bundle</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Import-Package>${bundle.import.package}</Import-Package>
                         <Export-Package>${bundle.export.package}</Export-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
-                        <Private-Package>org.osgi.service.discovery,org.osgi.service.distribution</Private-Package>
+                        <Spring-Context>META-INF/spring/*.xml;create-asynchrously:=false</Spring-Context>
                     </instructions>
                 </configuration>
             </plugin> 

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Activator.java Sun Jun 26 16:13:52 2011
@@ -87,6 +87,8 @@ public class Activator implements Manage
                                      org.apache.cxf.dosgi.dsw.Constants.RS_CONFIG_TYPE
         };
         props.put("remote.configs.supported", supportedConfigs);
+        
+        LOG.info("Registering RemoteServiceAdminFactory...");
 
         rsaFactoryReg = bc.registerService(RemoteServiceAdmin.class.getName(), rsaf, props);
         return rsaf;

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java Sun Jun 26 16:13:52 2011
@@ -79,7 +79,7 @@ public class JaxRSHttpServiceConfigurati
         List<UserResource> resources = JaxRSUtils.getModel(callingContext, iClass);
         if (resources != null) {
             factory.setModelBeansWithServiceClass(resources, iClass);
-            factory.setServiceBeans(serviceBean);
+            factory.setServiceBeanObjects(serviceBean);
         } else {
             factory.setServiceClass(iClass);
             factory.setResourceProvider(iClass, new SingletonResourceProvider(serviceBean));

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java Sun Jun 26 16:13:52 2011
@@ -106,7 +106,7 @@ public class JaxRSPojoConfigurationTypeH
         List<UserResource> resources = JaxRSUtils.getModel(callingContext, iClass);
         if (resources != null) {
             factory.setModelBeansWithServiceClass(resources, iClass);
-            factory.setServiceBeans(serviceBean);
+            factory.setServiceBeanObjects(serviceBean);
         } else {
             factory.setServiceClass(iClass);
             factory.setResourceProvider(iClass, new SingletonResourceProvider(serviceBean));

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java Sun Jun 26 16:13:52 2011
@@ -22,11 +22,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import org.apache.commons.logging.Log;
-import org.apache.cxf.dosgi.dsw.handlers.IntentUnsatifiedException;
 import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.frontend.ServerFactoryBean;
-import org.mortbay.jetty.servlet.PathMap.Entry;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Filter;

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java Sun Jun 26 16:13:52 2011
@@ -49,8 +49,8 @@ public class RemoteServiceAdminCore impl
 
     private Logger LOG = Logger.getLogger(RemoteServiceAdminCore.class.getName());
 
-    private LinkedHashMap<ServiceReference, Collection<ExportRegistrationImpl>> exportedServices = new LinkedHashMap<ServiceReference, Collection<ExportRegistrationImpl>>();
-    private LinkedHashMap<EndpointDescription, Collection<ImportRegistrationImpl>> importedServices = new LinkedHashMap<EndpointDescription, Collection<ImportRegistrationImpl>>();
+    private final LinkedHashMap<ServiceReference, Collection<ExportRegistrationImpl>> exportedServices = new LinkedHashMap<ServiceReference, Collection<ExportRegistrationImpl>>();
+    private final LinkedHashMap<EndpointDescription, Collection<ImportRegistrationImpl>> importedServices = new LinkedHashMap<EndpointDescription, Collection<ImportRegistrationImpl>>();
 
     private BundleContext bctx;
 
@@ -61,7 +61,8 @@ public class RemoteServiceAdminCore impl
     private volatile String defaultHost;
 
     // protected because of tests
-    protected static List<String> supportedConfigurationTypes = new ArrayList<String>();
+    protected static final List<String> supportedConfigurationTypes = new ArrayList<String>();
+
     static {
         supportedConfigurationTypes.add(Constants.WSDL_CONFIG_TYPE);
         supportedConfigurationTypes.add(Constants.RS_CONFIG_TYPE);

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceadminFactory.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceadminFactory.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceadminFactory.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceadminFactory.java Sun Jun 26 16:13:52 2011
@@ -20,6 +20,7 @@ package org.apache.cxf.dosgi.dsw.service
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.cxf.jaxws.javaee.ResAuthType;
@@ -42,14 +43,16 @@ public class RemoteServiceadminFactory i
     }
 
     public Object getService(Bundle b, ServiceRegistration sr) {
-        LOG.finest("new RemoteServiceAdmin ServiceInstance created for Bundle "+b.getSymbolicName());
+        LOG.log(Level.FINEST, "new RemoteServiceAdmin ServiceInstance created for Bundle {0}",
+                b.getSymbolicName());
         RemoteServiceAdminInstance rsai = new RemoteServiceAdminInstance(bctx,rsaCore);
         rsaServiceInstances.add(rsai);
         return rsai;
     }
 
     public void ungetService(Bundle b, ServiceRegistration sr, Object serviceObject) {
-        LOG.finest("RemoteServiceAdmin ServiceInstance removed for Bundle "+b.getSymbolicName());
+        LOG.log(Level.FINEST, "RemoteServiceAdmin ServiceInstance removed for Bundle {0}",
+                b.getSymbolicName());
         if (serviceObject instanceof RemoteServiceAdminInstance) {
             RemoteServiceAdminInstance rsai = (RemoteServiceAdminInstance)serviceObject;
             rsai.close();

Modified: cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-osgi-remote-service-admin-interfaces/pom.xml Sun Jun 26 16:13:52 2011
@@ -35,10 +35,10 @@
     </properties>
     
     <dependencies>
-        <dependency> 
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
-            <version>1.8.0</version>
+            <version>${felix.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.felix</groupId>
@@ -46,7 +46,7 @@
                 </exclusion>
             </exclusions>
             <scope>provided</scope>
-        </dependency> 
+        </dependency>
     </dependencies>
 
     <build>
@@ -54,15 +54,13 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <manifestLocation>META-INF</manifestLocation>
                     <instructions>
                         <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
-                        <Bundle-Version>${pom.version}</Bundle-Version>
-                        <Export-Package>${bundle.namespace}.*;version="${pom.version}"</Export-Package>
-                        <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Export-Package>${bundle.namespace}.*;version="${remote.service.admin.interfaces.version}"</Export-Package>
                         <Embed-Directory>target/dependency</Embed-Directory>
                         <Embed-StripGroup>true</Embed-StripGroup>
                     </instructions>

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml Sun Jun 26 16:13:52 2011
@@ -31,10 +31,12 @@
 
     <properties>
         <topDirectoryLocation>../..</topDirectoryLocation>
-        <bundle.import.package>*</bundle.import.package>
+        <bundle.import.package>
+            org.osgi.service.remoteserviceadmin;version="[${remote.service.admin.interfaces.version},2)",
+            *
+        </bundle.import.package>
         <bundle.export.package>
-            org.apache.cxf.dosgi.*;version="${pom.version}",
-            org.osgi.service.remoteserviceadmin;version="${remote.service.admin.interfaces.version}"
+            org.apache.cxf.dosgi.*;version="${project.version}"
         </bundle.export.package>
     </properties>
 
@@ -54,7 +56,7 @@
         <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -80,7 +82,7 @@
                     <instructions>
                         <Bundle-Name>CXF dOSGi Topology Manager</Bundle-Name>
                         <Bundle-Description>Default CXF Topology Manager as described in OSGi Remote Service Admin specification.</Bundle-Description>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Bundle-Activator>org.apache.cxf.dosgi.topologymanager.Activator</Bundle-Activator>
                         <Import-Package>${bundle.import.package}</Import-Package>

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManager.java Sun Jun 26 16:13:52 2011
@@ -20,6 +20,7 @@ package org.apache.cxf.dosgi.topologyman
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -30,6 +31,7 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.osgi.framework.BundleContext;
@@ -56,7 +58,7 @@ public class TopologyManager {
     private ExecutorService execService = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS,
                                                                  new LinkedBlockingQueue<Runnable>());
 
-    private RemoteServiceAdminList remoteServiceAdminList;
+    private final RemoteServiceAdminList remoteServiceAdminList;
 
     private ServiceListenerImpl serviceListerner;
 
@@ -77,14 +79,14 @@ public class TopologyManager {
      * 
      * </pre>
      */
-    private HashMap<ServiceReference, HashMap<RemoteServiceAdmin, Collection<ExportRegistration>>> exportedServices = new LinkedHashMap<ServiceReference, HashMap<RemoteServiceAdmin, Collection<ExportRegistration>>>();
+    private final HashMap<ServiceReference, HashMap<RemoteServiceAdmin, Collection<ExportRegistration>>> exportedServices = new LinkedHashMap<ServiceReference, HashMap<RemoteServiceAdmin, Collection<ExportRegistration>>>();
 
     private BundleContext bctx;
     // private List<RemoteServiceAdmin> remoteServiceAdmins = new ArrayList<RemoteServiceAdmin>();
 
     private ServiceTracker stEndpointListeners;
 
-    public TopologyManager(BundleContext ctx, RemoteServiceAdminList rsaList) {
+    public TopologyManager(BundleContext ctx, final RemoteServiceAdminList rsaList) {
         bctx = ctx;
 
         remoteServiceAdminList = rsaList;
@@ -228,43 +230,45 @@ public class TopologyManager {
         execService.execute(new Runnable() {
             @SuppressWarnings("unchecked")
             public void run() {
-                LOG.info("TopologyManager: exporting  serice ...");
+                LOG.info("TopologyManager: exporting service ...");
 
-                HashMap<RemoteServiceAdmin, Collection<ExportRegistration>> exports = null;
+                Map<RemoteServiceAdmin, Collection<ExportRegistration>> exports = null;
 
                 synchronized (exportedServices) {
-                    exports = exportedServices.get(sref);
+                    exports = Collections.synchronizedMap(exportedServices.get(sref));
                 }
                 // FIXME: Not thread safe...?
                 if (exports != null) {
-                    synchronized (exports) {
-                        synchronized (remoteServiceAdminList) {
-                            for (RemoteServiceAdmin remoteServiceAdmin : remoteServiceAdminList) {
-                                LOG
-                                    .info("TopologyManager: handling remoteServiceAdmin "
-                                          + remoteServiceAdmin);
-
-                                if (exports.containsKey(remoteServiceAdmin)) {
-                                    // already handled by this remoteServiceAdmin
-                                    LOG
-                                        .info("TopologyManager: already handled by this remoteServiceAdmin -> skipping");
+                    if(remoteServiceAdminList == null || remoteServiceAdminList.size() == 0) {
+                        LOG.log(Level.SEVERE, "No RemoteServiceAdmin available! Unable to export service from bundle {0}, interfaces: {1}",
+                                new Object[]{sref.getBundle().getSymbolicName(), sref.getProperty(org.osgi.framework.Constants.OBJECTCLASS)});
+                    }
+
+                    synchronized (remoteServiceAdminList) {
+                        for (final RemoteServiceAdmin remoteServiceAdmin : remoteServiceAdminList) {
+                            LOG
+                                .info("TopologyManager: handling remoteServiceAdmin "
+                                      + remoteServiceAdmin);
+
+                            if (exports.containsKey(remoteServiceAdmin)) {
+                                // already handled by this remoteServiceAdmin
+                                LOG.info("TopologyManager: already handled by this remoteServiceAdmin -> skipping");
+                            } else {
+                                // TODO: additional parameter Map ?
+                                LOG.info("TopologyManager: exporting ...");
+                                Collection<ExportRegistration> endpoints = remoteServiceAdmin
+                                    .exportService(sref, null);
+                                if (endpoints == null) {
+                                    // TODO export failed -> What should be done here?
+                                    LOG.info("TopologyManager: export failed");
+                                    exports.put(remoteServiceAdmin, null);
                                 } else {
-                                    // TODO: additional parameter Map ?
-                                    LOG.info("TopologyManager: exporting ...");
-                                    Collection<ExportRegistration> endpoints = remoteServiceAdmin
-                                        .exportService(sref, null);
-                                    if (endpoints == null) {
-                                        // TODO export failed -> What should be done here?
-                                        LOG.info("TopologyManager: export failed");
-                                        exports.put(remoteServiceAdmin, null);
-                                    } else {
-                                        LOG.info("TopologyManager: export sucessful Endpoints:" + endpoints);
-                                        // enqueue in local list of endpoints
-                                        exports.put(remoteServiceAdmin, endpoints);
-
-                                        // publish to endpoint listeners
-                                        nofifyListeners(endpoints);
-                                    }
+                                    LOG.info("TopologyManager: export sucessful Endpoints:" + endpoints);
+                                    // enqueue in local list of endpoints
+                                    exports.put(remoteServiceAdmin, endpoints);
+
+                                    // publish to endpoint listeners
+                                    nofifyListeners(endpoints);
                                 }
                             }
                         }

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManagerImport.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManagerImport.java?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManagerImport.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/TopologyManagerImport.java Sun Jun 26 16:13:52 2011
@@ -29,10 +29,10 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.remoteserviceadmin.EndpointDescription;
 import org.osgi.service.remoteserviceadmin.ImportReference;
 import org.osgi.service.remoteserviceadmin.ImportRegistration;
@@ -44,10 +44,10 @@ public class TopologyManagerImport {
     private ExecutorService execService = new ThreadPoolExecutor(5, 10, 50, TimeUnit.SECONDS,
                                                                  new LinkedBlockingQueue<Runnable>());
 
-    private EndpointListenerImpl endpointListener;
-    private BundleContext bctx;
-    private RemoteServiceAdminList remoteServiceAdminList;
-    private ListenerHookImpl listenerHook;
+    private final EndpointListenerImpl endpointListener;
+    private final BundleContext bctx;
+    private final RemoteServiceAdminList remoteServiceAdminList;
+    private final ListenerHookImpl listenerHook;
 
     /**
      * If set to false only one service is imported for each import interest even it multiple services are
@@ -62,7 +62,7 @@ public class TopologyManagerImport {
      * counter. If an interest is removed, the related ServiceInterest object is used to reduce the reference
      * counter until it reaches zero. in this case the interest is removed.
      */
-    private Map<String/* filter */, ImportInterest> importInterests = new HashMap<String, ImportInterest>();
+    private final Map<String/* filter */, ImportInterest> importInterests = new HashMap<String, ImportInterest>();
 
     private static class ImportInterest {
         String filter;
@@ -86,14 +86,18 @@ public class TopologyManagerImport {
     /**
      * FIXME: Documnet me .... !
      */
-    private Map<String /* filter */, List<EndpointDescription>> importPossibilities = new HashMap<String, List<EndpointDescription>>();
-    private Map<String /* filter */, List<ImportRegistration>> importedServices = new HashMap<String, List<ImportRegistration>>();
+    private final Map<String /* filter */, List<EndpointDescription>> importPossibilities = new HashMap<String, List<EndpointDescription>>();
+    private final Map<String /* filter */, List<ImportRegistration>> importedServices = new HashMap<String, List<ImportRegistration>>();
 
     public TopologyManagerImport(BundleContext bc, RemoteServiceAdminList rsaList) {
         bctx = bc;
         remoteServiceAdminList = rsaList;
         endpointListener = new EndpointListenerImpl(bctx, this);
         listenerHook = new ListenerHookImpl(bctx, this);
+        
+        if(rsaList == null || rsaList.size() == 0) {
+            LOG.log(Level.WARNING, "No RemoteServiceAdmin service available!");
+        }
     }
 
     public void start() {
@@ -134,8 +138,9 @@ public class TopologyManagerImport {
                 // remove reference
                 if (i.removeReference() <= 0) {
                     // last reference, remove from scope
-                    LOG.fine("last reference to import interest is gone -> removing interest  filter:"
-                             + exFilter);
+                    LOG.log(Level.FINE,
+                            "last reference to import interest is gone -> removing interest  filter: {0}",
+                            exFilter);
                     endpointListener.reduceScope(exFilter);
                     importInterests.remove(exFilter);
                     List<ImportRegistration> irs = importedServices.remove(exFilter);
@@ -171,7 +176,9 @@ public class TopologyManagerImport {
 
     public void addImportableService(String filter, EndpointDescription epd) {
 
-        LOG.fine("importable service added for filter " + filter + " -> " + epd);
+        LOG.log(Level.FINE, "importable service added for filter {0} -> {1}",
+                new Object[]{filter, epd});
+
         synchronized (importPossibilities) {
             List<EndpointDescription> ips = importPossibilities.get(filter);
             if (ips == null) {
@@ -187,7 +194,7 @@ public class TopologyManagerImport {
 
     private void triggerImport(final String filter) {
 
-        LOG.fine("import of a service for filter " + filter + " was queued");
+        LOG.log(Level.FINE, "import of a service for filter {0} was queued", filter);
 
         execService.execute(new Runnable() {
             public void run() {
@@ -304,6 +311,12 @@ public class TopologyManagerImport {
 
     private ImportRegistration importService(EndpointDescription ep) {
         synchronized (remoteServiceAdminList) {
+            if(remoteServiceAdminList == null || remoteServiceAdminList.size() == 0) {
+                LOG.log(Level.WARNING,
+                        "Unable to import service ({0}): no RemoteServiceAdmin service available!",
+                        ep);
+            }
+
             for (RemoteServiceAdmin rsa : remoteServiceAdminList) {
                 ImportRegistration ir = rsa.importService(ep);
                 if (ir != null && ir.getException() == null) {

Modified: cxf/dosgi/trunk/felix/profiles/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/pom.xml?rev=1139830&r1=1139829&r2=1139830&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/pom.xml (original)
+++ cxf/dosgi/trunk/felix/profiles/pom.xml Sun Jun 26 16:13:52 2011
@@ -44,16 +44,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
             <version>${jetty.version}</version>
-        </dependency> 
+        </dependency>
 
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
             <version>${jetty.version}</version>
-        </dependency>      
+        </dependency>
 
         <dependency> 
            <groupId>org.apache.servicemix.specs</groupId> 
@@ -79,22 +79,22 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-javamail_1.4_spec</artifactId>
-            <version>1.2</version>
+            <version>1.7.1</version>
         </dependency> 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
-            <version>1.0.2</version>
+            <version>1.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.1.2</version>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>1.0</version>
         </dependency>
 
         <dependency>
@@ -104,8 +104,8 @@
         </dependency>
 
         <dependency>
-           <groupId>org.apache.servicemix.bundles</groupId> 
-           <artifactId>org.apache.servicemix.bundles.xmlschema</artifactId> 
+           <groupId>org.apache.ws.xmlschema</groupId> 
+           <artifactId>xmlschema-core</artifactId> 
            <version>${xmlschema.bundle.version}</version> 
         </dependency>
         <dependency>
@@ -114,8 +114,8 @@
            <version>${xmlresolver.bundle.version}</version> 
         </dependency>
         <dependency>
-           <groupId>org.apache.servicemix.bundles</groupId> 
-           <artifactId>org.apache.servicemix.bundles.neethi</artifactId> 
+           <groupId>org.apache.neethi</groupId> 
+           <artifactId>neethi</artifactId> 
            <version>${neethi.bundle.version}</version> 
         </dependency>
         <dependency>
@@ -143,10 +143,10 @@
         
         
         <dependency>
-           <groupId>org.apache.servicemix.bundles</groupId> 
-           <artifactId>org.apache.servicemix.bundles.woodstox</artifactId> 
-           <version>${woodstox.bundle.version}</version> 
-        </dependency> 
+           <groupId>org.codehaus.woodstox</groupId>
+           <artifactId>woodstox-core-asl</artifactId>
+           <version>${woodstox.bundle.version}</version>
+        </dependency>
         
         <dependency>  
            <groupId>org.aopalliance</groupId>  



Mime
View raw message