You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tuscany.apache.org by ant elder <an...@gmail.com> on 2008/06/14 11:54:25 UTC
Re: svn commit: r667639 - in /incubator/tuscany/java/sca: distribution/ distribution/bundle/ distribution/manifest/ itest/osgi-tuscany/tuscany-3rdparty/ itest/osgi-tuscany/tuscany-osgi-installer/ itest/osgi-tuscany/tuscany-runtime/ itest/serializatio
Was it intentional that runtime-tomcat was changed to not use the runtime
module in this change? Thats changed the tomcat deep integration so it no
longer includes all the tuscany extensions.
...ant
On Fri, Jun 13, 2008 at 9:25 PM, <sl...@apache.org> wrote:
> Author: slaws
> Date: Fri Jun 13 13:25:54 2008
> New Revision: 667639
>
> URL: http://svn.apache.org/viewvc?rev=667639&view=rev
> Log:
> Unhook the old domain modules from the rest of the runtime, tests and
> samples. I've left the old modules in place for this commit. We can now
> remove then at will.
>
> Modified:
> incubator/tuscany/java/sca/distribution/bundle/pom.xml
> incubator/tuscany/java/sca/distribution/manifest/pom.xml
> incubator/tuscany/java/sca/distribution/pom.xml
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
>
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> incubator/tuscany/java/sca/itest/serialization/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/TestNode.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/host-embedded/pom.xml
> incubator/tuscany/java/sca/modules/pom.xml
> incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml
>
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
>
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
>
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
>
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
>
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
>
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
>
> Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
> +++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Fri Jun 13
> 13:25:54 2008
> @@ -235,21 +235,6 @@
> </dependency>
> <dependency>
> <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain-api</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain-impl</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> <artifactId>tuscany-host-embedded</artifactId>
> <version>${pom.version}</version>
> </dependency>
> @@ -391,26 +376,11 @@
> </dependency>
> <dependency>
> <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node-api</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> <artifactId>tuscany-node2-api</artifactId>
> <version>${pom.version}</version>
> </dependency>
> <dependency>
> <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> <artifactId>tuscany-node2-impl</artifactId>
> <version>${pom.version}</version>
> </dependency>
>
> Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original)
> +++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Fri Jun 13
> 13:25:54 2008
> @@ -312,21 +312,6 @@
> </dependency>
> <dependency>
> <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain-api</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain-impl</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> <artifactId>tuscany-host-embedded</artifactId>
> <version>${pom.version}</version>
> </dependency>
> @@ -469,26 +454,11 @@
> </dependency>
> <dependency>
> <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node-api</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> <artifactId>tuscany-node2-api</artifactId>
> <version>${pom.version}</version>
> </dependency>
> <dependency>
> <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> <artifactId>tuscany-node2-impl</artifactId>
> <version>${pom.version}</version>
> </dependency>
>
> Modified: incubator/tuscany/java/sca/distribution/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/distribution/pom.xml (original)
> +++ incubator/tuscany/java/sca/distribution/pom.xml Fri Jun 13 13:25:54
> 2008
> @@ -38,7 +38,7 @@
> <modules>
> <module>bundle</module>
> <module>manifest</module>
> - <module>webapp</module>
> + <!--module>webapp</module-->
> </modules>
>
> <dependencies>
>
> Modified:
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
> Fri Jun 13 13:25:54 2008
> @@ -52,16 +52,6 @@
> </dependency>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-domain-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> <artifactId>tuscany-assembly-xml</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> </dependency>
>
> Modified:
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> (original)
> +++
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> Fri Jun 13 13:25:54 2008
> @@ -337,21 +337,6 @@
> </dependency>
> <dependency>
> <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain-api</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-domain-impl</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> <artifactId>tuscany-host-embedded</artifactId>
> <version>${pom.version}</version>
> </dependency>
> @@ -495,21 +480,6 @@
> <artifactId>tuscany-implementation-widget-runtime</artifactId>
> <version>${pom.version}</version>
> </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node-api</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>${pom.groupId}</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>${pom.version}</version>
> - </dependency>
> <!--
> <dependency>
> <groupId>${pom.groupId}</groupId>
>
> Modified:
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> Fri Jun 13 13:25:54 2008
> @@ -77,36 +77,6 @@
> </dependency>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-domain-api</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-domain</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-domain-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-api</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> <artifactId>tuscany-assembly-xml</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> </dependency>
>
> Modified: incubator/tuscany/java/sca/itest/serialization/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/serialization/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/itest/serialization/pom.xml (original)
> +++ incubator/tuscany/java/sca/itest/serialization/pom.xml Fri Jun 13
> 13:25:54 2008
> @@ -40,21 +40,7 @@
> <artifactId>tuscany-implementation-java-runtime</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> <scope>runtime</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - <scope>test</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-domain-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - <scope>test</scope>
> - </dependency>
> + </dependency>
>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> @@ -62,8 +48,7 @@
> <version>2.0-incubating-SNAPSHOT</version>
> <scope>test</scope>
> </dependency>
> -
> -
> +
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> <artifactId>tuscany-binding-ws-axis2</artifactId>
>
> 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> @@ -29,7 +29,6 @@
> 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.spi.NodeFactory;
> import org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader;
> import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
>
> 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> @@ -44,7 +44,6 @@
> import org.apache.tuscany.sca.interfacedef.wsdl.java2wsdl.Java2WSDLHelper;
> import org.apache.tuscany.sca.invocation.Invoker;
> import org.apache.tuscany.sca.invocation.MessageFactory;
> -import org.apache.tuscany.sca.node.spi.NodeFactory;
> import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
> import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> import org.apache.tuscany.sca.runtime.EndpointReference;
> @@ -63,7 +62,6 @@
>
> private static final Logger logger =
> Logger.getLogger(Axis2SCAReferenceBindingProvider.class.getName());
>
> - private NodeFactory nodeFactory;
> private RuntimeComponent component;
> private RuntimeComponentReference reference;
> private SCABinding binding;
> @@ -84,7 +82,6 @@
> WSDLFactory wsdlFactory =
> modelFactories.getFactory(WSDLFactory.class);
> XSDFactory xsdFactory =
> modelFactories.getFactory(XSDFactory.class);
>
> - this.nodeFactory = modelFactories.getFactory(NodeFactory.class);
> this.component = component;
> this.reference = reference;
> this.binding = binding.getSCABinding();
>
> 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> @@ -39,7 +39,6 @@
> import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
> import org.apache.tuscany.sca.interfacedef.wsdl.java2wsdl.Java2WSDLHelper;
> import org.apache.tuscany.sca.invocation.MessageFactory;
> -import org.apache.tuscany.sca.node.spi.NodeFactory;
> import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> import org.apache.tuscany.sca.runtime.RuntimeComponent;
> @@ -56,7 +55,6 @@
>
> private static final Logger logger =
> Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());
>
> - private NodeFactory nodeFactory;
> private SCABinding binding;
> private Axis2ServiceProvider axisProvider;
> private WebServiceBinding wsBinding;
> @@ -76,7 +74,6 @@
> WSDLFactory wsdlFactory =
> modelFactories.getFactory(WSDLFactory.class);
> XSDFactory xsdFactory =
> modelFactories.getFactory(XSDFactory.class);
>
> - this.nodeFactory = modelFactories.getFactory(NodeFactory.class);
> this.binding = binding.getSCABinding();
> wsBinding =
> modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();
>
> @@ -104,113 +101,7 @@
> messageFactory,
>
> policyHandlerClassnames);
>
> - this.binding.setURI(wsBinding.getURI());
> -
> -/*
> - if ((nodeFactory != null) && (nodeFactory.getNode() != null)){
> -
> - SCADomainEventService domainProxy =
> (SCADomainEventService)nodeFactory.getNode().getDomain();
> -
> - if (domainProxy != 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());
> - componentServiceName = servicePath.getPath();
> -
> - // strip any leading slash
> - 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 controls the port
> - // 2. correct the host name in the case that it's
> localhost
> - String componentServiceUrlString = wsBinding.getURI();
> - URI componentServiceUrl =
> URI.create(componentServiceUrlString);
> -
> - String newHost = componentServiceUrl.getHost();
> - int newPort = componentServiceUrl.getPort();
> -
> - // 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;
> - try {
> - URI tmpURI = new
> URI(nodeFactory.getNode().getURI());
> - nodeUrl = tmpURI.toURL();
> - } catch (Exception ex) {
> - throw new IllegalStateException("Node running
> inside a webapp and node was not created with a valid node url");
> - }
> -
> - 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 == null || 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");
> - }
> - }
> - if (newPort == -1) {
> - newPort = 8080;
> - }
> -
> - // replace the old with the new
> - try {
> - componentServiceUrl = new
> URI(componentServiceUrl.getScheme() == null? "http" :
> componentServiceUrl.getScheme(),
> -
> componentServiceUrl.getUserInfo(),
> -
> newHost, newPort,
> -
> componentServiceUrl.getPath(),
> -
> componentServiceUrl.getQuery(),
> -
> componentServiceUrl.getFragment());
> - componentServiceUrlString =
> componentServiceUrl.toString();
> - } catch (URISyntaxException e) {
> - throw new IllegalStateException(e);
> - }
> -
> - try {
> -
> domainProxy.registerServiceEndpoint(nodeFactory.getNode().getDomain().getURI(),
> -
> nodeFactory.getNode().getURI(),
> -
> componentServiceName,
> -
> SCABinding.class.getName(),
> -
> componentServiceUrlString);
> - } catch(Exception ex) {
> - logger.log(Level.WARNING,
> - "Unable to register service: " +
> - nodeFactory.getNode().getDomain().getURI()
> + " " +
> - nodeFactory.getNode().getURI() + " " +
> - componentServiceName + " " +
> - SCABinding.class.getName() + " " +
> - componentServiceUrlString);
> - }
> - }
> - } else {
> - throw new IllegalStateException("No domain available for
> component: "+
> - component.getName() +
> - " and service: " +
> - service.getName());
> - }
> -*/
> + this.binding.setURI(wsBinding.getURI());
>
> }
>
>
> Modified:
> incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.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/TestNode.java?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
> (original)
> +++
> incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
> Fri Jun 13 13:25:54 2008
> @@ -39,7 +39,6 @@
> 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.NodeException;
> import org.apache.tuscany.sca.runtime.RuntimeComponent;
> import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
> import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> @@ -107,8 +106,7 @@
> }
> }
>
> - public void start()
> - throws NodeException {
> + public void start() {
>
> try {
> nodeRuntime.getCompositeActivator().start(appComposite);
> @@ -119,13 +117,14 @@
>
> }
>
> - public void stop() throws NodeException {
> + public void stop() {
> try {
> nodeRuntime.stop();
> - } catch(Exception ex) {
> - throw new NodeException(ex);
> + } catch (Exception ex) {
> + System.err.println("Exception when creating domain " +
> ex.getMessage());
> + ex.printStackTrace(System.err);
> }
> - }
> + }
>
> public <B> B getService(Class<B> businessInterface, String serviceName)
> {
> ServiceReference<B> serviceReference =
> getServiceReference(businessInterface, serviceName);
>
> 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=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/modules/binding-sca/pom.xml (original)
> +++ incubator/tuscany/java/sca/modules/binding-sca/pom.xml Fri Jun 13
> 13:25:54 2008
> @@ -63,18 +63,6 @@
> </dependency>
>
> <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-domain</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> -
> - <dependency>
> <groupId>org.easymock</groupId>
> <artifactId>easymock</artifactId>
> <version>2.2</version>
>
> 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> @@ -22,7 +22,6 @@
> import org.apache.tuscany.sca.assembly.SCABinding;
> import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> -import org.apache.tuscany.sca.node.spi.NodeFactory;
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
> import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> @@ -38,25 +37,23 @@
> public class RuntimeSCABindingProviderFactory implements
> BindingProviderFactory<SCABinding> {
>
> private ExtensionPointRegistry extensionPoints;
> - private NodeFactory nodeFactory;
>
> public RuntimeSCABindingProviderFactory(ExtensionPointRegistry
> extensionPoints) {
> this.extensionPoints = extensionPoints;
> - ModelFactoryExtensionPoint factories =
> extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
> - nodeFactory = factories.getFactory(NodeFactory.class);
> +
> }
>
> public ReferenceBindingProvider
> createReferenceBindingProvider(RuntimeComponent component,
>
> RuntimeComponentReference reference,
>
> SCABinding binding) {
>
> - return new RuntimeSCAReferenceBindingProvider(extensionPoints,
> nodeFactory, component, reference, binding);
> + return new RuntimeSCAReferenceBindingProvider(extensionPoints,
> component, reference, binding);
> }
>
> public ServiceBindingProvider
> createServiceBindingProvider(RuntimeComponent component,
>
> RuntimeComponentService service,
> SCABinding
> binding) {
> - return new RuntimeSCAServiceBindingProvider(extensionPoints,
> nodeFactory, component, service, binding);
> + return new RuntimeSCAServiceBindingProvider(extensionPoints,
> 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> @@ -30,7 +30,6 @@
> import org.apache.tuscany.sca.interfacedef.Operation;
> import org.apache.tuscany.sca.invocation.InvocationChain;
> import org.apache.tuscany.sca.invocation.Invoker;
> -import org.apache.tuscany.sca.node.spi.NodeFactory;
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
> import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
> import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> @@ -54,7 +53,6 @@
>
> private static final Logger logger =
> Logger.getLogger(RuntimeSCAReferenceBindingProvider.class.getName());
>
> - private NodeFactory nodeFactory;
> private RuntimeComponent component;
> private RuntimeComponentReference reference;
> private SCABinding binding;
> @@ -64,11 +62,9 @@
> private ReferenceBindingProvider distributedProvider = null;
>
> public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry
> extensionPoints,
> - NodeFactory nodeFactory,
> RuntimeComponent component,
> RuntimeComponentReference
> reference,
> SCABinding binding) {
> - this.nodeFactory = nodeFactory;
> this.component = component;
> this.reference = reference;
> this.binding = binding;
>
> 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> @@ -25,7 +25,6 @@
> import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
> import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> import org.apache.tuscany.sca.interfacedef.InterfaceContract;
> -import org.apache.tuscany.sca.node.spi.NodeFactory;
> import org.apache.tuscany.sca.provider.BindingProviderFactory;
> import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> @@ -42,18 +41,15 @@
> */
> public class RuntimeSCAServiceBindingProvider implements
> ServiceBindingProvider {
>
> - private NodeFactory nodeFactory;
> private RuntimeComponentService service;
> private BindingProviderFactory<DistributedSCABinding>
> distributedProviderFactory;
> private ServiceBindingProvider distributedProvider;
> private DistributedSCABinding distributedBinding;
>
> public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry
> extensionPoints,
> - NodeFactory nodeFactory,
> RuntimeComponent component,
> RuntimeComponentService
> service,
> SCABinding binding) {
> - this.nodeFactory = nodeFactory;
> this.service = service;
> // if there is potentially a wire to this service that crosses the
> node boundary
> if (service.getInterfaceContract().getInterface().isRemotable()) {
>
> Modified: incubator/tuscany/java/sca/modules/host-embedded/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/modules/host-embedded/pom.xml (original)
> +++ incubator/tuscany/java/sca/modules/host-embedded/pom.xml Fri Jun 13
> 13:25:54 2008
> @@ -85,12 +85,6 @@
>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-api</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> <artifactId>tuscany-core-databinding</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> </dependency>
>
> Modified: incubator/tuscany/java/sca/modules/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/modules/pom.xml (original)
> +++ incubator/tuscany/java/sca/modules/pom.xml Fri Jun 13 13:25:54 2008
> @@ -55,7 +55,6 @@
> <module>binding-atom-abdera</module>
> <module>binding-rss</module>
> <module>binding-rss-rome</module>
> - <!-- -->
> <module>binding-http</module>
> <module>binding-http-runtime</module>
> <module>binding-jms</module>
> @@ -65,9 +64,6 @@
> <module>binding-rmi</module>
> <module>binding-sca</module>
> <module>binding-sca-axis2</module>
> - <!--
> - <module>binding-sca-jms</module>
> - -->
> <module>binding-sca-xml</module>
> <module>binding-ws</module>
> <module>binding-ws-axis2</module>
> @@ -99,9 +95,6 @@
> <module>data-engine-helper</module>
> <module>definitions</module>
> <module>definitions-xml</module>
> - <module>domain</module>
> - <module>domain-api</module>
> - <module>domain-impl</module>
> <module>domain-manager</module>
> <module>endpoint</module>
> <module>extensibility</module>
> @@ -143,10 +136,7 @@
> <module>implementation-xquery</module>
> <module>monitor</module>
> <module>monitor-logging</module>
> - <module>node</module>
> - <module>node-api</module>
> <module>node2-api</module>
> - <module>node-impl</module>
> <module>node2-impl</module>
> <module>node2-launcher</module>
> <module>node2-launcher-webapp</module>
> @@ -159,9 +149,9 @@
> <module>policy-security-jsr250</module>
> <module>policy-security-ws</module>
> <module>policy-transaction</module>
> - <module>runtime</module>
> + <!--module>runtime</module-->
> <module>runtime-tomcat</module>
> - <module>runtime-war</module>
> + <!--module>runtime-war</module-->
> <module>sca-api</module>
> <module>workspace</module>
> <module>workspace-impl</module>
>
> Modified: incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml (original)
> +++ incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml Fri Jun 13
> 13:25:54 2008
> @@ -57,7 +57,7 @@
> <scope>provided</scope>
> </dependency>
>
> - <dependency>
> + <!-- dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> <artifactId>tuscany-runtime</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> @@ -67,7 +67,7 @@
> <artifactId>tuscany-endpoint</artifactId>
> </exclusion>
> </exclusions>
> - </dependency>
> + </dependency-->
>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
>
> Modified:
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> (original)
> +++
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> Fri Jun 13 13:25:54 2008
> @@ -26,7 +26,7 @@
> import org.apache.catalina.LifecycleEvent;
> import org.apache.catalina.LifecycleListener;
> import org.apache.catalina.core.StandardContext;
> -import org.apache.tuscany.sca.runtime.Launcher;
> +//import org.apache.tuscany.sca.runtime.Launcher;
>
> /**
> *
> @@ -34,11 +34,11 @@
> */
> public class TuscanyContextListener implements LifecycleListener {
>
> - private Launcher launcher;
> +// private Launcher launcher;
>
> - public TuscanyContextListener(Launcher launcher) {
> - this.launcher = launcher;
> - }
> +// public TuscanyContextListener(Launcher launcher) {
> +// this.launcher = launcher;
> +// }
>
> public void lifecycleEvent(LifecycleEvent event) {
> String type = event.getType();
> @@ -56,7 +56,7 @@
> File f = new File(path + "WEB-INF/classes");
> if (f.exists()) {
> System.out.println("adding contribution: "+ path);
> - launcher.addContribution(f.toURL());
> +// launcher.addContribution(f.toURL());
> }
> } catch (Exception e) {
> e.printStackTrace();
>
> Modified: incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml Fri Jun
> 13 13:25:54 2008
> @@ -38,7 +38,7 @@
> <dependencies>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-api</artifactId>
> + <artifactId>tuscany-node2-impl</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> </dependency>
>
> @@ -61,14 +61,7 @@
> <artifactId>tuscany-host-tomcat</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> <scope>runtime</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - <scope>runtime</scope>
> - </dependency>
> + </dependency>
>
> <dependency>
> <groupId>junit</groupId>
>
> Modified:
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
> (original)
> +++
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
> Fri Jun 13 13:25:54 2008
> @@ -20,8 +20,12 @@
>
> import myserver.MyService;
> import myserver.MyServiceCallback;
> -import org.apache.tuscany.sca.node.SCANode;
> -import org.apache.tuscany.sca.node.SCANodeFactory;
> +
> +import org.apache.tuscany.sca.host.embedded.SCADomain;
> +import org.apache.tuscany.sca.node.SCAClient;
> +import org.apache.tuscany.sca.node.SCANode2;
> +import org.apache.tuscany.sca.node.SCANode2Factory;
> +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
> import org.osoa.sca.annotations.Reference;
> import org.osoa.sca.annotations.Scope;
> import org.osoa.sca.annotations.Service;
> @@ -47,11 +51,12 @@
> }
>
> public static void main(String[] args) throws Exception {
> - SCANode node =
> SCANodeFactory.createNodeWithComposite("myapp.composite");
> - MyClient myClient = node.getDomain().getService(MyClient.class,
> "MyClientComponent");
> + SCANode2 node =
> SCANode2Factory.newInstance().createSCANode("target/classes/myapp.composite",
> new SCAContribution("test", "target/classes"));
> + node.start();
> + MyClient myClient = ((SCAClient)node).getService(MyClient.class,
> "MyClientComponent");
> myClient.aClientMethod();
> Thread.sleep(5000); // don't exit before callback arrives
> System.out.println("Closing the domain");
> - node.destroy();
> + node.stop();
> }
> }
>
> Modified:
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> (original)
> +++
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> Fri Jun 13 13:25:54 2008
> @@ -18,8 +18,9 @@
> */
> package myapp;
>
> -import org.apache.tuscany.sca.node.SCANode;
> -import org.apache.tuscany.sca.node.SCANodeFactory;
> +import org.apache.tuscany.sca.node.SCANode2;
> +import org.apache.tuscany.sca.node.SCANode2Factory;
> +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
> import org.junit.After;
> import org.junit.Before;
> import org.junit.Test;
> @@ -29,11 +30,16 @@
> */
> public class CallbackClientTestCase {
>
> - private SCANode node;
> + private SCANode2 node;
>
> @Before
> public void startServer() throws Exception {
> - node =
> SCANodeFactory.createNodeWithComposite("callbackws.composite");
> + try {
> + node =
> SCANode2Factory.newInstance().createSCANode("jar:file:../callback-ws-service/target/sample-callback-ws-service.jar!/callbackws.composite",
> new SCAContribution("server",
> "../callback-ws-service/target/sample-callback-ws-service.jar"));
> + node.start();
> + } catch (Exception ex) {
> + System.out.println(ex.toString());
> + }
> }
>
> @Test
> @@ -43,6 +49,6 @@
>
> @After
> public void stopServer() throws Exception {
> - node.destroy();
> + node.stop();
> }
> }
>
> Modified: incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml Fri Jun
> 13 13:25:54 2008
> @@ -38,7 +38,7 @@
> <dependencies>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-api</artifactId>
> + <artifactId>tuscany-node2-impl</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> </dependency>
>
> @@ -61,14 +61,7 @@
> <artifactId>tuscany-host-tomcat</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> <scope>runtime</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-node-impl</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> - <scope>runtime</scope>
> - </dependency>
> + </dependency>
>
> <dependency>
> <groupId>junit</groupId>
>
> Modified:
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
> (original)
> +++
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
> Fri Jun 13 13:25:54 2008
> @@ -20,8 +20,9 @@
>
> import java.io.IOException;
>
> -import org.apache.tuscany.sca.node.SCANode;
> -import org.apache.tuscany.sca.node.SCANodeFactory;
> +import org.apache.tuscany.sca.node.SCANode2;
> +import org.apache.tuscany.sca.node.SCANode2Factory;
> +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
>
> /**
> * This server program shows how to create and start an SCA runtime that
> @@ -30,8 +31,9 @@
> public class CallbackServer {
>
> public static void main(String[] args) throws Exception {
> -
> - SCANode node =
> SCANodeFactory.createNodeWithComposite("callbackws.composite");
> +
> + SCANode2 node =
> SCANode2Factory.newInstance().createSCANode("target/classes/callbackws.composite",
> new SCAContribution("test", "target/classes"));
> + node.start();
>
> try {
> System.out.println("Callback server started (press enter to
> shutdown)");
> @@ -40,7 +42,7 @@
> e.printStackTrace();
> }
>
> - node.destroy();
> + node.stop();
> System.out.println("Callback server stopped");
> }
>
>
> Modified:
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> (original)
> +++
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> Fri Jun 13 13:25:54 2008
> @@ -21,8 +21,9 @@
> import java.io.IOException;
> import java.net.Socket;
>
> -import org.apache.tuscany.sca.node.SCANode;
> -import org.apache.tuscany.sca.node.SCANodeFactory;
> +import org.apache.tuscany.sca.node.SCANode2;
> +import org.apache.tuscany.sca.node.SCANode2Factory;
> +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
> import org.junit.After;
> import org.junit.Before;
> import org.junit.Test;
> @@ -32,11 +33,12 @@
> */
> public class CallbackServerTestCase {
>
> - private SCANode node;
> + private SCANode2 node;
>
> @Before
> public void startServer() throws Exception {
> - node =
> SCANodeFactory.createNodeWithComposite("callbackws.composite");
> + node =
> SCANode2Factory.newInstance().createSCANode("target/classes/callbackws.composite",
> new SCAContribution("test", "target/classes"));
> + node.start();
> }
>
> @Test
> @@ -46,6 +48,6 @@
>
> @After
> public void stopServer() throws Exception {
> - node.destroy();
> + node.stop();
> }
> }
>
> Modified: incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml Fri
> Jun 13 13:25:54 2008
> @@ -39,9 +39,9 @@
> <dependencies>
>
> <dependency>
> - <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-runtime-war</artifactId>
> - <version>2.0-incubating-SNAPSHOT</version>
> + <groupId>${pom.groupId}</groupId>
> + <artifactId>tuscany-host-webapp</artifactId>
> + <version>${pom.version}</version>
> </dependency>
>
> <!-- exclude stax 1.0.1 as we're also pulling in
> javax\xml\stream\stax-api\1.0-2 -->
>
> Modified:
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml Fri
> Jun 13 13:25:54 2008
> @@ -58,7 +58,7 @@
>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>sample-helloworld-ws-service-jms</artifactId>
> + <artifactId>sample-helloworld-service-jms</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> <scope>test</scope>
> </dependency>
>
> Modified:
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> (original)
> +++
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> Fri Jun 13 13:25:54 2008
> @@ -19,8 +19,6 @@
> package helloworld;
>
> import org.apache.tuscany.sca.host.embedded.SCADomain;
> -import org.apache.tuscany.sca.node.SCANode;
> -import org.apache.tuscany.sca.node.SCANodeFactory;
>
> /**
> * This client program shows how to create an SCA runtime, start it,
> @@ -29,15 +27,15 @@
> public class HelloWorldJmsClient {
>
> public final static void main(String[] args) throws Exception {
> - SCANode node =
> SCANodeFactory.createNodeWithComposite("helloworldjmsreference.composite");
> - HelloWorldService helloWorldService =
> node.getDomain().getService(HelloWorldService.class,
> "HelloWorldServiceComponent");
> + //SCANode node =
> SCANodeFactory.createNodeWithComposite("helloworldjmsreference.composite");
> + //HelloWorldService helloWorldService =
> node.getDomain().getService(HelloWorldService.class,
> "HelloWorldServiceComponent");
>
> - //SCADomain scaDomain =
> SCADomain.newInstance("helloworldjmsreference.composite");
> - //HelloWorldService helloWorldService =
> scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
> + SCADomain scaDomain =
> SCADomain.newInstance("helloworldjmsreference.composite");
> + HelloWorldService helloWorldService =
> scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
>
> String value = helloWorldService.getGreetings("World");
> System.out.println(value);
>
> - node.destroy();
> + scaDomain.close();
> }
> }
>
> Modified: incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
>
> ==============================================================================
> --- incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml Fri
> Jun 13 13:25:54 2008
> @@ -59,7 +59,7 @@
>
> <dependency>
> <groupId>org.apache.tuscany.sca</groupId>
> - <artifactId>tuscany-binding-ws-axis2</artifactId>
> + <artifactId>tuscany-binding-jms</artifactId>
> <version>2.0-incubating-SNAPSHOT</version>
> <scope>runtime</scope>
> </dependency>
> @@ -70,6 +70,19 @@
> <version>4.2</version>
> <scope>test</scope>
> </dependency>
> +
> + <dependency>
> + <groupId>org.apache.activemq</groupId>
> + <artifactId>apache-activemq</artifactId>
> + <version>4.1.1</version>
> + <scope>test</scope>
> + <exclusions>
> + <exclusion>
> + <groupId>org.apache.activemq</groupId>
> + <artifactId>activemq-web-demo</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
>
> </dependencies>
>
>
>
>
Re: svn commit: r667639 - in /incubator/tuscany/java/sca: distribution/ distribution/bundle/ distribution/manifest/ itest/osgi-tuscany/tuscany-3rdparty/ itest/osgi-tuscany/tuscany-osgi-installer/ itest/osgi-tuscany/tuscany-runtime/ itest/serializatio
Posted by Simon Laws <si...@googlemail.com>.
Yes, It was intentional. But I knew I was breaking it. Sorry about that. I
pointed this out in my post on the subject. I'll help you to fix it up in
the branch and trunk now that we have the modules unhooked.
Simon
On Sat, Jun 14, 2008 at 10:54 AM, ant elder <an...@gmail.com> wrote:
> Was it intentional that runtime-tomcat was changed to not use the runtime
> module in this change? Thats changed the tomcat deep integration so it no
> longer includes all the tuscany extensions.
>
> ...ant
>
> On Fri, Jun 13, 2008 at 9:25 PM, <sl...@apache.org> wrote:
>
> > Author: slaws
> > Date: Fri Jun 13 13:25:54 2008
> > New Revision: 667639
> >
> > URL: http://svn.apache.org/viewvc?rev=667639&view=rev
> > Log:
> > Unhook the old domain modules from the rest of the runtime, tests and
> > samples. I've left the old modules in place for this commit. We can now
> > remove then at will.
> >
> > Modified:
> > incubator/tuscany/java/sca/distribution/bundle/pom.xml
> > incubator/tuscany/java/sca/distribution/manifest/pom.xml
> > incubator/tuscany/java/sca/distribution/pom.xml
> > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
> >
> >
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> > incubator/tuscany/java/sca/itest/serialization/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/TestNode.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/host-embedded/pom.xml
> > incubator/tuscany/java/sca/modules/pom.xml
> > incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml
> >
> >
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> > incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
> >
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
> >
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> > incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
> >
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
> >
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> > incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml
> > incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
> >
> >
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> > incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
> >
> > Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
> > +++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Fri Jun 13
> > 13:25:54 2008
> > @@ -235,21 +235,6 @@
> > </dependency>
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain-api</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain-impl</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > <artifactId>tuscany-host-embedded</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> > @@ -391,26 +376,11 @@
> > </dependency>
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node-api</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > <artifactId>tuscany-node2-api</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > <artifactId>tuscany-node2-impl</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> >
> > Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original)
> > +++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Fri Jun 13
> > 13:25:54 2008
> > @@ -312,21 +312,6 @@
> > </dependency>
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain-api</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain-impl</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > <artifactId>tuscany-host-embedded</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> > @@ -469,26 +454,11 @@
> > </dependency>
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node-api</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > <artifactId>tuscany-node2-api</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > <artifactId>tuscany-node2-impl</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> >
> > Modified: incubator/tuscany/java/sca/distribution/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/distribution/pom.xml (original)
> > +++ incubator/tuscany/java/sca/distribution/pom.xml Fri Jun 13 13:25:54
> > 2008
> > @@ -38,7 +38,7 @@
> > <modules>
> > <module>bundle</module>
> > <module>manifest</module>
> > - <module>webapp</module>
> > + <!--module>webapp</module-->
> > </modules>
> >
> > <dependencies>
> >
> > Modified:
> > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
> > (original)
> > +++
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
> > Fri Jun 13 13:25:54 2008
> > @@ -52,16 +52,6 @@
> > </dependency>
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-domain-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > <artifactId>tuscany-assembly-xml</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > </dependency>
> >
> > Modified:
> >
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
> > Fri Jun 13 13:25:54 2008
> > @@ -337,21 +337,6 @@
> > </dependency>
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain-api</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-domain-impl</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > <artifactId>tuscany-host-embedded</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> > @@ -495,21 +480,6 @@
> >
> <artifactId>tuscany-implementation-widget-runtime</artifactId>
> > <version>${pom.version}</version>
> > </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node-api</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>${pom.groupId}</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>${pom.version}</version>
> > - </dependency>
> > <!--
> > <dependency>
> > <groupId>${pom.groupId}</groupId>
> >
> > Modified:
> > incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> > (original)
> > +++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
> > Fri Jun 13 13:25:54 2008
> > @@ -77,36 +77,6 @@
> > </dependency>
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-domain-api</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-domain</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-domain-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-api</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > <artifactId>tuscany-assembly-xml</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > </dependency>
> >
> > Modified: incubator/tuscany/java/sca/itest/serialization/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/serialization/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/itest/serialization/pom.xml (original)
> > +++ incubator/tuscany/java/sca/itest/serialization/pom.xml Fri Jun 13
> > 13:25:54 2008
> > @@ -40,21 +40,7 @@
> > <artifactId>tuscany-implementation-java-runtime</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > <scope>runtime</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - <scope>test</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-domain-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - <scope>test</scope>
> > - </dependency>
> > + </dependency>
> >
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > @@ -62,8 +48,7 @@
> > <version>2.0-incubating-SNAPSHOT</version>
> > <scope>test</scope>
> > </dependency>
> > -
> > -
> > +
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > <artifactId>tuscany-binding-ws-axis2</artifactId>
> >
> > 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> > @@ -29,7 +29,6 @@
> > 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.spi.NodeFactory;
> > import
> org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader;
> > import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
> > import org.apache.tuscany.sca.provider.BindingProviderFactory;
> >
> > 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> > @@ -44,7 +44,6 @@
> > import
> org.apache.tuscany.sca.interfacedef.wsdl.java2wsdl.Java2WSDLHelper;
> > import org.apache.tuscany.sca.invocation.Invoker;
> > import org.apache.tuscany.sca.invocation.MessageFactory;
> > -import org.apache.tuscany.sca.node.spi.NodeFactory;
> > import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
> > import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> > import org.apache.tuscany.sca.runtime.EndpointReference;
> > @@ -63,7 +62,6 @@
> >
> > private static final Logger logger =
> > Logger.getLogger(Axis2SCAReferenceBindingProvider.class.getName());
> >
> > - private NodeFactory nodeFactory;
> > private RuntimeComponent component;
> > private RuntimeComponentReference reference;
> > private SCABinding binding;
> > @@ -84,7 +82,6 @@
> > WSDLFactory wsdlFactory =
> > modelFactories.getFactory(WSDLFactory.class);
> > XSDFactory xsdFactory =
> > modelFactories.getFactory(XSDFactory.class);
> >
> > - this.nodeFactory = modelFactories.getFactory(NodeFactory.class);
> > this.component = component;
> > this.reference = reference;
> > this.binding = binding.getSCABinding();
> >
> > 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> > @@ -39,7 +39,6 @@
> > import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
> > import
> org.apache.tuscany.sca.interfacedef.wsdl.java2wsdl.Java2WSDLHelper;
> > import org.apache.tuscany.sca.invocation.MessageFactory;
> > -import org.apache.tuscany.sca.node.spi.NodeFactory;
> > import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
> > import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> > import org.apache.tuscany.sca.runtime.RuntimeComponent;
> > @@ -56,7 +55,6 @@
> >
> > private static final Logger logger =
> > Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName());
> >
> > - private NodeFactory nodeFactory;
> > private SCABinding binding;
> > private Axis2ServiceProvider axisProvider;
> > private WebServiceBinding wsBinding;
> > @@ -76,7 +74,6 @@
> > WSDLFactory wsdlFactory =
> > modelFactories.getFactory(WSDLFactory.class);
> > XSDFactory xsdFactory =
> > modelFactories.getFactory(XSDFactory.class);
> >
> > - this.nodeFactory = modelFactories.getFactory(NodeFactory.class);
> > this.binding = binding.getSCABinding();
> > wsBinding =
> >
> modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding();
> >
> > @@ -104,113 +101,7 @@
> > messageFactory,
> >
> > policyHandlerClassnames);
> >
> > - this.binding.setURI(wsBinding.getURI());
> > -
> > -/*
> > - if ((nodeFactory != null) && (nodeFactory.getNode() != null)){
> > -
> > - SCADomainEventService domainProxy =
> > (SCADomainEventService)nodeFactory.getNode().getDomain();
> > -
> > - if (domainProxy != 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());
> > - componentServiceName = servicePath.getPath();
> > -
> > - // strip any leading slash
> > - 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 controls the port
> > - // 2. correct the host name in the case that it's
> > localhost
> > - String componentServiceUrlString = wsBinding.getURI();
> > - URI componentServiceUrl =
> > URI.create(componentServiceUrlString);
> > -
> > - String newHost = componentServiceUrl.getHost();
> > - int newPort = componentServiceUrl.getPort();
> > -
> > - // 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;
> > - try {
> > - URI tmpURI = new
> > URI(nodeFactory.getNode().getURI());
> > - nodeUrl = tmpURI.toURL();
> > - } catch (Exception ex) {
> > - throw new IllegalStateException("Node running
> > inside a webapp and node was not created with a valid node url");
> > - }
> > -
> > - 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 == null || 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");
> > - }
> > - }
> > - if (newPort == -1) {
> > - newPort = 8080;
> > - }
> > -
> > - // replace the old with the new
> > - try {
> > - componentServiceUrl = new
> > URI(componentServiceUrl.getScheme() == null? "http" :
> > componentServiceUrl.getScheme(),
> > -
> > componentServiceUrl.getUserInfo(),
> > -
> > newHost, newPort,
> > -
> > componentServiceUrl.getPath(),
> > -
> > componentServiceUrl.getQuery(),
> > -
> > componentServiceUrl.getFragment());
> > - componentServiceUrlString =
> > componentServiceUrl.toString();
> > - } catch (URISyntaxException e) {
> > - throw new IllegalStateException(e);
> > - }
> > -
> > - try {
> > -
> >
> domainProxy.registerServiceEndpoint(nodeFactory.getNode().getDomain().getURI(),
> > -
> > nodeFactory.getNode().getURI(),
> > -
> > componentServiceName,
> > -
> > SCABinding.class.getName(),
> > -
> > componentServiceUrlString);
> > - } catch(Exception ex) {
> > - logger.log(Level.WARNING,
> > - "Unable to register service: " +
> > -
> nodeFactory.getNode().getDomain().getURI()
> > + " " +
> > - nodeFactory.getNode().getURI() + " " +
> > - componentServiceName + " " +
> > - SCABinding.class.getName() + " " +
> > - componentServiceUrlString);
> > - }
> > - }
> > - } else {
> > - throw new IllegalStateException("No domain available for
> > component: "+
> > - component.getName() +
> > - " and service: " +
> > - service.getName());
> > - }
> > -*/
> > + this.binding.setURI(wsBinding.getURI());
> >
> > }
> >
> >
> > Modified:
> >
> incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.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/TestNode.java?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
> > Fri Jun 13 13:25:54 2008
> > @@ -39,7 +39,6 @@
> > 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.NodeException;
> > import org.apache.tuscany.sca.runtime.RuntimeComponent;
> > import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
> > import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
> > @@ -107,8 +106,7 @@
> > }
> > }
> >
> > - public void start()
> > - throws NodeException {
> > + public void start() {
> >
> > try {
> > nodeRuntime.getCompositeActivator().start(appComposite);
> > @@ -119,13 +117,14 @@
> >
> > }
> >
> > - public void stop() throws NodeException {
> > + public void stop() {
> > try {
> > nodeRuntime.stop();
> > - } catch(Exception ex) {
> > - throw new NodeException(ex);
> > + } catch (Exception ex) {
> > + System.err.println("Exception when creating domain " +
> > ex.getMessage());
> > + ex.printStackTrace(System.err);
> > }
> > - }
> > + }
> >
> > public <B> B getService(Class<B> businessInterface, String
> serviceName)
> > {
> > ServiceReference<B> serviceReference =
> > getServiceReference(businessInterface, serviceName);
> >
> > 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=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/modules/binding-sca/pom.xml (original)
> > +++ incubator/tuscany/java/sca/modules/binding-sca/pom.xml Fri Jun 13
> > 13:25:54 2008
> > @@ -63,18 +63,6 @@
> > </dependency>
> >
> > <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-domain</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > -
> > - <dependency>
> > <groupId>org.easymock</groupId>
> > <artifactId>easymock</artifactId>
> > <version>2.2</version>
> >
> > 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> > @@ -22,7 +22,6 @@
> > import org.apache.tuscany.sca.assembly.SCABinding;
> > import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
> > import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> > -import org.apache.tuscany.sca.node.spi.NodeFactory;
> > import org.apache.tuscany.sca.provider.BindingProviderFactory;
> > import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> > import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> > @@ -38,25 +37,23 @@
> > public class RuntimeSCABindingProviderFactory implements
> > BindingProviderFactory<SCABinding> {
> >
> > private ExtensionPointRegistry extensionPoints;
> > - private NodeFactory nodeFactory;
> >
> > public RuntimeSCABindingProviderFactory(ExtensionPointRegistry
> > extensionPoints) {
> > this.extensionPoints = extensionPoints;
> > - ModelFactoryExtensionPoint factories =
> > extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
> > - nodeFactory = factories.getFactory(NodeFactory.class);
> > +
> > }
> >
> > public ReferenceBindingProvider
> > createReferenceBindingProvider(RuntimeComponent component,
> >
> > RuntimeComponentReference reference,
> >
> > SCABinding binding) {
> >
> > - return new RuntimeSCAReferenceBindingProvider(extensionPoints,
> > nodeFactory, component, reference, binding);
> > + return new RuntimeSCAReferenceBindingProvider(extensionPoints,
> > component, reference, binding);
> > }
> >
> > public ServiceBindingProvider
> > createServiceBindingProvider(RuntimeComponent component,
> >
> > RuntimeComponentService service,
> > SCABinding
> > binding) {
> > - return new RuntimeSCAServiceBindingProvider(extensionPoints,
> > nodeFactory, component, service, binding);
> > + return new RuntimeSCAServiceBindingProvider(extensionPoints,
> > 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> > @@ -30,7 +30,6 @@
> > import org.apache.tuscany.sca.interfacedef.Operation;
> > import org.apache.tuscany.sca.invocation.InvocationChain;
> > import org.apache.tuscany.sca.invocation.Invoker;
> > -import org.apache.tuscany.sca.node.spi.NodeFactory;
> > import org.apache.tuscany.sca.provider.BindingProviderFactory;
> > import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
> > import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> > @@ -54,7 +53,6 @@
> >
> > private static final Logger logger =
> > Logger.getLogger(RuntimeSCAReferenceBindingProvider.class.getName());
> >
> > - private NodeFactory nodeFactory;
> > private RuntimeComponent component;
> > private RuntimeComponentReference reference;
> > private SCABinding binding;
> > @@ -64,11 +62,9 @@
> > private ReferenceBindingProvider distributedProvider = null;
> >
> > public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry
> > extensionPoints,
> > - NodeFactory nodeFactory,
> > RuntimeComponent component,
> > RuntimeComponentReference
> > reference,
> > SCABinding binding) {
> > - this.nodeFactory = nodeFactory;
> > this.component = component;
> > this.reference = reference;
> > this.binding = binding;
> >
> > 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=667639&r1=667638&r2=667639&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 Jun 13 13:25:54 2008
> > @@ -25,7 +25,6 @@
> > import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
> > import org.apache.tuscany.sca.core.ExtensionPointRegistry;
> > import org.apache.tuscany.sca.interfacedef.InterfaceContract;
> > -import org.apache.tuscany.sca.node.spi.NodeFactory;
> > import org.apache.tuscany.sca.provider.BindingProviderFactory;
> > import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
> > import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> > @@ -42,18 +41,15 @@
> > */
> > public class RuntimeSCAServiceBindingProvider implements
> > ServiceBindingProvider {
> >
> > - private NodeFactory nodeFactory;
> > private RuntimeComponentService service;
> > private BindingProviderFactory<DistributedSCABinding>
> > distributedProviderFactory;
> > private ServiceBindingProvider distributedProvider;
> > private DistributedSCABinding distributedBinding;
> >
> > public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry
> > extensionPoints,
> > - NodeFactory nodeFactory,
> > RuntimeComponent component,
> > RuntimeComponentService
> > service,
> > SCABinding binding) {
> > - this.nodeFactory = nodeFactory;
> > this.service = service;
> > // if there is potentially a wire to this service that crosses
> the
> > node boundary
> > if (service.getInterfaceContract().getInterface().isRemotable())
> {
> >
> > Modified: incubator/tuscany/java/sca/modules/host-embedded/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-embedded/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/modules/host-embedded/pom.xml (original)
> > +++ incubator/tuscany/java/sca/modules/host-embedded/pom.xml Fri Jun 13
> > 13:25:54 2008
> > @@ -85,12 +85,6 @@
> >
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-api</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > <artifactId>tuscany-core-databinding</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > </dependency>
> >
> > Modified: incubator/tuscany/java/sca/modules/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/modules/pom.xml (original)
> > +++ incubator/tuscany/java/sca/modules/pom.xml Fri Jun 13 13:25:54 2008
> > @@ -55,7 +55,6 @@
> > <module>binding-atom-abdera</module>
> > <module>binding-rss</module>
> > <module>binding-rss-rome</module>
> > - <!-- -->
> > <module>binding-http</module>
> > <module>binding-http-runtime</module>
> > <module>binding-jms</module>
> > @@ -65,9 +64,6 @@
> > <module>binding-rmi</module>
> > <module>binding-sca</module>
> > <module>binding-sca-axis2</module>
> > - <!--
> > - <module>binding-sca-jms</module>
> > - -->
> > <module>binding-sca-xml</module>
> > <module>binding-ws</module>
> > <module>binding-ws-axis2</module>
> > @@ -99,9 +95,6 @@
> > <module>data-engine-helper</module>
> > <module>definitions</module>
> > <module>definitions-xml</module>
> > - <module>domain</module>
> > - <module>domain-api</module>
> > - <module>domain-impl</module>
> > <module>domain-manager</module>
> > <module>endpoint</module>
> > <module>extensibility</module>
> > @@ -143,10 +136,7 @@
> > <module>implementation-xquery</module>
> > <module>monitor</module>
> > <module>monitor-logging</module>
> > - <module>node</module>
> > - <module>node-api</module>
> > <module>node2-api</module>
> > - <module>node-impl</module>
> > <module>node2-impl</module>
> > <module>node2-launcher</module>
> > <module>node2-launcher-webapp</module>
> > @@ -159,9 +149,9 @@
> > <module>policy-security-jsr250</module>
> > <module>policy-security-ws</module>
> > <module>policy-transaction</module>
> > - <module>runtime</module>
> > + <!--module>runtime</module-->
> > <module>runtime-tomcat</module>
> > - <module>runtime-war</module>
> > + <!--module>runtime-war</module-->
> > <module>sca-api</module>
> > <module>workspace</module>
> > <module>workspace-impl</module>
> >
> > Modified: incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml (original)
> > +++ incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml Fri Jun 13
> > 13:25:54 2008
> > @@ -57,7 +57,7 @@
> > <scope>provided</scope>
> > </dependency>
> >
> > - <dependency>
> > + <!-- dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > <artifactId>tuscany-runtime</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > @@ -67,7 +67,7 @@
> > <artifactId>tuscany-endpoint</artifactId>
> > </exclusion>
> > </exclusions>
> > - </dependency>
> > + </dependency-->
> >
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> >
> > Modified:
> >
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
> > Fri Jun 13 13:25:54 2008
> > @@ -26,7 +26,7 @@
> > import org.apache.catalina.LifecycleEvent;
> > import org.apache.catalina.LifecycleListener;
> > import org.apache.catalina.core.StandardContext;
> > -import org.apache.tuscany.sca.runtime.Launcher;
> > +//import org.apache.tuscany.sca.runtime.Launcher;
> >
> > /**
> > *
> > @@ -34,11 +34,11 @@
> > */
> > public class TuscanyContextListener implements LifecycleListener {
> >
> > - private Launcher launcher;
> > +// private Launcher launcher;
> >
> > - public TuscanyContextListener(Launcher launcher) {
> > - this.launcher = launcher;
> > - }
> > +// public TuscanyContextListener(Launcher launcher) {
> > +// this.launcher = launcher;
> > +// }
> >
> > public void lifecycleEvent(LifecycleEvent event) {
> > String type = event.getType();
> > @@ -56,7 +56,7 @@
> > File f = new File(path + "WEB-INF/classes");
> > if (f.exists()) {
> > System.out.println("adding contribution: "+ path);
> > - launcher.addContribution(f.toURL());
> > +// launcher.addContribution(f.toURL());
> > }
> > } catch (Exception e) {
> > e.printStackTrace();
> >
> > Modified: incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
> > (original)
> > +++ incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml Fri Jun
> > 13 13:25:54 2008
> > @@ -38,7 +38,7 @@
> > <dependencies>
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-api</artifactId>
> > + <artifactId>tuscany-node2-impl</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > </dependency>
> >
> > @@ -61,14 +61,7 @@
> > <artifactId>tuscany-host-tomcat</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > <scope>runtime</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - <scope>runtime</scope>
> > - </dependency>
> > + </dependency>
> >
> > <dependency>
> > <groupId>junit</groupId>
> >
> > Modified:
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
> > Fri Jun 13 13:25:54 2008
> > @@ -20,8 +20,12 @@
> >
> > import myserver.MyService;
> > import myserver.MyServiceCallback;
> > -import org.apache.tuscany.sca.node.SCANode;
> > -import org.apache.tuscany.sca.node.SCANodeFactory;
> > +
> > +import org.apache.tuscany.sca.host.embedded.SCADomain;
> > +import org.apache.tuscany.sca.node.SCAClient;
> > +import org.apache.tuscany.sca.node.SCANode2;
> > +import org.apache.tuscany.sca.node.SCANode2Factory;
> > +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
> > import org.osoa.sca.annotations.Reference;
> > import org.osoa.sca.annotations.Scope;
> > import org.osoa.sca.annotations.Service;
> > @@ -47,11 +51,12 @@
> > }
> >
> > public static void main(String[] args) throws Exception {
> > - SCANode node =
> > SCANodeFactory.createNodeWithComposite("myapp.composite");
> > - MyClient myClient = node.getDomain().getService(MyClient.class,
> > "MyClientComponent");
> > + SCANode2 node =
> >
> SCANode2Factory.newInstance().createSCANode("target/classes/myapp.composite",
> > new SCAContribution("test", "target/classes"));
> > + node.start();
> > + MyClient myClient = ((SCAClient)node).getService(MyClient.class,
> > "MyClientComponent");
> > myClient.aClientMethod();
> > Thread.sleep(5000); // don't exit before callback arrives
> > System.out.println("Closing the domain");
> > - node.destroy();
> > + node.stop();
> > }
> > }
> >
> > Modified:
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
> > Fri Jun 13 13:25:54 2008
> > @@ -18,8 +18,9 @@
> > */
> > package myapp;
> >
> > -import org.apache.tuscany.sca.node.SCANode;
> > -import org.apache.tuscany.sca.node.SCANodeFactory;
> > +import org.apache.tuscany.sca.node.SCANode2;
> > +import org.apache.tuscany.sca.node.SCANode2Factory;
> > +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
> > import org.junit.After;
> > import org.junit.Before;
> > import org.junit.Test;
> > @@ -29,11 +30,16 @@
> > */
> > public class CallbackClientTestCase {
> >
> > - private SCANode node;
> > + private SCANode2 node;
> >
> > @Before
> > public void startServer() throws Exception {
> > - node =
> > SCANodeFactory.createNodeWithComposite("callbackws.composite");
> > + try {
> > + node =
> >
> SCANode2Factory.newInstance().createSCANode("jar:file:../callback-ws-service/target/sample-callback-ws-service.jar!/callbackws.composite",
> > new SCAContribution("server",
> > "../callback-ws-service/target/sample-callback-ws-service.jar"));
> > + node.start();
> > + } catch (Exception ex) {
> > + System.out.println(ex.toString());
> > + }
> > }
> >
> > @Test
> > @@ -43,6 +49,6 @@
> >
> > @After
> > public void stopServer() throws Exception {
> > - node.destroy();
> > + node.stop();
> > }
> > }
> >
> > Modified: incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml
> > (original)
> > +++ incubator/tuscany/java/sca/samples/callback-ws-service/pom.xml Fri
> Jun
> > 13 13:25:54 2008
> > @@ -38,7 +38,7 @@
> > <dependencies>
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-api</artifactId>
> > + <artifactId>tuscany-node2-impl</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > </dependency>
> >
> > @@ -61,14 +61,7 @@
> > <artifactId>tuscany-host-tomcat</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > <scope>runtime</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-node-impl</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > - <scope>runtime</scope>
> > - </dependency>
> > + </dependency>
> >
> > <dependency>
> > <groupId>junit</groupId>
> >
> > Modified:
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
> > Fri Jun 13 13:25:54 2008
> > @@ -20,8 +20,9 @@
> >
> > import java.io.IOException;
> >
> > -import org.apache.tuscany.sca.node.SCANode;
> > -import org.apache.tuscany.sca.node.SCANodeFactory;
> > +import org.apache.tuscany.sca.node.SCANode2;
> > +import org.apache.tuscany.sca.node.SCANode2Factory;
> > +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
> >
> > /**
> > * This server program shows how to create and start an SCA runtime that
> > @@ -30,8 +31,9 @@
> > public class CallbackServer {
> >
> > public static void main(String[] args) throws Exception {
> > -
> > - SCANode node =
> > SCANodeFactory.createNodeWithComposite("callbackws.composite");
> > +
> > + SCANode2 node =
> >
> SCANode2Factory.newInstance().createSCANode("target/classes/callbackws.composite",
> > new SCAContribution("test", "target/classes"));
> > + node.start();
> >
> > try {
> > System.out.println("Callback server started (press enter to
> > shutdown)");
> > @@ -40,7 +42,7 @@
> > e.printStackTrace();
> > }
> >
> > - node.destroy();
> > + node.stop();
> > System.out.println("Callback server stopped");
> > }
> >
> >
> > Modified:
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
> > Fri Jun 13 13:25:54 2008
> > @@ -21,8 +21,9 @@
> > import java.io.IOException;
> > import java.net.Socket;
> >
> > -import org.apache.tuscany.sca.node.SCANode;
> > -import org.apache.tuscany.sca.node.SCANodeFactory;
> > +import org.apache.tuscany.sca.node.SCANode2;
> > +import org.apache.tuscany.sca.node.SCANode2Factory;
> > +import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
> > import org.junit.After;
> > import org.junit.Before;
> > import org.junit.Test;
> > @@ -32,11 +33,12 @@
> > */
> > public class CallbackServerTestCase {
> >
> > - private SCANode node;
> > + private SCANode2 node;
> >
> > @Before
> > public void startServer() throws Exception {
> > - node =
> > SCANodeFactory.createNodeWithComposite("callbackws.composite");
> > + node =
> >
> SCANode2Factory.newInstance().createSCANode("target/classes/callbackws.composite",
> > new SCAContribution("test", "target/classes"));
> > + node.start();
> > }
> >
> > @Test
> > @@ -46,6 +48,6 @@
> >
> > @After
> > public void stopServer() throws Exception {
> > - node.destroy();
> > + node.stop();
> > }
> > }
> >
> > Modified:
> incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml
> > (original)
> > +++ incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml Fri
> > Jun 13 13:25:54 2008
> > @@ -39,9 +39,9 @@
> > <dependencies>
> >
> > <dependency>
> > - <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-runtime-war</artifactId>
> > - <version>2.0-incubating-SNAPSHOT</version>
> > + <groupId>${pom.groupId}</groupId>
> > + <artifactId>tuscany-host-webapp</artifactId>
> > + <version>${pom.version}</version>
> > </dependency>
> >
> > <!-- exclude stax 1.0.1 as we're also pulling in
> > javax\xml\stream\stax-api\1.0-2 -->
> >
> > Modified:
> > incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
> > (original)
> > +++ incubator/tuscany/java/sca/samples/helloworld-reference-jms/pom.xml
> Fri
> > Jun 13 13:25:54 2008
> > @@ -58,7 +58,7 @@
> >
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>sample-helloworld-ws-service-jms</artifactId>
> > + <artifactId>sample-helloworld-service-jms</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > <scope>test</scope>
> > </dependency>
> >
> > Modified:
> >
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> > (original)
> > +++
> >
> incubator/tuscany/java/sca/samples/helloworld-reference-jms/src/main/java/helloworld/HelloWorldJmsClient.java
> > Fri Jun 13 13:25:54 2008
> > @@ -19,8 +19,6 @@
> > package helloworld;
> >
> > import org.apache.tuscany.sca.host.embedded.SCADomain;
> > -import org.apache.tuscany.sca.node.SCANode;
> > -import org.apache.tuscany.sca.node.SCANodeFactory;
> >
> > /**
> > * This client program shows how to create an SCA runtime, start it,
> > @@ -29,15 +27,15 @@
> > public class HelloWorldJmsClient {
> >
> > public final static void main(String[] args) throws Exception {
> > - SCANode node =
> >
> SCANodeFactory.createNodeWithComposite("helloworldjmsreference.composite");
> > - HelloWorldService helloWorldService =
> > node.getDomain().getService(HelloWorldService.class,
> > "HelloWorldServiceComponent");
> > + //SCANode node =
> >
> SCANodeFactory.createNodeWithComposite("helloworldjmsreference.composite");
> > + //HelloWorldService helloWorldService =
> > node.getDomain().getService(HelloWorldService.class,
> > "HelloWorldServiceComponent");
> >
> > - //SCADomain scaDomain =
> > SCADomain.newInstance("helloworldjmsreference.composite");
> > - //HelloWorldService helloWorldService =
> > scaDomain.getService(HelloWorldService.class,
> "HelloWorldServiceComponent");
> > + SCADomain scaDomain =
> > SCADomain.newInstance("helloworldjmsreference.composite");
> > + HelloWorldService helloWorldService =
> > scaDomain.getService(HelloWorldService.class,
> "HelloWorldServiceComponent");
> >
> > String value = helloWorldService.getGreetings("World");
> > System.out.println(value);
> >
> > - node.destroy();
> > + scaDomain.close();
> > }
> > }
> >
> > Modified:
> incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml?rev=667639&r1=667638&r2=667639&view=diff
> >
> >
> ==============================================================================
> > --- incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml
> > (original)
> > +++ incubator/tuscany/java/sca/samples/helloworld-service-jms/pom.xml Fri
> > Jun 13 13:25:54 2008
> > @@ -59,7 +59,7 @@
> >
> > <dependency>
> > <groupId>org.apache.tuscany.sca</groupId>
> > - <artifactId>tuscany-binding-ws-axis2</artifactId>
> > + <artifactId>tuscany-binding-jms</artifactId>
> > <version>2.0-incubating-SNAPSHOT</version>
> > <scope>runtime</scope>
> > </dependency>
> > @@ -70,6 +70,19 @@
> > <version>4.2</version>
> > <scope>test</scope>
> > </dependency>
> > +
> > + <dependency>
> > + <groupId>org.apache.activemq</groupId>
> > + <artifactId>apache-activemq</artifactId>
> > + <version>4.1.1</version>
> > + <scope>test</scope>
> > + <exclusions>
> > + <exclusion>
> > + <groupId>org.apache.activemq</groupId>
> > + <artifactId>activemq-web-demo</artifactId>
> > + </exclusion>
> > + </exclusions>
> > + </dependency>
> >
> > </dependencies>
> >
> >
> >
> >
>