You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/02/09 22:20:47 UTC
svn commit: r908233 - in /tuscany/sca-java-2.x/trunk:
itest/nodes/two-nodes-two-vms-test/ itest/scaclient-api/src/main/java/itest/
itest/scaclient-api/src/test/java/test/scaclient/
modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/bindi...
Author: rfeng
Date: Tue Feb 9 21:20:45 2010
New Revision: 908233
URL: http://svn.apache.org/viewvc?rev=908233&view=rev
Log:
Start to clean up the node-api (remove Node.destroy())
Added:
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java (with props)
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java
- copied, changed from r907733, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java
Removed:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java
Modified:
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java
tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
tuscany/sca-java-2.x/trunk/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
tuscany/sca-java-2.x/trunk/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
tuscany/sca-java-2.x/trunk/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
tuscany/sca-java-2.x/trunk/samples/store/src/main/java/launch/Launch.java
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml Tue Feb 9 21:20:45 2010
@@ -20,7 +20,7 @@
<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- uri="http://sample/nodes/TestNode1"
+ uri="http://sample/nodes/TestNode2"
domainRegistry = "tribes://228.0.0.100:50000"
domain="http://domain1">
Modified: tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java Tue Feb 9 21:20:45 2010
@@ -21,15 +21,21 @@
import org.oasisopen.sca.annotation.EagerInit;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
@EagerInit
@Scope("COMPOSITE")
-public class HelloworldServiceImpl implements HelloworldService {
+@Service({HelloworldService.class, RemoteHelloworldService.class})
+public class HelloworldServiceImpl implements HelloworldService, RemoteHelloworldService {
public String sayHello(String name) {
return "Hello " + name;
}
+ public String sayHelloRemote(String name) {
+ return "Hello " + name;
+ }
+
@Init
public void init() {
System.out.println(sayHello("world"));
Added: tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java?rev=908233&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java (added)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java Tue Feb 9 21:20:45 2010
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package itest;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface RemoteHelloworldService {
+
+ String sayHelloRemote(String name);
+
+}
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java Tue Feb 9 21:20:45 2010
@@ -20,6 +20,7 @@
package test.scaclient;
import itest.HelloworldService;
+import itest.RemoteHelloworldService;
import java.net.URI;
@@ -27,7 +28,6 @@
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.Ignore;
import org.junit.Test;
import org.oasisopen.sca.client.SCAClientFactory;
@@ -46,8 +46,13 @@
node = NodeFactory.getInstance().createNode((String)null, new String[] {"target/classes"});
node.start();
- HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");
+ SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("default"));
+ HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService");
assertEquals("Hello petra", service.sayHello("petra"));
+
+ RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService");
+ assertEquals("Hello petra", remoteService.sayHelloRemote("petra"));
+
}
@Test
@@ -55,7 +60,12 @@
node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
node.start();
- HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent");
+ SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain"));
+ HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService");
+ assertEquals("Hello petra", service.sayHello("petra"));
+
+ RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService");
+ assertEquals("Hello petra", remoteService.sayHelloRemote("petra"));
assertEquals("Hello petra", service.sayHello("petra"));
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java Tue Feb 9 21:20:45 2010
@@ -45,11 +45,9 @@
protected static void destroyTestEnvironment() throws Exception {
if (scaConsumerNode != null) {
scaConsumerNode.stop();
- scaConsumerNode.destroy();
}
if (scaProviderNode != null) {
scaProviderNode.stop();
- scaProviderNode.destroy();
}
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java Tue Feb 9 21:20:45 2010
@@ -99,11 +99,9 @@
public static void destroy() throws Exception {
if (scaConsumerNode != null) {
scaConsumerNode.stop();
- scaConsumerNode.destroy();
}
if (scaProviderNode != null) {
scaProviderNode.stop();
- scaProviderNode.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java Tue Feb 9 21:20:45 2010
@@ -39,6 +39,5 @@
testService.testCustomerCollection();
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java Tue Feb 9 21:20:45 2010
@@ -85,7 +85,6 @@
//System.out.println(">>>ContentNegotiationTest.destroy");
if (scaProviderNode != null) {
scaProviderNode.stop();
- scaProviderNode.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java Tue Feb 9 21:20:45 2010
@@ -90,7 +90,6 @@
System.out.println(">>>MediaCollectionTestCase.destroy");
if (scaProviderNode != null) {
scaProviderNode.stop();
- scaProviderNode.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java Tue Feb 9 21:20:45 2010
@@ -45,6 +45,5 @@
}
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java Tue Feb 9 21:20:45 2010
@@ -81,7 +81,6 @@
//System.out.println(">>>ProviderEntryEntityTagsTestCase.destroy");
if (scaProviderNode != null) {
scaProviderNode.stop();
- scaProviderNode.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java Tue Feb 9 21:20:45 2010
@@ -87,7 +87,6 @@
//System.out.println(">>>ProviderFeedEntityTagsTestCase.destroy");
if (scaProviderNode != null) {
scaProviderNode.stop();
- scaProviderNode.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java Tue Feb 9 21:20:45 2010
@@ -60,7 +60,6 @@
public static void destroy() throws Exception {
if(node != null) {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java Tue Feb 9 21:20:45 2010
@@ -54,7 +54,6 @@
public static void destroy() throws Exception {
if(node != null) {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java Tue Feb 9 21:20:45 2010
@@ -59,7 +59,6 @@
@Override
protected void tearDown() throws Exception {
node.stop();
- node.destroy();
}
public void testCalculator() throws Exception {
Modified: tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java Tue Feb 9 21:20:45 2010
@@ -75,7 +75,6 @@
@AfterClass
public static void tearDown() throws Exception {
node.stop();
- node.destroy();
}
/**
Modified: tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java Tue Feb 9 21:20:45 2010
@@ -88,7 +88,6 @@
@AfterClass
public static void tearDown() throws Exception {
node.stop();
- node.destroy();
}
/**
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java Tue Feb 9 21:20:45 2010
@@ -60,7 +60,6 @@
@AfterClass
public static void tearDown() throws Exception {
node.stop();
- node.destroy();
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java Tue Feb 9 21:20:45 2010
@@ -61,7 +61,6 @@
@AfterClass
public static void tearDown() throws Exception {
node.stop();
- node.destroy();
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java Tue Feb 9 21:20:45 2010
@@ -50,7 +50,6 @@
@AfterClass
public static void tearDown() throws Exception {
nodeServer.stop();
- nodeServer.destroy();
}
@Test
@@ -66,7 +65,6 @@
Assert.assertEquals("echo: ABC", result);
if (node != null) {
node.stop();
- node.destroy();
}
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java Tue Feb 9 21:20:45 2010
@@ -61,7 +61,6 @@
@AfterClass
public static void tearDown() throws Exception {
node.stop();
- node.destroy();
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java Tue Feb 9 21:20:45 2010
@@ -61,7 +61,6 @@
@AfterClass
public static void tearDown() throws Exception {
node.stop();
- node.destroy();
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java Tue Feb 9 21:20:45 2010
@@ -75,7 +75,6 @@
@AfterClass
public static void destroy() throws Exception {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java Tue Feb 9 21:20:45 2010
@@ -46,7 +46,6 @@
@Override
protected void tearDown() throws Exception {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java Tue Feb 9 21:20:45 2010
@@ -46,7 +46,6 @@
@Override
protected void tearDown() throws Exception {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java Tue Feb 9 21:20:45 2010
@@ -46,7 +46,6 @@
@Override
protected void tearDown() throws Exception {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java Tue Feb 9 21:20:45 2010
@@ -46,7 +46,6 @@
@Override
protected void tearDown() throws Exception {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/pom.xml Tue Feb 9 21:20:45 2010
@@ -85,7 +85,7 @@
<configuration>
<buildNumberPropertyName>sources.version</buildNumberPropertyName>
<timestampPropertyName>build.timestamp</timestampPropertyName>
- <doCheck>true</doCheck>
+ <doCheck>false</doCheck>
<doUpdate>true</doUpdate>
<revisionOnScmFailure>00000</revisionOnScmFailure>
</configuration>
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java Tue Feb 9 21:20:45 2010
@@ -199,7 +199,7 @@
listeners.remove(listener);
}
- public String getDomainName() {
+ public String getDomainURI() {
return domainURI;
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java Tue Feb 9 21:20:45 2010
@@ -42,14 +42,6 @@
* @param component
* @param ref
*/
- void start(CompositeContext compositeContext, RuntimeComponent component, RuntimeComponentReference ref);
-
- /**
- * Activate a component reference
- * @param compositeContext The context of the Node
- * @param component
- * @param ref
- */
void activate(CompositeContext compositeContext, RuntimeComponent component, RuntimeComponentReference ref);
/**
@@ -59,7 +51,7 @@
* @param ref
*/
void activate(CompositeContext compositeContext, RuntimeComponent component, RuntimeComponentService service);
-
+
/**
* De-activate a component reference
* @param component
@@ -81,6 +73,15 @@
void deactivate(Composite composite) throws ActivationException;
/**
+ * Start a component reference
+ * @param compositeContext The context of the Node
+ * @param component
+ * @param ref
+ */
+ void start(CompositeContext compositeContext, RuntimeComponent component, RuntimeComponentReference ref);
+
+
+ /**
* Start a component
* @param component
*/
@@ -104,4 +105,55 @@
*/
void stop(CompositeContext compositeContext, Composite composite) throws ActivationException;
+ /**
+ * Activate an endpoint
+ * @param compositeContext
+ * @param endpoint
+ */
+ void activate(CompositeContext compositeContext, RuntimeEndpoint endpoint);
+
+ /**
+ * Activate an endpoint reference
+ * @param compositeContext
+ * @param endpointReference
+ */
+ void activate(CompositeContext compositeContext, RuntimeEndpointReference endpointReference);
+
+ /**
+ * Deactivate an endpoint
+ * @param endpoint
+ */
+ void deactivate(RuntimeEndpoint endpoint);
+
+ /**
+ * Deactivate an endpoint reference
+ * @param endpointReference
+ */
+ void deactivate(RuntimeEndpointReference endpointReference);
+
+ /**
+ * Start an endpoint
+ * @param compositeContext
+ * @param endpoint
+ */
+ void start(CompositeContext compositeContext, RuntimeEndpoint endpoint);
+
+ /**
+ * Start an endpoint reference
+ * @param compositeContext
+ * @param endpointReference
+ */
+ void start(CompositeContext compositeContext, RuntimeEndpointReference endpointReference);
+
+ /**
+ * Stop an endpoint
+ * @param endpoint
+ */
+ void stop(RuntimeEndpoint endpoint);
+
+ /**
+ * Stop an endpoint reference
+ * @param endpointReference
+ */
+ void stop(RuntimeEndpointReference endpointReference);
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java Tue Feb 9 21:20:45 2010
@@ -22,7 +22,8 @@
import java.util.Collection;
/**
- *
+ * A DomainRegistryFactory is responsible for creating an instance of the DomainRegistry for a given
+ * registry URI and domain URI
*/
public interface DomainRegistryFactory {
/**
@@ -33,13 +34,28 @@
* @return
*/
EndpointRegistry getEndpointRegistry(String endpointRegistryURI, String domainURI);
-
+
/**
* Return all active endpoint registries
* @return
*/
Collection<EndpointRegistry> getEndpointRegistries();
+
+ /**
+ * Add an EndpointListener
+ * @param listener
+ */
void addListener(EndpointListener listener);
+
+ /**
+ * Remove an EndpointListener
+ * @param listener
+ */
void removeListener(EndpointListener listener);
+
+ /**
+ * Return an array of schemes that this factory supports
+ * @return
+ */
String[] getSupportedSchemes();
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java Tue Feb 9 21:20:45 2010
@@ -22,12 +22,23 @@
import java.util.List;
/**
- *
+ * Extension point for DomainRegistryFactory
*/
public interface DomainRegistryFactoryExtensionPoint {
+ /**
+ * Add a DomainRegistryFactory
+ * @param factory
+ */
void addDomainRegistryFactory(DomainRegistryFactory factory);
+ /**
+ * Remove a DomainRegistryFactory
+ * @param factory
+ */
void removeDomainRegistryFactory(DomainRegistryFactory factory);
+ /**
+ * @return A list of DomainRegistryFactory
+ */
List<DomainRegistryFactory> getDomainRegistryFactories();
}
Copied: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java (from r907733, tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java)
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java?p2=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java&p1=tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java&r1=907733&r2=908233&rev=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/TuscanyURI.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java Tue Feb 9 21:20:45 2010
@@ -39,7 +39,7 @@
* remotes - a list of ipAddress:port for remote nodes
*
*/
-public class TuscanyURI {
+public class DomainRegistryURI {
private String domainName = "default";
private String bindAddress = null; // null means all network adapters
@@ -51,7 +51,7 @@
private List<String> remotes = new ArrayList<String>();
private String uri;
- public TuscanyURI(String uri) {
+ public DomainRegistryURI(String uri) {
this.uri = uri;
parseURI(uri);
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java Tue Feb 9 21:20:45 2010
@@ -66,5 +66,5 @@
void addListener(EndpointListener listener);
void removeListener(EndpointListener listener);
- String getDomainName();
+ String getDomainURI();
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistry.java Tue Feb 9 21:20:45 2010
@@ -68,7 +68,7 @@
// See if there is a previously created registry for that domain
for (DomainRegistryFactory factory : factories.getDomainRegistryFactories()) {
for (EndpointRegistry endpointRegistry : factory.getEndpointRegistries()) {
- if (endpointRegistry.getDomainName().equals(domainURI)) {
+ if (endpointRegistry.getDomainURI().equals(domainURI)) {
return endpointRegistry;
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java Tue Feb 9 21:20:45 2010
@@ -23,7 +23,7 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.runtime.TuscanyURI;
+import org.apache.tuscany.sca.runtime.DomainRegistryURI;
import org.junit.Test;
public class ConfigURITestCase {
@@ -31,7 +31,7 @@
@Test
public void testInvalidPrefix() throws UnknownHostException {
try {
- new TuscanyURI("foo");
+ new DomainRegistryURI("foo");
Assert.fail();
} catch (IllegalArgumentException e) {
// expected
@@ -40,14 +40,14 @@
@Test
public void testDomainName() throws UnknownHostException {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
}
@Test
public void testListenAddr() throws UnknownHostException {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?listen=4321");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain?listen=4321");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals(4321, configURI.getListenPort());
@@ -55,7 +55,7 @@
}
@Test
public void testListenAddr2() throws UnknownHostException {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?listen=1.1.1.1:4321");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain?listen=1.1.1.1:4321");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals(4321, configURI.getListenPort());
@@ -64,14 +64,14 @@
@Test
public void testMulticase1() throws UnknownHostException {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?multicast=off");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain?multicast=off");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertTrue(configURI.isMulticastDisabled());
}
@Test
public void testMulticase2() throws UnknownHostException {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?multicast=1.2.3.4:67");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain?multicast=1.2.3.4:67");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals("1.2.3.4", configURI.getMulticastAddress());
@@ -80,7 +80,7 @@
@Test
public void testMulticase3() throws UnknownHostException {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?multicast=1.2.3.4");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain?multicast=1.2.3.4");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertFalse(configURI.isMulticastDisabled());
Assert.assertEquals("1.2.3.4", configURI.getMulticastAddress());
@@ -89,14 +89,14 @@
@Test
public void testPassword() {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?password=bla");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain?password=bla");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertEquals("bla", configURI.getPassword());
}
@Test
public void testRemotes() throws UnknownHostException {
- TuscanyURI configURI = new TuscanyURI("tuscany:myDomain?remotes=1.1.1.1:23,2.2.2.2");
+ DomainRegistryURI configURI = new DomainRegistryURI("tuscany:myDomain?remotes=1.1.1.1:23,2.2.2.2");
Assert.assertEquals("myDomain", configURI.getDomainName());
Assert.assertTrue(configURI.isMulticastDisabled());
Assert.assertEquals(2, configURI.getRemotes().size());
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java Tue Feb 9 21:20:45 2010
@@ -24,7 +24,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
@@ -35,7 +34,6 @@
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.context.CompositeContext;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.core.scope.ScopeContainer;
import org.apache.tuscany.sca.core.scope.ScopeRegistry;
@@ -50,7 +48,6 @@
import org.apache.tuscany.sca.provider.ServiceBindingProvider;
import org.apache.tuscany.sca.runtime.ActivationException;
import org.apache.tuscany.sca.runtime.CompositeActivator;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -63,14 +60,11 @@
public class CompositeActivatorImpl implements CompositeActivator {
final Logger logger = Logger.getLogger(CompositeActivatorImpl.class.getName());
- private final AssemblyFactory assemblyFactory;
private final ScopeRegistry scopeRegistry;
private final ProviderFactoryExtensionPoint providerFactories;
public CompositeActivatorImpl(ExtensionPointRegistry extensionPoints) {
UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
- FactoryExtensionPoint factories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
- this.assemblyFactory = factories.getFactory(AssemblyFactory.class);
this.scopeRegistry = utilities.getUtility(ScopeRegistry.class);
this.providerFactories = extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
}
@@ -235,7 +229,7 @@
// Add a wire for each service Endpoint
for ( Endpoint endpoint : service.getEndpoints()){
RuntimeEndpoint ep = (RuntimeEndpoint) endpoint;
- ep.bind(compositeContext);
+ activate(compositeContext, ep);
// create the interface contract for the binding and service ends of the wire
// that are created as forward only contracts
@@ -248,17 +242,25 @@
}
}
+ public void activate(CompositeContext compositeContext, RuntimeEndpoint ep) {
+ ep.bind(compositeContext);
+ }
+
public void deactivate(RuntimeComponent component, RuntimeComponentService service) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("Deactivating component service: " + component.getURI() + "#" + service.getName());
}
for(Endpoint ep: service.getEndpoints()) {
if(ep instanceof RuntimeEndpoint) {
- ((RuntimeEndpoint) ep).unbind();
+ deactivate((RuntimeEndpoint) ep);
}
}
}
+ public void deactivate(RuntimeEndpoint ep) {
+ ep.unbind();
+ }
+
// Reference activation/deactivation
public void activate(CompositeContext compositeContext, RuntimeComponent component, RuntimeComponentReference reference) {
@@ -271,7 +273,7 @@
// asks the component context to start the reference which creates the wires
reference.setComponent(component);
for(EndpointReference epr: reference.getEndpointReferences()) {
- addReferenceWire(compositeContext, epr);
+ activate(compositeContext, (RuntimeEndpointReference) epr);
}
// TODO reference wires are added at component start for some reason
@@ -282,10 +284,14 @@
logger.fine("Deactivating component reference: " + component.getURI() + "#" + reference.getName());
}
for(EndpointReference endpointReference: reference.getEndpointReferences()) {
- ((RuntimeEndpointReference) endpointReference).unbind();
+ deactivate((RuntimeEndpointReference)endpointReference);
}
}
+ public void deactivate(RuntimeEndpointReference endpointReference) {
+ endpointReference.unbind();
+ }
+
//=========================================================================
// Start
//=========================================================================
@@ -351,23 +357,7 @@
}
for (Endpoint endpoint : service.getEndpoints()) {
RuntimeEndpoint ep = (RuntimeEndpoint) endpoint;
- // FIXME: Should the policy providers be started before the endpoint is started?
- for (PolicyProvider policyProvider : ep.getPolicyProviders()) {
- policyProvider.start();
- }
-
- final ServiceBindingProvider bindingProvider = ep.getBindingProvider();
- if (bindingProvider != null) {
- // bindingProvider.start();
- // Allow bindings to add shutdown hooks. Requires RuntimePermission shutdownHooks in policy.
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run() {
- bindingProvider.start();
- return null;
- }
- });
- compositeContext.getEndpointRegistry().addEndpoint(endpoint);
- }
+ start(compositeContext, ep);
}
}
@@ -375,6 +365,26 @@
runtimeComponent.setStarted(true);
}
+ public void start(CompositeContext compositeContext, RuntimeEndpoint ep) {
+ // FIXME: Should the policy providers be started before the endpoint is started?
+ for (PolicyProvider policyProvider : ep.getPolicyProviders()) {
+ policyProvider.start();
+ }
+
+ final ServiceBindingProvider bindingProvider = ep.getBindingProvider();
+ if (bindingProvider != null) {
+ // bindingProvider.start();
+ // Allow bindings to add shutdown hooks. Requires RuntimePermission shutdownHooks in policy.
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ bindingProvider.start();
+ return null;
+ }
+ });
+ compositeContext.getEndpointRegistry().addEndpoint(ep);
+ }
+ }
+
public void stop(CompositeContext compositeContext, Component component) {
if (!((RuntimeComponent)component).isStarted()) {
return;
@@ -388,20 +398,7 @@
}
for (Endpoint endpoint : service.getEndpoints()) {
RuntimeEndpoint ep = (RuntimeEndpoint) endpoint;
- compositeContext.getEndpointRegistry().removeEndpoint(endpoint);
- final ServiceBindingProvider bindingProvider = ep.getBindingProvider();
- if (bindingProvider != null) {
- // Allow bindings to read properties. Requires PropertyPermission read in security policy.
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run() {
- bindingProvider.stop();
- return null;
- }
- });
- }
- for (PolicyProvider policyProvider : ep.getPolicyProviders()) {
- policyProvider.stop();
- }
+ stop(ep);
}
}
for (ComponentReference reference : component.getReferences()) {
@@ -411,21 +408,7 @@
for (EndpointReference endpointReference : reference.getEndpointReferences()) {
RuntimeEndpointReference epr = (RuntimeEndpointReference) endpointReference;
- compositeContext.getEndpointRegistry().removeEndpointReference(endpointReference);
- final ReferenceBindingProvider bindingProvider = epr.getBindingProvider();
- if (bindingProvider != null) {
- // Allow bindings to read properties. Requires PropertyPermission read in security policy.
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
- public Object run() {
- bindingProvider.stop();
- return null;
- }
- });
- }
- for (PolicyProvider policyProvider : epr.getPolicyProviders()) {
- policyProvider.stop();
- }
-
+ stop(epr);
}
}
Implementation implementation = component.getImplementation();
@@ -458,6 +441,23 @@
((RuntimeComponent)component).setStarted(false);
}
+ public void stop(RuntimeEndpoint ep) {
+ ep.getCompositeContext().getEndpointRegistry().removeEndpoint(ep);
+ final ServiceBindingProvider bindingProvider = ep.getBindingProvider();
+ if (bindingProvider != null) {
+ // Allow bindings to read properties. Requires PropertyPermission read in security policy.
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ bindingProvider.stop();
+ return null;
+ }
+ });
+ }
+ for (PolicyProvider policyProvider : ep.getPolicyProviders()) {
+ policyProvider.stop();
+ }
+ }
+
// Scope container start/stop
// separate off from component start that all endpoints are
// registered before any @EagerInit takes place
@@ -490,40 +490,49 @@
// is first used (when the chains are created)
for (EndpointReference endpointReference : componentReference.getEndpointReferences()){
// addReferenceWire(compositeContext, endpointReference);
- compositeContext.getEndpointRegistry().addEndpointReference(endpointReference);
+ start(compositeContext, (RuntimeEndpointReference) endpointReference);
}
}
}
+ public void start(CompositeContext compositeContext, RuntimeEndpointReference endpointReference) {
+ compositeContext.getEndpointRegistry().addEndpointReference(endpointReference);
+ }
+
public void stop(Component component, ComponentReference reference) {
if (logger.isLoggable(Level.FINE)) {
logger.fine("Stopping component reference: " + component.getURI() + "#" + reference.getName());
}
RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
- RuntimeComponent runtimeComponent = (RuntimeComponent) component;
- EndpointRegistry endpointRegistry = runtimeComponent.getComponentContext().getCompositeContext().getEndpointRegistry();
for ( EndpointReference endpointReference : runtimeRef.getEndpointReferences()){
RuntimeEndpointReference epr = (RuntimeEndpointReference) endpointReference;
- endpointRegistry.removeEndpointReference(endpointReference);
- ReferenceBindingProvider bindingProvider = epr.getBindingProvider();
- if (bindingProvider != null) {
- bindingProvider.stop();
- }
- for (PolicyProvider policyProvider : epr.getPolicyProviders()) {
- policyProvider.stop();
- }
+ stop(epr);
+ }
+ }
+
+ public void stop(RuntimeEndpointReference epr) {
+ CompositeContext compositeContext = epr.getCompositeContext();
+ if (compositeContext == null) {
+ throw new IllegalStateException("The endpoint reference is not bound");
+ }
+ compositeContext.getEndpointRegistry().removeEndpointReference(epr);
+ ReferenceBindingProvider bindingProvider = epr.getBindingProvider();
+ if (bindingProvider != null) {
+ bindingProvider.stop();
+ }
+ for (PolicyProvider policyProvider : epr.getPolicyProviders()) {
+ policyProvider.stop();
}
}
- private void addReferenceWire(CompositeContext compositeContext, EndpointReference endpointReference) {
- RuntimeEndpointReference epr = (RuntimeEndpointReference) endpointReference;
+ public void activate(CompositeContext compositeContext, RuntimeEndpointReference epr) {
// create the wire
// null endpoint passed in here as the endpoint reference may
// not be resolved yet
epr.bind(compositeContext);
- ComponentReference reference = endpointReference.getReference();
+ ComponentReference reference = epr.getReference();
InterfaceContract sourceContract = epr.getComponentTypeReferenceInterfaceContract();
// TODO - EPR - interface contract seems to be null in the implementation.web
@@ -531,7 +540,7 @@
if (sourceContract == null){
// TODO - Can't do this with move of matching to wire
// take the contract from the service to which the reference is connected
- sourceContract = ((RuntimeEndpoint) endpointReference.getTargetEndpoint()).getComponentTypeServiceInterfaceContract();
+ sourceContract = ((RuntimeEndpoint) epr.getTargetEndpoint()).getComponentTypeServiceInterfaceContract();
reference.setInterfaceContract(sourceContract);
}
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-dht/src/main/java/org/apache/tuscany/sca/endpoint/dht/OverlayEndpointRegistry.java Tue Feb 9 21:20:45 2010
@@ -336,7 +336,7 @@
// TODO Auto-generated method stub
return null;
}
- public String getDomainName() {
+ public String getDomainURI() {
return domainURI;
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java Tue Feb 9 21:20:45 2010
@@ -32,7 +32,7 @@
import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
import org.apache.tuscany.sca.runtime.EndpointRegistry;
import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.TuscanyURI;
+import org.apache.tuscany.sca.runtime.DomainRegistryURI;
import com.hazelcast.config.Config;
import com.hazelcast.config.MapConfig;
@@ -54,7 +54,7 @@
public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener, EntryListener<String, Endpoint>, MembershipListener {
private final static Logger logger = Logger.getLogger(HazelcastEndpointRegistry.class.getName());
- protected TuscanyURI configURI;
+ protected DomainRegistryURI configURI;
private HazelcastInstance hazelcastInstance;
protected Map<Object, Object> map;
@@ -65,7 +65,7 @@
String domainRegistryURI,
String domainURI) {
super(registry, attributes, domainRegistryURI, domainURI);
- this.configURI = new TuscanyURI(domainRegistryURI);
+ this.configURI = new DomainRegistryURI(domainRegistryURI);
}
public void start() {
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java Tue Feb 9 21:20:45 2010
@@ -51,7 +51,7 @@
import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
import org.apache.tuscany.sca.runtime.EndpointRegistry;
import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.TuscanyURI;
+import org.apache.tuscany.sca.runtime.DomainRegistryURI;
/**
* A replicated EndpointRegistry based on Apache Tomcat Tribes
@@ -148,7 +148,7 @@
}
private void setTuscanyConfig(Map<String, String> map, String domainRegistryURI) {
- TuscanyURI tuscanyURI = new TuscanyURI(domainRegistryURI);
+ DomainRegistryURI tuscanyURI = new DomainRegistryURI(domainRegistryURI);
map.put("address", tuscanyURI.getMulticastAddress());
map.put("port", Integer.toString(tuscanyURI.getMulticastPort()));
map.put("bind", tuscanyURI.getBindAddress());
Modified: tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/endpoint-zookeeper/src/main/java/org/apache/tuscany/sca/endpoint/zookeeper/DistributedRegistry.java Tue Feb 9 21:20:45 2010
@@ -305,7 +305,7 @@
return endpoints;
}
- public String getDomainName() {
+ public String getDomainURI() {
return domainURI;
}
Modified: tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java Tue Feb 9 21:20:45 2010
@@ -46,10 +46,5 @@
*/
void stop();
- /**
- * Destroy the node.
- */
- void destroy();
-
- public List<String> getServiceNames();
+ List<String> getServiceNames();
}
Modified: tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java Tue Feb 9 21:20:45 2010
@@ -51,6 +51,5 @@
}
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java Tue Feb 9 21:20:45 2010
@@ -163,7 +163,6 @@
if (inited) {
for (Node node : nodes.values()) {
node.stop();
- node.destroy();
}
nodes.clear();
deployer.stop();
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Tue Feb 9 21:20:45 2010
@@ -102,9 +102,6 @@
return getConfiguration().getURI();
}
- public void destroy() {
- }
-
public Node start() {
logger.log(Level.INFO, "Starting node: " + configuration.getURI() + " domain: " + configuration.getDomainName());
Modified: tuscany/sca-java-2.x/trunk/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-equinox/src/test/java/calculator/CalculatorTestCase.java Tue Feb 9 21:20:45 2010
@@ -52,7 +52,6 @@
public static void tearDownAfterClass() throws Exception {
if (node != null) {
node.stop();
- node.destroy();
}
if (launcher != null) {
launcher.destroy();
Modified: tuscany/sca-java-2.x/trunk/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java Tue Feb 9 21:20:45 2010
@@ -45,7 +45,6 @@
public static void tearDownAfterClass() throws Exception {
if (node != null) {
node.stop();
- node.destroy();
}
}
Modified: tuscany/sca-java-2.x/trunk/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java Tue Feb 9 21:20:45 2010
@@ -59,7 +59,6 @@
public static void tearDownAfterClass() throws Exception {
if (node != null) {
node.stop();
- node.destroy();
}
if (launcher != null) {
launcher.destroy();
Modified: tuscany/sca-java-2.x/trunk/samples/store/src/main/java/launch/Launch.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/store/src/main/java/launch/Launch.java?rev=908233&r1=908232&r2=908233&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/store/src/main/java/launch/Launch.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/store/src/main/java/launch/Launch.java Tue Feb 9 21:20:45 2010
@@ -34,7 +34,6 @@
System.in.read();
System.out.println("Stopping ...");
node.stop();
- node.destroy();
System.out.println();
}
}