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/20 15:53:52 UTC
svn commit: r577748 [1/4] - in /incubator/tuscany/java/sca: ./
itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/
itest/databindings/sdogen/
itest/databindings/sdogen/src/main/resources/generate/
itest/interop-soap-client/...
Author: slaws
Date: Thu Sep 20 06:53:40 2007
New Revision: 577748
URL: http://svn.apache.org/viewvc?rev=577748&view=rev
Log:
Bring node/domain changes into trunk from branch SCA 1.0
Fix up the sca-api module name to tuscany-sca-spi
Added:
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
incubator/tuscany/java/sca/modules/domain-api/ (with props)
incubator/tuscany/java/sca/modules/domain-api/DISCLAIMER
incubator/tuscany/java/sca/modules/domain-api/LICENSE
incubator/tuscany/java/sca/modules/domain-api/NOTICE
incubator/tuscany/java/sca/modules/domain-api/pom.xml
incubator/tuscany/java/sca/modules/domain-api/src/
incubator/tuscany/java/sca/modules/domain-api/src/main/
incubator/tuscany/java/sca/modules/domain-api/src/main/java/
incubator/tuscany/java/sca/modules/domain-api/src/main/java/org/
incubator/tuscany/java/sca/modules/domain-api/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/domain-api/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/domain-api/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/
incubator/tuscany/java/sca/modules/domain-api/src/main/java/org/apache/tuscany/sca/domain/SCADomain.java
incubator/tuscany/java/sca/modules/domain-api/src/test/
incubator/tuscany/java/sca/modules/domain-api/src/test/java/
incubator/tuscany/java/sca/modules/domain-api/src/test/resources/
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainServiceImpl.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/META-INF/
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/domain.composite
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/domain.png (with props)
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/index.html
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/node.png (with props)
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/webroot/style.css
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainService.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/DomainManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeUtil.java
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/META-INF/
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/index.html
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/node.png (with props)
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/webroot/style.css
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/InMemoryTestCase.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANode.java
Modified:
incubator/tuscany/java/sca/ (props changed)
incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml
incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml
incubator/tuscany/java/sca/modules/binding-jms/pom.xml
incubator/tuscany/java/sca/modules/binding-notification/pom.xml
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/Axis2SCABindingInvoker.java
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/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/core-spi/pom.xml
incubator/tuscany/java/sca/modules/core-spring/pom.xml
incubator/tuscany/java/sca/modules/data-engine-helper/pom.xml
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/DomainManagerServiceImpl.java
incubator/tuscany/java/sca/modules/domain/pom.xml
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/implementation-das/pom.xml
incubator/tuscany/java/sca/modules/implementation-data/pom.xml
incubator/tuscany/java/sca/modules/implementation-java/pom.xml
incubator/tuscany/java/sca/modules/implementation-notification/pom.xml
incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml
incubator/tuscany/java/sca/modules/implementation-script/pom.xml
incubator/tuscany/java/sca/modules/implementation-spring/pom.xml
incubator/tuscany/java/sca/modules/interface-java/pom.xml
incubator/tuscany/java/sca/modules/java2wsdl/pom.xml
incubator/tuscany/java/sca/modules/node-impl/pom.xml
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/NodeManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/test/resources/nodeA/Calculator.composite
incubator/tuscany/java/sca/modules/node/pom.xml
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/NodeManagerInitService.java
incubator/tuscany/java/sca/modules/pom.xml
incubator/tuscany/java/sca/modules/sca-api/pom.xml
incubator/tuscany/java/sca/samples/README
incubator/tuscany/java/sca/samples/calculator-distributed/build.xml
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/main/java/node/DomainNode.java
incubator/tuscany/java/sca/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
incubator/tuscany/java/sca/samples/company-das/pom.xml
incubator/tuscany/java/sca/samples/databinding-echo/pom.xml
incubator/tuscany/java/sca/tools/registry-inspector/ (props changed)
Propchange: incubator/tuscany/java/sca/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Sep 20 06:53:40 2007
@@ -11,4 +11,7 @@
.settings
.deployables
.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
+Maven_Ant_Builder.launch
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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -25,7 +25,9 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
+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;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -37,11 +39,11 @@
*/
public class CallableReferenceRemoteTestCase {
- private static String DEFAULT_DOMAIN_NAME = "mydomain";
+ private static String DEFAULT_DOMAIN_URL = "http://localhost:8877";
- private static NodeImpl registry;
- private static NodeImpl nodeA;
- private static NodeImpl nodeB;
+ private static SCADomain domain;
+ private static SCADomain domainNodeA;
+ private static SCADomain domainNodeB;
private static AComponent acomponent;
@@ -50,29 +52,22 @@
try {
System.out.println("Setting up distributed registry");
- registry = new NodeImpl();
- registry.start();
- registry.getContributionManager().startContribution(CallableReferenceRemoteTestCase.class.getClassLoader().getResource("domain/"));
- //registry.getContributionManager().startContribution("file:///C:/simon/tuscany/java-head/sca/modules/distributed-impl/target/tuscany-distributed-impl-1.0-incubating-SNAPSHOT.jar");
+ domain = SCADomain.newInstance("domain.composite");
System.out.println("Setting up distributed nodes");
// create the node that runs the
// calculator component
- nodeA = new NodeImpl(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 NodeImpl(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,8 +76,9 @@
@AfterClass
public static void destroy() throws Exception {
// stop the nodes and hence the domains they contain
- nodeA.stop();
- nodeB.stop();
+ domainNodeA.close();
+ domainNodeB.close();
+ domain.close();
}
@Test
Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/pom.xml Thu Sep 20 06:53:40 2007
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>${pom.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm (original)
+++ incubator/tuscany/java/sca/itest/databindings/sdogen/src/main/resources/generate/pom.xml.vm Thu Sep 20 06:53:40 2007
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>${pom.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/interop-soap-client/pom.xml Thu Sep 20 06:53:40 2007
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/interop-soap-round2-client/pom.xml Thu Sep 20 06:53:40 2007
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/binding-jms/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-jms/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-jms/pom.xml Thu Sep 20 06:53:40 2007
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-notification/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/pom.xml Thu Sep 20 06:53:40 2007
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -86,9 +86,21 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
<version>1.2.5</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
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=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml Thu Sep 20 06:53:40 2007
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain</artifactId>
+ <artifactId>tuscany-node</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/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/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java Thu Sep 20 06:53:40 2007
@@ -18,12 +18,19 @@
*/
package org.apache.tuscany.sca.binding.sca.axis2.impl;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.net.ConnectException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.axis2.AxisFault;
import org.apache.tuscany.sca.invocation.Interceptor;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.runtime.EndpointReference;
import org.osoa.sca.ServiceUnavailableException;
+
/**
* A wrapper for the Axis2BindingInvoker that ensures that the url of the target
* service is correct by looking it up in the service registry if it is not provided
@@ -31,7 +38,11 @@
* @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $
*/
public class Axis2SCABindingInvoker implements Interceptor {
-
+
+ private final static Logger logger = Logger.getLogger(Axis2SCABindingInvoker.class.getName());
+
+ private int retryCount = 100;
+ private int retryInterval = 5000; //ms
private Invoker axis2Invoker;
private Axis2SCAReferenceBindingProvider provider;
@@ -94,6 +105,46 @@
}
// do the axis2 stuff
- return axis2Invoker.invoke(msg);
+ Message returnMessage = null;
+
+ // for (int i =0; i < retryCount; i++){
+
+ returnMessage = axis2Invoker.invoke(msg);
+ /*
+ if ( AxisFault.class.isInstance(returnMessage.getBody())){
+
+ AxisFault axisFault = returnMessage.getBody();
+
+ if (axisFault.getCause().getClass() == ConnectException.class) {
+ logger.log(Level.INFO, "Trying to send message to " +
+ msg.getTo().getURI());
+
+ // try and get the service endpoint again just in case
+ // it's moved
+ EndpointReference serviceEPR = provider.refreshServiceEndpoint();
+
+ if (serviceEPR == null) {
+ throw new ServiceUnavailableException("Endpoint for service: " + provider.getSCABinding().getURI()
+ + " can't be found for component: "
+ + provider.getComponent().getName()
+ + " reference: "
+ + provider.getComponentReference().getName());
+ }
+ msg.setTo(serviceEPR);
+ } else {
+ break;
+ }
+
+ } else {
+ break;
+ }
+
+ try {
+ Thread.sleep(retryInterval);
+ } catch(InterruptedException ex) {
+ }
+ }
+ */
+ return returnMessage;
}
}
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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -22,11 +22,11 @@
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.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;
+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 Domain 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);
- DomainFactory domainFactory = modelFactories.getFactory(DomainFactory.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/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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -28,14 +28,14 @@
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.domain.Domain;
-import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.SCADomainService;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
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.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 Domain 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(Domain 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
- ServiceDiscoveryService serviceDiscovery = domain.getServiceDiscovery();
+ 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());
@@ -130,7 +130,7 @@
}
}
} else {
- throw new IllegalStateException("No service manager available for component: "+
+ throw new IllegalStateException("No domain service available while trying to find component: "+
component.getName() +
" and service: " +
reference.getName());
@@ -138,6 +138,16 @@
}
return serviceEPR;
+ }
+
+ /**
+ * Go back to the distributed domain to go and get the service endpoint
+ *
+ * @return An EPR for the target service that this reference refers to
+ */
+ public EndpointReference refreshServiceEndpoint(){
+ serviceEPR= null;
+ return getServiceEndpoint();
}
/**
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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -19,7 +19,11 @@
package org.apache.tuscany.sca.binding.sca.axis2.impl;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URL;
+import java.net.UnknownHostException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -30,12 +34,12 @@
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.domain.Domain;
-import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.SCADomainService;
import org.apache.tuscany.sca.host.http.ServletHost;
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.SCANode;
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -50,7 +54,7 @@
private final static Logger logger = Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());
- private Domain domain;
+ private SCANode node;
private SCABinding binding;
private Axis2ServiceProvider axisProvider;
private WebServiceBinding wsBinding;
@@ -58,12 +62,13 @@
private boolean started = false;
- public Axis2SCAServiceBindingProvider(Domain 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();
@@ -88,42 +93,94 @@
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
- ServiceDiscoveryService serviceDiscovery = domain.getServiceDiscovery();
+ SCADomainService domainService = node.getDomainService();
- if (serviceDiscovery != null) {
- // register endpoint against the path element of the binding uri
- String componentName = this.binding.getURI();
+ if (domainService != null) {
+ // work out what the component service name is that will be registered
+ // it should be the path element of the binding uri
+ String componentServiceName = this.binding.getURI();
try {
URI servicePath = new URI(this.binding.getURI());
- componentName = servicePath.getPath();
+ componentServiceName = servicePath.getPath();
// strip any leading slash
- if (componentName.charAt(0) == '/'){
- componentName = componentName.substring(1, componentName.length());
+ if (componentServiceName.charAt(0) == '/'){
+ componentServiceName = componentServiceName.substring(1, componentServiceName.length());
}
} catch(Exception ex) {
// do nothing, the binding uri string will be used
}
-
+
+ // work out what the endpoint address is that the component service name will be registered
+ // against. Be default this is the url calculated by the web services binding but
+ // we have to adjust that to:
+ // 1. correct the host and port in the case that this is a web app as the container controlls the port
+ // 2. correct the host name in the case that it's localhost
+ String componentServiceUrlString = wsBinding.getURI();
+ URL componentServiceUrl;
+
+ try {
+ componentServiceUrl = new URL(componentServiceUrlString);
+ } catch (MalformedURLException ex) {
+ throw new IllegalStateException("Unable to conver url " +
+ componentServiceUrlString +
+ " as generated by the web service binding into a URL");
+ }
+
+ String originalHost = componentServiceUrl.getHost();
+ String newHost = originalHost;
+ int originalPort = componentServiceUrl.getPort();
+ int newPort = originalPort;
+
+ // TODO - could do with a change to the ServletHost API so that we can just ask the servlet
+ // host if it is controlling the URL
+ if (servletHost.getClass().getName().equals("WebbAppServletHost")){
+ // 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 = node.getNodeURL();
+
+ if (nodeUrl != null){
+ newHost = nodeUrl.getHost();
+ newPort = nodeUrl.getPort();
+ } else {
+ throw new IllegalStateException("Node running inside a webapp and node was not created with a valid node url");
+ }
+ }
+
+ // no good registering localhost as a host name when nodes are spread across
+ // machines
+ if ( newHost.equals("localhost")){
+ try {
+ newHost = InetAddress.getLocalHost().getHostName();
+ } catch(UnknownHostException ex) {
+ throw new IllegalStateException("Got unknown host while trying to get the local host name in order to regsiter service with the domain");
+ }
+ }
+
+ // replace the old with the new
+ componentServiceUrlString = componentServiceUrlString.replace(String.valueOf(originalPort), String.valueOf(newPort));
+ componentServiceUrlString = componentServiceUrlString.replace(originalHost, newHost);
+
try {
- serviceDiscovery.registerServiceEndpoint(domain.getDomainUri(),
- domain.getNodeUri(),
- componentName,
- SCABinding.class.getName(),
- wsBinding.getURI());
- } catch(Exception ex) {
- logger.log(Level.WARNING,
- "Unable to register service: " +
- domain.getDomainUri() + " " +
- domain.getNodeUri() + " " +
- componentName + " " +
- SCABinding.class.getName() + " " +
- wsBinding.getURI());
- }
+ domainService.registerServiceEndpoint(node.getDomainURI(),
+ node.getNodeURI(),
+ componentServiceName,
+ SCABinding.class.getName(),
+ componentServiceUrlString);
+ } catch(Exception ex) {
+ logger.log(Level.WARNING,
+ "Unable to register service: " +
+ node.getDomainURI() + " " +
+ node.getNodeURI() + " " +
+ componentServiceName + " " +
+ SCABinding.class.getName() + " " +
+ componentServiceUrlString);
+ }
} else {
/* don't think we should thrown an exception here as it
* may be a stand alone node
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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 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.domain.Domain;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.binding.sca.axis2;
-import org.apache.tuscany.sca.domain.Domain;
public class BaseTest {
Added: incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.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/NodeFactoryImpl.java?rev=577748&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java (added)
+++ incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java Thu Sep 20 06:53:40 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/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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -36,11 +36,13 @@
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.domain.Domain;
-import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.SCADomainService;
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.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,11 +56,11 @@
*
* @version $Rev: 552343 $ $Date$
*/
-public class TestDomain implements Domain {
+public class TestDomain implements SCANode {
private String nodeName;
private String domainURI;
- private static ServiceDiscoveryService serviceDiscovery;
+ private static SCADomainService serviceDiscovery;
private ReallySmallRuntime nodeRuntime;
private ClassLoader cl = BaseTest.class.getClassLoader();
@@ -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
@@ -127,17 +129,34 @@
}
- public String getNodeUri(){
+ public String getNodeURI(){
return nodeName;
}
- public String getDomainUri(){
+ public String getDomainURI(){
return domainURI;
}
- public ServiceDiscoveryService getServiceDiscovery(){
- return serviceDiscovery;
+
+ public URL getNodeURL(){
+ return null;
+ }
+
+ public URL getDomainURL(){
+ return null;
}
+
+ 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/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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.SCADomainService;
import org.apache.tuscany.sca.domain.ServiceInfo;
@@ -31,7 +31,7 @@
*
* @version $Rev: 552343 $ $Date: 2007-07-01 18:43:40 +0100 (Sun, 01 Jul 2007) $
*/
-public class TestServiceDiscoveryImpl implements ServiceDiscoveryService{
+public class TestServiceDiscoveryImpl implements SCADomainService{
List<ServiceEndpoint> serviceEndpoints = new ArrayList<ServiceEndpoint>();
@@ -111,7 +111,9 @@
return "";
}
-
+ public String removeServiceEndpoint(String domainUri, String nodeUri, String serviceName, String bindingName){
+ return "";
+ }
/**
* Locates information about a service endpoint
*
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=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-sca/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-sca/pom.xml Thu Sep 20 06:53:40 2007
@@ -64,9 +64,15 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain</artifactId>
+ <artifactId>tuscany-node</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-domain</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>
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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 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.domain.Domain;
-import org.apache.tuscany.sca.domain.DomainFactory;
+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 Domain domain = null;
+ private SCANode node = null;
public RuntimeSCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
this.extensionPoints = extensionPoints;
ModelFactoryExtensionPoint factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
- DomainFactory domainFactory = factories.getFactory(DomainFactory.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/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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -23,11 +23,11 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.domain.Domain;
-import org.apache.tuscany.sca.domain.ServiceDiscoveryService;
+import org.apache.tuscany.sca.domain.SCADomainService;
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.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 Domain 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,
- Domain 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,14 +98,14 @@
// 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)) {
- ServiceDiscoveryService serviceDiscovery = domain.getServiceDiscovery();
+ 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) {
+ if ((serviceUrl == null) || serviceUrl.equals("")) {
targetIsRemote = false;
} else {
targetIsRemote = true;
@@ -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/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=577748&r1=577747&r2=577748&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 Thu Sep 20 06:53:40 2007
@@ -22,11 +22,10 @@
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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;
+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;
@@ -43,18 +42,18 @@
*/
public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider {
- private Domain domain;
+ private SCANode node;
private RuntimeComponentService service;
private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory;
private ServiceBindingProvider distributedProvider;
private DistributedSCABinding distributedBinding;
public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints,
- Domain 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()) {
@@ -74,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() +
Modified: incubator/tuscany/java/sca/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core-spi/pom.xml Thu Sep 20 06:53:40 2007
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/core-spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spring/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spring/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/core-spring/pom.xml Thu Sep 20 06:53:40 2007
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/data-engine-helper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-engine-helper/pom.xml?rev=577748&r1=577747&r2=577748&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/data-engine-helper/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/data-engine-helper/pom.xml Thu Sep 20 06:53:40 2007
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sca-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
Propchange: incubator/tuscany/java/sca/modules/domain-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 20 06:53:40 2007
@@ -0,0 +1,11 @@
+target
+*.iws
+*.ipr
+*.iml
+*.log*
+.project
+.classpath
+junit*.properties
+.settings
+.deployables
+.wtpmodules
Added: incubator/tuscany/java/sca/modules/domain-api/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-api/DISCLAIMER?rev=577748&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-api/DISCLAIMER (added)
+++ incubator/tuscany/java/sca/modules/domain-api/DISCLAIMER Thu Sep 20 06:53:40 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-api/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-api/LICENSE?rev=577748&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-api/LICENSE (added)
+++ incubator/tuscany/java/sca/modules/domain-api/LICENSE Thu Sep 20 06:53:40 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-api/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-api/NOTICE?rev=577748&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-api/NOTICE (added)
+++ incubator/tuscany/java/sca/modules/domain-api/NOTICE Thu Sep 20 06:53:40 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-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-api/pom.xml?rev=577748&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-api/pom.xml (added)
+++ incubator/tuscany/java/sca/modules/domain-api/pom.xml Thu Sep 20 06:53:40 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.1-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>tuscany-sca-api</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org