You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2007/02/10 00:10:21 UTC
svn commit: r505545 - in /incubator/tuscany/branches/sca-java-integration:
./ sca/test/ testing/sca/ testing/sca/itest/
testing/sca/itest/bindingsTest/bindingsclient/
testing/sca/itest/bindingsTest/bindingscomposite/
testing/sca/itest/bindingsTest/bind...
Author: rineholt
Date: Fri Feb 9 15:10:19 2007
New Revision: 505545
URL: http://svn.apache.org/viewvc?view=rev&rev=505545
Log:
make tests use 1.0 variable for spec
Modified:
incubator/tuscany/branches/sca-java-integration/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/test/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml
Modified: incubator/tuscany/branches/sca-java-integration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/pom.xml Fri Feb 9 15:10:19 2007
@@ -48,21 +48,12 @@
<module>buildtools</module>
<module>spec</module>
<module>sca</module>
+ <module>testing/sca</module>
<module>samples</module>
<module>sampleapps</module>
<module>testing/sca</module>
</modules>
</profile>
- <!-- profile to build sca -->
- <profile>
- <id>sca</id>
- <modules>
- <module>pom/parent</module>
- <module>buildtools</module>
- <module>spec</module>
- <module>sca</module>
- </modules>
- </profile>
</profiles>
</project>
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/pom.xml Fri Feb 9 15:10:19 2007
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>core</artifactId>
- <version>0.1-pre-spec-SNAPSHOT</version>
+ <version>1.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsclient/pom.xml Fri Feb 9 15:10:19 2007
@@ -40,8 +40,7 @@
</dependency>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingscomposite/pom.xml Fri Feb 9 15:10:19 2007
@@ -19,6 +19,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.tuscany.testing</groupId>
+ <artifactId>sca-itest</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.testing.bindingstest</groupId>
<artifactId>iTest-Bindings-bindingscomposite</artifactId>
@@ -35,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindingsTest/bindingsutility/pom.xml Fri Feb 9 15:10:19 2007
@@ -19,6 +19,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.tuscany.testing</groupId>
+ <artifactId>sca-itest</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.testing.bindingstest</groupId>
<artifactId>iTest-Bindings-bindingsutility</artifactId>
@@ -36,8 +42,7 @@
</dependency>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
- <version>1.0-incubator-SNAPSHOT</version>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -59,4 +59,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/pom.xml Fri Feb 9 15:10:19 2007
@@ -28,12 +28,12 @@
<artifactId>exceptionTests</artifactId>
<version>SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Test Suite for SCA Spec APIs</name>
+ <name>Test Suite Exception Handling</name>
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java Fri Feb 9 15:10:19 2007
@@ -30,13 +30,13 @@
public class ExceptionHandlerImpl implements ExceptionHandler {
static final String INIT = "INIT";
- public ExceptionThrower exceptionThrower;
+ private ExceptionThrower exceptionThrower;
- private String theGood = null;
+ private String theGood;
- private Checked theBad = null;
+ private Checked theBad;
- private UnChecked theUgly = null;
+ private UnChecked theUgly;
/*
* (non-Javadoc)
@@ -84,7 +84,7 @@
assert false : "Got wrong exception '" + e.getClass().getName();
assert result == INIT;
} catch (UnChecked e) {
- theUgly = e;
+ theUgly = e;
} catch (Throwable t) {
// This is not good.
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/pom.xml Fri Feb 9 15:10:19 2007
@@ -48,7 +48,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/pom.xml Fri Feb 9 15:10:19 2007
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
+ <artifactId>sca-api-r${scaSpecVersion}</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -89,4 +89,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml?view=diff&rev=505545&r1=505544&r2=505545
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml Fri Feb 9 15:10:19 2007
@@ -30,6 +30,7 @@
<packaging>pom</packaging>
<name>Tuscany SCA tests</name>
<properties>
+ <scaKernelVersion>0.1-pre-spec-SNAPSHOT</scaKernelVersion>
<sca.version>1.0-incubator-SNAPSHOT</sca.version>
<sdo.version>1.0-incubator-SNAPSHOT</sdo.version>
<testing.version>1.0-incubator-SNAPSHOT</testing.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org