[jbossws-commits] JBossWS SVN: r3680 - in branches/jbossws-2.0: jbossws-core/ant-import and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Jun 21 12:08:28 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-21 12:08:28 -0400 (Thu, 21 Jun 2007)
New Revision: 3680
Modified:
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
Log:
[JBWS-1665] incorrect wsdl generation
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-21 16:08:28 UTC (rev 3680)
@@ -146,12 +146,11 @@
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-j2ee.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
- <pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.client}/stax-api.jar"/>
- <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.server.lib}/servlet-api.jar"/>
- <pathelement location="${jboss.client}/junit.jar"/>
</path>
<path id="tests.client.classpath">
<pathelement location="${jboss.client}/commons-logging.jar"/>
Modified: branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-21 16:08:28 UTC (rev 3680)
@@ -115,8 +115,8 @@
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
@@ -133,16 +133,15 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
<pathelement location="${thirdparty.dir}/stax-api.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
<pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/xalan.jar"/>
<pathelement location="${thirdparty.dir}/xmlsec.jar"/>
<pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
- <pathelement location="${thirdparty.dir}/policy.jar"/>
</path>
</target>
Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxws.xml 2007-06-21 16:08:28 UTC (rev 3680)
@@ -160,19 +160,6 @@
</fileset>
</jar>
- <!-- jaxws-jbws1665 -->
- <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1665.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/jbws1665/CoordinateData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/PropertyData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TraceData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TracePollData.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.class"/>
- <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.class"/>
- </fileset>
- </jar>
-
<!-- jaxws-jbws981 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws981.jar">
<fileset dir="${tests.output.dir}/classes">
@@ -308,6 +295,18 @@
</classes>
</war>
+ <!-- jaxws-jbws1665 -->
+ <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1665.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1665/CoordinateData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/PropertyData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TraceData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TracePollData.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1665/TrackingServiceInterface.class"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws1666 -->
<war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-06-21 15:50:44 UTC (rev 3679)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1665/JBWS1665TestCase.java 2007-06-21 16:08:28 UTC (rev 3680)
@@ -45,7 +45,7 @@
*/
public class JBWS1665TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1655/TrackingServiceBean";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1665/TrackingServiceBean";
public static Test suite()
{
More information about the jbossws-commits
mailing list