Author: rfeng
Date: Wed Feb 3 22:00:39 2010
New Revision: 906262
URL: http://svn.apache.org/viewvc?rev=906262&view=rev
Log:
Add domainURI/nodeURI to runtime endpoint/endpoint reference
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java?rev=906262&r1=906261&r2=906262&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
Wed Feb 3 22:00:39 2010
@@ -39,17 +39,21 @@
protected EndpointRegistry endpointRegistry;
protected ComponentContextFactory componentContextFactory;
protected Composite domainComposite;
+ protected String nodeURI;
+ protected String domainURI;
- public CompositeContext(ExtensionPointRegistry registry, EndpointRegistry
endpointRegistry, Composite domainComposite) {
+ public CompositeContext(ExtensionPointRegistry registry, EndpointRegistry
endpointRegistry, Composite domainComposite, String domainURI, String nodeURI) {
this.extensionPointRegistry = registry;
this.endpointRegistry = endpointRegistry;
ContextFactoryExtensionPoint contextFactories =
registry.getExtensionPoint(ContextFactoryExtensionPoint.class);
this.componentContextFactory =
contextFactories.getFactory(ComponentContextFactory.class);
this.domainComposite = domainComposite;
+ this.domainURI = domainURI;
+ this.nodeURI = nodeURI;
}
public CompositeContext(ExtensionPointRegistry registry, EndpointRegistry
endpointRegistry) {
- this(registry, endpointRegistry, null);
+ this(registry, endpointRegistry, null, "default", "default");
}
/**
@@ -124,4 +128,12 @@
public static void removeCompositeContext() {
context.remove();
}
+
+ public String getNodeURI() {
+ return nodeURI;
+ }
+
+ public String getDomainURI() {
+ return domainURI;
+ }
}
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java?rev=906262&r1=906261&r2=906262&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
Wed Feb 3 22:00:39 2010
@@ -55,6 +55,18 @@
* @return
*/
CompositeContext getCompositeContext();
+
+
+ /**
+ * Get the node URI
+ * @return The node URI
+ */
+ String getNodeURI();
+ /**
+ * Get the domain URI
+ * @return The domain URI
+ */
+ String getDomainURI();
/**
* Unbind the invocable from the composite context
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=906262&r1=906261&r2=906262&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
Wed Feb 3 22:00:39 2010
@@ -78,7 +78,6 @@
*/
public class RuntimeEndpointImpl extends EndpointImpl implements
RuntimeEndpoint, Externalizable {
private transient CompositeContext compositeContext;
- private transient EndpointRegistry endpointRegistry;
private transient RuntimeWireProcessor wireProcessor;
private transient ProviderFactoryExtensionPoint providerFactories;
private transient InterfaceContractMapper interfaceContractMapper;
@@ -99,6 +98,9 @@
protected InterfaceContract bindingInterfaceContract;
protected InterfaceContract serviceInterfaceContract;
+
+ private String domainURI;
+ private String nodeURI;
/**
* No-arg constructor for Java serilization
@@ -129,6 +131,8 @@
this.policySets = copy.policySets;
this.uri = copy.uri;
+ this.nodeURI = copy.nodeURI;
+ this.domainURI = copy.domainURI;
this.remote = copy.remote;
this.unresolved = copy.unresolved;
@@ -144,6 +148,12 @@
public void bind(CompositeContext compositeContext) {
this.compositeContext = compositeContext;
+ if (nodeURI != null) {
+ this.nodeURI = compositeContext.getNodeURI();
+ }
+ if (domainURI != null) {
+ this.domainURI = compositeContext.getDomainURI();
+ }
bind(compositeContext.getExtensionPointRegistry(),
compositeContext.getEndpointRegistry());
}
@@ -152,7 +162,6 @@
compositeContext = new CompositeContext(registry,
endpointRegistry);
}
this.registry = registry;
- this.endpointRegistry = endpointRegistry;
UtilityExtensionPoint utilities =
registry.getExtensionPoint(UtilityExtensionPoint.class);
this.interfaceContractMapper =
utilities.getUtility(InterfaceContractMapper.class);
this.workScheduler = utilities.getUtility(WorkScheduler.class);
@@ -566,4 +575,12 @@
}
}
+ public String getDomainURI() {
+ return domainURI;
+ }
+
+ public String getNodeURI() {
+ return nodeURI;
+ }
+
}
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=906262&r1=906261&r2=906262&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
Wed Feb 3 22:00:39 2010
@@ -100,6 +100,8 @@
protected InterfaceContract bindingInterfaceContract;
protected InterfaceContract referenceInterfaceContract;
+ private String domainURI;
+ private String nodeURI;
private String xml;
@@ -132,6 +134,8 @@
this.policySets = copy.policySets;
this.uri = copy.uri;
+ this.domainURI = copy.domainURI;
+ this.nodeURI = copy.nodeURI;
this.remote = copy.remote;
this.unresolved = copy.unresolved;
this.status = copy.status;
@@ -148,6 +152,12 @@
public void bind(CompositeContext compositeContext) {
this.compositeContext = compositeContext;
+ if (nodeURI != null) {
+ this.nodeURI = compositeContext.getNodeURI();
+ }
+ if (domainURI != null) {
+ this.domainURI = compositeContext.getDomainURI();
+ }
bind(compositeContext.getExtensionPointRegistry(),
compositeContext.getEndpointRegistry());
}
@@ -534,5 +544,13 @@
}
}
}
+
+ public String getDomainURI() {
+ return domainURI;
+ }
+
+ public String getNodeURI() {
+ return nodeURI;
+ }
}
Modified:
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java?rev=906262&r1=906261&r2=906262&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
Wed Feb 3 22:00:39 2010
@@ -250,7 +250,8 @@
EndpointDescription ep = null;
if (rsaEvent.getImportReference() != null) {
ep = rsaEvent.getImportReference().getImportedEndpoint();
- } else {
+ }
+ if (rsaEvent.getExportReference() != null) {
ep = rsaEvent.getExportReference().getExportedEndpoint();
}
props.put("endpoint.service.id", ep.getServiceId());
Modified:
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=906262&r1=906261&r2=906262&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Wed Feb 3 22:00:39 2010
@@ -134,7 +134,8 @@
domainComposite = manager.configureNode(configuration,
contributions, context);
this.compositeContext =
- new CompositeContext(manager.registry, endpointRegistry,
domainComposite);
+ new CompositeContext(manager.registry, endpointRegistry,
domainComposite, configuration
+ .getDomainURI(), configuration.getURI());
CompositeContext.setThreadCompositeContext(compositeContext);
} finally {
// Reset the thread context monitor
@@ -211,7 +212,6 @@
} // end if
manager.removeNode(configuration);
-
manager.registry.getExtensionPoint(UtilityExtensionPoint.class).removeUtility(compositeActivator);
this.compositeActivator = null;
this.proxyFactory = null;
this.domainComposite = null;
