You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/08/13 02:15:42 UTC
svn commit: r803747 - in
/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca:
node/osgi/impl/ osgi/service/discovery/impl/ osgi/service/remoteadmin/
osgi/service/remoteadmin/impl/
Author: rfeng
Date: Thu Aug 13 00:15:42 2009
New Revision: 803747
URL: http://svn.apache.org/viewvc?rev=803747&view=rev
Log:
A few renames of the classes
Added:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteServiceAdmin.java
- copied, changed from r803718, tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteAdmin.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiHelper.java
- copied, changed from r803718, tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminHelper.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteServiceAdminImpl.java
- copied, changed from r803718, tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java
Removed:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteAdmin.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminHelper.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java
Modified:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteControllerImpl.java
Modified: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java?rev=803747&r1=803746&r2=803747&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java Thu Aug 13 00:15:42 2009
@@ -22,7 +22,7 @@
import static org.apache.tuscany.sca.node.osgi.impl.NodeManager.isSCABundle;
import org.apache.tuscany.sca.osgi.service.discovery.impl.DiscoveryActivator;
-import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.RemoteAdminImpl;
+import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.RemoteServiceAdminImpl;
import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.RemoteControllerImpl;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
@@ -39,7 +39,7 @@
private NodeManager manager;
private DiscoveryActivator discoveryActivator = new DiscoveryActivator();
- private RemoteAdminImpl remoteAdmin;
+ private RemoteServiceAdminImpl remoteAdmin;
private RemoteControllerImpl controller;
private void init() {
@@ -60,7 +60,7 @@
// FIXME: We should try to avoid aggressive initialization
init();
- remoteAdmin = new RemoteAdminImpl(context);
+ remoteAdmin = new RemoteServiceAdminImpl(context);
remoteAdmin.start();
controller = new RemoteControllerImpl(context);
Modified: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java?rev=803747&r1=803746&r2=803747&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java Thu Aug 13 00:15:42 2009
@@ -40,7 +40,7 @@
import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointDescription;
import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointListener;
import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteConstants;
-import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.RemoteAdminHelper;
+import org.apache.tuscany.sca.osgi.service.remoteadmin.impl.OSGiHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -207,7 +207,7 @@
}
private boolean filterMatches(String filterValue, EndpointDescription sd) {
- Filter filter = RemoteAdminHelper.createFilter(context, filterValue);
+ Filter filter = OSGiHelper.createFilter(context, filterValue);
Hashtable<String, Object> props = new Hashtable<String, Object>(sd.getProperties());
// Add two faked properties to make the filter match
props.put(Constants.OBJECTCLASS, sd.getInterfaces());
@@ -242,7 +242,7 @@
String property,
Map<String, List<EndpointListener>> forwardMap,
Map<EndpointListener, Collection<String>> reverseMap) {
- Collection<String> collection = RemoteAdminHelper.getStringCollection(reference, property);
+ Collection<String> collection = OSGiHelper.getStringCollection(reference, property);
if (logger.isLoggable(Level.FINE)) {
logger.fine("adding listener: " + listener
+ " collection: "
Copied: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteServiceAdmin.java (from r803718, tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteAdmin.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteServiceAdmin.java?p2=tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteServiceAdmin.java&p1=tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteAdmin.java&r1=803718&r2=803747&rev=803747&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteAdmin.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/RemoteServiceAdmin.java Thu Aug 13 00:15:42 2009
@@ -36,7 +36,7 @@
* @ThreadSafe
*/
-public interface RemoteAdmin {
+public interface RemoteServiceAdmin {
/**
* Export a service to an endpoint. The Remote Service Admin must create an
* endpoint that can be used by other Distrbution Providers to connect to
Copied: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiHelper.java (from r803718, tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminHelper.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiHelper.java?p2=tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiHelper.java&p1=tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminHelper.java&r1=803718&r2=803747&rev=803747&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminHelper.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/OSGiHelper.java Thu Aug 13 00:15:42 2009
@@ -30,8 +30,8 @@
/**
*
*/
-public class RemoteAdminHelper {
- private RemoteAdminHelper() {
+public class OSGiHelper {
+ private OSGiHelper() {
}
/**
Modified: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteControllerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteControllerImpl.java?rev=803747&r1=803746&r2=803747&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteControllerImpl.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteControllerImpl.java Thu Aug 13 00:15:42 2009
@@ -49,7 +49,7 @@
import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointListener;
import org.apache.tuscany.sca.osgi.service.remoteadmin.ExportRegistration;
import org.apache.tuscany.sca.osgi.service.remoteadmin.ImportRegistration;
-import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdmin;
+import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteServiceAdmin;
import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdminEvent;
import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdminListener;
import org.osgi.framework.Bundle;
@@ -107,7 +107,7 @@
}
endpointListener = context.registerService(EndpointListener.class.getName(), this, null);
- remoteAdmins = new ServiceTracker(this.context, RemoteAdmin.class.getName(), null);
+ remoteAdmins = new ServiceTracker(this.context, RemoteServiceAdmin.class.getName(), null);
remoteAdmins.open();
// DO NOT register EventHook.class.getName() as it cannot report existing services
@@ -183,7 +183,7 @@
logger.warning("No RemoteAdmin services are available.");
} else {
for (Object ra : admins) {
- RemoteAdmin remoteAdmin = (RemoteAdmin)ra;
+ RemoteServiceAdmin remoteAdmin = (RemoteServiceAdmin)ra;
List<ExportRegistration> exportRegistrations = remoteAdmin.exportService(reference);
if (exportRegistrations != null && !exportRegistrations.isEmpty()) {
exportedServices.putValue(reference, exportRegistrations);
@@ -331,7 +331,7 @@
if (admins != null) {
for (Object ra : admins) {
- RemoteAdmin remoteAdmin = (RemoteAdmin)ra;
+ RemoteServiceAdmin remoteAdmin = (RemoteServiceAdmin)ra;
ImportRegistration importRegistration = remoteAdmin.importService(description);
if (importRegistration != null) {
importedServices.putValue(endpoint, importRegistration);
Copied: tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteServiceAdminImpl.java (from r803718, tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteServiceAdminImpl.java?p2=tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteServiceAdminImpl.java&p1=tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java&r1=803718&r2=803747&rev=803747&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteAdminImpl.java (original)
+++ tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/remoteadmin/impl/RemoteServiceAdminImpl.java Thu Aug 13 00:15:42 2009
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.osgi.service.remoteadmin.EndpointDescription;
import org.apache.tuscany.sca.osgi.service.remoteadmin.ExportRegistration;
import org.apache.tuscany.sca.osgi.service.remoteadmin.ImportRegistration;
-import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdmin;
+import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteServiceAdmin;
import org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdminListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -36,9 +36,9 @@
import org.osgi.util.tracker.ServiceTracker;
/**
- * SCA Implementation of {@link RemoteAdmin}
+ * SCA Implementation of {@link RemoteServiceAdmin}
*/
-public class RemoteAdminImpl implements RemoteAdmin {
+public class RemoteServiceAdminImpl implements RemoteServiceAdmin {
private BundleContext context;
private ServiceRegistration registration;
private ServiceTracker listeners;
@@ -49,7 +49,7 @@
private Collection<ImportRegistration> importedEndpoints = new ArrayList<ImportRegistration>();
private Collection<ExportRegistration> exportedServices = new ArrayList<ExportRegistration>();
- public RemoteAdminImpl(BundleContext context) {
+ public RemoteServiceAdminImpl(BundleContext context) {
this.context = context;
}
@@ -58,7 +58,7 @@
this.importer = new OSGiServiceImporter(context);
exporter.start();
importer.start();
- registration = context.registerService(RemoteAdmin.class.getName(), this, null);
+ registration = context.registerService(RemoteServiceAdmin.class.getName(), this, null);
listeners = new ServiceTracker(this.context, RemoteAdminListener.class.getName(), null);
listeners.open();
}
@@ -91,7 +91,7 @@
}
/**
- * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdmin#exportService(org.osgi.framework.ServiceReference)
+ * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteServiceAdmin#exportService(org.osgi.framework.ServiceReference)
*/
public List<ExportRegistration> exportService(ServiceReference ref) {
List<ExportRegistration> exportRegistrations = exporter.exportService(ref);
@@ -102,7 +102,7 @@
}
/**
- * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdmin#exportService(org.osgi.framework.ServiceReference,
+ * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteServiceAdmin#exportService(org.osgi.framework.ServiceReference,
* java.util.Map)
*/
public List<ExportRegistration> exportService(ServiceReference ref, Map<String, Object> properties) {
@@ -114,21 +114,21 @@
}
/**
- * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdmin#getExportedServices()
+ * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteServiceAdmin#getExportedServices()
*/
public Collection<ExportRegistration> getExportedServices() {
return exportedServices;
}
/**
- * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdmin#getImportedEndpoints()
+ * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteServiceAdmin#getImportedEndpoints()
*/
public Collection<ImportRegistration> getImportedEndpoints() {
return importedEndpoints;
}
/**
- * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteAdmin#importService(org.apache.tuscany.sca.dosgi.discovery.EndpointDescription)
+ * @see org.apache.tuscany.sca.osgi.service.remoteadmin.RemoteServiceAdmin#importService(org.apache.tuscany.sca.dosgi.discovery.EndpointDescription)
*/
public ImportRegistration importService(EndpointDescription endpoint) {
Bundle bundle = (Bundle) endpoint.getProperties().get(Bundle.class.getName());