summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/testing/itest/scdl
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-11-15 10:21:30 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-11-15 10:21:30 +0000
commit53845bb2aadc15c37e51ad91ed5c1962218d0d4b (patch)
tree86745853ff5107f389138a2a0257955f14343f41 /sca-java-2.x/trunk/testing/itest/scdl
parent5db2a92b891add878e2bcc862b528a4c1e7536d2 (diff)
Update some itests for base + extensions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035209 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/testing/itest/scdl')
-rw-r--r--sca-java-2.x/trunk/testing/itest/scdl/pom.xml24
-rw-r--r--sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java37
-rw-r--r--sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite3
3 files changed, 6 insertions, 58 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/pom.xml b/sca-java-2.x/trunk/testing/itest/scdl/pom.xml
index 54e1c132ec..a1f86c8171 100644
--- a/sca-java-2.x/trunk/testing/itest/scdl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/scdl/pom.xml
@@ -30,31 +30,11 @@
<name>Apache Tuscany SCA iTest SCDL</name>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonp</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
index 7923492776..82b3706bc5 100644
--- a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
@@ -32,44 +32,13 @@ import org.junit.Test;
*
* Current required jars are:
*
- * activation-1.1.jar
* asm-3.1.jar
- * geronimo-stax-api_1.0_spec-1.0.1.jar
- * jaxb-api-2.1.jar
- * jaxb-impl-2.1.12.jar
- * jaxws-api-2.1.jar
- * jsr181-api-1.0-MR1.jar
- * jsr250-api-1.0.jar
+ * cglib-2.2.jar
* junit-4.8.1.jar
- * tuscany-assembly-2.0-SNAPSHOT.jar
- * tuscany-assembly-xml-2.0-SNAPSHOT.jar
- * tuscany-assembly-xsd-2.0-SNAPSHOT.jar
- * tuscany-binding-http-2.0-SNAPSHOT.jar
- * tuscany-binding-jms-2.0-SNAPSHOT.jar
- * tuscany-binding-jsonp-2.0-SNAPSHOT.jar
- * tuscany-binding-rmi-2.0-SNAPSHOT.jar
- * tuscany-binding-ws-2.0-SNAPSHOT.jar
- * tuscany-builder-2.0-SNAPSHOT.jar
- * tuscany-common-java-2.0-SNAPSHOT.jar
- * tuscany-common-xml-2.0-SNAPSHOT.jar
- * tuscany-contribution-2.0-SNAPSHOT.jar
- * tuscany-core-spi-2.0-SNAPSHOT.jar
- * tuscany-databinding-2.0-SNAPSHOT.jar
- * tuscany-databinding-jaxb-2.0-SNAPSHOT.jar
- * tuscany-deployment-2.0-SNAPSHOT.jar
- * tuscany-extensibility-2.0-SNAPSHOT.jar
- * tuscany-implementation-java-2.0-SNAPSHOT.jar
- * tuscany-interface-java-2.0-SNAPSHOT.jar
- * tuscany-interface-java-jaxws-2.0-SNAPSHOT.jar
- * tuscany-interface-wsdl-2.0-SNAPSHOT.jar
- * tuscany-monitor-2.0-SNAPSHOT.jar
- * tuscany-sca-api-2.0-SNAPSHOT.jar
- * tuscany-xsd-2.0-SNAPSHOT.jar
+ * tuscany-base-runtime-2.0-SNAPSHOT.jar
* wsdl4j-1.6.2.jar
- * wstx-asl-3.2.4.jar
* XmlSchema-1.4.3.jar
*
- * TODO: WS binding drags in all runtime
*/
public class ValidateDependenciesTestCase {
@@ -80,6 +49,6 @@ public class ValidateDependenciesTestCase {
Assert.assertTrue(dependenciesDir.exists());
File[] dependencyFiles = dependenciesDir.listFiles();
- Assert.assertEquals(36, dependencyFiles.length);
+ Assert.assertEquals(6, dependencyFiles.length);
}
}
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite
index c0bb2bbc40..6fa81b6e47 100644
--- a/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite
+++ b/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite
@@ -43,9 +43,8 @@
<tuscany:binding.rmi/>
</service>
-<!-- TODO: leave out WS binding for now as it drags in entire runtime
<service name="WSService" promote="JavaComponent">
<binding.ws/>
</service>
--->
+
</composite>