Return-Path: 
 <commits-return-10674-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 25029 invoked from network); 17 Dec 2009 14:45:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Dec 2009 14:45:41 -0000
Received: (qmail 46500 invoked by uid 500); 17 Dec 2009 14:45:40 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 46441 invoked by uid 500); 17 Dec 2009 14:45:40 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 46432 invoked by uid 99); 17 Dec 2009 14:45:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 14:45:40 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 14:45:38 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B59C523889F7; Thu, 17 Dec 2009 14:45:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r891733 - in /cxf/dosgi/trunk: discovery/distributed/
 discovery/distributed/cxf-discovery/
 discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/
 discovery/distributed/zookeeper-server-config/ discovery/...
Date: Thu, 17 Dec 2009 14:45:05 -0000
To: commits@cxf.apache.org
From: davidb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091217144516.B59C523889F7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: davidb
Date: Thu Dec 17 14:44:40 2009
New Revision: 891733

URL: http://svn.apache.org/viewvc?rev=891733&view=rev
Log:
Realigned the Maven module names.
Also re-applied the fix for CXF-2578 as this is the only fix that went in after CXF 1.1 was released.

Modified:
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java
    cxf/dosgi/trunk/discovery/distributed/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/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-osgi-remote-service-admin-interfaces/pom.xml
    cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml
    cxf/dosgi/trunk/felix/pom.xml
    cxf/dosgi/trunk/felix/profiles/pom.xml
    cxf/dosgi/trunk/felix/shell.tui/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=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Thu Dec 17 14:44:40 2009
@@ -23,7 +23,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF Distributed OSGI Distributed Discovery Service Bundle</name>
+    <name>Distributed OSGI Distributed Discovery Service Bundle</name>
     <version>1.2-SNAPSHOT</version>
 
     <parent>

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java?rev=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Activator.java Thu Dec 17 14:44:40 2009
@@ -19,13 +19,9 @@
 package org.apache.cxf.dosgi.discovery.zookeeper;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Properties;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.osgi.framework.BundleActivator;
@@ -43,7 +39,7 @@
     private Dictionary zkProperties;
     private BundleContext bctx;
 
-    public void start(BundleContext bc) throws Exception {
+    public synchronized void start(BundleContext bc) throws Exception {
         bctx = bc;
         zkProperties = getCMDefaults();
 
@@ -64,7 +60,7 @@
 
     }
 
-    public void updated(Dictionary configuration) throws ConfigurationException {
+    public synchronized void updated(Dictionary configuration) throws ConfigurationException {
 
         if (configuration == null) {
 

Modified: cxf/dosgi/trunk/discovery/distributed/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/pom.xml?rev=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/pom.xml Thu Dec 17 14:44:40 2009
@@ -25,7 +25,7 @@
     <artifactId>cxf-dosgi-ri-discovery-distributed-parent</artifactId>
     <version>1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>CXF Distributed OSGI Distributed Discovery Parent</name>
+    <name>Distributed OSGI Distributed Discovery Parent</name>
     <url>http://cxf.apache.org</url>
 
     <parent>

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=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml Thu Dec 17 14:44:40 2009
@@ -23,7 +23,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server-config</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF Distributed OSGI Distributed Discovery Zookeeper Server Control Configuration Bundle</name>
+    <name>Distributed OSGI Distributed Discovery Zookeeper Server Control Configuration Bundle</name>
     <description>This bundle provides some default OSGi Configuration Admin data and is only useful for use in the OSGi CT suite</description>
     <version>1.2-SNAPSHOT</version>
 

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=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml Thu Dec 17 14:44:40 2009
@@ -23,7 +23,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF Distributed OSGI Distributed Discovery Zookeeper Server Control Bundle</name>
+    <name>Distributed OSGI Distributed Discovery Zookeeper Server Control Bundle</name>
     <version>1.2-SNAPSHOT</version>
 
     <parent>

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=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-wrapper/pom.xml Thu Dec 17 14:44:40 2009
@@ -23,7 +23,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF Distributed OSGI Distributed Discovery Zookeeper Library Wrapper Bundle</name>
+    <name>Distributed OSGI Distributed Discovery Zookeeper Library Wrapper Bundle</name>
     <version>1.2-SNAPSHOT</version>
 
     <parent>

Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Thu Dec 17 14:44:40 2009
@@ -23,7 +23,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF Distributed OSGI Local Discovery Service Bundle</name>
+    <name>Distributed OSGI Local Discovery Service Bundle</name>
     <version>1.2-SNAPSHOT</version>
 
     <parent>

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Thu Dec 17 14:44:40 2009
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF Distribution Software Bundle</name>
+    <name>Distributed OSGi Distribution Software Bundle</name>
     <version>1.2-SNAPSHOT</version>
 
     <parent>

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=891733&r1=891732&r2=891733&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 Thu Dec 17 14:44:40 2009
@@ -44,7 +44,7 @@
     
     private ServiceRegistration decoratorReg;
 
-    public void start(BundleContext context) throws Exception {
+    public synchronized void start(BundleContext context) throws Exception {
         // Disable the fast infoset as it's not compatible (yet) with OSGi
         System.setProperty("org.apache.cxf.nofastinfoset", "true");
 
@@ -121,7 +121,7 @@
         return defaults;
     }
 
-    public void updated(Dictionary props) throws ConfigurationException {
+    public synchronized void updated(Dictionary props) throws ConfigurationException {
         if (props != null && CONFIG_SERVICE_PID.equals(props.get(Constants.SERVICE_PID))) {
           //  topManager.updated(props);
         }

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=891733&r1=891732&r2=891733&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 Thu Dec 17 14:44:40 2009
@@ -20,7 +20,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF OSGi Remote Service Admin interfaces</name>
+    <name>Distributed OSGi Remote Service Admin interfaces</name>
     <version>${remote.service.admin.interfaces.version}</version>
 
     <parent>
@@ -31,15 +31,15 @@
     </parent>
 
 
-	<properties>
-		<bundle.symbolicName>cxf-dosgi-remote-service-admin-interfaces</bundle.symbolicName>
-		<bundle.namespace>org.osgi.service.remoteserviceadmin</bundle.namespace>
-	</properties>
-	
-	
-	
-	
-	<dependencies>
+    <properties>
+        <bundle.symbolicName>cxf-dosgi-remote-service-admin-interfaces</bundle.symbolicName>
+        <bundle.namespace>org.osgi.service.remoteserviceadmin</bundle.namespace>
+    </properties>
+    
+    
+    
+    
+    <dependencies>
         <dependency> 
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
@@ -52,45 +52,45 @@
             </exclusions>
             <scope>provided</scope>
         </dependency> 
-	</dependencies>
-	
-	
-	
+    </dependencies>
+    
+    
+    
 
     <build>
         <plugins>
             <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>
-						<Embed-Directory>target/dependency</Embed-Directory>
-						<Embed-StripGroup>true</Embed-StripGroup>
-					</instructions>
-				</configuration>
-			</plugin>
-
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</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>
+                        <Embed-Directory>target/dependency</Embed-Directory>
+                        <Embed-StripGroup>true</Embed-StripGroup>
+                    </instructions>
+                </configuration>
+            </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml Thu Dec 17 14:44:40 2009
@@ -20,7 +20,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-topology-manager</artifactId>
     <packaging>bundle</packaging>
-    <name>CXF OSGi Topology Manager implementation</name>
+    <name>Distributed OSGi Topology Manager implementation</name>
     <version>1.2-SNAPSHOT</version>
 
     <parent>

Modified: cxf/dosgi/trunk/felix/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/pom.xml?rev=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/pom.xml (original)
+++ cxf/dosgi/trunk/felix/pom.xml Thu Dec 17 14:44:40 2009
@@ -5,7 +5,7 @@
     <version>1.2-SNAPSHOT</version>
 
     <packaging>pom</packaging>
-    <name>CXF Distributed OSGi Temporary Private Felix Framework Build</name>
+    <name>Distributed OSGi Temporary Private Felix Framework Build</name>
 
     <parent>
         <groupId>org.apache.cxf.dosgi</groupId>

Modified: cxf/dosgi/trunk/felix/profiles/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/profiles/pom.xml?rev=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/profiles/pom.xml (original)
+++ cxf/dosgi/trunk/felix/profiles/pom.xml Thu Dec 17 14:44:40 2009
@@ -22,7 +22,7 @@
     <groupId>org.apache.cxf.dosgi</groupId>
     <artifactId>cxf-dosgi-ri-felix-profiles</artifactId>
     <packaging>jar</packaging>
-    <name>CXF Distributed OSGi Felix Profiles</name>
+    <name>Distributed OSGi Felix Profiles</name>
     <version>1.2-SNAPSHOT</version>
 
     <parent>

Modified: cxf/dosgi/trunk/felix/shell.tui/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/felix/shell.tui/pom.xml?rev=891733&r1=891732&r2=891733&view=diff
==============================================================================
--- cxf/dosgi/trunk/felix/shell.tui/pom.xml (original)
+++ cxf/dosgi/trunk/felix/shell.tui/pom.xml Thu Dec 17 14:44:40 2009
@@ -20,7 +20,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
-  <name>CXF Distributed OSGi Temporary Private Apache Felix Shell TUI Build</name>
+  <name>Distributed OSGi Temporary Private Apache Felix Shell TUI Build</name>
   <description>A simple textual user interface for Felix' shell service.</description>
   <groupId>org.apache.cxf.dosgi</groupId>
   <artifactId>felix-shell-extension</artifactId>