JBossWS SVN: r1824 - trunk/integration-jboss50
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 11:10:13 -0500 (Fri, 05 Jan 2007)
New Revision: 1824
Modified:
trunk/integration-jboss50/build.xml
Log:
Fix jbossws-samples
Modified: trunk/integration-jboss50/build.xml
===================================================================
--- trunk/integration-jboss50/build.xml 2007-01-05 16:10:07 UTC (rev 1823)
+++ trunk/integration-jboss50/build.xml 2007-01-05 16:10:13 UTC (rev 1824)
@@ -76,7 +76,7 @@
<!-- Build jbossws-jboss50-integration.jar -->
<mkdir dir="${jboss50.output.lib.dir}"/>
- <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar" manifest="${etc.dir}/default.mf">
<fileset dir="${jboss50.output.classes.dir}">
<include name="org/jboss/ws/integration/jboss50/**"/>
</fileset>
@@ -95,7 +95,7 @@
</war>
<!-- Build jbossws50.sar -->
- <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${etc.dir}/default.mf">
<fileset dir="${jboss50.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
17 years, 12 months
- 1
- 0
JBossWS SVN: r1823 - in trunk/jbossws-docs/user-guide/project: . en/modules en/modules/mtom-xop en/modules/wsaddressing
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 11:10:07 -0500 (Fri, 05 Jan 2007)
New Revision: 1823
Modified:
trunk/jbossws-docs/user-guide/project/build.xml
trunk/jbossws-docs/user-guide/project/en/modules/appendix-a.xml
trunk/jbossws-docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml
trunk/jbossws-docs/user-guide/project/en/modules/wsaddressing/wsaddressing.xml
Log:
Fix jbossws-samples
Modified: trunk/jbossws-docs/user-guide/project/build.xml
===================================================================
--- trunk/jbossws-docs/user-guide/project/build.xml 2007-01-05 16:10:02 UTC (rev 1822)
+++ trunk/jbossws-docs/user-guide/project/build.xml 2007-01-05 16:10:07 UTC (rev 1823)
@@ -6,7 +6,7 @@
<available property="docbook-support.available" file="${docbook-support.home}/support.xml"/>
<!-- Setup the build timestamp & build identifer properties -->
- <property file="../../../version.properties"/>
+ <property file="${build.dir}/version.properties"/>
<tstamp>
<format property="build.date" pattern="dd-MMM-yyyy"/>
</tstamp>
@@ -19,9 +19,9 @@
<ant antfile="${doc.module.home}/build-docbook.xml" inheritall="false">
<property name="docbook-support.home" value="${docbook-support.home}"/>
</ant>
- <copy todir="build/en" file="../../../src/main/resources/dist/Install.txt" filtering="yes" overwrite="yes">
+ <copy todir="build/en" file="${core.dir}/src/main/resources/dist/Install.txt" filtering="yes" overwrite="yes">
<filterset>
- <filtersfile file="../../../version.properties"/>
+ <filtersfile file="${build.dir}/version.properties"/>
</filterset>
</copy>
</target>
@@ -41,7 +41,7 @@
<copy tofile="en/master.xml" file="en/master.template" filtering="yes" overwrite="yes">
<filterset>
<filter token="build.date" value="${build.date}"/>
- <filtersfile file="../../../version.properties"/>
+ <filtersfile file="${build.dir}/version.properties"/>
</filterset>
</copy>
</target>
Modified: trunk/jbossws-docs/user-guide/project/en/modules/appendix-a.xml
===================================================================
--- trunk/jbossws-docs/user-guide/project/en/modules/appendix-a.xml 2007-01-05 16:10:02 UTC (rev 1822)
+++ trunk/jbossws-docs/user-guide/project/en/modules/appendix-a.xml 2007-01-05 16:10:07 UTC (rev 1823)
@@ -8,13 +8,13 @@
<itemizedlist>
<listitem>
- <para><ulink url="http://fisheye.jboss.com/viewrep/~raw,r=HEAD/JBossWS/trunk/src/main/resou...">WSTools configuration syntax</ulink></para>
+ <para><ulink url="http://fisheye.jboss.com/viewrep/~raw,r=HEAD/JBossWS/trunk/jbossws-core/s...">WSTools configuration syntax</ulink></para>
</listitem>
<listitem>
- <para><ulink url="http://fisheye.jboss.com/viewrep/~raw,r=HEAD/JBossWS/trunk/src/main/resou...">JBossWS configuration syntax</ulink></para>
+ <para><ulink url="http://fisheye.jboss.com/viewrep/~raw,r=HEAD/JBossWS/trunk/jbossws-core/s...">JBossWS configuration syntax</ulink></para>
</listitem>
<listitem>
- <para><ulink url="http://fisheye.jboss.com/viewrep/~raw,r=HEAD/JBossWS/trunk/src/main/resou...">Security configuration syntax</ulink></para>
+ <para><ulink url="http://fisheye.jboss.com/viewrep/~raw,r=HEAD/JBossWS/trunk/jbossws-core/s...">Security configuration syntax</ulink></para>
</listitem>
<listitem>
<para><ulink url="http://java.sun.com/developer/technicalArticles/xml/jaxrpcpatterns/">Patterns and Strategies for Building Document-Based Web Services</ulink></para>
Modified: trunk/jbossws-docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml
===================================================================
--- trunk/jbossws-docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml 2007-01-05 16:10:02 UTC (rev 1822)
+++ trunk/jbossws-docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml 2007-01-05 16:10:07 UTC (rev 1823)
@@ -54,7 +54,7 @@
</sect1>
- <sect1 id="mtom-schema-elements">
+ <sect1 id="mtom-parameter-types">
<title>Supported MTOM parameter types</title>
<para>
<table frame="all">
Modified: trunk/jbossws-docs/user-guide/project/en/modules/wsaddressing/wsaddressing.xml
===================================================================
--- trunk/jbossws-docs/user-guide/project/en/modules/wsaddressing/wsaddressing.xml 2007-01-05 16:10:02 UTC (rev 1822)
+++ trunk/jbossws-docs/user-guide/project/en/modules/wsaddressing/wsaddressing.xml 2007-01-05 16:10:07 UTC (rev 1823)
@@ -95,12 +95,10 @@
}
]]></programlisting></para>
- <para>The <ulink url="http://fisheye.jboss.com/viewrep/JBossWS/trunk/src/main/java/org/jboss/ws...">SOAPServerHandler</ulink>
- is provided by JBossWS and <emphasis>reads/writes the addressing properties and puts then into the message context</emphasis>.
+ <para>The SOAPServerHandler is provided by JBossWS and <emphasis>reads/writes the addressing properties and puts then into the message context</emphasis>.
</para>
- <para>The <ulink url="http://fisheye.jboss.com/viewrep/JBossWS/trunk/src/test/java/org/jboss/te...">ServerHandler</ulink>
- is implementation specific.</para>
+ <para>The ServerHandler is implementation specific.</para>
<para><command>Client side handler configuration</command></para>
@@ -130,12 +128,10 @@
</jboss-client>
]]></programlisting></para>
- <para>The <ulink url="http://fisheye.jboss.com/viewrep/JBossWS/trunk/src/main/java/org/jboss/ws...">SOAPServerHandler</ulink>
- is provided by JBossWS and <emphasis>reads/writes the addressing properties and puts then into the message context</emphasis>.
+ <para>The SOAPServerHandler is provided by JBossWS and <emphasis>reads/writes the addressing properties and puts then into the message context</emphasis>.
</para>
- <para>The <ulink url="http://fisheye.jboss.com/viewrep/JBossWS/trunk/src/test/java/org/jboss/te...">ServerHandler</ulink>
- is implementation specific.</para>
+ <para>The ServerHandler is implementation specific.</para>
<para><command>A client connecting to the stateful endpoint</command></para>
17 years, 12 months
- 1
- 0
JBossWS SVN: r1822 - trunk/jbossws-tests/src/main/java/org/jboss/test/ws
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 11:10:02 -0500 (Fri, 05 Jan 2007)
New Revision: 1822
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
Log:
Fix jbossws-samples
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-05 16:09:50 UTC (rev 1821)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-01-05 16:10:02 UTC (rev 1822)
@@ -121,7 +121,7 @@
}
else
{
- throw new IllegalStateException("Unsupported target server: " + getIntegrationTarget());
+ throw new IllegalStateException("Unsupported integration target: " + getIntegrationTarget());
}
}
17 years, 12 months
- 1
- 0
JBossWS SVN: r1821 - in trunk/jbossws-core: . src/main/resources/dist src/main/resources/samples src/main/resources/samples/common src/main/resources/samples/jaxrpc/jsr109pojo src/main/resources/samples/jaxrpc/mtom src/main/resources/samples/jaxrpc/secureejb src/main/resources/samples/jaxrpc/wsbpel src/main/resources/samples/jaxws/jsr181ejb src/main/resources/samples/jaxws/jsr181pojo src/main/resources/samples/jaxws/retail src/main/resources/samples/jaxws/wsaddressing
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 11:09:50 -0500 (Fri, 05 Jan 2007)
New Revision: 1821
Modified:
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt
trunk/jbossws-core/src/main/resources/samples/ant.properties.example
trunk/jbossws-core/src/main/resources/samples/build.xml
trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml
trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml
trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml
trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml
trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml
trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml
trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml
trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml
trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml
trunk/jbossws-core/src/main/resources/samples/version.properties
Log:
Fix jbossws-samples
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -20,6 +20,7 @@
<property name="core.src.dir" value="${core.dir}/src/main"/>
<property name="core.java.dir" value="${core.src.dir}/java"/>
<property name="core.resources.dir" value="${core.src.dir}/resources"/>
+ <property name="core.samples.dir" value="${core.resources.dir}/samples"/>
<property name="core.output.dir" value="${core.dir}/output"/>
<property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
@@ -70,8 +71,8 @@
<!-- Compile etc files (manifests and such) -->
<target name="core-compile-etc" depends="core-init">
- <mkdir dir="${output.etc.dir}"/>
- <copy todir="${output.etc.dir}" filtering="yes" overwrite="yes">
+ <mkdir dir="${etc.dir}"/>
+ <copy todir="${etc.dir}" filtering="yes" overwrite="yes">
<fileset dir="${build.dir}/etc"/>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
@@ -100,7 +101,7 @@
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${etc.dir}/default.mf">
<fileset dir="${core.output.classes14.dir}">
<include name="javax/xml/rpc/**"/>
</fileset>
@@ -108,7 +109,7 @@
<!-- Build jboss-saaj.jar -->
<mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${etc.dir}/default.mf">
<fileset dir="${core.output.classes14.dir}">
<include name="javax/xml/soap/**"/>
</fileset>
@@ -117,7 +118,7 @@
<!-- Build jboss-jaxws.jar -->
<mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${etc.dir}/default.mf">
<fileset dir="${core.output.classes.dir}">
<include name="javax/jws/**"/>
<include name="javax/xml/ws/**"/>
@@ -127,7 +128,7 @@
<!-- Build jbossws-core.jar -->
<mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${etc.dir}/default.mf">
<fileset dir="${core.output.classes.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
@@ -139,7 +140,7 @@
</jar>
<!-- Build jbossws-client.jar -->
- <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${output.etc.dir}/default.mf">
+ <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf">
<fileset dir="${core.output.classes14.dir}">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
@@ -157,7 +158,7 @@
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
- <fileset dir="${output.etc.dir}">
+ <fileset dir="${etc.dir}">
<include name="wstools.sh"/>
<include name="wstools.bat"/>
<include name="wstools-log4j.xml"/>
Modified: trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt
===================================================================
--- trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-01-05 16:09:50 UTC (rev 1821)
@@ -22,6 +22,19 @@
What's new in jbossws-(a)version.id@
----------------------------------
+
+Errata
+------
+
+
+Enjoy,
+The JBossWS Team
+
+Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+What's new in jbossws-1.0.4
+---------------------------
+
* [JBWS-660] XOP inline base64Binary and sign message
* [JBWS-779] Add webservices.xml support to wsdlTojava
* [JBWS-868] BPEL in jbossws-samples
@@ -48,11 +61,6 @@
* FIXME: [JBWS-798] Complete EventingTestCase
* FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums
-Enjoy,
-The JBossWS Team
-
-Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
What's new in jbossws-1.0.3
----------------------------------
@@ -79,6 +87,3 @@
* [JBWS-871] Arrays with JSR181 endpoints
* [JBWS-923] Complete MTOM for rpc/literal
* Bug fixes
-
-Enjoy,
-The JBossWS Team
\ No newline at end of file
Modified: trunk/jbossws-core/src/main/resources/samples/ant.properties.example
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-05 16:09:50 UTC (rev 1821)
@@ -2,19 +2,24 @@
#
# Required JBoss Home
-#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.GA-ejb3
+#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
+#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
-# Optional JBoss Home
-#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
+# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
+jbossws.integration.target=jboss42
# The JBoss server instance
jboss.server.instance=default
# Tomcat Home
-#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17
+#tomcat.home=/usr/java/tomcat
#tomcat.manager.username=manager
#tomcat.manager.password=manager
-# The target server the test endpoints are deployed to
-# This can be [jboss|tomcat]
-jbossws.target.server=jboss
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
+jboss.repository=http://repository.jboss.com
Modified: trunk/jbossws-core/src/main/resources/samples/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -25,7 +25,7 @@
<ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="jars"/>
<ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="jars"/>
<ant antfile="${basedir}/jaxrpc/swa/build.xml" target="jars"/>
- <ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="jars"/>
+ <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="jars"/-->
<ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="jars"/>
<ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/>
@@ -53,6 +53,7 @@
<ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="tests"/>
<ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="tests"/>
<ant antfile="${basedir}/jaxrpc/swa/build.xml" target="tests"/>
+ <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="tests"/-->
<ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="tests"/>
<ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/>
Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -24,107 +24,71 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-jboss-integration.jar" dest="${thirdparty.dir}/jbossws-jboss-integration.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-tomcat-integration.jar" dest="${thirdparty.dir}/jbossws-tomcat-integration.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jboss-jaxws14.jar" dest="${thirdparty.dir}/jboss-jaxws14.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-client.jar" dest="${thirdparty.dir}/jbossws14-client.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-jboss-integration.jar" dest="${thirdparty.dir}/jbossws14-jboss-integration.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-tomcat-integration.jar" dest="${thirdparty.dir}/jbossws14-tomcat-integration.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+ <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
</target>
<target name="thirdparty-classpath">
- <!-- jbossws vs. jbossws14 -->
- <condition property="jbossws.version" value="jbossws14">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <property name="jbossws.version" value="jbossws"/>
-
- <!-- jboss-jaxws vs. jboss-jaxws14 -->
- <condition property="jaxws.version" value="jboss-jaxws14">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <property name="jaxws.version" value="jboss-jaxws"/>
-
<path id="client.classpath">
<fileset dir="${thirdparty.dir}">
<include name="activation.jar"/>
<include name="commons-logging.jar"/>
<include name="concurrent.jar"/>
<include name="javassist.jar"/>
- <include name="jboss-common.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jboss-common-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
+ <include name="jboss-logging-spi.jar"/>
<include name="jboss-xml-binding.jar"/>
- <include name="jbossretro-rt.jar"/>
- <include name="jboss-backport-concurrent.jar"/>
+ <include name="jbossws-client.jar"/>
<include name="log4j.jar"/>
<include name="mail.jar"/>
<include name="wsdl4j.jar"/>
<include name="xml-apis.jar"/>
- <include name="${jbossws.version}-client.jar"/>
- <include name="${jaxws.version}.jar"/>
</fileset>
</path>
- <!-- In case of jdk1.4, use a dummy location -->
- <property name="jboss.ejb3.deployer" value="${thirdparty.dir}"/>
-
<path id="compile.classpath">
<path refid="client.classpath"/>
- <fileset dir="${jboss.client}">
- <include name="jbosssx-client.jar"/>
- </fileset>
- <fileset dir="${jboss.ejb3.deployer}">
- <include name="jboss-annotations-ejb3.jar"/>
- <include name="jboss-ejb3x.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="jboss-j2ee.jar"/>
- <include name="mailapi.jar"/>
- <include name="${jbossws.version}-jboss-integration.jar"/>
- <include name="${jbossws.version}-tomcat-integration.jar"/>
- </fileset>
+ <pathelement location="${jboss.client}/jbosssx-client.jar"/>
+ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
+ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/>
+ <pathelement location="${thirdparty.dir}/mailapi.jar"/>
</path>
<path id="tests.classpath">
<path refid="client.classpath"/>
- <fileset dir="${jboss.client}">
- <include name="jboss-aop-jdk50-client.jar"/>
- <include name="jboss-aspect-jdk50-client.jar"/>
- <include name="jboss-ejb3-client.jar"/>
- <include name="jbossall-client.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="${jbossws.version}-jboss-integration.jar"/>
- <include name="${jbossws.version}-tomcat-integration.jar"/>
- <include name="servlet-api.jar"/>
- </fileset>
+ <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
</target>
Modified: trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -2,60 +2,47 @@
<!-- $Id$ -->
-<project default="imported">
+<project>
- <!--
- Init
- -->
- <target name="init">
+ <import file="${basedir}/common/build-thirdparty.xml"/>
+
+ <!-- Prepare-->
+ <target name="prepare">
<property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
<property name="common.java" value="${basedir}/common/java"/>
<property name="common.resources" value="${basedir}/common/resources"/>
- <property name="build.test.dir" value="${basedir}/output"/>
+ <property name="build.tests.dir" value="${basedir}/output"/>
+ <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
- <!-- JDK Detection -->
- <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
-
- <!-- Target Server [jboss|tomcat] -->
- <property name="jbossws.target.server.${jbossws.target.server}" value="true"/>
- <condition property="only-on-jboss">
- <isset property="jbossws.target.server.jboss"/>
- </condition>
- <condition property="only-on-jboss-jdk15">
- <and>
- <isset property="jbossws.target.server.jboss"/>
- <isset property="HAVE_JDK_1.5"/>
- </and>
- </condition>
-
- <!-- JBoss Home -->
- <condition property="jboss.home" value="${jboss.jdk14.home}">
+ <!-- Force Thirdparty Get -->
+ <condition property="force.thirdparty.get">
<not>
- <isset property="HAVE_JDK_1.5"/>
+ <available file="${thirdparty.dir}" type="dir"/>
</not>
</condition>
- <condition property="jboss.home" value="${jboss.jdk15.home}">
- <isset property="HAVE_JDK_1.5"/>
+
+ <!-- Define jboss.home -->
+ <condition property="jboss.home" value="${jboss50.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
</condition>
-
- <property name="jboss.client" value="${jboss.home}/client"/>
- <property name="jboss.lib" value="${jboss.home}/lib"/>
- <property name="jboss.client" value="${jboss.home}/client"/>
- <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
- <property name="jboss.server.lib" value="${jboss.server}/lib"/>
- <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
-
- <!-- Java Endorsed -->
- <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed">
- <isset property="jbossws.target.server.jboss"/>
+ <condition property="jboss.home" value="${jboss42.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
</condition>
- <condition property="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed">
- <isset property="jbossws.target.server.tomcat"/>
+ <condition property="jboss.home" value="${jboss40.home}">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss40"/>
</condition>
-
+
+ <!-- Integration Target Server -->
+ <condition property="jbossws.integration.target.jboss">
+ <isset property="jboss.home"/>
+ </condition>
+ <condition property="jbossws.integration.target.tomcat">
+ <equals arg1="${jbossws.integration.target}" arg2="tomcat"/>
+ </condition>
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -78,77 +65,85 @@
<property name="node0.http.url" value="http://${node0}:8080"/>
<property name="node0.jndi.url" value="jnp://${node0}:1099"/>
- <available property="jbossws.client.jar" value="jbossws14-client.jar" file="${jboss.client}/jbossws14-client.jar"/>
- <available property="jbossws.client.jar" value="jbossws-client.jar" file="${jboss.client}/jbossws-client.jar"/>
+ <!-- Use -Ddebug=true for client debugging -->
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
+ <isset property="debug"/>
+ </condition>
+ <condition property="remote.debug.line" value="">
+ <not>
+ <isset property="debug"/>
+ </not>
+ </condition>
- <path id="client.classpath">
- <fileset dir="${jboss.client}">
- <include name="activation.jar"/>
- <include name="commons-logging.jar"/>
- <include name="javassist.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="jbossall-client.jar"/>
- <include name="jbossretro-rt.jar"/>
- <include name="jboss-backport-concurrent.jar"/>
- <include name="${jbossws.client.jar}"/>
- <include name="log4j.jar"/>
- <include name="mail.jar"/>
- </fileset>
- </path>
+ </target>
+
+ <!-- Init-->
+ <target name="init" depends="prepare,check-jboss,check-tomcat">
- <path id="compile.classpath">
- <path refid="client.classpath"/>
- <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/>
- <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/>
- </path>
+ <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="tomcat.home = ${tomcat.home}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="node0 = ${node0}"/>
+ <echo/>
+ <echo message="***************************"/>
+ <echo message="* ${chapter}"/>
+ <echo message="***************************"/>
+ <echo/>
- <path id="tests.classpath">
- <path refid="client.classpath"/>
- <fileset dir="${jboss.client}">
- <include name="jboss-aop-jdk50-client.jar"/>
- <include name="jboss-aspect-jdk50-client.jar"/>
- <include name="jboss-ejb3-client.jar"/>
- </fileset>
- <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/>
- <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/>
- </path>
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <mkdir dir="${build.tests.dir}/resources"/>
+ <mkdir dir="${build.tests.dir}/reports"/>
+ <mkdir dir="${build.tests.dir}/libs"/>
+ <mkdir dir="${build.tests.dir}/log"/>
+ <mkdir dir="${build.tests.dir}/wstools/java"/>
+ <mkdir dir="${build.tests.dir}/wstools/resources"/>
- <echo message="jboss.home = ${jboss.home}"/>
- <echo message="tomcat.home = ${tomcat.home}"/>
- <echo message="java.home = ${java.home}"/>
- <echo message="node0 = ${node0}"/>
- <echo/>
+ <touch file="${build.tests.dir}/log/samples.log"/>
- <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/>
- <fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/>
+ </target>
+
+ <!-- Check JBoss -->
+ <target name="check-jboss">
- <mkdir dir="${build.test.dir}/classes"/>
- <mkdir dir="${build.test.dir}/resources"/>
- <mkdir dir="${build.test.dir}/reports"/>
- <mkdir dir="${build.test.dir}/libs"/>
- <mkdir dir="${build.test.dir}/log"/>
- <mkdir dir="${build.test.dir}/wstools/java"/>
- <mkdir dir="${build.test.dir}/wstools/resources"/>
+ <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/>
+ <fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/>
- <touch file="${build.test.dir}/log/samples.log"/>
+ <!-- Java Endorsed -->
+ <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed">
+ <isset property="jbossws.integration.target.jboss"/>
+ </condition>
+
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <property name="jboss.client" value="${jboss.home}/client"/>
+ <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
+ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+ <property name="jboss.server.lib" value="${jboss.server}/lib"/>
+
</target>
- <!--
- Compile the java sources
- -->
- <target name="compile" depends="init" description="compile the sources" if="HAVE_JDK_1.4">
- <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on">
- <src path="${common.java}"/>
- <src path="${java.dir}"/>
- </javac>
+ <!-- Check tomcat -->
+ <target name="check-tomcat" if="jbossws.integration.target.tomcat">
+
+ <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
+ <condition property="cannot.use.tomcat">
+ <and>
+ <isset property="jbossws.integration.target.tomcat"/>
+ <not>
+ <isset property="tomcat.available"/>
+ </not>
+ </and>
+ </condition>
+ <fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/>
+
+ <!-- Java Endorsed -->
+ <property name="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"/>
+
</target>
- <!--
- Compile the java sources with jdk-1.5
- -->
- <target name="compile15" depends="init" description="compile the sources" if="HAVE_JDK_1.5">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on">
+ <!-- Compile the java sources -->
+ <target name="compile" depends="init,thirdparty"
+ description="compile the sources">
+ <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
<src path="${common.java}"/>
<src path="${java.dir}"/>
</javac>
@@ -158,9 +153,9 @@
Compile the generated java sources
-->
<target name="compile-generated" depends="init" description="compile the generated sources">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on">
- <src path="${build.test.dir}/wstools/java"/>
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
+ <src path="${build.tests.dir}/wstools/java"/>
</javac>
</target>
@@ -169,17 +164,18 @@
-->
<target name="copy-resources" depends="init" description="copy the resources">
<!-- copy resource files -->
- <copy todir="${build.test.dir}/resources/${sample.path}">
+ <copy todir="${build.tests.dir}/resources/${sample.path}">
<fileset dir="${resources.dir}">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
</fileset>
<filterset>
<filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${build.tests.dir}/wsdl-publish"/>
</filterset>
</copy>
<!-- copy binary files -->
- <copy todir="${build.test.dir}/resources/${sample.path}">
+ <copy todir="${build.tests.dir}/resources/${sample.path}">
<fileset dir="${resources.dir}">
<exclude name="**/*.wsdl"/>
<exclude name="**/*.xml"/>
@@ -192,14 +188,14 @@
-->
<target name="copy-generated" depends="init" description="copy the resources">
<!-- copy generated resource files -->
- <copy todir="${build.test.dir}/resources">
- <fileset dir="${build.test.dir}/wstools/resources">
+ <copy todir="${build.tests.dir}/resources">
+ <fileset dir="${build.tests.dir}/wstools/resources">
<include name="${sample.path}/**/*.wsdl"/>
<include name="${sample.path}/**/*.xml"/>
</fileset>
</copy>
<!-- copy override resource files -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
+ <copy todir="${build.tests.dir}/resources" overwrite="true">
<fileset dir="${common.resources}/overrides">
<include name="${sample.path}/**/*.wsdl"/>
<include name="${sample.path}/**/*.xml"/>
@@ -217,41 +213,41 @@
-->
<target name="one-test" depends="init" if="test" description="run a single test">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
- <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" /-->
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
+ <jvmarg line="${remote.debug.line}"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="log.dir" value="${build.test.dir}/log"/>
+ <sysproperty key="log.dir" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
- <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
<sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
<classpath>
- <pathelement path="${build.test.dir}/classes"/>
+ <pathelement path="${build.tests.dir}/classes"/>
<pathelement path="${common.resources}"/>
<path refid="tests.classpath"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
- <test fork="yes" todir="${build.test.dir}/reports" name="${test}"/>
+ <test fork="yes" todir="${build.tests.dir}/reports" name="${test}"/>
</junit>
- <junitreport todir="${build.test.dir}/reports">
- <fileset dir="${build.test.dir}/reports">
+ <junitreport todir="${build.tests.dir}/reports">
+ <fileset dir="${build.tests.dir}/reports">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${build.test.dir}/reports/html"/>
+ <report format="frames" todir="${build.tests.dir}/reports/html"/>
</junitreport>
</target>
@@ -262,33 +258,33 @@
-->
<target name="test" depends="init" if="test" description="run a collection of tests">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="log.dir" value="${build.test.dir}/log"/>
+ <sysproperty key="log.dir" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
- <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
+ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/>
<sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>
<sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
<classpath>
- <pathelement path="${build.test.dir}/classes"/>
+ <pathelement path="${build.tests.dir}/classes"/>
<pathelement path="${common.resources}"/>
<path refid="tests.classpath"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
- <batchtest fork="yes" todir="${build.test.dir}/reports">
+ <batchtest fork="yes" todir="${build.tests.dir}/reports">
<fileset dir="${java.dir}">
<include name="org/jboss/test/ws/${test}/**/*TestCase.java"/>
</fileset>
@@ -301,11 +297,11 @@
Generate the test report
-->
<target name="tests-report" depends="init" description="generate the test report">
- <junitreport todir="${build.test.dir}/reports">
- <fileset dir="${build.test.dir}/reports">
+ <junitreport todir="${build.tests.dir}/reports">
+ <fileset dir="${build.tests.dir}/reports">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${build.test.dir}/reports/html"/>
+ <report format="frames" todir="${build.tests.dir}/reports/html"/>
</junitreport>
</target>
@@ -319,7 +315,7 @@
Clean the build
-->
<target name="clean" depends="init" description="clean the build">
- <delete dir="${build.test.dir}"/>
+ <delete dir="${build.tests.dir}"/>
</target>
</project>
\ No newline at end of file
Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
@@ -44,6 +44,7 @@
<webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
@@ -34,8 +34,8 @@
<!-- jaxrpc-samples-mtom -->
<war warfile="${build.tests.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
<classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
</classes>
<webinf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
@@ -28,7 +28,8 @@
<!--
Build the test deployments
-->
- <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
+ <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
+ description="build the deployments">
<!-- jaxrpc-samples-secureejb -->
<jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar">
Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -3,126 +3,119 @@
<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
-
- <property name="chapter" value="jaxrpc/wsbpel" />
- <property name="sample.path" value="jaxrpc/samples/wsbpel" />
- <property name="java.dir" value="${basedir}/${chapter}/java" />
- <property name="resources.dir" value="${basedir}/${chapter}/resources" />
-
- <import file="${basedir}/common/imported-build.xml" />
-
- <target name="init-jbpmbpel">
+
+ <property name="chapter" value="jaxrpc/wsbpel"/>
+ <property name="sample.path" value="jaxrpc/samples/wsbpel"/>
+ <property name="java.dir" value="${basedir}/${chapter}/java"/>
+ <property name="resources.dir" value="${basedir}/${chapter}/resources"/>
+
+ <import file="${basedir}/common/imported-build.xml"/>
+
+ <target name="init-jbpmbpel" depends="init">
+
<!-- Check that jBPM BPEL has been deployed -->
- <property name="jboss.server.deploy.jbpmbpel"
- value="${jboss.server.deploy}/jbpm-bpel.sar" />
- <available property="jbpmbpel.available"
- file="${jboss.server.deploy.jbpmbpel}" />
- <antcall target="deploy-jbpmbpel" />
-
+ <property name="jboss.server.deploy.jbpmbpel" value="${jboss.server.deploy}/jbpm-bpel.sar"/>
+ <available property="jbpmbpel.available" file="${jboss.server.deploy.jbpmbpel}" type="dir"/>
+ <antcall target="deploy-jbpmbpel"/>
+
<!-- The jBPM BPEL classpath -->
<path id="jbpmbpel.classpath">
- <path refid="client.classpath" />
+ <path refid="client.classpath"/>
+ <fileset dir="${jboss.lib}">
+ <include name="commons-logging.jar"/>
+ </fileset>
<fileset dir="${jboss.server.lib}">
- <include name="dom4j.jar" />
- <include name="commons-collections.jar" />
+ <include name="dom4j.jar"/>
+ <include name="commons-collections.jar"/>
</fileset>
<fileset dir="${jboss.server.deploy.jbpmbpel}">
- <include name="jbpm*.jar" />
- <include name="commons-lang*.jar" />
- <include name="jaxen*.jar" />
+ <include name="jbpm*.jar"/>
+ <include name="commons-lang*.jar"/>
+ <include name="jaxen*.jar"/>
</fileset>
- <path location="${jboss.server.deploy.jbpmbpel}" />
- <path location="${common.resources}" />
+ <path location="${jboss.server.deploy.jbpmbpel}"/>
+ <path location="${common.resources}"/>
</path>
</target>
-
+
<target name="deploy-jbpmbpel" unless="jbpmbpel.available">
- <mkdir dir="${jboss.server.deploy.jbpmbpel}" />
- <unjar dest="${jboss.server.deploy.jbpmbpel}"
- src="${basedir}/lib/jbpm-bpel.sar" />
+ <mkdir dir="${jboss.server.deploy.jbpmbpel}"/>
+ <unjar dest="${jboss.server.deploy.jbpmbpel}" src="${thirdparty.dir}/jbpm-bpel.sar"/>
</target>
-
- <target name="generate-sources"
- depends="init-jbpmbpel"
- description="Generate the deployment resources.">
-
+
+ <target name="generate-sources" depends="init-jbpmbpel" description="Generate the deployment resources.">
+
<!-- Package the BPEL process and related WSDL interfaces -->
<zip destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
+ <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel"/>
</zip>
-
+
<!-- Define the servicegen ant task -->
- <taskdef name="servicegen"
- classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
- <classpath refid="jbpmbpel.classpath" />
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpmbpel.classpath"/>
</taskdef>
-
+
<!-- Generate binding and service elements -->
<servicegen processfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
-
+ outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"/>
+
<!-- Define the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath>
- <path refid="client.classpath" />
- <path location="${build.tests.dir}" />
- <path location="${common.resources}" />
+ <path refid="client.classpath"/>
+ <path location="${build.tests.dir}"/>
+ <path location="${common.resources}"/>
</classpath>
</taskdef>
-
+
<!-- samples/wsbpel -->
- <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
- config="${resources.dir}/hello/wstools-config.xml" />
-
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${resources.dir}/hello/wstools-config.xml"/>
+
<move todir="${build.tests.dir}/wstools/java">
- <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
- includes="org/**" />
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" includes="org/**"/>
</move>
</target>
-
+
<!-- Build the test deployments -->
- <target name="jars"
- depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
- description="build the deployments">
-
+ <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
+
<!-- jaxrpc-samples-wsbpel -->
- <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
<classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/>
</classes>
<webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="webservices.xml" />
- <include name="classes/bpel-application.xml" />
+ <include name="webservices.xml"/>
+ <include name="classes/bpel-application.xml"/>
</webinf>
<webinf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
- <include name="wsdl/**" />
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
</webinf>
</war>
-
+
<jar destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
<fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
</fileset>
<metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
- <include name="application-client.xml" />
- <include name="jboss-client.xml" />
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
</metainf>
<metainf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
+ <include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
</target>
-
+
<!-- Run the testsuite -->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${sample.path}" />
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
-
+
</project>
\ No newline at end of file
Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
@@ -11,8 +11,8 @@
<import file="${basedir}/common/imported-build.xml"/>
- <target name="generate-sources" depends="compile15"
- description="Generate the deployment resources." if="HAVE_JDK_1.5">
+ <target name="generate-sources" depends="compile"
+ description="Generate the deployment resources.">
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
@@ -30,8 +30,8 @@
<!--
Build the test deployments
-->
- <target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated"
- description="build the deployments" if="HAVE_JDK_1.5">
+ <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
+ description="build the deployments">
<!-- jaxws-samples-jsr181ejb -->
<jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
@@ -11,8 +11,8 @@
<import file="${basedir}/common/imported-build.xml"/>
- <target name="generate-sources" depends="compile15"
- description="Generate the deployment resources." if="HAVE_JDK_1.5">
+ <target name="generate-sources" depends="compile"
+ description="Generate the deployment resources.">
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
@@ -30,8 +30,8 @@
<!--
Build the test deployments
-->
- <target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated"
- description="build the deployments" if="HAVE_JDK_1.5">
+ <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
+ description="build the deployments">
<!-- jaxws-samples-jsr181pojo -->
<war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -14,8 +14,8 @@
<!--
Build the test deployments
-->
- <target name="jars" depends="compile15,copy-resources"
- description="build the deployments" if="HAVE_JDK_1.5">
+ <target name="jars" depends="compile,copy-resources"
+ description="build the deployments">
<!-- jaxws-samples-retail -->
<jar jarfile="${build.test.dir}/libs/jaxws-samples-retail.ejb3">
Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml 2007-01-05 16:09:50 UTC (rev 1821)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
@@ -11,8 +11,8 @@
<import file="${basedir}/common/imported-build.xml"/>
- <target name="generate-sources" depends="compile15"
- description="Generate the deployment resources." if="HAVE_JDK_1.5">
+ <target name="generate-sources" depends="compile"
+ description="Generate the deployment resources.">
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
@@ -29,8 +29,8 @@
<!--
Build the test deployments
-->
- <target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated"
- description="build the deployments" if="HAVE_JDK_1.5">
+ <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
+ description="build the deployments">
<!-- jaxws-samples-wsaddressing -->
<war warfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
@@ -63,7 +63,7 @@
Run the testsuite
-->
<target name="tests" depends="jars"
- description="run the testsuite" if="HAVE_JDK_1.5">
+ description="run the testsuite">
<antcall target="test">
<param name="test" value="${sample.path}"/>
</antcall>
Modified: trunk/jbossws-core/src/main/resources/samples/version.properties
===================================================================
--- trunk/jbossws-core/src/main/resources/samples/version.properties 2007-01-05 15:47:19 UTC (rev 1820)
+++ trunk/jbossws-core/src/main/resources/samples/version.properties 2007-01-05 16:09:50 UTC (rev 1821)
@@ -2,20 +2,20 @@
# $Id: version.properties 1420 2006-11-14 12:44:10Z thomas.diesler(a)jboss.com $
# thirdparty library versions
-apache-collections=@apache-collections@
apache-log4j=@apache-log4j@
apache-logging=@apache-logging@
ibm-wsdl4j=@ibm-wsdl4j@
javassist=@javassist@
jbpm-bpel=@jbpm-bpel@
-jbossas=@jbossas@
-jboss-backport-concurrent=@jboss-backport-concurrent@
-jboss-common=@jboss-common@
-jboss-jbossretro=@jboss-jbossretro@
+jboss-common-core=@jboss-common-core@
+jboss-common-logging=@jboss-common-logging@
+jboss-ejb3=@jboss-ejb3@
jboss-jbossws=(a)version.id@
jboss-jbossxb=@jboss-jbossxb@
+jbossas-core-libs=@jbossas-core-libs@
oswego-concurrent=@oswego-concurrent@
sun-jaf=@sun-jaf@
+sun-jaxb=@sun-jaxb@
sun-javamail=@sun-javamail@
sun-servlet=@sun-servlet@
17 years, 12 months
- 1
- 0
JBossWS SVN: r1820 - branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-05 10:47:19 -0500 (Fri, 05 Jan 2007)
New Revision: 1820
Modified:
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml
Log:
JBWS-1441 - Run test in bare mode as there are multiple elements in the response.
Modified: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-05 15:31:56 UTC (rev 1819)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-05 15:47:19 UTC (rev 1820)
@@ -1,5 +1,5 @@
<configuration>
- <wsdl-java location="resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="wrapped">
+ <wsdl-java location="resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="bare">
<mapping file="jaxrpc-mapping.xml"/>
</wsdl-java>
</configuration>
17 years, 12 months
- 1
- 0
JBossWS SVN: r1819 - in branches/dlofthouse/JBWS-1441/src/test: java/org/jboss/test/ws/tools java/org/jboss/test/ws/tools/jbws1441 resources/tools resources/tools/jbws1441
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-05 10:31:56 -0500 (Fri, 05 Jan 2007)
New Revision: 1819
Added:
branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/
branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml
Log:
JBWS-1441 - Test Case
Added: branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1441;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 5 Jan 2007
+ */
+public class JBWS1441TestCase extends JBossWSTest
+{
+
+ private static final String resourceDir = "resources/tools/jbws1441";
+ private static final String toolsDir = "tools/jbws1441";
+
+ public void testGenerate() throws Exception
+ {
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource("AbstractType.java");
+ compareSource("Person.java");
+ compareSource("PhoneBook_PortType.java");
+ compareSource("TelephoneNumber.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String fileName) throws Exception
+ {
+ File expected = new File(resourceDir + "/" + fileName);
+ File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1441/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,13 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1441;
+
+
+public class AbstractType {
+
+ public AbstractType() {
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/AbstractType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,36 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1441;
+
+
+public class Person extends org.jboss.test.ws.jbws1441.AbstractType {
+ protected java.lang.String firstName;
+ protected java.lang.String surname;
+
+ public Person() {
+ }
+
+ public Person(java.lang.String firstName, java.lang.String surname) {
+ this.firstName = firstName;
+ this.surname = surname;
+ }
+
+ public java.lang.String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(java.lang.String firstName) {
+ this.firstName = firstName;
+ }
+
+ public java.lang.String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(java.lang.String surname) {
+ this.surname = surname;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1441' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1441/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1441' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1441/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1441/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='AbstractType'>
+ <sequence/>
+ </complexType>
+
+ <complexType name='Person'>
+ <complexContent>
+ <extension base='tns:AbstractType'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <complexContent>
+ <extension base='tns:AbstractType'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name='lookup' type='tns:Person'/>
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1441;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1441.TelephoneNumber lookup(org.jboss.test.ws.jbws1441.Person parameters) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,36 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1441;
+
+
+public class TelephoneNumber extends org.jboss.test.ws.jbws1441.AbstractType {
+ protected java.lang.String areaCode;
+ protected java.lang.String number;
+
+ public TelephoneNumber() {
+ }
+
+ public TelephoneNumber(java.lang.String areaCode, java.lang.String number) {
+ this.areaCode = areaCode;
+ this.number = number;
+ }
+
+ public java.lang.String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(java.lang.String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public java.lang.String getNumber() {
+ return number;
+ }
+
+ public void setNumber(java.lang.String number) {
+ this.number = number;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1441</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1260</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1441</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1260/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1441.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1441.Person</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1260/types">typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1441.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1260">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1441.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1260">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1260">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1441.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1441.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1260">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-05 14:42:43 UTC (rev 1818)
+++ branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-05 15:31:56 UTC (rev 1819)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="wrapped">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1441/src/test/resources/tools/jbws1441/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 12 months
- 1
- 0
JBossWS SVN: r1818 - branches/dlofthouse
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-05 09:42:43 -0500 (Fri, 05 Jan 2007)
New Revision: 1818
Added:
branches/dlofthouse/JBWS-1441/
Log:
Branch for JBWS-1441
Copied: branches/dlofthouse/JBWS-1441 (from rev 1817, branches/jbossws-1.0)
17 years, 12 months
- 1
- 0
JBossWS SVN: r1817 - trunk/jbossws-docs/online/tutorial-doc/en
by jbossws-commits＠lists.jboss.org
Author: sam.griffith(a)jboss.com
Date: 2007-01-05 07:30:20 -0500 (Fri, 05 Jan 2007)
New Revision: 1817
Modified:
trunk/jbossws-docs/online/tutorial-doc/en/master.xml
Log:
Modified: trunk/jbossws-docs/online/tutorial-doc/en/master.xml
===================================================================
--- trunk/jbossws-docs/online/tutorial-doc/en/master.xml 2007-01-05 12:15:43 UTC (rev 1816)
+++ trunk/jbossws-docs/online/tutorial-doc/en/master.xml 2007-01-05 12:30:20 UTC (rev 1817)
@@ -19,8 +19,8 @@
<bookinfo>
<title>JBossWS Tutorials</title>
- <subtitle>jbossws-2.0.0.CR3.DEV</subtitle>
- <releaseinfo>10-Dec-2006</releaseinfo>
+ <subtitle>jbossws-1.2.0.CR2</subtitle>
+ <releaseinfo>05-Jan-2007</releaseinfo>
<releaseinfo>
<ulink url="http://labs.jboss.com/jbossws/tutorials/en/html/index.html">[Multiple Pages]</ulink>,
<ulink url="http://labs.jboss.com/jbossws/tutorials/en/html_single/index.html">[Single Page]</ulink>,
17 years, 12 months
- 1
- 0
JBossWS SVN: r1816 - trunk/integration-jboss42
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 07:15:43 -0500 (Fri, 05 Jan 2007)
New Revision: 1816
Modified:
trunk/integration-jboss42/build.xml
Log:
Fix jdk-1.4 compile issues
Modified: trunk/integration-jboss42/build.xml
===================================================================
--- trunk/integration-jboss42/build.xml 2007-01-05 12:15:39 UTC (rev 1815)
+++ trunk/integration-jboss42/build.xml 2007-01-05 12:15:43 UTC (rev 1816)
@@ -26,6 +26,7 @@
<property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/>
<target name="jboss42-init" depends="prepare, thirdparty">
+ <fail message="Not available: ${jboss42.client}/jboss-client.jar" unless="jboss42.available"/>
</target>
<!-- ================================================================== -->
17 years, 12 months
- 1
- 0
JBossWS SVN: r1815 - trunk/integration-tomcat
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-05 07:15:39 -0500 (Fri, 05 Jan 2007)
New Revision: 1815
Modified:
trunk/integration-tomcat/build.xml
Log:
Fix jdk-1.4 compile issues
Modified: trunk/integration-tomcat/build.xml
===================================================================
--- trunk/integration-tomcat/build.xml 2007-01-05 12:15:34 UTC (rev 1814)
+++ trunk/integration-tomcat/build.xml 2007-01-05 12:15:39 UTC (rev 1815)
@@ -28,6 +28,7 @@
<available property="jbossws.thirdparty.available" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar"/>
<target name="tomcat-init" depends="prepare, thirdparty">
+ <fail message="Not available: ${tomcat.home}/server/lib/catalina.jar" unless="tomcat.available"/>
</target>
<!-- ================================================================== -->
@@ -139,10 +140,7 @@
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/>
<copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/>
- <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-core.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-jaxws.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/>
- <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-saaj.jar" overwrite="true"/>
+ <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-client.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/>
<copy todir="${tomcat.common.dir}/lib" file="${tomcat.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/>
<copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/>
17 years, 12 months
- 1
- 0