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 2009/04/02 12:08:43 UTC
svn commit: r761229 - in /tuscany/java/sca/itest: contribution-folder/
contribution-folder/src/ contribution-folder/src/test/java/
contribution-folder/src/test/resources/repository2/folderWithJars/
contribution-folder/src/test/resources/repository2/fol...
Author: antelder
Date: Thu Apr 2 10:08:42 2009
New Revision: 761229
URL: http://svn.apache.org/viewvc?rev=761229&view=rev
Log:
Copy itest for zip and folder contributions from 1.x to 2.x
Added:
tuscany/java/sca/itest/contribution-folder/
- copied from r761184, tuscany/branches/sca-java-1.x/itest/contribution-folder/
tuscany/java/sca/itest/contribution-folder/pom.xml
- copied, changed from r761214, tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml
tuscany/java/sca/itest/contribution-folder/src/
- copied from r761214, tuscany/branches/sca-java-1.x/itest/contribution-folder/src/
tuscany/java/sca/itest/contribution-zip/
- copied from r761184, tuscany/branches/sca-java-1.x/itest/contribution-folder/
tuscany/java/sca/itest/contribution-zip/pom.xml
- copied, changed from r761214, tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml
tuscany/java/sca/itest/contribution-zip/src/
- copied from r761214, tuscany/branches/sca-java-1.x/itest/contribution-folder/src/
Removed:
tuscany/java/sca/itest/contribution-folder/src/test/java/ContributionZIPTestCaseFIXME.java
tuscany/java/sca/itest/contribution-zip/src/test/java/ContributionFolderTestCaseFIXME.java
Modified:
tuscany/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
tuscany/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCaseFIXME.java
tuscany/java/sca/itest/contribution-zip/src/test/resources/repository3/contribution.zip
Copied: tuscany/java/sca/itest/contribution-folder/pom.xml (from r761214, tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-folder/pom.xml?p2=tuscany/java/sca/itest/contribution-folder/pom.xml&p1=tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml&r1=761214&r2=761229&rev=761229&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml (original)
+++ tuscany/java/sca/itest/contribution-folder/pom.xml Thu Apr 2 10:08:42 2009
@@ -22,30 +22,25 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-contribution-folder</artifactId>
- <name>Apache Tuscany SCA iTest Folder and ZIP Contribution</name>
+ <name>Apache Tuscany SCA iTest Contribution Folder</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution-impl</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java?rev=761229&r1=761214&r2=761229&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java (original)
+++ tuscany/java/sca/itest/contribution-folder/src/test/java/ContributionFolderTestCaseFIXME.java Thu Apr 2 10:08:42 2009
@@ -2,7 +2,9 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import calculator.CalculatorService;
@@ -15,21 +17,22 @@
*/
public class ContributionFolderTestCaseFIXME extends TestCase {
- private SCADomain domain;
+ private Node node;
@Override
protected void setUp() throws Exception {
- domain = SCADomain.newInstance("myDomain", "src/test/resources/repository2/folderWithJars", null );
+ node = NodeFactory.newInstance().createNode(null, new Contribution("foo", "src/test/resources/repository2"));
+ node.start();
}
public void testInvoke() throws Exception {
- CalculatorService service = domain.getService(CalculatorService.class, "CalculatorServiceComponent");
+ CalculatorService service = node.getService(CalculatorService.class, "CalculatorServiceComponent");
assertEquals(3.0, service.add(1, 2));
}
@Override
protected void tearDown() throws Exception {
- domain.close();
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite?rev=761229&r1=761214&r2=761229&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite (original)
+++ tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/Calculator.composite Thu Apr 2 10:08:42 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
targetNamespace="http://sample"
xmlns:sample="http://sample"
name="Calculator">
Modified: tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml?rev=761229&r1=761214&r2=761229&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml (original)
+++ tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/META-INF/sca-contribution.xml Thu Apr 2 10:08:42 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
xmlns:sample="http://sample">
<deployable composite="sample:Calculator"/>
</contribution>
\ No newline at end of file
Modified: tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/service.jar?rev=761229&r1=761214&r2=761229&view=diff
==============================================================================
Binary files - no diff available.
Modified: tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-folder/src/test/resources/repository2/folderWithJars/serviceImpl.jar?rev=761229&r1=761214&r2=761229&view=diff
==============================================================================
Binary files - no diff available.
Copied: tuscany/java/sca/itest/contribution-zip/pom.xml (from r761214, tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-zip/pom.xml?p2=tuscany/java/sca/itest/contribution-zip/pom.xml&p1=tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml&r1=761214&r2=761229&rev=761229&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-folder/pom.xml (original)
+++ tuscany/java/sca/itest/contribution-zip/pom.xml Thu Apr 2 10:08:42 2009
@@ -22,30 +22,24 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>itest-contribution-folder</artifactId>
- <name>Apache Tuscany SCA iTest Folder and ZIP Contribution</name>
+ <artifactId>itest-contribution-zip</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution ZIP</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution-impl</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: tuscany/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCaseFIXME.java?rev=761229&r1=761214&r2=761229&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCaseFIXME.java (original)
+++ tuscany/java/sca/itest/contribution-zip/src/test/java/ContributionZIPTestCaseFIXME.java Thu Apr 2 10:08:42 2009
@@ -2,7 +2,9 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import calculator.CalculatorService;
@@ -15,21 +17,22 @@
*/
public class ContributionZIPTestCaseFIXME extends TestCase {
- private SCADomain domain;
+ private Node node;
@Override
protected void setUp() throws Exception {
- domain = SCADomain.newInstance("myDomain", "src/test/resources/repository3/contribution.zip", null );
+ node = NodeFactory.newInstance().createNode(null, new Contribution("foo", "src/test/resources/repository3/contribution.zip"));
+ node.start();
}
public void testInvoke() throws Exception {
- CalculatorService service = domain.getService(CalculatorService.class, "CalculatorServiceComponent");
+ CalculatorService service = node.getService(CalculatorService.class, "CalculatorServiceComponent");
assertEquals(3.0, service.add(1, 2));
}
@Override
protected void tearDown() throws Exception {
- domain.close();
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/contribution-zip/src/test/resources/repository3/contribution.zip
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-zip/src/test/resources/repository3/contribution.zip?rev=761229&r1=761214&r2=761229&view=diff
==============================================================================
Binary files - no diff available.