svn commit: r782605 - in /cxf/dosgi/trunk: discovery/distributed/cxf-discovery/ discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/ discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery...

[davidb]

Author: davidb
Date: Mon Jun  8 12:28:32 2009
New Revision: 782605

URL: http://svn.apache.org/viewvc?rev=782605&view=rev
Log:
Further tweaks to the Discovery implementation.

Removed:
    
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryServiceImpl.java
    
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/DiscoveryServiceImplTest.java
Modified:
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
    cxf/dosgi/trunk/distribution/discovery-single-bundle/pom.xml
    
cxf/dosgi/trunk/distribution/discovery-single-bundle/src/main/java/org/apache/cxf/dosgi/discovery/singlebundle/AggregatedActivator.java
    
cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java

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=782605&r1=782604&r2=782605&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Mon Jun  8 
12:28:32 2009
@@ -70,12 +70,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-core</artifactId>
-            <version>${spring.osgi.version}</version>
-        </dependency> 
-
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -105,8 +99,6 @@
                             org.osgi.framework;version="[1.4.0,2.0.0)",
                             org.osgi.service.discovery;version="[1.0.0,2.0.0)",
                             org.osgi.util.tracker;version="[1.3.0,2.0.0)",
-                            
org.springframework.beans.factory;version="[2.5.0,3.0.0)",
-                            
org.springframework.osgi.context;version="[1.2.0,2.0.0)",
                             *
                         </Import-Package>
                         
<Export-Package>org.apache.cxf.dosgi.discovery.zookeeper;version=${pom.version}</Export-Package>

Modified: cxf/dosgi/trunk/distribution/discovery-single-bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-single-bundle/pom.xml?rev=782605&r1=782604&r2=782605&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/discovery-single-bundle/pom.xml Mon Jun  8 
12:28:32 2009
@@ -109,8 +109,6 @@
               org.osgi.service.discovery;version="[1.0.0,2.0.0)",
               org.osgi.service.packageadmin;version="[1.2.0,2.0.0)",
               org.osgi.util.tracker;version="[1.3.0,2.0.0)",
-              org.springframework.beans.factory;version="[2.5.0,3.0.0)",
-              org.springframework.osgi.context;version="[1.2.0,2.0.0)",
               org.w3c.dom,
               org.xml.sax.*,
               !*

Modified: 
cxf/dosgi/trunk/distribution/discovery-single-bundle/src/main/java/org/apache/cxf/dosgi/discovery/singlebundle/AggregatedActivator.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-single-bundle/src/main/java/org/apache/cxf/dosgi/discovery/singlebundle/AggregatedActivator.java?rev=782605&r1=782604&r2=782605&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/distribution/discovery-single-bundle/src/main/java/org/apache/cxf/dosgi/discovery/singlebundle/AggregatedActivator.java
 (original)
+++ 
cxf/dosgi/trunk/distribution/discovery-single-bundle/src/main/java/org/apache/cxf/dosgi/discovery/singlebundle/AggregatedActivator.java
 Mon Jun  8 12:28:32 2009
@@ -82,7 +82,10 @@
         BufferedReader br = new BufferedReader(new 
InputStreamReader(url.openStream()));
         String line = null;
         while ((line = br.readLine()) != null) {
-            bundleActivators.add(line);
+            line = line.trim();
+            if (line.length() > 0) {
+                bundleActivators.add(line);
+            }
         }
         
         return bundleActivators;

Modified: 
cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java?rev=782605&r1=782604&r2=782605&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
 (original)
+++ 
cxf/dosgi/trunk/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivator.java
 Mon Jun  8 12:28:32 2009
@@ -144,7 +144,10 @@
         BufferedReader br = new BufferedReader(new 
InputStreamReader(url.openStream()));
         String line = null;
         while ((line = br.readLine()) != null) {
-            bundleActivators.add(line);
+            line = line.trim();
+            if (line.length() > 0) {
+                bundleActivators.add(line);
+            }
         }
         
         return bundleActivators;