You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/10/03 17:59:37 UTC
svn commit: r701419 - in
/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests:
wsa-common/ wsa-common/src/main/java/org/apache/geronimo/jaxws/
wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/
wsa-common/src/main/webapp/ wsa-com...
Author: gawor
Date: Fri Oct 3 08:59:36 2008
New Revision: 701419
URL: http://svn.apache.org/viewvc?rev=701419&view=rev
Log:
split web service from test client code to prevent jaxb confclits
Added:
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java (props changed)
- copied unchanged from r701137, geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java (props changed)
- copied unchanged from r701137, geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java (props changed)
- copied unchanged from r701137, geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java (props changed)
- copied unchanged from r701137, geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/WEB-INF/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/WEB-INF/wsdl/
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/WEB-INF/wsdl/calculator.wsdl (props changed)
- copied unchanged from r701137, geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/wsdl/calculator.wsdl
Removed:
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/wsdl/
Modified:
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/pom.xml?rev=701419&r1=701418&r2=701419&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/pom.xml Fri Oct 3 08:59:36 2008
@@ -31,13 +31,17 @@
</parent>
<artifactId>wsa-common</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WS-A Common</name>
- <packaging>jar</packaging>
+ <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WS-A WAR Test Client</name>
+ <packaging>war</packaging>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/WEB-INF/wsdl/calculator.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/WEB-INF/wsdl/calculator.wsdl
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/WEB-INF/wsdl/calculator.wsdl
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-common/src/main/webapp/WEB-INF/wsdl/calculator.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml?rev=701419&r1=701418&r2=701419&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml Fri Oct 3 08:59:36 2008
@@ -55,6 +55,7 @@
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>wsa-common</artifactId>
<version>${version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -124,7 +125,7 @@
<systemProperties>
<property>
<name>webAppName</name>
- <value>wsa-war</value>
+ <value>wsa-common</value>
</property>
</systemProperties>
</configuration>
@@ -140,6 +141,14 @@
<goal>deploy-module</goal>
</goals>
<configuration>
+ <modules>
+ <module>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>wsa-common</artifactId>
+ <type>war</type>
+ <version>${version}</version>
+ </module>
+ </modules>
<moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
</configuration>
</execution>
@@ -151,6 +160,14 @@
<goal>undeploy-module</goal>
</goals>
<configuration>
+ <modules>
+ <module>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>wsa-common</artifactId>
+ <type>war</type>
+ <version>${version}</version>
+ </module>
+ </modules>
<moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
</configuration>
</execution>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml?rev=701419&r1=701418&r2=701419&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml Fri Oct 3 08:59:36 2008
@@ -38,12 +38,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-common</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=701419&r1=701418&r2=701419&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Oct 3 08:59:36 2008
@@ -26,7 +26,7 @@
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}</artifactId>
- <version>1.0</version>
+ <version>${version}</version>
<type>jar</type>
</moduleId>
</environment>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml?rev=701419&r1=701418&r2=701419&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml Fri Oct 3 08:59:36 2008
@@ -36,20 +36,10 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-common</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=701419&r1=701418&r2=701419&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Oct 3 08:59:36 2008
@@ -20,33 +20,11 @@
<dep:moduleId>
<dep:groupId>${pom.groupId}</dep:groupId>
<dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>1.0</dep:version>
+ <dep:version>${version}</dep:version>
<dep:type>war</dep:type>
</dep:moduleId>
</dep:environment>
<context-root>/${pom.artifactId}</context-root>
- <service-ref>
- <service-ref-name>services/Calculator</service-ref-name>
- <port>
- <port-name>CalculatorPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/wsa-war/calculator</uri>
- </port>
- </service-ref>
-
- <service-ref>
- <service-ref-name>services/ejb/Calculator</service-ref-name>
- <port>
- <port-name>CalculatorPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/CalculatorService/Calculator</uri>
- </port>
- </service-ref>
-
</web-app>
Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml?rev=701419&r1=701418&r2=701419&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml Fri Oct 3 08:59:36 2008
@@ -35,41 +35,5 @@
<servlet-name>CalculatorServlet</servlet-name>
<url-pattern>/calculator</url-pattern>
</servlet-mapping>
-
- <servlet>
- <display-name>TestServletWeb</display-name>
- <servlet-name>TestServletWeb</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.wsa.TestServletWeb</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServletWeb</servlet-name>
- <url-pattern>/test-web</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>TestServletEJB</display-name>
- <servlet-name>TestServletEJB</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.wsa.TestServletEJB</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServletEJB</servlet-name>
- <url-pattern>/test-ejb</url-pattern>
- </servlet-mapping>
-
- <service-ref>
- <service-ref-name>services/Calculator</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/calculator.wsdl</wsdl-file>
- </service-ref>
-
- <service-ref>
- <service-ref-name>services/ejb/Calculator</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/calculator.wsdl</wsdl-file>
- </service-ref>
-
+
</web-app>