You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 14:47:01 UTC
svn commit: r1027519 - in /tuscany/sca-java-1.x/trunk/itest/databindings:
jaxb-bottom-up/ jaxb-bottom-up/src/main/resources/
jaxb-bottom-up/src/main/resources/myContent/
jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/
jaxb-...
Author: nash
Date: Tue Oct 26 12:47:01 2010
New Revision: 1027519
URL: http://svn.apache.org/viewvc?rev=1027519&view=rev
Log:
Merge r1006259 TUSCANY-3707: Use a local copy of the Tuscany home page so tests work without an internet connection
Added:
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/myContent/
- copied from r1006259, tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-bottom-up/src/main/resources/myContent/
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/myContent/home.html
- copied unchanged from r1006259, tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-bottom-up/src/main/resources/myContent/home.html
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/myContent/
- copied from r1006259, tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-top-down/src/main/resources/myContent/
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/myContent/home.html
- copied unchanged from r1006259, tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/databindings/jaxb-top-down/src/main/resources/myContent/home.html
Modified:
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
Modified: tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml?rev=1027519&r1=1027518&r2=1027519&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml Tue Oct 26 12:47:01 2010
@@ -136,6 +136,21 @@
<scope>provided</scope>
</dependency>
<!-- End of addition -->
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-resource-runtime</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http-runtime</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite?rev=1027519&r1=1027518&r2=1027519&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite (original)
+++ tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite Tue Oct 26 12:47:01 2010
@@ -19,6 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
name="StandardTypesService">
<!-- Clients to test the service -->
@@ -63,4 +64,12 @@
<binding.sca/>
</service>
</component>
+
+ <!-- Local cache of Tuscany home page -->
+ <component name="myWeb">
+ <tuscany:implementation.resource location="myContent"/>
+ <service name="Resource">
+ <tuscany:binding.http/>
+ </service>
+ </component>
</composite>
Modified: tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java?rev=1027519&r1=1027518&r2=1027519&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java (original)
+++ tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java Tue Oct 26 12:47:01 2010
@@ -1280,7 +1280,7 @@ public class StandardTypesDatabindingTes
private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException {
DataHandler[] dha = new DataHandler[3];
dha[0] = new DataHandler("Some data", "text/plain");
- dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html"));
+ dha[1] = new DataHandler(new URL("http://localhost:8080/myWeb/home.html"));
dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
for (int i = 0; i < dha.length; ++i) {
@@ -1294,7 +1294,7 @@ public class StandardTypesDatabindingTes
private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException {
DataHandler[] dha = new DataHandler[3];
dha[0] = new DataHandler("Some data", "text/plain");
- dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html"));
+ dha[1] = new DataHandler(new URL("http://localhost:8080/myWeb/home.html"));
dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha);
Modified: tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml?rev=1027519&r1=1027518&r2=1027519&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml Tue Oct 26 12:47:01 2010
@@ -145,7 +145,20 @@
</dependency>
<!-- End of addition -->
-
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-resource-runtime</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-http-runtime</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite?rev=1027519&r1=1027518&r2=1027519&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite (original)
+++ tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite Tue Oct 26 12:47:01 2010
@@ -23,6 +23,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
name="StandardTypesService">
<!-- Clients to test the service -->
@@ -77,4 +78,12 @@
<binding.ws uri="http://localhost:8085/sts-ep-w" requires="MTOM"/>
</service>
</component>
+
+ <!-- Local cache of Tuscany home page -->
+ <component name="myWeb">
+ <tuscany:implementation.resource location="myContent"/>
+ <service name="Resource">
+ <tuscany:binding.http/>
+ </service>
+ </component>
</composite>
Modified: tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java?rev=1027519&r1=1027518&r2=1027519&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java (original)
+++ tuscany/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java Tue Oct 26 12:47:01 2010
@@ -1287,7 +1287,7 @@ public class StandardTypesDatabindingTes
private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException {
DataHandler[] dha = new DataHandler[3];
dha[0] = new DataHandler("Some data", "text/plain");
- dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html"));
+ dha[1] = new DataHandler(new URL("http://localhost:8080/myWeb/home.html"));
dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
for (int i = 0; i < dha.length; ++i) {
@@ -1301,7 +1301,7 @@ public class StandardTypesDatabindingTes
private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException {
DataHandler[] dha = new DataHandler[3];
dha[0] = new DataHandler("Some data", "text/plain");
- dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html"));
+ dha[1] = new DataHandler(new URL("http://localhost:8080/myWeb/home.html"));
dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes()));
DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha);