You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/03/08 10:03:24 UTC
svn commit: r384161 - in /incubator/tuscany/java/testing/tomcat: ./
helloworldaxis2/ helloworldaxis2/src/ helloworldaxis2/src/test/
helloworldaxis2/src/test/java/ helloworldaxis2/src/test/java/org/
helloworldaxis2/src/test/java/org/apache/ helloworldax...
Author: jsdelfino
Date: Wed Mar 8 01:03:21 2006
New Revision: 384161
URL: http://svn.apache.org/viewcvs?rev=384161&view=rev
Log:
Fix for TUSCANY-50, added Axis2 test case to Tomcat integration test suite
Added:
incubator/tuscany/java/testing/tomcat/helloworldaxis2/ (with props)
incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml (with props)
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/
incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/TestHelloWorldAxisTestCase.java (with props)
Modified:
incubator/tuscany/java/testing/tomcat/build.xml
incubator/tuscany/java/testing/tomcat/pom.xml
Modified: incubator/tuscany/java/testing/tomcat/build.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/build.xml?rev=384161&r1=384160&r2=384161&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/build.xml (original)
+++ incubator/tuscany/java/testing/tomcat/build.xml Wed Mar 8 01:03:21 2006
@@ -86,7 +86,6 @@
<include name="**/${tuscany.acceptance.groupId}/tuscany-binding-axis2/${tuscany.acceptance.version}/tuscany-binding-axis2-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-common/${tuscany.acceptance.version}/tuscany-common-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-container-java/${tuscany.acceptance.version}/tuscany-container-java-${tuscany.acceptance.version}.jar" />
- <include name="**/${tuscany.acceptance.groupId}/tuscany-container-js/${tuscany.acceptance.version}/tuscany-container-js-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-core/${tuscany.acceptance.version}/tuscany-core-${tuscany.acceptance.version}.jar" />
<include name="**/${tuscany.acceptance.groupId}/tuscany-model/${tuscany.acceptance.version}/tuscany-model-${tuscany.acceptance.version}.jar" />
</patternset>
@@ -101,40 +100,6 @@
<patternset id="tuscany.acceptance.server.dependencies">
<include name="**/asm/asm/2.2/asm-2.2.jar" />
<include name="**/axis/axis-wsdl4j/1.2/axis-wsdl4j-1.2.jar" />
-
-<!--
- <include name="**/axis/axis/1.2.1/axis-1.2.1.jar" />
- <include name="**/axis/axis-jaxrpc/1.2.1/axis-jaxrpc-1.2.1.jar" />
- <include name="**/axis/axis-saaj/1.2.1/axis-saaj-1.2.1.jar" />
- <include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
- <include name="**/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar" />
--->
- <include name="**/annogen/annogen/0.1.0/annogen-0.1.0.jar" />
- <include name="**/axis/axis-wsdl4j/1.2/axis-wsdl4j-1.2.jar" />
- <include name="**/axis2/axis2-adb/0.94/axis2-adb-0.94.jar" />
- <include name="**/axis2/axis2-codegen/0.94/axis2-codegen-0.94.jar" />
- <include name="**/axis2/axis2-core/0.94/axis2-core-0.94.jar" />
- <include name="**/axis2/axis2-doom/0.94/axis2-doom-0.94.jar" />
- <include name="**/backport-util-concurrent/backport-util-concurrent/2.0_01_pd/backport-util-concurrent-2.0_01_pd.jar" />
- <include name="**/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" />
- <include name="**/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar" />
- <include name="**/geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar" />
- <include name="**/geronimo-spec/geronimo-spec-javamail/1.3.1-rc5/geronimo-spec-javamail-1.3.1-rc5.Jar" />
- <include name="**/geronimo-spec/geronimo-spec-jms/1.1-rc4/geronimo-spec-jms-1.1-rc4.jar" />
- <include name="**/jaxen/jaxen/1.1-beta-7/jaxen-1.1-beta-7.jar" />
- <include name="**/log4j/log4j/1.2.12/log4j-1.2.12.jar" />
- <include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
- <include name="**/ws-commons/ws-policy/SNAPSHOT/ws-policy-SNAPSHOT.jar" />
- <include name="**/wss4j/wss4j/SNAPSHOT/wss4j-SNAPSHOT.Jar" />
- <include name="**/woodstox/wstx-asl/2.8.2/wstx-asl-2.8.2.jar" />
- <include name="**/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar" />
- <include name="**/ws-commons/XmlSchema/1.0-SNAPSHOT/XmlSchema-1.0-SNAPSHOT.jar" />
- <include name="**/xmlunit/xmlunit/1.0/xmlunit-1.0.Jar" />
- <include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
-
- </patternset>
-
- <patternset id="tuscany.acceptance.server.axis.dependencies">
<!--
<include name="**/axis/axis/1.2.1/axis-1.2.1.jar" />
<include name="**/axis/axis-jaxrpc/1.2.1/axis-jaxrpc-1.2.1.jar" />
@@ -142,55 +107,15 @@
<include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
<include name="**/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar" />
-->
- <!--
- <include name="**/annogen/annogen/0.1.0/annogen-0.1.0.jar" />
<include name="**/axis/axis-wsdl4j/1.2/axis-wsdl4j-1.2.jar" />
- <include name="**/axis2/axis2-adb/0.94/axis2-adb-0.94.jar" />
- <include name="**/axis2/axis2-codegen/0.94/axis2-codegen-0.94.jar" />
<include name="**/axis2/axis2-core/0.94/axis2-core-0.94.jar" />
- <include name="**/axis2/axis2-doom/0.94/axis2-doom-0.94.jar" />
- <include name="**/backport-util-concurrent/backport-util-concurrent/2.0_01_pd/backport-util-concurrent-2.0_01_pd.jar" />
<include name="**/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" />
<include name="**/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar" />
- <include name="**/geronimo-spec/geronimo-spec-activation/1.0.2-rc4/geronimo-spec-activation-1.0.2-rc4.jar" />
- <include name="**/geronimo-spec/geronimo-spec-javamail/1.3.1-rc5/geronimo-spec-javamail-1.3.1-rc5.Jar" />
- <include name="**/geronimo-spec/geronimo-spec-jms/1.1-rc4/geronimo-spec-jms-1.1-rc4.jar" />
- <include name="**/jaxen/jaxen/1.1-beta-7/jaxen-1.1-beta-7.jar" />
+ <include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
<include name="**/log4j/log4j/1.2.12/log4j-1.2.12.jar" />
<include name="**/stax/stax-api/1.0/stax-api-1.0.jar" />
<include name="**/ws-commons/ws-policy/SNAPSHOT/ws-policy-SNAPSHOT.jar" />
- <include name="**/wss4j/wss4j/SNAPSHOT/wss4j-SNAPSHOT.Jar" />
<include name="**/woodstox/wstx-asl/2.8.2/wstx-asl-2.8.2.jar" />
- <include name="**/xmlbeans/xbean/2.1.0/xbean-2.1.0.jar" />
- <include name="**/ws-commons/XmlSchema/1.0-SNAPSHOT/XmlSchema-1.0-SNAPSHOT.jar" />
- <include name="**/xmlunit/xmlunit/1.0/xmlunit-1.0.Jar" />
- <include name="**/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" />
- -->
-
- <include name="annogen-0.1.0.jar" />
- <include name="axis2-adb-0.94.jar" />
- <include name="axis2-codegen-0.94.jar" />
- <include name="axis2-core-0.94.jar" />
- <include name="axis2-doom-0.94.jar" />
- <include name="axis-wsdl4j-1.2.jar" />
- <include name="backport-util-concurrent-2.0_01_pd.jar" />
- <include name="commons-codec-1.3.jar" />
- <include name="commons-httpclient-3.0.jar" />
- <include name="commons-logging-1.0.4.jar" />
- <include name="geronimo-spec-activation-1.0.2-rc4.jar" />
- <include name="geronimo-spec-javamail-1.3.1-rc5.jar" />
- <include name="geronimo-spec-jms-1.1-rc4.jar" />
- <include name="jaxen-1.1-beta-7.jar" />
- <include name="log4j-1.2.12.jar" />
- <include name="maven-itest-plugin-1.0.jar" />
- <include name="servletapi-2.3.jar" />
- <include name="stax-api-1.0.jar" />
- <include name="ws-policy-SNAPSHOT.jar" />
- <include name="wstx-asl-2.8.1.jar" />
- <!-- <include name="xbean-2.1.0.jar" /> -->
- <!-- <include name="xercesImpl-2.7.1.jar" /> -->
- <!-- <include name="xml-apis-1.3.02.jar" /> -->
- <include name="XmlSchema-SNAPSHOT.jar" />
</patternset>
@@ -249,11 +174,6 @@
<fileset dir="${tuscany.maven.repos.dir}">
<patternset refid="tuscany.acceptance.server.dependencies" />
</fileset>
- <!--
- <fileset dir="axis2-std-0.94-bin/lib">
- <patternset refid="tuscany.acceptance.server.axis.dependencies" />
- </fileset>
- -->
</copy>
</target>
@@ -285,7 +205,7 @@
</target>
<target name="tuscany.tomcat.fixcontextxml" depends='init,backup.context.xml' unless='tuscany.acceptance.tomcat.contextxmlorg.available'>
<property name="tuscany.acceptance.tomcat.contextxmlorg.available" value='true' />
-<!-- DO NOTHING AT THIS TIME
+ <!-- DO NOTHING AT THIS TIME
<xslt
in="${tuscany.acceptance.tc.dir}/conf/context.xml.original"
style="context.xsl" out="${tuscany.acceptance.tc.dir}/conf/context.xml"
Propchange: incubator/tuscany/java/testing/tomcat/helloworldaxis2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 8 01:03:21 2006
@@ -0,0 +1,12 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+.settings
+.deployables
+.wtpmodules
Added: incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml?rev=384161&view=auto
==============================================================================
--- incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml (added)
+++ incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml Wed Mar 8 01:03:21 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-testing-tomcat</artifactId>
+ <version>SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tuscany-testing-tomcat-helloworldaxis2</artifactId>
+ <packaging>jar</packaging>
+ <name>Tuscany Testing Tomcat HelloWorld Axis2</name>
+ <description>Testing Tomcat HelloWorld Axis2 end user test</description>
+ <version>SNAPSHOT</version>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.samples.helloworld</groupId>
+ <artifactId>helloworldaxis2</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-jakarta-regexp</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-xslp</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/testing/tomcat/helloworldaxis2/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Added: incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/TestHelloWorldAxisTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/TestHelloWorldAxisTestCase.java?rev=384161&view=auto
==============================================================================
--- incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/TestHelloWorldAxisTestCase.java (added)
+++ incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/TestHelloWorldAxisTestCase.java Wed Mar 8 01:03:21 2006
@@ -0,0 +1,53 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tuscany.samples.helloworldws;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.samples.helloworldaxis.GetGreetings;
+import org.apache.tuscany.samples.helloworldaxis.GetGreetingsResponse;
+import org.apache.tuscany.samples.helloworldaxis.HelloWorldServiceImplStub;
+
+
+public class TestHelloWorldAxisTestCase extends TestCase {
+
+ final static String urlstrTuscanyService = "http://localhost:8080/helloworldws-SNAPSHOT/services/HelloWorldService";
+
+ public String getGreetings(String urlstr, String name) throws Exception {
+ HelloWorldServiceImplStub stub = new HelloWorldServiceImplStub(urlstr);
+
+ GetGreetings input = new GetGreetings();
+ input.setIn0(name);
+
+ GetGreetingsResponse response=stub.getGreetings(input);
+
+ return response.getGetGreetingsReturn();
+ }
+
+
+ public void testHelloWorldDefault() throws Exception {
+ final String name= "World";
+ String greeting= getGreetings(urlstrTuscanyService, name);
+ assertEquals(greeting, "Hello " + name);
+
+ final String name2= "SCA World!";
+ greeting= getGreetings(urlstrTuscanyService, name2);
+ assertEquals(greeting, "Hello " + name2);
+
+ }
+
+}
Propchange: incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/TestHelloWorldAxisTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/testing/tomcat/helloworldaxis2/src/test/java/org/apache/tuscany/samples/helloworldws/TestHelloWorldAxisTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified: incubator/tuscany/java/testing/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/testing/tomcat/pom.xml?rev=384161&r1=384160&r2=384161&view=diff
==============================================================================
--- incubator/tuscany/java/testing/tomcat/pom.xml (original)
+++ incubator/tuscany/java/testing/tomcat/pom.xml Wed Mar 8 01:03:21 2006
@@ -31,13 +31,14 @@
<module>helloworldws</module>
<!--
<module>helloworldaxis</module>
+-->
+ <module>helloworldaxis2</module>
+<!--
these can't seem to run cause they need htmlunit and the dependencies download
seems broken for htmlunit
htmlunit:htmlunit:jar:1.7
dom4j:dom4j:jar:1.5
javax.xml:jsr173:jar:1.0 jar seems to be missing here http://www.ibiblio.org/maven2/javax/xml/jsr173/1.0/
-
-
<module>helloworldweb</module>
<module>bigbank</module>
<module>helloworldwebdas</module>