You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/08/30 19:07:47 UTC
svn commit: r438546 - in
/webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse:
Activator.java ManagementBinding.java ManagementResourceRouter.java
Author: danj
Date: Wed Aug 30 10:07:47 2006
New Revision: 438546
URL: http://svn.apache.org/viewvc?rev=438546&view=rev
Log:
Joel's sample update from MUSE-81
Modified:
webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/Activator.java
webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementBinding.java
webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementResourceRouter.java
Modified: webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/Activator.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/Activator.java?rev=438546&r1=438545&r2=438546&view=diff
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/Activator.java (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/Activator.java Wed Aug 30 10:07:47 2006
@@ -69,8 +69,6 @@
managementServiceRef = context.getServiceReference("org.apache.muse.core.platform.osgi.ResourceManagementProvider");
if(managementServiceRef != null){
managementProvider = (ResourceManagementProvider)context.getService(managementServiceRef);
- managementProvider.registerResourceDefinitionCallback(context.getBundle(), ManagementBinding.getDefault());
- managementProvider.registerCreateStartupResourcesCallback(context.getBundle(), ManagementBinding.getDefault());
}
context.addServiceListener(new WSDMServiceListener(),WSDM_PROVIDER_FILTER);
@@ -79,7 +77,7 @@
Hashtable providerProperties = new Hashtable();
providerProperties.put(Binding.PROVIDER_NAME,"WSDM");
providerProperties.put(Binding.PROVIDER_MAJOR_VERSION,new Integer(1));
- providerPropertis.put(Binding.PROVIDER_MINOR_VERSION,new Integer(1));
+ providerProperties.put(Binding.PROVIDER_MINOR_VERSION,new Integer(1));
bindingService = context.registerService(
"org.apache.muse.management.binding.Binding",
ManagementBinding.getDefault(), providerProperties);
@@ -101,8 +99,6 @@
case ServiceEvent.REGISTERED:
managementProvider = (ResourceManagementProvider)context.getService(ref);
managementServiceRef = ref;
- managementProvider.registerResourceDefinitionCallback(context.getBundle(), ManagementBinding.getDefault());
- managementProvider.registerCreateStartupResourcesCallback(context.getBundle(), ManagementBinding.getDefault());
break;
case ServiceEvent.MODIFIED:
break;
Modified: webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementBinding.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementBinding.java?rev=438546&r1=438545&r2=438546&view=diff
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementBinding.java (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementBinding.java Wed Aug 30 10:07:47 2006
@@ -7,8 +7,6 @@
import javax.xml.namespace.QName;
-import org.apache.muse.core.platform.osgi.CreateStartupResourcesCallback;
-import org.apache.muse.core.platform.osgi.ResourceDefinitionCallback;
import org.apache.muse.core.routing.ResourceRouter;
import org.apache.muse.management.binding.Binding;
import org.apache.muse.management.common.Contribution;
@@ -26,7 +24,7 @@
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
-public class ManagementBinding implements Binding, ServiceFactory, ResourceDefinitionCallback, CreateStartupResourcesCallback {
+public class ManagementBinding implements Binding, ServiceFactory {
private static ManagementBinding _instance = new ManagementBinding();
@@ -64,6 +62,7 @@
public void setResourceRouter(ResourceRouter router){
this._router = router;
+ handlePendingContributions();
}
private void handlePendingContributions(){
@@ -158,14 +157,6 @@
public void ungetService(Bundle bundle, ServiceRegistration registration, Object service) {
//not much to do here...
- }
-
- public void notifyResourceDefinition(Collection resourceDefs) {
- //TODO remove this if we don't need it
- }
-
- public void notifyCreateStartupResources() {
- handlePendingContributions();
}
public void unbindContribution(Contribution contribution) {
Modified: webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementResourceRouter.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementResourceRouter.java?rev=438546&r1=438545&r2=438546&view=diff
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementResourceRouter.java (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/samples/osgi_manager/plugins/org.apache.muse.management.wsdm/src/org/apache/muse/management/muse/ManagementResourceRouter.java Wed Aug 30 10:07:47 2006
@@ -3,7 +3,6 @@
import org.apache.muse.core.Resource;
import org.apache.muse.core.ResourceManager;
import org.apache.muse.core.SimpleResourceManager;
-import org.apache.muse.core.platform.osgi.OSGiResourceManager;
import org.apache.muse.core.routing.RouterPersistence;
import org.apache.muse.core.routing.SimpleResourceRouter;
import org.apache.muse.management.common.Contribution;
@@ -19,12 +18,11 @@
public void initialize() throws SoapFault {
super.initialize();
ManagementBinding.getDefault().setResourceRouter(this);
- ManagementBinding.getDefault().notifyCreateStartupResources();
}
protected ResourceManager createResourceManager()
{
- return new OSGiResourceManager();
+ return new SimpleResourceManager();
}
@@ -40,7 +38,7 @@
//fix up the EPR with the resource ID
EndpointReference epr = proxy.getEndpointReference();
epr.addParameter(WsaConstants.DEFAULT_RESOURCE_ID_QNAME ,contribution.getIdentifier());
- ((OSGiResourceManager)manager).addResource(proxy.getEndpointReference(),proxy);
+ manager.addResource(proxy.getEndpointReference(),proxy);
return proxy;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org