You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/09/17 09:31:43 UTC
svn commit: r576287 [1/2] - in /incubator/tuscany/branches/sca-java-1.0:
distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/
itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/
modules/ modules/binding-sca-axis...
Author: slaws
Date: Mon Sep 17 00:31:38 2007
New Revision: 576287
URL: http://svn.apache.org/viewvc?rev=576287&view=rev
Log:
Wrap the node/domain interface in an SCADomain to make it look like the host.embedded.SCADomain
Added:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/ (with props)
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/DISCLAIMER
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/LICENSE
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/NOTICE
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/pom.xml
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/test/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/test/java/
incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/test/resources/
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/CompositeManager.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/ContributionManager.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANode.java
Removed:
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/DomainFactoryImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainFactoryImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainFactory.java
Modified:
incubator/tuscany/branches/sca-java-1.0/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
incubator/tuscany/branches/sca-java-1.0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/pom.xml
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/pom.xml
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ContributionManagerImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/InMemoryTestCase.java
incubator/tuscany/branches/sca-java-1.0/modules/node/pom.xml
incubator/tuscany/branches/sca-java-1.0/modules/pom.xml
incubator/tuscany/branches/sca-java-1.0/samples/calculator-distributed/build.xml
incubator/tuscany/branches/sca-java-1.0/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
incubator/tuscany/branches/sca-java-1.0/samples/calculator-distributed/src/main/java/node/DomainNode.java
incubator/tuscany/branches/sca-java-1.0/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
Modified: incubator/tuscany/branches/sca-java-1.0/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java Mon Sep 17 00:31:38 2007
@@ -126,9 +126,9 @@
}
- protected void addContribution(URL contribution) throws CompositeBuilderException, ActivationException, URISyntaxException {
+ protected void addContribution(URL contribution) throws CompositeBuilderException, ContributionException, IOException, ActivationException, URISyntaxException {
classLoader.addURL(contribution);
- ((ContributionManagerImpl)node.getContributionManager()).addContributionJAR(contribution);
+ ((ContributionManagerImpl)node.getContributionManager()).addContribution(contribution);
existingContributions.put(contribution, new Long(new File(contribution.toURI()).lastModified()));
logger.log(Level.INFO, "Added contribution: " + contribution);
}
Modified: incubator/tuscany/branches/sca-java-1.0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java Mon Sep 17 00:31:38 2007
@@ -25,6 +25,7 @@
import junit.framework.Assert;
+import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.node.impl.SCANodeImpl;
import org.apache.tuscany.sca.node.impl.SCANodeUtil;
import org.junit.AfterClass;
@@ -38,11 +39,11 @@
*/
public class CallableReferenceRemoteTestCase {
- private static String DEFAULT_DOMAIN_NAME = "http://localhost:8877";
+ private static String DEFAULT_DOMAIN_URL = "http://localhost:8877";
- private static SCANodeImpl domain;
- private static SCANodeImpl nodeA;
- private static SCANodeImpl nodeB;
+ private static SCADomain domain;
+ private static SCADomain domainNodeA;
+ private static SCADomain domainNodeB;
private static AComponent acomponent;
@@ -51,28 +52,22 @@
try {
System.out.println("Setting up distributed registry");
- domain = new SCANodeImpl();
- domain.start();
- domain.getContributionManager().startContribution(SCANodeUtil.findContributionFromComposite(CallableReferenceRemoteTestCase.class.getClassLoader(), "domain.composite"));
+ domain = SCADomain.newInstance("domain.composite");
System.out.println("Setting up distributed nodes");
// create the node that runs the
// calculator component
- nodeA = new SCANodeImpl(DEFAULT_DOMAIN_NAME, "nodeA");
- nodeA.start();
- nodeA.getContributionManager().startContribution(CallableReferenceRemoteTestCase.class.getClassLoader().getResource("nodeA/"));
+ domainNodeA = SCADomain.newInstance(DEFAULT_DOMAIN_URL, "nodeA", null, "nodeA/CompositeA.composite");
// create the node that runs the
// add component
- nodeB = new SCANodeImpl(DEFAULT_DOMAIN_NAME, "nodeB");
- nodeB.start();
- nodeB.getContributionManager().startContribution(CallableReferenceRemoteTestCase.class.getClassLoader().getResource("nodeB/"));
+ domainNodeB = SCADomain.newInstance(DEFAULT_DOMAIN_URL, "nodeB", null, "nodeB/CompositeB.composite");
// get a reference to the calculator service from domainA
// which will be running this component
- acomponent = nodeA.getService(AComponent.class, "AComponent/AComponent");
+ acomponent = domainNodeA.getService(AComponent.class, "AComponent/AComponent");
} catch (Exception ex) {
System.out.println(ex.toString());
}
@@ -81,9 +76,9 @@
@AfterClass
public static void destroy() throws Exception {
// stop the nodes and hence the domains they contain
- nodeA.stop();
- nodeB.stop();
- domain.stop();
+ domainNodeA.close();
+ domainNodeB.close();
+ domain.close();
}
@Test
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java Mon Sep 17 00:31:38 2007
@@ -107,10 +107,10 @@
// do the axis2 stuff
Message returnMessage = null;
- for (int i =0; i < retryCount; i++){
+ // for (int i =0; i < retryCount; i++){
returnMessage = axis2Invoker.invoke(msg);
-
+ /*
if ( AxisFault.class.isInstance(returnMessage.getBody())){
AxisFault axisFault = returnMessage.getBody();
@@ -144,7 +144,7 @@
} catch(InterruptedException ex) {
}
}
-
+ */
return returnMessage;
}
}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java Mon Sep 17 00:31:38 2007
@@ -25,8 +25,8 @@
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.node.SCADomainFactory;
-import org.apache.tuscany.sca.node.SCADomain;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -43,30 +43,30 @@
private MessageFactory messageFactory;
private ServletHost servletHost;
- private SCADomain domain = null;
+ private SCANode node = null;
public Axis2SCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
this.servletHost = servletHosts.getServletHosts().get(0);
ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
this.messageFactory = modelFactories.getFactory(MessageFactory.class);
- SCADomainFactory domainFactory = modelFactories.getFactory(SCADomainFactory.class);
+ NodeFactory nodeFactory = modelFactories.getFactory(NodeFactory.class);
- if (domainFactory != null) {
- this.domain = domainFactory.getDomain();
+ if (nodeFactory != null) {
+ this.node = nodeFactory.getNode();
}
}
public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
RuntimeComponentReference reference,
DistributedSCABinding binding) {
- return new Axis2SCAReferenceBindingProvider(domain, component, reference, binding, servletHost, messageFactory);
+ return new Axis2SCAReferenceBindingProvider(node, component, reference, binding, servletHost, messageFactory);
}
public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
RuntimeComponentService service,
DistributedSCABinding binding) {
- return new Axis2SCAServiceBindingProvider(domain, component, service, binding, servletHost, messageFactory);
+ return new Axis2SCAServiceBindingProvider(node, component, service, binding, servletHost, messageFactory);
}
public Class<DistributedSCABinding> getModelType() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java Mon Sep 17 00:31:38 2007
@@ -35,7 +35,7 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.node.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.runtime.EndpointReference;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -50,7 +50,7 @@
*/
public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvider {
- private SCADomain domain;
+ private SCANode node;
private RuntimeComponent component;
private RuntimeComponentReference reference;
private SCABinding binding;
@@ -60,13 +60,13 @@
private EndpointReference serviceEPR = null;
private EndpointReference callbackEPR = null;
- public Axis2SCAReferenceBindingProvider(SCADomain domain,
+ public Axis2SCAReferenceBindingProvider(SCANode node,
RuntimeComponent component,
RuntimeComponentReference reference,
DistributedSCABinding binding,
ServletHost servletHost,
MessageFactory messageFactory) {
- this.domain = domain;
+ this.node = node;
this.component = component;
this.reference = reference;
this.binding = binding.getSCABinding();
@@ -111,16 +111,16 @@
*/
public EndpointReference getServiceEndpoint(){
- if ( serviceEPR == null && domain != null ){
+ if ( serviceEPR == null && node != null ){
// try to resolve the service endpoint with the registry
- SCADomainService serviceDiscovery = domain.getDomainService();
+ SCADomainService serviceDiscovery = node.getDomainService();
if (serviceDiscovery != null){
// The binding URI might be null in the case where this reference is completely
// dynamic, for example, in the case of callbacks
if (binding.getURI() != null) {
- String serviceUrl = serviceDiscovery.findServiceEndpoint(domain.getDomainURI(),
+ String serviceUrl = serviceDiscovery.findServiceEndpoint(node.getDomainURI(),
binding.getURI(),
SCABinding.class.getName());
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java Mon Sep 17 00:31:38 2007
@@ -39,7 +39,7 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.node.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -54,6 +54,7 @@
private final static Logger logger = Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());
+ private SCANode node;
private SCABinding binding;
private Axis2ServiceProvider axisProvider;
private WebServiceBinding wsBinding;
@@ -61,12 +62,13 @@
private boolean started = false;
- public Axis2SCAServiceBindingProvider(SCADomain domain,
+ public Axis2SCAServiceBindingProvider(SCANode node,
RuntimeComponent component,
RuntimeComponentService service,
DistributedSCABinding binding,
ServletHost servletHost,
MessageFactory messageFactory) {
+ this.node = node;
this.binding = binding.getSCABinding();
wsBinding = (new DefaultWebServiceBindingFactory()).createWebServiceBinding();
@@ -91,10 +93,10 @@
messageFactory);
- if (domain != null){
+ if (node != null){
// get the url out of the binding and send it to the registry if
// a distributed domain is configured
- SCADomainService domainService = domain.getDomainService();
+ SCADomainService domainService = node.getDomainService();
if (domainService != null) {
// work out what the component service name is that will be registered
@@ -140,7 +142,7 @@
// the service URL will likely be completely different to that
// calculated by the ws binding so replace it with the node url
// The node url will have been set via init parameters in the web app
- URL nodeUrl = domain.getNodeURL();
+ URL nodeUrl = node.getNodeURL();
if (nodeUrl != null){
newHost = nodeUrl.getHost();
@@ -165,16 +167,16 @@
componentServiceUrlString = componentServiceUrlString.replace(originalHost, newHost);
try {
- domainService.registerServiceEndpoint(domain.getDomainURI(),
- domain.getNodeURI(),
+ domainService.registerServiceEndpoint(node.getDomainURI(),
+ node.getNodeURI(),
componentServiceName,
SCABinding.class.getName(),
componentServiceUrlString);
} catch(Exception ex) {
logger.log(Level.WARNING,
"Unable to register service: " +
- domain.getDomainURI() + " " +
- domain.getNodeURI() + " " +
+ node.getDomainURI() + " " +
+ node.getNodeURI() + " " +
componentServiceName + " " +
SCABinding.class.getName() + " " +
componentServiceUrlString);
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java Mon Sep 17 00:31:38 2007
@@ -23,8 +23,6 @@
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
import org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.apache.tuscany.sca.node.SCADomain;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java Mon Sep 17 00:31:38 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.binding.sca.axis2;
-import org.apache.tuscany.sca.node.SCADomain;
public class BaseTest {
Added: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java?rev=576287&view=auto
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java (added)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java Mon Sep 17 00:31:38 2007
@@ -0,0 +1,47 @@
+/*
+ * 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.tuscany.sca.binding.sca.axis2;
+
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.tuscany.sca.node.SCANode;
+
+/**
+ * A factory that always returns the same domain object
+ *
+ * @version $Rev: 556897 $ $Date: 2007-09-15 12:27:27 +0100 (Sat, 15 Sep 2007) $
+ */
+public class NodeFactoryImpl implements NodeFactory {
+
+ SCANode node = null;
+
+ public NodeFactoryImpl(SCANode node){
+ this.node = node;
+ }
+
+ /**
+ * Returns the domain object
+ *
+ * @return the domain
+ */
+ public SCANode getNode(){
+ return node;
+ }
+
+}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java Mon Sep 17 00:31:38 2007
@@ -40,7 +40,9 @@
import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-import org.apache.tuscany.sca.node.SCADomain;
+import org.apache.tuscany.sca.node.ComponentManager;
+import org.apache.tuscany.sca.node.ContributionManager;
+import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -54,7 +56,7 @@
*
* @version $Rev: 552343 $ $Date$
*/
-public class TestDomain implements SCADomain {
+public class TestDomain implements SCANode {
private String nodeName;
private String domainURI;
@@ -88,7 +90,7 @@
// make the domain available to the model.
ModelFactoryExtensionPoint factories = nodeRuntime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class);
- DomainFactoryImpl domainFactory = new DomainFactoryImpl(this);
+ NodeFactoryImpl domainFactory = new NodeFactoryImpl(this);
factories.addFactory(domainFactory);
// add a contribution to the domain
@@ -146,7 +148,15 @@
public SCADomainService getDomainService(){
return serviceDiscovery;
- }
+ }
+
+ public ContributionManager getContributionManager(){
+ return null;
+ }
+
+ public ComponentManager getComponentManager(){
+ return null;
+ }
public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException {
return null;
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/pom.xml?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/pom.xml Mon Sep 17 00:31:38 2007
@@ -67,6 +67,12 @@
<artifactId>tuscany-node</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java Mon Sep 17 00:31:38 2007
@@ -22,8 +22,8 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.node.SCADomainFactory;
-import org.apache.tuscany.sca.node.SCADomain;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -39,15 +39,15 @@
public class RuntimeSCABindingProviderFactory implements BindingProviderFactory<SCABinding> {
private ExtensionPointRegistry extensionPoints;
- private SCADomain domain = null;
+ private SCANode node = null;
public RuntimeSCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
this.extensionPoints = extensionPoints;
ModelFactoryExtensionPoint factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
- SCADomainFactory domainFactory = factories.getFactory(SCADomainFactory.class);
+ NodeFactory domainFactory = factories.getFactory(NodeFactory.class);
if (domainFactory != null) {
- domain = domainFactory.getDomain();
+ node = domainFactory.getNode();
}
}
@@ -56,13 +56,13 @@
RuntimeComponentReference reference,
SCABinding binding) {
- return new RuntimeSCAReferenceBindingProvider(extensionPoints, domain, component, reference, binding);
+ return new RuntimeSCAReferenceBindingProvider(extensionPoints, node, component, reference, binding);
}
public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
RuntimeComponentService service,
SCABinding binding) {
- return new RuntimeSCAServiceBindingProvider(extensionPoints, domain, component, service, binding);
+ return new RuntimeSCAServiceBindingProvider(extensionPoints, node, component, service, binding);
}
public Class<SCABinding> getModelType() {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java Mon Sep 17 00:31:38 2007
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.node.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
@@ -49,7 +49,7 @@
*/
public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvider {
- private SCADomain domain;
+ private SCANode node;
private RuntimeComponent component;
private RuntimeComponentReference reference;
private SCABinding binding;
@@ -59,11 +59,11 @@
private ReferenceBindingProvider distributedProvider = null;
public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints,
- SCADomain domain,
+ SCANode domain,
RuntimeComponent component,
RuntimeComponentReference reference,
SCABinding binding) {
- this.domain = domain;
+ this.node = domain;
this.component = component;
this.reference = reference;
this.binding = binding;
@@ -98,11 +98,11 @@
// reference, e.g. a callback, so check the domain to see if the service is available
// at this node. The binding uri might be null here if the dynamic reference has been
// fully configured yet. It won't have all of the information until invocation time
- if ((domain != null) && (binding.getURI() != null)) {
- SCADomainService serviceDiscovery = domain.getDomainService();
+ if ((node != null) && (binding.getURI() != null)) {
+ SCADomainService serviceDiscovery = node.getDomainService();
String serviceUrl =
- serviceDiscovery.findServiceEndpoint(domain.getDomainURI(),
+ serviceDiscovery.findServiceEndpoint(node.getDomainURI(),
binding.getURI(),
SCABinding.class.getName());
if ((serviceUrl == null) || serviceUrl.equals("")) {
@@ -132,7 +132,7 @@
+ reference.getName());
}
- if (domain == null) {
+ if (node == null) {
throw new IllegalStateException("No distributed domain available for component: " + component
.getName()
+ " and reference: "
Modified: incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java Mon Sep 17 00:31:38 2007
@@ -25,7 +25,7 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.node.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
@@ -42,18 +42,18 @@
*/
public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider {
- private SCADomain domain;
+ private SCANode node;
private RuntimeComponentService service;
private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory;
private ServiceBindingProvider distributedProvider;
private DistributedSCABinding distributedBinding;
public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints,
- SCADomain domain,
+ SCANode node,
RuntimeComponent component,
RuntimeComponentService service,
SCABinding binding) {
- this.domain = domain;
+ this.node = node;
this.service = service;
// if there is potentially a wire to this service that crosses the node boundary
if (service.getInterfaceContract().getInterface().isRemotable()) {
@@ -73,7 +73,7 @@
// - distributed domain in which to look for remote endpoints
// - remotable interface on the service
if (distributedProviderFactory != null) {
- if (this.domain != null) {
+ if (this.node != null) {
if (!service.getInterfaceContract().getInterface().isRemotable()) {
throw new IllegalStateException("Reference interface not remoteable for component: "+
component.getName() +
Propchange: incubator/tuscany/branches/sca-java-1.0/modules/domain-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 17 00:31:38 2007
@@ -0,0 +1,11 @@
+target
+*.iws
+*.ipr
+*.iml
+*.log*
+.project
+.classpath
+junit*.properties
+.settings
+.deployables
+.wtpmodules
Added: incubator/tuscany/branches/sca-java-1.0/modules/domain-api/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/domain-api/DISCLAIMER?rev=576287&view=auto
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/domain-api/DISCLAIMER (added)
+++ incubator/tuscany/branches/sca-java-1.0/modules/domain-api/DISCLAIMER Mon Sep 17 00:31:38 2007
@@ -0,0 +1,8 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
Added: incubator/tuscany/branches/sca-java-1.0/modules/domain-api/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/domain-api/LICENSE?rev=576287&view=auto
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/domain-api/LICENSE (added)
+++ incubator/tuscany/branches/sca-java-1.0/modules/domain-api/LICENSE Mon Sep 17 00:31:38 2007
@@ -0,0 +1,205 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+
Added: incubator/tuscany/branches/sca-java-1.0/modules/domain-api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/domain-api/NOTICE?rev=576287&view=auto
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/domain-api/NOTICE (added)
+++ incubator/tuscany/branches/sca-java-1.0/modules/domain-api/NOTICE Mon Sep 17 00:31:38 2007
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: incubator/tuscany/branches/sca-java-1.0/modules/domain-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/domain-api/pom.xml?rev=576287&view=auto
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/domain-api/pom.xml (added)
+++ incubator/tuscany/branches/sca-java-1.0/modules/domain-api/pom.xml Mon Sep 17 00:31:38 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-domain-api</artifactId>
+ <name>Apache Tuscany SCA Node API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>sca-api</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java?rev=576287&view=auto
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java (added)
+++ incubator/tuscany/branches/sca-java-1.0/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java Mon Sep 17 00:31:38 2007
@@ -0,0 +1,256 @@
+/*
+ * 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.tuscany.sca.domain;
+
+import java.net.URL;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Constructor;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import org.osoa.sca.CallableReference;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.ServiceRuntimeException;
+
+
+/**
+ * A handle to an SCA domain.
+ *
+ * @version $Rev: 556897 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public abstract class SCADomain {
+
+
+ final static String LOCAL_DOMAIN_URI = "standalonedomain";
+ final static String LOCAL_NODE_URI = "standalonenode";
+
+
+ /**
+ * Returns a new instance of a local SCA domain.
+ *
+ * @return
+ */
+ public static SCADomain newInstance() {
+ return createNewInstance(LOCAL_DOMAIN_URI, LOCAL_NODE_URI, null);
+ }
+
+ /**
+ * Returns a new instance of a local SCA domain. The specified deployable
+ * composite will be included in the SCA domain.
+ *
+ * @param composite the deployable composite to include in the SCA domain.
+ * @return
+ */
+ public static SCADomain newInstance(String composite) {
+ return createNewInstance(LOCAL_DOMAIN_URI, LOCAL_NODE_URI, "/", composite);
+ }
+
+ /**
+ * Returns a new instance of a local SCA domain. The specified deployable
+ * composites will be included in the SCA domain.
+ *
+ * @param domainURI the URI of the SCA domain identifies where the domain service is running
+ * @param nodeURI the URI of the node - either a URL used to describe the node endpoints or a URI just used identify the node
+ * @param contributionLocation the location of an SCA contribution
+ * @param composites the deployable composites to include in the SCA domain.
+ * @return
+ */
+ public static SCADomain newInstance(String domainURI, String nodeURI, String contributionLocation, String... composites) {
+ return createNewInstance(domainURI, nodeURI, contributionLocation, composites);
+ }
+
+ /**
+ * Removes the specified local SCA Domain instance
+ *
+ * @param domainInstance the instance to be removed
+ */
+ // FIXME: Adding this as temporary support for the "connect" API
+ // public static void removeInstance(SCADomain domainInstance) {
+ // }
+
+ /**
+ * Returns an SCADomain representing a remote SCA domain.
+ *
+ * @param domainURI the URI of the SCA domain
+ * @return
+ */
+ // FIXME : this is a temporary implementation to get the capability working
+ // public static SCADomain connect(String domainURI) {
+ // return null;
+ // }
+
+ /**
+ * Close the SCA domain.
+ */
+ public abstract void close();
+
+ /**
+ * Returns the URI of the SCA Domain.
+ *
+ * @return the URI of the SCA Domain
+ */
+ public abstract String getURI();
+
+ /**
+ * Cast a type-safe reference to a CallableReference. Converts a type-safe
+ * reference to an equivalent CallableReference; if the target refers to a
+ * service then a ServiceReference will be returned, if the target refers to
+ * a callback then a CallableReference will be returned.
+ *
+ * @param target a reference proxy provided by the SCA runtime
+ * @param <B> the Java type of the business interface for the reference
+ * @param <R> the type of reference to be returned
+ * @return a CallableReference equivalent for the proxy
+ * @throws IllegalArgumentException if the supplied instance is not a
+ * reference supplied by the SCA runtime
+ */
+ public abstract <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException;
+
+ /**
+ * Returns a proxy for a service provided by a component in the SCA domain.
+ *
+ * @param businessInterface the interface that will be used to invoke the
+ * service
+ * @param serviceName the name of the service
+ * @param <B> the Java type of the business interface for the service
+ * @return an object that implements the business interface
+ */
+ public abstract <B> B getService(Class<B> businessInterface, String serviceName);
+
+ /**
+ * Returns a ServiceReference for a service provided by a component in the
+ * SCA domain.
+ *
+ * @param businessInterface the interface that will be used to invoke the
+ * service
+ * @param serviceName the name of the service
+ * @param <B> the Java type of the business interface for the service
+ * @return a ServiceReference for the designated service
+ */
+ public abstract <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName);
+
+ /**
+ * Read the service name from a configuration file
+ *
+ * @param classLoader
+ * @param name The name of the service class
+ * @return A class name which extends/implements the service class
+ * @throws IOException
+ */
+ private static String getServiceName(ClassLoader classLoader, String name) throws IOException {
+ InputStream is = classLoader.getResourceAsStream("META-INF/services/" + name);
+ if (is == null) {
+ return null;
+ }
+ BufferedReader reader = null;
+ try {
+ reader = new BufferedReader(new InputStreamReader(is));
+ while (true) {
+ String line = reader.readLine();
+ if (line == null) {
+ break;
+ } else if (!line.startsWith("#")) {
+ return line.trim();
+ }
+ }
+ } finally {
+ if (reader != null) {
+ reader.close();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns an SCADomain instance. If the system property
+ * "org.apache.tuscany.sca.host.embedded.SCADomain" is set, its value is used as
+ * the name of the implementation class. Otherwise, if the resource
+ * "META-INF/services/org.apache.tuscany.sca.host.embedded.SCADomain" can be
+ * loaded from the supplied classloader. Otherwise, it will use
+ * "org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain" as the default.
+ * The named class is loaded from the supplied classloader.
+ *
+ * @param classLoader
+ * @param domainURI
+ * @param contributionLocation
+ * @param composites
+ * @return
+ */
+ static SCADomain createNewInstance(String domainURI, String nodeURI, String contributionLocation, String... composites) {
+
+ SCADomain node = null;
+
+ try {
+ // Determine the runtime and application classloader
+ final ClassLoader runtimeClassLoader = SCADomain.class.getClassLoader();
+ final ClassLoader applicationClassLoader = Thread.currentThread().getContextClassLoader();
+
+ // Discover the SCADomain implementation
+ final String name = SCADomain.class.getName();
+ String className = AccessController.doPrivileged(new PrivilegedAction<String>() {
+ public String run() {
+ return System.getProperty(name);
+ }
+ });
+
+ if (className == null) {
+ className = getServiceName(runtimeClassLoader, name);
+ }
+
+ if (className == null) {
+ className = "org.apache.tuscany.sca.node.impl.SCANodeImpl";
+ }
+
+ // Create an instance of the discovered SCA domain implementation
+ Class cls = Class.forName(className, true, runtimeClassLoader);
+ Constructor<?> constructor = null;
+ try {
+ constructor = cls.getConstructor(String.class,
+ String.class,
+ ClassLoader.class,
+ ClassLoader.class,
+ String.class,
+ String[].class);
+ } catch (NoSuchMethodException e) {}
+
+ if (constructor != null) {
+ node = (SCADomain)constructor.newInstance(domainURI,
+ nodeURI,
+ runtimeClassLoader,
+ applicationClassLoader,
+ contributionLocation,
+ composites);
+ }
+
+ return node;
+
+ } catch (Exception e) {
+ throw new ServiceRuntimeException(e);
+ }
+ }
+
+ // public ComponentManager getComponentManager() {
+ // return null;
+ // }
+}
Modified: incubator/tuscany/branches/sca-java-1.0/modules/node-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-impl/pom.xml?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/node-impl/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/node-impl/pom.xml Mon Sep 17 00:31:38 2007
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
+ <artifactId>tuscany-domain-api</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java Mon Sep 17 00:31:38 2007
@@ -29,8 +29,6 @@
import org.apache.tuscany.sca.core.assembly.RuntimeComponentImpl;
import org.apache.tuscany.sca.node.ComponentListener;
import org.apache.tuscany.sca.node.ComponentManager;
-import org.apache.tuscany.sca.node.SCADomain;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
public class ComponentManagerServiceImpl implements ComponentManager {
Modified: incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ContributionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ContributionManagerImpl.java?rev=576287&r1=576286&r2=576287&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ContributionManagerImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ContributionManagerImpl.java Mon Sep 17 00:31:38 2007
@@ -25,17 +25,22 @@
import java.util.HashMap;
import java.util.Map;
+import javax.xml.namespace.QName;
+
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.DeployedArtifact;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.core.assembly.ActivationException;
+import org.apache.tuscany.sca.node.CompositeManager;
import org.apache.tuscany.sca.node.ContributionManager;
import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
+import org.osoa.sca.ServiceRuntimeException;
-public class ContributionManagerImpl implements ContributionManager {
+public class ContributionManagerImpl implements ContributionManager, CompositeManager {
protected String domainURI;
protected String nodeName;
@@ -45,6 +50,7 @@
private ModelResolver modelResolver;
+ private Map<String, Composite> compositeArtifacts = new HashMap<String, Composite>();
private Map<URL, Contribution> contributions = new HashMap<URL, Contribution>();
public ContributionManagerImpl(String domainURI, String nodeName, Composite nodeComposite, ReallySmallRuntime nodeRuntime, ClassLoader classLoader, ModelResolver modelResolver) {
@@ -56,91 +62,227 @@
this.modelResolver = modelResolver;
}
- public void addContribution(URL contributionLocation)
+ public void addContribution(URL contributionURL)
throws ActivationException, ContributionException, IOException, CompositeBuilderException {
- if (contributionLocation != null) {
+ if (contributionURL != null) {
// Get ready to add contributions to the domain
ContributionService contributionService = nodeRuntime.getContributionService();
// Contribute the SCA application
- Contribution contribution = contributionService.contribute(contributionLocation.toExternalForm(),
- contributionLocation,
+ Contribution contribution = contributionService.contribute(contributionURL.toExternalForm(),
+ contributionURL,
modelResolver,
false);
- contributions.put(contributionLocation, contribution);
-
- // Add the composites to the top level domain
- for(Composite composite: contribution.getDeployables()) {
- nodeComposite.getIncludes().add(composite);
- nodeRuntime.getCompositeBuilder().build(composite);
- }
+ contributions.put(contributionURL, contribution);
- // activate all of the composites just loaded
- for(Composite composite: contribution.getDeployables()) {
- nodeRuntime.getCompositeActivator().activate(composite);
- }
+ for (DeployedArtifact artifact : contribution.getArtifacts()) {
+ if (artifact.getModel() instanceof Composite) {
+ compositeArtifacts.put(artifact.getURI(), (Composite)artifact.getModel());
+ }
+ }
+
+ } else {
+ throw new ActivationException("Contribution " + contributionURL + " not found");
+ }
+ }
+
+ /**
+ * Add all composite in a contribution
+ *
+ * @param contributionURL
+ */
+ public void addAllComposites(URL contributionURL)
+ throws ActivationException, ContributionException, IOException, CompositeBuilderException {
+ Contribution contribution = contributions.get(contributionURL);
+
+ if ( contribution != null) {
+ // Add the composites to the top level domain
+ for(Composite composite: contribution.getDeployables()) {
+ nodeComposite.getIncludes().add(composite);
+ nodeRuntime.getCompositeBuilder().build(composite);
+ }
+
+ // activate all of the composites just loaded
+ for(Composite composite: contribution.getDeployables()) {
+ nodeRuntime.getCompositeActivator().activate(composite);
+ }
} else {
- throw new ActivationException("Contribution " + contributionLocation + " not found");
+ throw new ActivationException("Contribution " + contributionURL + " not found");
}
+ }
+
+ /**
+ * adds a named composite
+ *
+ * @param compositeName the name of the composite to be added
+ */
+ public void addComposite(QName compositeName){
+ //TODO
+ }
+
+ /**
+ * adds a named composite
+ *
+ * @param compositePath the path to the composite to be added
+ */
+ public void addComposite(String compositePath)
+ throws ActivationException, ContributionException, IOException, CompositeBuilderException {
+
+ Composite composite = compositeArtifacts.get(compositePath);
+
+ if (composite == null) {
+ throw new ServiceRuntimeException("Composite not found: " + compositePath);
+ }
+
+ nodeComposite.getIncludes().add(composite);
+ nodeRuntime.getCompositeBuilder().build(composite);
+ nodeRuntime.getCompositeActivator().activate(composite);
+ }
+
+ /**
+ * Starts all composites in a contribution
+ *
+ * @param contributionURL
+ */
+ public void startAllComposites(URL contributionURL)
+ throws ActivationException {
+ Contribution contribution = contributions.get(contributionURL);
+
+ if (contribution != null) {
+ for(Composite composite: contribution.getDeployables()) {
+ nodeRuntime.getCompositeActivator().start(composite);
+ }
+ } else {
+ throw new ActivationException("Contribution " + contributionURL+ " not started");
+ }
}
+
+ /**
+ * Starts a named composite
+ *
+ * @param compositeName the name of the composite to be started
+ */
+ public void startComposite(QName compositeName){
+
+ }
+
+ /**
+ * Starts a named composite
+ *
+ * @param compositePath the path to the composite to be started
+ */
+ public void startComposite(String compositePath)
+ throws ActivationException {
+ Composite composite = compositeArtifacts.get(compositePath);
+
+ if (composite == null) {
+ throw new ServiceRuntimeException("Composite not found: " + compositePath);
+ }
+
+ nodeRuntime.getCompositeActivator().start(composite);
+ }
+
+ /**
+ * Stops a all composites in a contribution
+ *
+ * @param compositeURL
+ */
+ public void stopAllComposites(URL contributionURL)
+ throws ActivationException {
+ Contribution contribution = contributions.get(contributionURL);
+
+ if (contribution != null) {
+ for(Composite composite: contribution.getDeployables()) {
+ nodeRuntime.getCompositeActivator().stop(composite);
+ }
+ } else {
+ throw new ActivationException("Contribution " + contributionURL+ " not stopped");
+ }
+ }
+
+ /**
+ * Stops a named composite
+ *
+ * @param compositeName the name of the composite to be stopped
+ */
+ public void stopComposite(QName compositeName){
+
+ }
+
+ /**
+ * Stops a named composite
+ *
+ * @param compositeName the name of the composite to be stopped
+ */
+ public void stopComposite(String compositePath){
+
+ }
+
- public void removeContribution(URL contributionLocation)
+ public void removeContribution(URL contributionURL)
throws ActivationException, ContributionException {
- Contribution contribution = contributions.get(contributionLocation);
-
- stopContribution(contributionLocation);
-
+ // Remove contribution
+ nodeRuntime.getContributionService().remove(contributionURL.toExternalForm());
+ }
+
+ /**
+ * Removes all composites
+ *
+ * @param compositeName the name of the composite to be added
+ */
+ public void removeAllComposites(URL contributionURL)
+ throws ActivationException {
+ Contribution contribution = contributions.get(contributionURL);
+
+ stopAllComposites(contributionURL);
+
// Deactivate the composites
- for(Composite composite: contribution.getDeployables()) {
+ for(Composite composite: contribution.getDeployables()) {
nodeRuntime.getCompositeActivator().deactivate(composite);
}
// Remove the composites
- for(Composite composite: contribution.getDeployables()) {
+ for(Composite composite: contribution.getDeployables()) {
nodeComposite.getIncludes().remove(composite);
}
-
- // Remove contribution
- nodeRuntime.getContributionService().remove(contributionLocation.toExternalForm());
- }
-
- public void startContribution(URL contributionLocation)
- throws ActivationException, ContributionException, IOException, CompositeBuilderException {
+
+ contributions.remove(contributionURL);
+ }
+
+ /**
+ * Removes a named composite
+ *
+ * @param compositeName the name of the composite to be added
+ */
+ public void removeComposite(QName compositeName){
- Contribution contribution = contributions.get(contributionLocation);
-
- if (contribution == null){
- addContribution(contributionLocation);
- }
-
- contribution = contributions.get(contributionLocation);
-
- if (contribution != null) {
- for(Composite composite: contribution.getDeployables()) {
- nodeRuntime.getCompositeActivator().start(composite);
- }
- } else {
- throw new ActivationException("Contribution " + contributionLocation + " not added");
- }
}
- public void stopContribution(URL contributionLocation)
- throws ActivationException {
-
- Contribution contribution = contributions.get(contributionLocation);
+ /**
+ * Removes a named composite
+ *
+ * @param compositeName the name of the composite to be added
+ */
+ public void removeComposite(String compositePath){
- if (contribution != null) {
- for(Composite composite: contribution.getDeployables()) {
- nodeRuntime.getCompositeActivator().stop(composite);
- }
- } else {
- throw new ActivationException("Contribution " + contributionLocation + " not added");
- }
+ }
+
+
+ /**
+ * Stop and remove everything
+ */
+ public void stop()
+ throws ActivationException, ContributionException {
+ for (URL contributionURL : contributions.keySet()){
+ stopAllComposites(contributionURL);
+ removeContribution(contributionURL);
+ }
}
-
+
+/*
public void addContributionJAR(URL contributionJar) throws CompositeBuilderException, ActivationException {
ContributionService contributionService = nodeRuntime.getContributionService();
@@ -186,4 +328,5 @@
}
return contribution;
}
+ */
}
Added: incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=576287&view=auto
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (added)
+++ incubator/tuscany/branches/sca-java-1.0/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java Mon Sep 17 00:31:38 2007
@@ -0,0 +1,48 @@
+/*
+ * 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.tuscany.sca.node.impl;
+
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.apache.tuscany.sca.node.SCANode;
+
+
+/**
+ * A factory that always returns the same domain object
+ *
+ * @version $Rev: 556897 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public class NodeFactoryImpl implements NodeFactory {
+
+ SCANode node = null;
+
+ public NodeFactoryImpl(SCANode node){
+ this.node = node;
+ }
+
+ /**
+ * Returns the domain object
+ *
+ * @return the domain
+ */
+ public SCANode getNode(){
+ return node;
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org