You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/08/03 14:47:14 UTC
svn commit: r981849 - in /tuscany/sca-java-2.x/trunk/modules/domain-node/src:
main/java/org/apache/tuscany/sca/node2/NodeFactory.java
test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
Author: antelder
Date: Tue Aug 3 12:47:14 2010
New Revision: 981849
URL: http://svn.apache.org/viewvc?rev=981849&view=rev
Log:
Change createStandaloneNode to be named newStandaloneNode
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java?rev=981849&r1=981848&r2=981849&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/NodeFactory.java Tue Aug 3 12:47:14 2010
@@ -60,7 +60,7 @@ public class NodeFactory {
* @param dependentContributionURLs optional URLs of dependent contributions
* @return a Node with installed contributions
*/
- public static Node createStandaloneNode(String compositeURI, String contributionURL, String... dependentContributionURLs) {
+ public static Node newStandaloneNode(String compositeURI, String contributionURL, String... dependentContributionURLs) {
try {
NodeFactory nodeFactory = newInstance();
EndpointRegistry endpointRegistry = new EndpointRegistryImpl(nodeFactory.extensionPointRegistry, null, null);
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java?rev=981849&r1=981848&r2=981849&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java Tue Aug 3 12:47:14 2010
@@ -47,8 +47,8 @@ public class NodeTestCase {
@Ignore("Depdends on itest/T3558 which isn't in the build?")
public void testInstallWithDependent() throws NoSuchServiceException, ContributionReadException, ActivationException, ValidationException {
Node node = NodeFactory.newInstance().createNode("default");
- node.installContribution("store", "/Tuscany/svn/2.x-trunk/itest/T3558/src/test/resources/sample-store.jar", null, null, true);
- node.installContribution("store-client", "/Tuscany/svn/2.x-trunk/itest/T3558/src/test/resources/sample-store-client.jar", null, null, true);
+ node.installContribution("store", "../../itest/T3558/src/test/resources/sample-store.jar", null, null, true);
+ node.installContribution("store-client", "../../itest/T3558/src/test/resources/sample-store-client.jar", null, null, true);
// Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent");
// Assert.assertEquals("Hello petra", helloworldService.sayHello("petra"));
@@ -121,7 +121,7 @@ public class NodeTestCase {
@Test
public void testStaticCreate() {
- Node node = NodeFactory.createStandaloneNode("helloworld.composite", "src/test/resources/sample-helloworld.jar");
+ Node node = NodeFactory.newStandaloneNode("helloworld.composite", "src/test/resources/sample-helloworld.jar");
List<String> cs = node.getInstalledContributions();
Assert.assertEquals(1, cs.size());
List<String> dcs = node.getDeployedCompostes(cs.get(0));
@@ -131,7 +131,7 @@ public class NodeTestCase {
@Test
public void testStaticCreateWithNullComposite() {
- Node node = NodeFactory.createStandaloneNode(null, "src/test/resources/sample-helloworld.jar");
+ Node node = NodeFactory.newStandaloneNode(null, "src/test/resources/sample-helloworld.jar");
List<String> cs = node.getInstalledContributions();
Assert.assertEquals(1, cs.size());
List<String> dcs = node.getDeployedCompostes(cs.get(0));