You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by dk...@apache.org on 2006/05/12 19:57:44 UTC

svn commit: r405810 - in /incubator/tuscany/java/testing/interop/clients: ./ webserviceInteropDoc/ webserviceInteropDoc/src/main/resources/wsdl/ webserviceSOAPRound2/ webserviceSOAPRound2/src/main/resources/wsdl/ webserviceXSQ/

Author: dkulp
Date: Fri May 12 10:57:42 2006
New Revision: 405810

URL: http://svn.apache.org/viewcvs?rev=405810&view=rev
Log:
Update interop tests to allow testing with celtix ws binding.
Add celtix custom wsdl extensor to turn off chunking since it doesn't work hitting those servers.  Can be removed once TUSCANY-355 is fixed


Modified:
    incubator/tuscany/java/testing/interop/clients/pom.xml
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/pom.xml
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/wsdl/interopdoc.wsdl
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/pom.xml
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/wsdl/interoptestdoclit.wsdl
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/pom.xml

Modified: incubator/tuscany/java/testing/interop/clients/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/interop/clients/pom.xml?rev=405810&r1=405809&r2=405810&view=diff
==============================================================================
--- incubator/tuscany/java/testing/interop/clients/pom.xml (original)
+++ incubator/tuscany/java/testing/interop/clients/pom.xml Fri May 12 10:57:42 2006
@@ -33,4 +33,20 @@
         <module>webserviceXSQ</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*TestCase.java</include>
+                    </includes>
+                    <reportFormat>brief</reportFormat>
+                    <useFile>false</useFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/pom.xml?rev=405810&r1=405809&r2=405810&view=diff
==============================================================================
--- incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/pom.xml (original)
+++ incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/pom.xml Fri May 12 10:57:42 2006
@@ -27,8 +27,18 @@
     <name>Tuscany Interop Testing - Clients - InteropDoc</name>
     <version>SNAPSHOT</version>
 
+    <properties>
+        <ws.type>axis2</ws.type>
+    </properties>
+
     <dependencies>
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>${pom.version}</version>
@@ -42,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.bindings</groupId>
-            <artifactId>tuscany-binding-axis2</artifactId>
+            <artifactId>tuscany-binding-${ws.type}</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -84,34 +94,6 @@
                 </executions>
             </plugin>
             
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <executions>
-                    <execution>
-		                <configuration>
-		                	<!-- This does not work, the test cases do not see the property -->
-		                	<!--
-		                    <systemProperties>
-		                    		<interopServiceName>RemoteInteropDocService</interopServiceName>
-		                    </systemProperties>
-		                    -->
-		                	<!-- This does not work either -->
-		                	<!--
-		                    <systemProperties>
-		                    		<property>
-		                    			<name>interopServiceName</name>
-		                    			<value>RemoteInteropDocService</value>
-		                    		</property>
-		                    </systemProperties>
-		                    -->
-		                </configuration>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>    
 </project>

Modified: incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/wsdl/interopdoc.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/wsdl/interopdoc.wsdl?rev=405810&r1=405809&r2=405810&view=diff
==============================================================================
--- incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/wsdl/interopdoc.wsdl (original)
+++ incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/wsdl/interopdoc.wsdl Fri May 12 10:57:42 2006
@@ -155,6 +155,8 @@
 
   		<port name="interopDocPort" binding="tns:doc_test_binding">
     			<soap:address location="http://www.whitemesa.net/interopdoc"/>
+                <http-conf:client xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
+                    AllowChunking="false"/>
   		</port>
 
 	</service>

Modified: incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/pom.xml?rev=405810&r1=405809&r2=405810&view=diff
==============================================================================
--- incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/pom.xml (original)
+++ incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/pom.xml Fri May 12 10:57:42 2006
@@ -27,8 +27,19 @@
     <name>Tuscany Interop Testing - Clients - SOAP Builders Round 2 Interop Test</name>
     <version>SNAPSHOT</version>
 
+    <properties>
+        <ws.type>axis2</ws.type>
+    </properties>
+
     <dependencies>
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.tuscany</groupId>
             <artifactId>tuscany-core</artifactId>
             <version>${pom.version}</version>
@@ -42,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.bindings</groupId>
-            <artifactId>tuscany-binding-axis2</artifactId>
+            <artifactId>tuscany-binding-${ws.type}</artifactId>
             <version>${pom.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -84,34 +95,6 @@
                 </executions>
             </plugin>
             
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <executions>
-                    <execution>
-		                <configuration>
-		                	<!-- This does not work, the test cases do not see the property -->
-		                	<!--
-		                    <systemProperties>
-		                    		<interopServiceName>RemoteInteropDocService</interopServiceName>
-		                    </systemProperties>
-		                    -->
-		                	<!-- This does not work either -->
-		                	<!--
-		                    <systemProperties>
-		                    		<property>
-		                    			<name>interopServiceName</name>
-		                    			<value>RemoteInteropDocService</value>
-		                    		</property>
-		                    </systemProperties>
-		                    -->
-		                </configuration>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>    
 </project>

Modified: incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/wsdl/interoptestdoclit.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/wsdl/interoptestdoclit.wsdl?rev=405810&r1=405809&r2=405810&view=diff
==============================================================================
--- incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/wsdl/interoptestdoclit.wsdl (original)
+++ incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/wsdl/interoptestdoclit.wsdl Fri May 12 10:57:42 2006
@@ -130,6 +130,8 @@
             name="WSDLInteropTestDocLitPort">
             <soap:address 
                 location="http://mssoapinterop.org/stkv3/wsdl/interopTestDocLit.wsdl"/>
+            <http-conf:client xmlns:http-conf="http://celtix.objectweb.org/transports/http/configuration"
+                AllowChunking="false"/>
         </port>
     </service>
 </definitions>

Modified: incubator/tuscany/java/testing/interop/clients/webserviceXSQ/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/interop/clients/webserviceXSQ/pom.xml?rev=405810&r1=405809&r2=405810&view=diff
==============================================================================
--- incubator/tuscany/java/testing/interop/clients/webserviceXSQ/pom.xml (original)
+++ incubator/tuscany/java/testing/interop/clients/webserviceXSQ/pom.xml Fri May 12 10:57:42 2006
@@ -27,6 +27,10 @@
     <name>Tuscany Interop Testing - Clients - webserviceXSQ</name>
     <version>SNAPSHOT</version>
 
+    <properties>
+        <ws.type>axis2</ws.type>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany</groupId>
@@ -36,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.bindings</groupId>
-            <artifactId>tuscany-binding-axis2</artifactId>
+            <artifactId>tuscany-binding-${ws.type}</artifactId>
             <version>${pom.version}</version>
             <scope>test</scope>
         </dependency>