Return-Path: Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: (qmail 92479 invoked from network); 3 Aug 2010 12:48:37 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Aug 2010 12:48:37 -0000 Received: (qmail 26023 invoked by uid 500); 3 Aug 2010 12:48:37 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 25953 invoked by uid 500); 3 Aug 2010 12:48:35 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 25946 invoked by uid 99); 3 Aug 2010 12:48:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Aug 2010 12:48:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Aug 2010 12:48:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB77423888FE; Tue, 3 Aug 2010 12:47:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 03 Aug 2010 12:47:14 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100803124714.EB77423888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 cs = node.getInstalledContributions(); Assert.assertEquals(1, cs.size()); List 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 cs = node.getInstalledContributions(); Assert.assertEquals(1, cs.size()); List dcs = node.getDeployedCompostes(cs.get(0));