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/14 13:07:07 UTC
svn commit: r575620 [1/4] - in /incubator/tuscany/java/sca:
distribution/webapp/
distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/
distribution/webapp/src/main/resources/_node/ itest/callablereferences/
itest/callablereferences/src/main/...
Author: slaws
Date: Fri Sep 14 04:06:59 2007
New Revision: 575620
URL: http://svn.apache.org/viewvc?rev=575620&view=rev
Log:
Split out distributed and distributed-impl in node, node-impl, domain, domain-impl
Added:
incubator/tuscany/java/sca/modules/domain/
incubator/tuscany/java/sca/modules/domain-impl/
incubator/tuscany/java/sca/modules/domain-impl/DISCLAIMER
incubator/tuscany/java/sca/modules/domain-impl/LICENSE
incubator/tuscany/java/sca/modules/domain-impl/NOTICE
incubator/tuscany/java/sca/modules/domain-impl/pom.xml
incubator/tuscany/java/sca/modules/domain-impl/src/
incubator/tuscany/java/sca/modules/domain-impl/src/main/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceDiscoveryServiceImpl.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/
incubator/tuscany/java/sca/modules/domain-impl/src/test/
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/
incubator/tuscany/java/sca/modules/domain-impl/src/test/resources/
incubator/tuscany/java/sca/modules/domain/DISCLAIMER
incubator/tuscany/java/sca/modules/domain/LICENSE
incubator/tuscany/java/sca/modules/domain/NOTICE
incubator/tuscany/java/sca/modules/domain/pom.xml
incubator/tuscany/java/sca/modules/domain/src/
incubator/tuscany/java/sca/modules/domain/src/main/
incubator/tuscany/java/sca/modules/domain/src/main/java/
incubator/tuscany/java/sca/modules/domain/src/main/java/org/
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/Domain.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/DomainFactory.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/DomainManagerService.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/NodeInfo.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/ServiceDiscoveryService.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/ServiceInfo.java
incubator/tuscany/java/sca/modules/domain/src/test/
incubator/tuscany/java/sca/modules/node/
incubator/tuscany/java/sca/modules/node-impl/
incubator/tuscany/java/sca/modules/node-impl/DISCLAIMER
incubator/tuscany/java/sca/modules/node-impl/LICENSE
incubator/tuscany/java/sca/modules/node-impl/NOTICE
incubator/tuscany/java/sca/modules/node-impl/pom.xml
incubator/tuscany/java/sca/modules/node-impl/src/
incubator/tuscany/java/sca/modules/node-impl/src/main/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ContributionManagerImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainFactoryImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainManagerProxyImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ServiceDiscoveryProxyImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/
incubator/tuscany/java/sca/modules/node-impl/src/test/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/AddService.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/AddServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/CalculatorService.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/DivideService.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/DivideServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/MultiplyService.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/MultiplyServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/SubtractService.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/calculator/SubtractServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/distributed/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/distributed/impl/InMemoryTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/_node/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/_node/META-INF/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/_node/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/_node/management.composite
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/domain/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/domain/META-INF/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/domain/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/domain/domain.composite
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/Calculator.composite
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/META-INF/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/wsdl/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/wsdl/add.wsdl
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/wsdl/multiply.wsdl
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/wsdl/subtract.wsdl
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeB/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeB/Calculator.composite
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeB/META-INF/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeB/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeC/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeC/Calculator.composite
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeC/META-INF/
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeC/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/node/DISCLAIMER
incubator/tuscany/java/sca/modules/node/LICENSE
incubator/tuscany/java/sca/modules/node/NOTICE
incubator/tuscany/java/sca/modules/node/pom.xml
incubator/tuscany/java/sca/modules/node/src/
incubator/tuscany/java/sca/modules/node/src/main/
incubator/tuscany/java/sca/modules/node/src/main/java/
incubator/tuscany/java/sca/modules/node/src/main/java/org/
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/CompositeManager.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ContributionManager.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/Node.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeManagerInitService.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeManagerService.java
incubator/tuscany/java/sca/modules/node/src/main/resources/
incubator/tuscany/java/sca/modules/node/src/test/
incubator/tuscany/java/sca/modules/node/src/test/java/
incubator/tuscany/java/sca/modules/node/src/test/resources/
Removed:
incubator/tuscany/java/sca/modules/distributed/
incubator/tuscany/java/sca/modules/distributed-impl/
Modified:
incubator/tuscany/java/sca/distribution/webapp/pom.xml
incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite
incubator/tuscany/java/sca/itest/callablereferences/pom.xml
incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/_node/management.composite
incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/domain/domain.composite
incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/DomainFactoryImpl.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java
incubator/tuscany/java/sca/modules/binding-sca/pom.xml
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/pom.xml
incubator/tuscany/java/sca/samples/calculator-distributed/pom.xml
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/_node/management.composite
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/resources/domain/domain.composite
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
incubator/tuscany/java/sca/samples/domain-webapp/pom.xml
incubator/tuscany/java/sca/samples/domain-webapp/src/main/java/node/DomainServer.java
incubator/tuscany/java/sca/samples/domain-webapp/src/main/resources/domain.composite
Modified: incubator/tuscany/java/sca/distribution/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/pom.xml?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/webapp/pom.xml Fri Sep 14 04:06:59 2007
@@ -33,7 +33,12 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-distributed-impl</artifactId>
+ <artifactId>tuscany-domain</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java (original)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java Fri Sep 14 04:06:59 2007
@@ -40,8 +40,8 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.core.assembly.ActivationException;
-import org.apache.tuscany.sca.distributed.node.impl.ContributionManagerImpl;
-import org.apache.tuscany.sca.distributed.node.impl.NodeImpl;
+import org.apache.tuscany.sca.node.impl.ContributionManagerImpl;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
/**
* A ServletContextListener for the Tuscany WAR distribution.
Modified: incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite (original)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/resources/_node/management.composite Fri Sep 14 04:06:59 2007
@@ -24,31 +24,31 @@
name="Management">
<component name="NodeManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.NodeManagerServiceImpl"/>
+ <implementation.java class="org.apache.tuscany.sca.node.impl.NodeManagerServiceImpl"/>
<service name="NodeManagerInitService">
- <interface.java interface="org.apache.tuscany.sca.distributed.node.NodeManagerInitService"/>
+ <interface.java interface="org.apache.tuscany.sca.node.NodeManagerInitService"/>
<binding.sca/>
</service>
<service name="NodeManagerService">
- <interface.java interface="org.apache.tuscany.sca.distributed.node.NodeManagerService"/>
+ <interface.java interface="org.apache.tuscany.sca.node.NodeManagerService"/>
<tuscany:binding.jsonrpc uri="http://localhost:8082/NodeManagerComponent/NodeManagerJson"/>
</service>
<service name="ComponentManagerService">
- <interface.java interface="org.apache.tuscany.sca.distributed.node.ComponentManagerService"/>
+ <interface.java interface="org.apache.tuscany.sca.node.ComponentManagerService"/>
<tuscany:binding.jsonrpc uri="http://localhost:8082/NodeManagerComponent/ComponentManagerJson"/>
</service>
</component>
<component name="DomainManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.DomainManagerProxyImpl"/>
+ <implementation.java class="org.apache.tuscany.sca.node.impl.DomainManagerProxyImpl"/>
<reference name="domainManager">
- <interface.java interface="org.apache.tuscany.sca.distributed.domain.DomainManagerService"/>
+ <interface.java interface="org.apache.tuscany.sca.domain.DomainManagerService"/>
<binding.ws uri="http://localhost:8081/DomainManagerComponent/DomainManager"/>
</reference>
</component>
<component name="ServiceDiscoveryComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.ServiceDiscoveryProxyImpl" />
+ <implementation.java class="org.apache.tuscany.sca.node.impl.ServiceDiscoveryProxyImpl" />
<reference name="serviceDiscovery">
<binding.ws uri="http://localhost:8081/ServiceDiscoveryComponent/ServiceDiscovery"/>
</reference>
Modified: incubator/tuscany/java/sca/itest/callablereferences/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/pom.xml?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/pom.xml Fri Sep 14 04:06:59 2007
@@ -44,10 +44,17 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distributed-impl</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain-impl</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/_node/management.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/_node/management.composite?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/_node/management.composite (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/_node/management.composite Fri Sep 14 04:06:59 2007
@@ -24,30 +24,30 @@
name="Management">
<component name="NodeManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.NodeManagerServiceImpl"/>
+ <implementation.java class="org.apache.tuscany.sca.node.impl.NodeManagerServiceImpl"/>
<service name="NodeManagerInitService">
- <interface.java interface="org.apache.tuscany.sca.distributed.node.NodeManagerInitService"/>
+ <interface.java interface="org.apache.tuscany.sca.node.NodeManagerInitService"/>
</service>
<service name="NodeManagerService">
- <interface.java interface="org.apache.tuscany.sca.distributed.node.NodeManagerService"/>
+ <interface.java interface="org.apache.tuscany.sca.node.NodeManagerService"/>
<tuscany:binding.jsonrpc uri="http://localhost:8081/NodeManagerComponent/NodeManagerJson"/>
</service>
<service name="ComponentManagerService">
- <interface.java interface="org.apache.tuscany.sca.distributed.node.ComponentManagerService"/>
+ <interface.java interface="org.apache.tuscany.sca.node.ComponentManagerService"/>
<tuscany:binding.jsonrpc uri="http://localhost:8081/NodeManagerComponent/ComponentManagerJson"/>
</service>
</component>
<component name="DomainManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.DomainManagerProxyImpl"/>
+ <implementation.java class="org.apache.tuscany.sca.node.impl.DomainManagerProxyImpl"/>
<reference name="domainManager">
- <interface.java interface="org.apache.tuscany.sca.distributed.domain.DomainManagerService"/>
+ <interface.java interface="org.apache.tuscany.sca.domain.DomainManagerService"/>
<binding.ws uri="http://localhost:8080/DomainManagerComponent/DomainManager"/>
</reference>
</component>
<component name="ServiceDiscoveryComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.node.impl.ServiceDiscoveryProxyImpl" />
+ <implementation.java class="org.apache.tuscany.sca.node.impl.ServiceDiscoveryProxyImpl" />
<reference name="serviceDiscovery">
<binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
</reference>
Modified: incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/domain/domain.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/domain/domain.composite?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/domain/domain.composite (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/domain/domain.composite Fri Sep 14 04:06:59 2007
@@ -23,18 +23,18 @@
name="Domain">
<component name="DomainManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.domain.impl.DomainManagerServiceImpl"/>
+ <implementation.java class="org.apache.tuscany.sca.domain.impl.DomainManagerServiceImpl"/>
<service name="DomainManagerService">
- <interface.java interface="org.apache.tuscany.sca.distributed.domain.DomainManagerService"/>
+ <interface.java interface="org.apache.tuscany.sca.domain.DomainManagerService"/>
<binding.ws uri="http://localhost:8080/DomainManagerComponent/DomainManager"/>
</service>
<reference name="serviceDiscovery" target="ServiceDiscoveryComponent"/>
</component>
<component name="ServiceDiscoveryComponent">
- <implementation.java class="org.apache.tuscany.sca.distributed.domain.impl.ServiceDiscoveryServiceImpl" />
+ <implementation.java class="org.apache.tuscany.sca.domain.impl.ServiceDiscoveryServiceImpl" />
<service name="ServiceDiscoveryService">
- <interface.java interface="org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService"/>
+ <interface.java interface="org.apache.tuscany.sca.domain.ServiceDiscoveryService"/>
<binding.sca uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscoverySCA"/>
<binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
</service>
Modified: incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java Fri Sep 14 04:06:59 2007
@@ -25,7 +25,7 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.distributed.node.impl.NodeImpl;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml Fri Sep 14 04:06:59 2007
@@ -31,6 +31,12 @@
<name>Apache Tuscany SCA Axis2-based Default Binding Extension</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: incubator/tuscany/java/sca/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/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java Fri Sep 14 04:06:59 2007
@@ -22,8 +22,8 @@
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.DomainFactory;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.DomainFactory;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
import org.apache.tuscany.sca.invocation.MessageFactory;
Modified: incubator/tuscany/java/sca/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/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java Fri Sep 14 04:06:59 2007
@@ -28,8 +28,8 @@
import org.apache.tuscany.sca.binding.ws.axis2.Axis2ReferenceBindingProvider;
import org.apache.tuscany.sca.binding.ws.axis2.Java2WSDLHelper;
import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl;
-import org.apache.tuscany.sca.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
Modified: incubator/tuscany/java/sca/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/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java Fri Sep 14 04:06:59 2007
@@ -30,8 +30,8 @@
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider;
import org.apache.tuscany.sca.binding.ws.axis2.Java2WSDLHelper;
-import org.apache.tuscany.sca.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java Fri Sep 14 04:06:59 2007
@@ -23,7 +23,7 @@
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.distributed.domain.Domain;
+import org.apache.tuscany.sca.domain.Domain;
import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java Fri Sep 14 04:06:59 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.sca.axis2;
-import org.apache.tuscany.sca.distributed.domain.Domain;
+import org.apache.tuscany.sca.domain.Domain;
public class BaseTest {
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/DomainFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/DomainFactoryImpl.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/DomainFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/DomainFactoryImpl.java Fri Sep 14 04:06:59 2007
@@ -19,9 +19,9 @@
package org.apache.tuscany.sca.binding.sca.axis2;
-import org.apache.tuscany.sca.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.DomainFactory;
-import org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.DomainFactory;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
import org.osoa.sca.CallableReference;
import org.osoa.sca.ServiceReference;
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java Fri Sep 14 04:06:59 2007
@@ -36,8 +36,8 @@
import org.apache.tuscany.sca.contribution.service.ContributionService;
import org.apache.tuscany.sca.core.assembly.ActivationException;
import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;
-import org.apache.tuscany.sca.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
Modified: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestServiceDiscoveryImpl.java Fri Sep 14 04:06:59 2007
@@ -22,8 +22,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService;
-import org.apache.tuscany.sca.distributed.domain.ServiceInfo;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.ServiceInfo;
/**
Modified: incubator/tuscany/java/sca/modules/binding-sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/pom.xml?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/pom.xml Fri Sep 14 04:06:59 2007
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distributed</artifactId>
+ <artifactId>tuscany-domain</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java Fri Sep 14 04:06:59 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.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.DomainFactory;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.DomainFactory;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java Fri Sep 14 04:06:59 2007
@@ -23,8 +23,8 @@
import org.apache.tuscany.sca.assembly.WireableBinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
Modified: incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java?rev=575620&r1=575619&r2=575620&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java Fri Sep 14 04:06:59 2007
@@ -23,8 +23,8 @@
import org.apache.tuscany.sca.assembly.WireableBinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.distributed.domain.Domain;
-import org.apache.tuscany.sca.distributed.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.Domain;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
Added: incubator/tuscany/java/sca/modules/domain-impl/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/DISCLAIMER?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/DISCLAIMER (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/DISCLAIMER Fri Sep 14 04:06:59 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/java/sca/modules/domain-impl/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/LICENSE?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/LICENSE (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/LICENSE Fri Sep 14 04:06:59 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/java/sca/modules/domain-impl/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/NOTICE?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/NOTICE (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/NOTICE Fri Sep 14 04:06:59 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/java/sca/modules/domain-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/pom.xml?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/pom.xml (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/pom.xml Fri Sep 14 04:06:59 2007
@@ -0,0 +1,101 @@
+<?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-impl</artifactId>
+ <name>Apache Tuscany SCA Domain Implementation</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xml</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-contribution-impl</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</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.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-sca-axis2</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java Fri Sep 14 04:06:59 2007
@@ -0,0 +1,88 @@
+/*
+ * 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.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.SCABinding;
+import org.apache.tuscany.sca.domain.DomainManagerService;
+import org.apache.tuscany.sca.domain.NodeInfo;
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.impl.ServiceDiscoveryServiceImpl.ServiceEndpoint;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+
+
+/**
+ * Stores details of services exposed and retrieves details of remote services
+ *
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+@Scope("COMPOSITE")
+public class DomainManagerServiceImpl implements DomainManagerService{
+
+ @Reference
+ public ServiceDiscoveryService serviceDiscovery;
+
+ List<NodeInfo> nodes = new ArrayList<NodeInfo>();
+
+ public String registerNode(String domainUri, String nodeUri){
+ NodeInfo nodeInfo = new NodeInfoImpl(domainUri, nodeUri);
+ nodes.add(nodeInfo);
+ System.err.println("Registering node: " + nodeUri);
+ return nodeUri;
+ }
+
+ public String removeNode(String domainUri, String nodeUri){
+
+ NodeInfo nodeToRemove = null;
+
+ for(NodeInfo node : nodes){
+ if ( node.match(domainUri, nodeUri)){
+ nodeToRemove = node;
+ break;
+ }
+ }
+
+ nodes.remove(nodeToRemove);
+ System.err.println("Removed node: " + nodeUri);
+
+ return nodeUri;
+ }
+
+ public List<NodeInfo> getNodeInfo(){
+
+ // get the nodeManagerUrl for each node
+ for(NodeInfo node : nodes){
+ String url = serviceDiscovery.findServiceEndpoint(node.getDomainUri(),
+ node.getNodeUri() + "NodeManagerService",
+ "");
+
+
+ if (url != null) {
+ node.setNodeManagerUrl(url);
+ }
+ }
+
+ return nodes;
+ }
+
+}
Added: incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/NodeInfoImpl.java Fri Sep 14 04:06:59 2007
@@ -0,0 +1,71 @@
+/*
+ * 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.impl;
+
+import java.io.Serializable;
+
+import org.apache.tuscany.sca.domain.NodeInfo;
+
+/**
+ * Information relating to an exposed service
+ *
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public class NodeInfoImpl implements NodeInfo, Serializable {
+
+ private String domainUri;
+ private String nodeUri;
+ private String nodeManagerUrl;
+
+ public NodeInfoImpl(String domainUri, String nodeUri){
+ this.domainUri = domainUri;
+ this.nodeUri = nodeUri;
+ }
+
+ public boolean match (String domainUri, String nodeUri){
+ return ((this.domainUri.equals(domainUri)) &&
+ (this.nodeUri.equals(nodeUri)));
+ }
+
+ public String getDomainUri(){
+ return domainUri;
+ }
+
+ public String getNodeUri(){
+ return nodeUri;
+ }
+
+ public void setNodeManagerUrl(String nodeManagerUrl){
+ this.nodeManagerUrl = nodeManagerUrl;
+ }
+
+ public String getNodeManagerUrl(){
+ return nodeManagerUrl;
+ }
+
+ @Override
+ public String toString (){
+ return "[" +
+ domainUri + " " +
+ nodeUri +
+ "]";
+ }
+
+}
Added: incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceDiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceDiscoveryServiceImpl.java?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceDiscoveryServiceImpl.java (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceDiscoveryServiceImpl.java Fri Sep 14 04:06:59 2007
@@ -0,0 +1,170 @@
+/*
+ * 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.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.ServiceInfo;
+import org.osoa.sca.annotations.Scope;
+
+
+/**
+ * Stores details of services exposed and retrieves details of remote services
+ *
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+@Scope("COMPOSITE")
+public class ServiceDiscoveryServiceImpl implements ServiceDiscoveryService {
+
+ List<ServiceEndpoint> serviceEndpoints = new ArrayList<ServiceEndpoint>();
+
+ public class ServiceEndpoint {
+ public String domainUri;
+ public String nodeUri;
+ public String serviceName;
+ public String bindingName;
+ public String url;
+
+ public ServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName, String URL){
+ this.domainUri = domainUri;
+ this.nodeUri = nodeUri;
+ this.serviceName = serviceName;
+ this.bindingName = bindingName;
+ this.url = URL;
+ }
+
+ public boolean match(String domainUri, String serviceName, String bindingName) {
+ // trap the case where the we are trying to map
+ // ComponentName/Service name with a registered ComponentName - this is OK
+ // ComponentName with a registered ComponentName/ServiceName - this should fail
+
+ boolean serviceNameMatch = false;
+
+ if (this.serviceName.equals(serviceName)) {
+ serviceNameMatch = true;
+ } else {
+ int s = serviceName.indexOf('/');
+ if ((s != -1) &&
+ (this.serviceName.equals(serviceName.substring(0, s)))){
+ serviceNameMatch = true;
+ }
+ }
+
+ return ((this.domainUri.equals(domainUri)) &&
+ (serviceNameMatch) &&
+ (this.bindingName.equals(bindingName)));
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ @Override
+ public String toString (){
+ return "[" +
+ domainUri + " " +
+ nodeUri + " " +
+ serviceName + " " +
+ bindingName + " " +
+ url +
+ "]";
+ }
+ }
+
+ /**
+ * Accepts information about a service endpoint and holds onto it
+ *
+ * @param domainUri the string uri for the distributed domain
+ * @param nodeUri the string uri for the current node
+ * @param serviceName the name of the service that is exposed and the provided endpoint
+ * @param bindingName the remote binding that is providing the endpoint
+ * @param url the enpoint url
+ */
+ public String registerServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName, String URL){
+ // if the service name ends in a "/" remove it
+ String modifiedServiceName = null;
+ if ( serviceName.endsWith("/") ) {
+ modifiedServiceName = serviceName.substring(0, serviceName.length() - 1);
+ } else {
+ modifiedServiceName = serviceName;
+ }
+
+ ServiceEndpoint serviceEndpoint = new ServiceEndpoint (domainUri, nodeUri, modifiedServiceName, bindingName, URL);
+ serviceEndpoints.add(serviceEndpoint);
+ System.err.println("Registering service: " + serviceEndpoint.toString());
+ return "";
+ }
+
+
+ /**
+ * Locates information about a service endpoint
+ *
+ * @param domainUri the string uri for the distributed domain
+ * @param serviceName the name of the service that is exposed and the provided endpoint
+ * @param bindingName the remote binding that we want to find an endpoint for
+ * @return url the endpoint url
+ */
+ public String findServiceEndpoint(String domainUri, String serviceName, String bindingName){
+ System.err.println("Finding service: [" +
+ domainUri + " " +
+ serviceName + " " +
+ bindingName +
+ "]");
+
+ String url = "";
+
+ for(ServiceEndpoint serviceEndpoint : serviceEndpoints){
+ if ( serviceEndpoint.match(domainUri, serviceName, bindingName)){
+ url = serviceEndpoint.getUrl();
+ // if you want to temporarily modify the registered port
+ // numbers for debugging uncomment this line
+ //url = replacePort(url, "8085", "8086");
+ System.err.println("Matching service url: " + url);
+ }
+ }
+ return url;
+ }
+
+ /**
+ * Converts a port number to something else to allow for debugging using a
+ * HTTP sniffer
+ * @param url
+ * @param fromPort the port to look for
+ * @param toPort the port to replace it with
+ * @return the new url
+ */
+ private String replacePort(String url, String fromPort, String toPort) {
+ return url.replace(fromPort, toPort);
+ }
+
+ public ServiceInfo getServiceInfo(){
+
+ ServiceEndpoint serviceEndpoint = serviceEndpoints.get(0);
+
+ return new ServiceInfoImpl(serviceEndpoint.domainUri,
+ serviceEndpoint.nodeUri,
+ serviceEndpoint.serviceName,
+ serviceEndpoint.bindingName,
+ serviceEndpoint.url);
+ }
+
+}
Added: incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java (added)
+++ incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/ServiceInfoImpl.java Fri Sep 14 04:06:59 2007
@@ -0,0 +1,84 @@
+/*
+ * 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.impl;
+
+import java.io.Serializable;
+
+import org.apache.tuscany.sca.domain.ServiceInfo;
+
+/**
+ * Information relating to an exposed service
+ *
+ * @version $Rev: 552343 $ $Date: 2007-09-07 12:41:52 +0100 (Fri, 07 Sep 2007) $
+ */
+public class ServiceInfoImpl implements ServiceInfo, Serializable {
+
+ private String domainUri;
+ private String nodeUri;
+ private String serviceName;
+ private String bindingName;
+ private String url;
+
+ public ServiceInfoImpl(String domainUri, String nodeUri, String serviceName, String bindingName, String URL){
+ this.domainUri = domainUri;
+ this.nodeUri = nodeUri;
+ this.serviceName = serviceName;
+ this.bindingName = bindingName;
+ this.url = URL;
+ }
+
+ public boolean match(String domainUri, String serviceName, String bindingName) {
+ // trap the case where the we are trying to map
+ // ComponentName/Service name with a registered ComponentName - this is OK
+ // ComponentName with a registered ComponentName/ServiceName - this should fail
+
+ boolean serviceNameMatch = false;
+
+ if (this.serviceName.equals(serviceName)) {
+ serviceNameMatch = true;
+ } else {
+ int s = serviceName.indexOf('/');
+ if ((s != -1) &&
+ (this.serviceName.equals(serviceName.substring(0, s)))){
+ serviceNameMatch = true;
+ }
+ }
+
+ return ((this.domainUri.equals(domainUri)) &&
+ (serviceNameMatch) &&
+ (this.bindingName.equals(bindingName)));
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ @Override
+ public String toString (){
+ return "[" +
+ domainUri + " " +
+ nodeUri + " " +
+ serviceName + " " +
+ bindingName + " " +
+ url +
+ "]";
+ }
+
+}
Added: incubator/tuscany/java/sca/modules/domain/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain/DISCLAIMER?rev=575620&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain/DISCLAIMER (added)
+++ incubator/tuscany/java/sca/modules/domain/DISCLAIMER Fri Sep 14 04:06:59 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.
+
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org