Author: mschaaf
Date: Mon Apr 19 10:35:49 2010
New Revision: 935517
URL: http://svn.apache.org/viewvc?rev=935517&view=rev
Log:
Changed the Zookeeper based discovery so that it is now able to discover
services without an objectClass set in the scope.
Changed the local discovery bundle to export a utility class which is needed by
the distributed discovery to generate and to parse the XML format used in the
Zookeeper nodes.
Added:
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java
- copied, changed from r935355,
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
- copied, changed from r935355,
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/ActivatorTest.java
- copied, changed from r935355,
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/ActivatorTest.java
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java
- copied, changed from r935355,
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryTest.java
Removed:
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/ActivatorTest.java
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryTest.java
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java
cxf/dosgi/trunk/discovery/local/pom.xml
cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java
(original)
+++
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerTrackerCustomizer.java
Mon Apr 19 10:35:49 2010
@@ -57,34 +57,31 @@ public class EndpointListenerTrackerCust
}
public Object addingService(ServiceReference sref) {
- LOG.info("addingService: " + sref);
+ LOG.fine("addingService: " + sref);
handleEndpointListener(sref);
return sref;
}
public void modifiedService(ServiceReference sref, Object service) {
- LOG.info("modifiedService: " + sref);
+ LOG.fine("modifiedService: " + sref);
handleEndpointListener(sref);
}
private void handleEndpointListener(ServiceReference sref) {
for (String key : sref.getPropertyKeys()) {
- LOG.info("modifiedService: property: " + key + " => " +
sref.getProperty(key));
+ LOG.finest("modifiedService: property: " + key + " => " +
sref.getProperty(key));
}
String[] scopes =
getStringPlusProperty(sref.getProperty(EndpointListener.ENDPOINT_LISTENER_SCOPE));
- LOG.info("trying to discover service for scopes[" + scopes.length +
"]: " + scopes);
-
+ LOG.fine("trying to discover service for scopes[" + scopes.length +
"]: ");
+ if(scopes!=null) for (String scope : scopes) {
+ LOG.fine("Scope: "+scope);
+ }
if (scopes.length > 0) {
for (String scope : scopes) {
- LOG.info("*********** Handling scope: " + scope);
+ LOG.fine("*********** Handling scope: " + scope);
String objClass = getObjectClass(scope);
- LOG.info("*********** objectClass: " + objClass);
+ LOG.fine("*********** objectClass: " + objClass);
- if(objClass==null){
- LOG.severe("The implementation is currently unable to
handle scopes without an objectClass component !");
- continue;
- }
-
synchronized (interestingScopes) {
synchronized (handledEndpointlisteners) {
Interest interest = interestingScopes.get(scope);
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java
(original)
+++
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceDataMonitorListenerImpl.java
Mon Apr 19 10:35:49 2010
@@ -1,44 +1,39 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.cxf.dosgi.discovery.zookeeper;
import java.io.ByteArrayInputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.cxf.dosgi.discovery.local.LocalDiscovery;
import org.apache.cxf.dosgi.discovery.local.LocalDiscoveryUtils;
+import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
-import org.jdom.Document;
+import org.apache.zookeeper.data.Stat;
import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.remoteserviceadmin.EndpointDescription;
import org.osgi.service.remoteserviceadmin.EndpointListener;
-import org.osgi.service.remoteserviceadmin.RemoteConstants;
public class InterfaceDataMonitorListenerImpl implements DataMonitorListener {
private static final Logger LOG =
Logger.getLogger(InterfaceDataMonitorListenerImpl.class.getName());
@@ -48,93 +43,142 @@ public class InterfaceDataMonitorListene
final String interFace;
final EndpointListenerTrackerCustomizer.Interest discoveredServiceTracker;
final String scope;
-
+ final boolean recursive;
+
private final BundleContext bctx;
-
+
// This map is *only* accessed in the change() method
- private Map<String, Map<String, Object>> nodes = new HashMap<String,
Map<String,Object>>();
-
- public InterfaceDataMonitorListenerImpl(ZooKeeper zk, String intf,
EndpointListenerTrackerCustomizer.Interest dst,String scope, BundleContext bc) {
+ private Map<String, Map<String, Object>> nodes = new HashMap<String,
Map<String, Object>>();
+
+ public InterfaceDataMonitorListenerImpl(ZooKeeper zk, String intf,
+
EndpointListenerTrackerCustomizer.Interest dst, String scope,
+ BundleContext bc) {
zookeeper = zk;
znode = Util.getZooKeeperPath(intf);
+ if (intf == null || "".equals(intf))
+ recursive = true;
+ else
+ recursive = false;
interFace = intf;
discoveredServiceTracker = dst;
bctx = bc;
this.scope = scope;
}
-
+
public synchronized void change() {
- Map<String, Map<String, Object>> newNodes = new HashMap<String,
Map<String,Object>>();
+ Map<String, Map<String, Object>> newNodes = new HashMap<String,
Map<String, Object>>();
Map<String, Map<String, Object>> prevNodes = nodes;
+ LOG.info("Zookeeper callback on node: " + znode);
+
+ processChildren(znode, newNodes, prevNodes);
+
+ for (Map<String, Object> props : prevNodes.values()) {
+ // whatever's left in prevNodes now has been removed from Discovery
+ EndpointDescription epd = new EndpointDescription(props);
+
+ for (ServiceReference sref :
discoveredServiceTracker.relatedServiceListeners) {
+ if (bctx.getService(sref) instanceof EndpointListener) {
+ EndpointListener epl =
(EndpointListener)bctx.getService(sref);
+ LOG.info("calling EndpointListener endpointRemoved: " +
epl + "from bundle "
+ + sref.getBundle().getSymbolicName());
+ epl.endpointRemoved(epd, scope);
+ }
+ }
+ }
+
+ nodes = newNodes;
+ }
+
+ private void processChildren(String znode, Map<String, Map<String,
Object>> newNodes,
+ Map<String, Map<String, Object>> prevNodes) {
+
+ List<String> children;
try {
- LOG.info("Zookeeper callback on node: " + znode);
- List<String> children = zookeeper.getChildren(znode, false);
-
+ LOG.fine("Processing " + znode);
+ children = zookeeper.getChildren(znode, false);
+
for (String child : children) {
- byte[] data = zookeeper.getData(znode + '/' + child, false,
null);
- LOG.info("Child: " + znode + "/" + child);
-
- List<Element> elements = LocalDiscoveryUtils.getElements(new
ByteArrayInputStream(data));
- EndpointDescription epd = null;
- if(elements.size()>0)
- epd =
LocalDiscoveryUtils.getEndpointDescription(elements.get(0));
- else{
- LOG.warning("No Discovery information found for node:
"+znode + "/" + child);
- continue;
+
+ Map<String, Object> p = processChild(znode, child,
prevNodes.get(child));
+ if (p != null) {
+ newNodes.put(child, p);
+ prevNodes.remove(child);
+ }
+ if (recursive) {
+ String newNode = znode + '/' + child;
+ processChildren(newNode, newNodes, prevNodes);
}
-
- LOG.finest("Properties: "+epd.getProperties());
-
- newNodes.put(child, epd.getProperties());
- Map<String, Object> prevVal = prevNodes.remove(child);
-
- if (prevVal == null) {
- // This guy is new
-
- for (ServiceReference sref :
discoveredServiceTracker.relatedServiceListeners) {
- if (bctx.getService(sref) instanceof EndpointListener)
{
- EndpointListener epl =
(EndpointListener)bctx.getService(sref);
-
- LOG.info("calling EndpointListener; "+epl+ "from
bundle " + sref.getBundle().getSymbolicName() );
-
- epl.endpointAdded(epd, scope);
- }
- }
- } else if (!prevVal.equals(epd.getProperties())){
- // There's been a modification
-// ServiceEndpointDescriptionImpl sed = new
ServiceEndpointDescriptionImpl(Collections.singletonList(interFace), m);
-// DiscoveredServiceNotification dsn = new
DiscoveredServiceNotificationImpl(Collections.emptyList(),
-// Collections.singleton(interFace),
DiscoveredServiceNotification.MODIFIED, sed);
-// discoveredServiceTracker.serviceChanged(dsn);
-
- // TODO
-
- }
}
- for (Map<String, Object> props : prevNodes.values()) {
- // whatever's left in prevNodes now has been removed from
Discovery
- EndpointDescription epd = new EndpointDescription(props);
-
+ } catch (KeeperException e) {
+ LOG.log(Level.SEVERE, "Problem processing Zookeeper node: " +
e.getMessage(), e);
+ } catch (InterruptedException e) {
+ LOG.log(Level.SEVERE, "Problem processing Zookeeper node: " +
e.getMessage(), e);
+ }
+
+ }
+
+ private Map<String, Object> processChild(String znode, String child,
Map<String, Object> prevVal) {
+
+ String node = znode + '/' + child;
+
+ try {
+ Stat s = zookeeper.exists(node, false);
+ if (s.getDataLength() <= 0) {
+ LOG.fine(node + " does not contain any discovery data");
+ return null;
+ }
+ byte[] data = zookeeper.getData(node, false, null);
+ LOG.info("Child: " + node);
+
+ List<Element> elements = LocalDiscoveryUtils.getElements(new
ByteArrayInputStream(data));
+ EndpointDescription epd = null;
+ if (elements.size() > 0)
+ epd =
LocalDiscoveryUtils.getEndpointDescription(elements.get(0));
+ else {
+ LOG.warning("No Discovery information found for node: " +
node);
+ return null;
+ }
+
+ LOG.finest("Properties: " + epd.getProperties());
+
+ if (prevVal == null) {
+ // This guy is new
+
for (ServiceReference sref :
discoveredServiceTracker.relatedServiceListeners) {
if (bctx.getService(sref) instanceof EndpointListener) {
EndpointListener epl =
(EndpointListener)bctx.getService(sref);
- LOG.info("calling EndpointListener endpointRemoved:
"+epl+ "from bundle " + sref.getBundle().getSymbolicName() );
- epl.endpointRemoved(epd, scope);
+
+ LOG.info("calling EndpointListener; " + epl + "from
bundle "
+ + sref.getBundle().getSymbolicName());
+
+ epl.endpointAdded(epd, scope);
}
}
-
+ } else if (!prevVal.equals(epd.getProperties())) {
+ // There's been a modification
+ // ServiceEndpointDescriptionImpl sed = new
+ //
ServiceEndpointDescriptionImpl(Collections.singletonList(interFace), m);
+ // DiscoveredServiceNotification dsn = new
+ // DiscoveredServiceNotificationImpl(Collections.emptyList(),
+ // Collections.singleton(interFace),
DiscoveredServiceNotification.MODIFIED, sed);
+ // discoveredServiceTracker.serviceChanged(dsn);
+
+ // TODO
+
}
+
+ return epd.getProperties();
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Problem processing Zookeeper callback:
"+e.getMessage(), e);
- } finally {
- nodes = newNodes;
+ LOG.log(Level.SEVERE, "Problem processing Zookeeper callback: " +
e.getMessage(), e);
}
+
+ return null;
}
public void inform(ServiceReference sref) {
LOG.fine("need to inform the service reference of maybe already
existing endpoints");
// TODO Auto-generated method stub
-
+
}
}
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java
(original)
+++
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/InterfaceMonitor.java
Mon Apr 19 10:35:49 2010
@@ -52,7 +52,6 @@ public class InterfaceMonitor implements
public void process(WatchedEvent event) {
LOG.finer("ZooKeeper watcher callback " + event);
-
processDelta();
}
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java
(original)
+++
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/Util.java
Mon Apr 19 10:35:49 2010
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Collections;
public class Util {
- static final String PATH_PREFIX = "/osgi/service_registry/";
+ static final String PATH_PREFIX = "/osgi/service_registry";
@SuppressWarnings("unchecked")
static Collection<String> getMultiValueProperty(Object property) {
@@ -39,7 +39,8 @@ public class Util {
}
static String getZooKeeperPath(String name) {
- return PATH_PREFIX + name.replace('.', '/');
+ if(name==null || "".equals(name)) return PATH_PREFIX;
+ return PATH_PREFIX + '/' + name.replace('.', '/');
}
}
Modified:
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java
(original)
+++
cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/UtilTest.java
Mon Apr 19 10:35:49 2010
@@ -48,7 +48,11 @@ public class UtilTest extends TestCase {
}
public void testGetZooKeeperPath() {
- assertEquals(Util.PATH_PREFIX + "org/example/Test",
+ assertEquals(Util.PATH_PREFIX + '/' +"org/example/Test",
Util.getZooKeeperPath("org.example.Test"));
+
+ // used for the recursive discovery
+ assertEquals(Util.PATH_PREFIX,Util.getZooKeeperPath(null));
+ assertEquals(Util.PATH_PREFIX,Util.getZooKeeperPath(""));
}
}
Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Mon Apr 19 10:35:49 2010
@@ -84,11 +84,12 @@
<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-Activator>org.apache.cxf.dosgi.discovery.local.Activator</Bundle-Activator>
+
<Bundle-Activator>org.apache.cxf.dosgi.discovery.local.internal.Activator</Bundle-Activator>
<Import-Package>*</Import-Package>
-
<Private-Package>org.apache.cxf.dosgi.discovery.local</Private-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>
</configuration>
Copied:
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java
(from r935355,
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/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?p2=cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java&p1=cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java&r1=935355&r2=935517&rev=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/Activator.java
(original)
+++
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/Activator.java
Mon Apr 19 10:35:49 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.dosgi.discovery.local;
+package org.apache.cxf.dosgi.discovery.local.internal;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Copied:
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
(from r935355,
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java)
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java?p2=cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java&p1=cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java&r1=935355&r2=935517&rev=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/LocalDiscovery.java
(original)
+++
cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
Mon Apr 19 10:35:49 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.dosgi.discovery.local;
+package org.apache.cxf.dosgi.discovery.local.internal;
import java.util.ArrayList;
import java.util.Collection;
@@ -30,6 +30,7 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
+import org.apache.cxf.dosgi.discovery.local.LocalDiscoveryUtils;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
Copied:
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/ActivatorTest.java
(from r935355,
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/ActivatorTest.java)
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/ActivatorTest.java?p2=cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/ActivatorTest.java&p1=cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/ActivatorTest.java&r1=935355&r2=935517&rev=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/ActivatorTest.java
(original)
+++
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/ActivatorTest.java
Mon Apr 19 10:35:49 2010
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.dosgi.discovery.local;
+package org.apache.cxf.dosgi.discovery.local.internal;
import junit.framework.TestCase;
+import org.apache.cxf.dosgi.discovery.local.internal.Activator;
+import org.apache.cxf.dosgi.discovery.local.internal.LocalDiscovery;
import org.easymock.IAnswer;
import org.easymock.classextension.EasyMock;
import org.osgi.framework.BundleContext;
Copied:
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java
(from r935355,
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryTest.java)
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java?p2=cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java&p1=cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryTest.java&r1=935355&r2=935517&rev=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/LocalDiscoveryTest.java
(original)
+++
cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java
Mon Apr 19 10:35:49 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.dosgi.discovery.local;
+package org.apache.cxf.dosgi.discovery.local.internal;
import java.net.URL;
import java.util.ArrayList;
@@ -33,6 +33,7 @@ import java.util.Set;
import junit.framework.TestCase;
+import org.apache.cxf.dosgi.discovery.local.internal.LocalDiscovery;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.osgi.framework.Bundle;
Modified:
cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
(original)
+++
cxf/dosgi/trunk/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/singlebundle/activators.list
Mon Apr 19 10:35:49 2010
@@ -1,7 +1,7 @@
org.apache.felix.cm.impl.ConfigurationManager
org.apache.felix.fileinstall.FileInstall
org.ops4j.pax.web.service.internal.Activator
-org.apache.cxf.dosgi.discovery.local.Activator
+org.apache.cxf.dosgi.discovery.local.internal.Activator
org.apache.cxf.dosgi.dsw.Activator
org.apache.cxf.dosgi.discovery.zookeeper.Activator
org.apache.cxf.dosgi.topologymanager.Activator
Modified:
cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java?rev=935517&r1=935516&r2=935517&view=diff
==============================================================================
---
cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
(original)
+++
cxf/dosgi/trunk/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/singlebundle/AggregatedActivatorTest.java
Mon Apr 19 10:35:49 2010
@@ -62,7 +62,7 @@ public class AggregatedActivatorTest ext
"org.apache.felix.cm.impl.ConfigurationManager",
"org.apache.felix.fileinstall.FileInstall",
"org.ops4j.pax.web.service.internal.Activator",
- "org.apache.cxf.dosgi.discovery.local.Activator",
+ "org.apache.cxf.dosgi.discovery.local.internal.Activator",
"org.apache.cxf.dosgi.dsw.Activator",
"org.apache.cxf.dosgi.discovery.zookeeper.Activator",
"org.apache.cxf.dosgi.topologymanager.Activator",
