JBossWS SVN: r1246 - in trunk/src/main/resources/samples: . common jaxrpc/wsbpel
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 15:03:21 -0400 (Tue, 17 Oct 2006)
New Revision: 1246
Added:
trunk/src/main/resources/samples/common/
trunk/src/main/resources/samples/common/imported-build.xml
trunk/src/main/resources/samples/common/jndi.properties
trunk/src/main/resources/samples/common/log4j.xml
Modified:
trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml
Log:
release snapshot
Added: trunk/src/main/resources/samples/common/imported-build.xml
===================================================================
--- trunk/src/main/resources/samples/common/imported-build.xml 2006-10-17 18:43:30 UTC (rev 1245)
+++ trunk/src/main/resources/samples/common/imported-build.xml 2006-10-17 19:03:21 UTC (rev 1246)
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<project default="imported">
+
+ <!--
+ Init
+ -->
+ <target name="init">
+
+ <property file="${basedir}/ant.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"/>
+
+ <!-- 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}">
+ <not>
+ <isset property="HAVE_JDK_1.5"/>
+ </not>
+ </condition>
+ <condition property="jboss.home" value="${jboss.jdk15.home}">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+
+ <property name="jboss.client" value="${jboss.home}/client"/>
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <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"/>
+
+ <!-- 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
+ localhost and hostname, then you need to specify node0 and node1 binding
+ in the local.properties that can in order to be able to run the clustering
+ tests.
+ -->
+ <property environment="env"/>
+ <condition property="hostname" value="${env.COMPUTERNAME}">
+ <os family="windows"/>
+ </condition>
+ <condition property="hostname" value="${env.HOSTNAME}">
+ <not>
+ <os family="windows"/>
+ </not>
+ </condition>
+
+ <!-- node0 defaults -->
+ <property name="node0" value="${hostname}"/>
+ <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"/>
+
+ <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>
+
+ <path id="compile.classpath">
+ <path refid="client.classpath"/>
+ <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/>
+ <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.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"/>
+ </fileset>
+ <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/>
+ <pathelement location="${basedir}/lib/jbossws-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/>
+
+ <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/>
+ <fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/>
+
+ <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"/>
+
+ <touch file="${build.test.dir}/log/samples.log"/>
+ </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>
+ </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">
+ <src path="${common.java}"/>
+ <src path="${java.dir}"/>
+ </javac>
+ </target>
+
+ <!--
+ 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"/>
+ </javac>
+ </target>
+
+ <!--
+ Copy the resources
+ -->
+ <target name="copy-resources" depends="init" description="copy the resources">
+ <!-- copy resource files -->
+ <copy todir="${build.test.dir}/resources/${sample.path}">
+ <fileset dir="${resources.dir}">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ </filterset>
+ </copy>
+ <!-- copy binary files -->
+ <copy todir="${build.test.dir}/resources/${sample.path}">
+ <fileset dir="${resources.dir}">
+ <exclude name="**/*.wsdl"/>
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!--
+ Copy the generated resources
+ -->
+ <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">
+ <include name="${sample.path}/**/*.wsdl"/>
+ <include name="${sample.path}/**/*.xml"/>
+ </fileset>
+ </copy>
+ <!-- copy override resource files -->
+ <copy todir="${build.test.dir}/resources" overwrite="true">
+ <fileset dir="${common.resources}/overrides">
+ <include name="${sample.path}/**/*.wsdl"/>
+ <include name="${sample.path}/**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="jbosstest.host.name" value="${node0}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!--
+ Run a single test
+
+ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.rpcstyle.TrivialServiceRpcTestCase one-test
+ -->
+ <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" /-->
+ <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="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <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.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="${common.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <test fork="yes" todir="${build.test.dir}/reports" name="${test}"/>
+ </junit>
+
+ <junitreport todir="${build.test.dir}/reports">
+ <fileset dir="${build.test.dir}/reports">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${build.test.dir}/reports/html"/>
+ </junitreport>
+ </target>
+
+ <!--
+ Run a test collection
+
+ ant -Dtest=wssecurity test
+ -->
+ <target name="test" depends="init" if="test" description="run a collection of tests">
+
+ <junit printsummary="yes" showoutput="yes" dir="${build.test.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="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
+ <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.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="${common.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
+ <batchtest fork="yes" todir="${build.test.dir}/reports">
+ <fileset dir="${java.dir}">
+ <include name="org/jboss/test/ws/${test}/**/*TestCase.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ </target>
+
+ <!--
+ 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">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${build.test.dir}/reports/html"/>
+ </junitreport>
+ </target>
+
+ <!--
+ Main entry point
+ -->
+ <target name="main" depends="jars" description="main build">
+ </target>
+
+ <!--
+ Clean the build
+ -->
+ <target name="clean" depends="init" description="clean the build">
+ <delete dir="${build.test.dir}"/>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: trunk/src/main/resources/samples/common/imported-build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/main/resources/samples/common/jndi.properties
===================================================================
--- trunk/src/main/resources/samples/common/jndi.properties 2006-10-17 18:43:30 UTC (rev 1245)
+++ trunk/src/main/resources/samples/common/jndi.properties 2006-10-17 19:03:21 UTC (rev 1246)
@@ -0,0 +1,4 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming.client
+java.naming.provider.url=jnp://localhost:1099
+j2ee.clientName=ws4ee-client
Added: trunk/src/main/resources/samples/common/log4j.xml
===================================================================
--- trunk/src/main/resources/samples/common/log4j.xml 2006-10-17 18:43:30 UTC (rev 1245)
+++ trunk/src/main/resources/samples/common/log4j.xml 2006-10-17 19:03:21 UTC (rev 1246)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${log.dir}/samples.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit apache axis to INFO as its DEBUG is even more verbose -->
+ <category name="org.jboss.axis">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!-- Limit JBoss webservice category -->
+ <category name="org.jboss.webservice">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!-- appender-ref ref="CONSOLE"/ -->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: trunk/src/main/resources/samples/common/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml
===================================================================
--- trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-10-17 18:43:30 UTC (rev 1245)
+++ trunk/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-10-17 19:03:21 UTC (rev 1246)
@@ -1,33 +1,31 @@
<?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">
<property name="chapter" value="jaxrpc/wsbpel" />
- <property name="sample.path" value="jaxrpc/samples/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="zip-processes">
- <!-- Zip the BPEL process and related WSDL interfaces -->
- <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
- </zip>
- </target>
-
- <target name="check-jbpmbpel">
+ <target name="init-jbpmbpel">
+ <!-- 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" />
+ <!-- The jBPM BPEL classpath -->
<path id="jbpmbpel.classpath">
<path refid="client.classpath" />
- <path location="${jboss.lib}/dom4j.jar" />
- <path location="${jboss.server.lib}/commons-collections.jar" />
+ <fileset dir="${jboss.server.lib}">
+ <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" />
@@ -38,11 +36,21 @@
</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" />
+ </target>
+
<target name="generate-sources"
- depends="zip-processes,check-jbpmbpel"
- if="jbpmbpel.available"
+ depends="init-jbpmbpel"
description="Generate the deployment resources.">
+ <!-- Package the BPEL process and related WSDL interfaces -->
+ <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
+ </zip>
+
<!-- Define the servicegen ant task -->
<taskdef name="servicegen"
classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
@@ -72,12 +80,9 @@
</move>
</target>
- <!--
- Build the test deployments
- -->
+ <!-- Build the test deployments -->
<target name="jars"
depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
- if="jbpmbpel.available"
description="build the deployments">
<!-- jaxrpc-samples-wsbpel -->
@@ -111,25 +116,10 @@
<include name="jaxrpc-mapping.xml" />
</metainf>
</jar>
-
</target>
- <target name="store-processes" if="jbpmbpel.available">
- <taskdef name="storeprocess"
- classname="org.jbpm.bpel.ant.DeployProcessTask">
- <classpath refid="jbpmbpel.classpath" />
- </taskdef>
- <!-- Store the process definition in the jBPM database -->
- <storeprocess processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" />
- </target>
-
- <!--
- Run the testsuite
- -->
- <target name="tests"
- depends="jars,store-processes"
- description="run the testsuite"
- if="jbpmbpel.available">
+ <!-- Run the testsuite -->
+ <target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
<param name="test" value="${sample.path}" />
</antcall>
17 years, 7 months
- 1
- 0
JBossWS SVN: r1245 - trunk
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 14:43:30 -0400 (Tue, 17 Oct 2006)
New Revision: 1245
Modified:
trunk/version.properties
Log:
update repository snapshot
Modified: trunk/version.properties
===================================================================
--- trunk/version.properties 2006-10-17 18:27:03 UTC (rev 1244)
+++ trunk/version.properties 2006-10-17 18:43:30 UTC (rev 1245)
@@ -6,7 +6,7 @@
specification.version=jbossws-2.0
version.id=2.0.0.CR1
-repository.id=2.0.0.CR1
+repository.id=snapshot
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
17 years, 7 months
- 1
- 0
JBossWS SVN: r1244 - in trunk/src/test/java/org/jboss/test/ws/jaxrpc: jbws1205 wsse
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 14:27:03 -0400 (Tue, 17 Oct 2006)
New Revision: 1244
Modified:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
Log:
Enable tests that show JBAS-3350
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-10-17 17:50:01 UTC (rev 1243)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java 2006-10-17 18:27:03 UTC (rev 1244)
@@ -38,7 +38,6 @@
private static TestEndpoint port;
- /*
public static Test suite() throws Exception
{
return JBossWSTestSetup.newTestSetup(JBWS1205TestCase.class, "jaxrpc-jbws1205-simple.war, jaxrpc-jbws1205-test.war, jaxrpc-jbws1205-client.jar");
@@ -55,15 +54,9 @@
port = (TestEndpoint)service.getPort(TestEndpoint.class);
}
}
- */
public void testEndpoint() throws Exception
{
- if (true)
- {
- System.out.println("FIXME: JBAS-3350");
- return;
- }
port.performTest();
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-10-17 17:50:01 UTC (rev 1243)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java 2006-10-17 18:27:03 UTC (rev 1244)
@@ -38,24 +38,16 @@
*/
public class WebClientTestCase extends JBossWSTest
{
- /*
public static Test suite() throws Exception
{
return JBossWSTestSetup.newTestSetup(WebClientTestCase.class, "jaxrpc-wsse-web-client.war");
}
- */
/**
* Test servlet client access
*/
public void testWebClient() throws Exception
{
- if (true)
- {
- System.out.println("FIXME: JBAS-3350");
- return;
- }
-
URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello");
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
String res = br.readLine();
17 years, 7 months
- 1
- 0
JBossWS SVN: r1243 - in trunk: . src/main/java/org/jboss/ws/jaxws/core
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 13:50:01 -0400 (Tue, 17 Oct 2006)
New Revision: 1243
Modified:
trunk/src/main/java/org/jboss/ws/jaxws/core/HTTPBindingJAXWS.java
trunk/version.properties
Log:
align jbossxb with JEE5_TCK
Modified: trunk/src/main/java/org/jboss/ws/jaxws/core/HTTPBindingJAXWS.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/core/HTTPBindingJAXWS.java 2006-10-17 14:02:51 UTC (rev 1242)
+++ trunk/src/main/java/org/jboss/ws/jaxws/core/HTTPBindingJAXWS.java 2006-10-17 17:50:01 UTC (rev 1243)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.jaxws.core;
-// $Id: $
+// $Id$
import java.util.List;
import java.util.Map;
Modified: trunk/version.properties
===================================================================
--- trunk/version.properties 2006-10-17 14:02:51 UTC (rev 1242)
+++ trunk/version.properties 2006-10-17 17:50:01 UTC (rev 1243)
@@ -18,7 +18,7 @@
ibm-wsdl4j=1.5.2jboss
javassist=3.3.0.GA
jboss-common=1.0.2
-jboss-jbossxb=snapshot
+jboss-jbossxb=1.0.0.CR6
jboss-microcontainer=snapshot
jboss-remoting=1.4.3.GA
17 years, 7 months
- 1
- 0
JBossWS SVN: r1242 - in branches/jbossws-1.0: . src/test
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 10:02:51 -0400 (Tue, 17 Oct 2006)
New Revision: 1242
Modified:
branches/jbossws-1.0/build.xml
branches/jbossws-1.0/src/test/build.xml
Log:
merge from trunk
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-10-17 13:57:51 UTC (rev 1241)
+++ branches/jbossws-1.0/build.xml 2006-10-17 14:02:51 UTC (rev 1242)
@@ -12,17 +12,17 @@
<!-- $Id$ -->
<project default="main" name="JBossWS">
-
+
<import file="${basedir}/src/ant/build-thirdparty.xml"/>
<import file="${basedir}/src/ant/build-samples.xml"/>
-
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<property file="ant.properties"/>
<property file="version.properties"/>
-
+
<property environment="env"/>
<property name="build.dir" value="${basedir}/output"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
@@ -44,9 +44,9 @@
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
<property name="test.resources.dir" value="${test.dir}/resources"/>
-
+
<property name="thirdparty.dir" value="${basedir}/thirdparty"/>
-
+
<property name="jboss.home" value="${jboss.jdk15.home}"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
<property name="jboss.client" value="${jboss.home}/client"/>
@@ -54,20 +54,20 @@
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
<property name="jboss.thirdparty" value="${jboss.home}/../../../thirdparty"/>
-
+
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<echo message="jboss.home = ${jboss.home}"/>
<echo message="tomcat.home = ${tomcat.home}"/>
<echo/>
-
+
<available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
<available property="jboss.ejb3.available" file="${jboss.client}/jboss-ejb3-client.jar"/>
<available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
@@ -83,36 +83,36 @@
<isfalse value="${checksum.ok}"/>
</or>
</condition>
-
+
<fail message="Not available: ${jboss.client}/jboss-ejb3-client.jar" unless="jboss.ejb3.available"/>
-
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
-
+
</target>
-
+
<target name="init" depends="prepare, thirdparty">
-
+
<!-- The combined compile classpath -->
<path id="core.classpath">
<path refid="library.classpath"/>
<path refid="jboss.core.classpath"/>
</path>
-
+
<!-- The combined integration classpath -->
<path id="integration.classpath">
<path refid="library.classpath"/>
<path refid="jboss.core.classpath"/>
<path refid="jboss.integration.classpath"/>
</path>
-
+
</target>
-
+
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
-
+
<!--
| Compile everything.
|
@@ -120,28 +120,28 @@
| different type of compile that needs to be performed, short of
| documentation compiles.
-->
-
+
<target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
-
+
<!-- Compile java sources -->
<target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/>
-
+
<!-- Compile core java sources -->
<target name="compile-interfaces" depends="init">
<mkdir dir="${build.classes14.dir}"/>
- <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
+ <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
<classpath refid="core.classpath"/>
</javac>
</target>
-
+
<!-- Compile core java sources -->
<target name="compile-core" depends="compile-interfaces">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}">
+ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
<include name="org/jboss/ws/**"/>
@@ -150,18 +150,18 @@
<classpath refid="core.classpath"/>
</javac>
</target>
-
+
<!-- Compile interation java sources -->
<target name="compile-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
- failonerror="${javac.fail.onerror}">
+ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/**"/>
<classpath path="${build.classes14.dir}"/>
<classpath refid="integration.classpath"/>
</javac>
</target>
-
+
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${build.etc.dir}"/>
@@ -176,7 +176,7 @@
</filterset>
</copy>
</target>
-
+
<!-- Compile resource files -->
<target name="compile-resources" depends="init">
<mkdir dir="${build.resources.dir}"/>
@@ -184,22 +184,22 @@
<fileset dir="${src.resources.dir}"/>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
-
+
<!--
| Build all jar files.
-->
<target name="jars" description="Builds all jar files." depends="compile,module-jars">
</target>
-
+
<!--
| Build all jar files.
-->
<target name="module-jars">
-
+
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf">
@@ -207,7 +207,7 @@
<include name="javax/xml/rpc/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-saaj.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf">
@@ -215,7 +215,7 @@
<include name="javax/xml/soap/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-jaxws.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf">
@@ -224,7 +224,7 @@
<include name="javax/xml/ws/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf">
@@ -238,7 +238,7 @@
<include name="dtd/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
@@ -247,14 +247,14 @@
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-tomcat-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/integration/tomcat/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws.beans -->
<mkdir dir="${build.lib.dir}/jbossws.beans/META-INF"/>
<copy todir="${build.lib.dir}/jbossws.beans/META-INF" file="${build.resources.dir}/jbossws.beans/META-INF/jboss-beans.xml"/>
@@ -280,7 +280,7 @@
<include name="wstools-log4j.xml"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-context.war -->
<war warfile="${build.lib.dir}/jbossws-context.war" webxml="${build.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
<fileset dir="${build.resources.dir}/jbossws.war">
@@ -291,7 +291,7 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
-
+
<!-- Build jbossws.war -->
<war warfile="${build.lib.dir}/jbossws.war" webxml="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
<fileset dir="${build.resources.dir}/jbossws.war">
@@ -306,7 +306,7 @@
<include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
</fileset>
</war>
-
+
<!-- Build jbossws.sar -->
<jar jarfile="${build.lib.dir}/jbossws.sar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
@@ -332,11 +332,11 @@
<include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
-
+
</target>
-
+
<target name="module-jars14" depends="jbossretro">
-
+
<!-- Build jboss-jaxws14.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf">
@@ -345,7 +345,7 @@
<include name="javax/xml/ws/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws14-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf">
@@ -359,7 +359,7 @@
<include name="dtd/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws14-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes14.dir}">
@@ -397,7 +397,7 @@
<include name="wstools-log4j.xml"/>
</fileset>
</jar>
-
+
<!-- Build jbossws14.sar -->
<jar jarfile="${build.lib.dir}/jbossws14.sar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
@@ -419,14 +419,14 @@
<include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
-
+
</target>
-
+
<!--
Retrotranslation
-->
<target name="jbossretro" depends="compile">
-
+
<!-- Weave the build.classes to build.classes14 -->
<taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro">
<classpath>
@@ -434,9 +434,9 @@
<pathelement location="${thirdparty.dir}/jbossretro.jar"/>
</classpath>
</taskdef>
-
+
<mkdir dir="${build.classes14.dir}"/>
-
+
<retro destdir="${build.classes14.dir}">
<classpath>
<pathelement location="${build.lib.dir}/jboss-jaxrpc.jar"/>
@@ -451,7 +451,7 @@
<classpath refid="integration.classpath"/>
<src path="${build.classes.dir}"/>
</retro>
-
+
<copy todir="${build.classes14.dir}">
<fileset dir="${build.resources.dir}">
<include name="schema/**"/>
@@ -459,11 +459,11 @@
</fileset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
-
+
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
<javadoc destdir="${build.api}" author="true" version="true" use="true" windowtitle="JBossWS API">
@@ -475,11 +475,11 @@
</packageset>
</javadoc>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment -->
<!-- ================================================================== -->
-
+
<!-- Deploy jbossws to the server -->
<target name="deploy-jbossws" depends="main" description="Deploy jbossws">
<antcall target="deploy-to-server">
@@ -491,13 +491,13 @@
<param name="jbossws" value="jbossws"/>
</antcall>
</target>
-
+
<!-- Deploy jbossws14 to the server -->
<target name="module-jars14-assert" unless="jboss.jdk14.home">
<echo>ERROR: 'jboss.jdk14.home' is not set. </echo>
- <echo>Make sure to point it to your jboss confiuguration thagt should run under jdk 1.4</echo>
+ <echo>Make sure to point it to your jboss configuration thagt should run under jdk 1.4</echo>
</target>
-
+
<target name="deploy-jbossws14" depends="main,module-jars14, module-jars14-assert" description="Deploy jbossws14" if="jboss.jdk14.home">
<antcall target="deploy-to-server">
<param name="jboss.deploy.home" value="${jboss.jdk14.home}"/>
@@ -508,7 +508,7 @@
<param name="jbossws" value="jbossws14"/>
</antcall>
</target>
-
+
<!-- Deploy to jboss -->
<target name="deploy-to-server">
<copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
@@ -518,14 +518,14 @@
<mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
<unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/>
</target>
-
+
<!-- Deploy to jboss/thirdparty -->
<target name="deploy-to-thirdparty" if="jboss.source.dist.available">
<copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
</target>
-
+
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
@@ -543,7 +543,7 @@
<copy todir="${tomcat.webapps.dir}" file="${build.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
-
+
<target name="jbossws-thirdparty-jar" unless="jbossws.thirdparty.available">
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${build.lib.dir}/build"/>
@@ -563,14 +563,14 @@
</jar>
<delete dir="${build.lib.dir}/build"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Release -->
<!-- ================================================================== -->
-
+
<!-- Deploy jbossws to the server specified like this: -Dserver=default -->
<target name="release" depends="all" description="Release to jboss.local.repository">
-
+
<!-- jbossws -->
<property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
<mkdir dir="${jbossws.dir}/lib"/>
@@ -588,7 +588,7 @@
<filtersfile file="version.properties"/>
</filterset>
</copy>
-
+
<!-- jbossws14 -->
<property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/>
<mkdir dir="${jbossws14.dir}/lib"/>
@@ -607,20 +607,20 @@
</filterset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Misc. -->
<!-- ================================================================== -->
-
+
<!-- Clean up all build output -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}"/>
</target>
-
+
<target name="main" description="Executes the default target (most)." depends="most"/>
-
+
<target name="most" description="Builds almost everything." depends="jars"/>
-
+
<target name="all" description="Create a distribution zip file"
depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs,build-bin-dist,build-src-dist">
</target>
@@ -655,7 +655,7 @@
<include name="wstools.sh"/>
</fileset>
</copy>
-
+
<!-- samples -->
<copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
@@ -666,17 +666,17 @@
<copy todir="${build.bin.dist}/docs" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/pdf"/>
</copy>
-
+
<!-- lib/jdk1.5 -->
<copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
</copy>
-
+
<!-- lib/jdk1.4 -->
<copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
</copy>
-
+
<!-- lib/tomcat -->
<copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true">
<fileset dir="${thirdparty.dir}">
@@ -718,5 +718,5 @@
<zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${build.src.dist}"
includes="jbossws-${version.id}/**"/>
</target>
-
+
</project>
Modified: branches/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/jbossws-1.0/src/test/build.xml 2006-10-17 13:57:51 UTC (rev 1241)
+++ branches/jbossws-1.0/src/test/build.xml 2006-10-17 14:02:51 UTC (rev 1242)
@@ -18,7 +18,7 @@
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
-
+
<property name="build.dir" value="${basedir}/output"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.test.dir" value="${build.dir}/tests"/>
@@ -429,6 +429,7 @@
<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"/>
+ <sysproperty key="client.scenario" value="${client.scenario}"/>
<classpath>
<path refid="test.client.classpath"/>
<pathelement location="${build.test.dir}/classes"/>
17 years, 7 months
- 1
- 0
JBossWS SVN: r1241 - in trunk: . src/ant src/test
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 09:57:51 -0400 (Tue, 17 Oct 2006)
New Revision: 1241
Modified:
trunk/
trunk/build.xml
trunk/src/ant/build-thirdparty.xml
trunk/src/test/build.xml
trunk/version.properties
Log:
Merge from jbossws-1.0
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
-
clipboard.xml
output
output-eclipse
thirdparty
ant.properties
+
clipboard.xml
output
output-eclipse
thirdparty
ant.properties
version.properties.md5
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-10-17 13:16:41 UTC (rev 1240)
+++ trunk/build.xml 2006-10-17 13:57:51 UTC (rev 1241)
@@ -31,7 +31,8 @@
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.resources.dir" value="${build.dir}/resources"/>
<property name="build.samples.dir" value="${build.dir}/samples"/>
- <property name="build.dist.dir" value="${build.dir}/dist"/>
+ <property name="build.bin.dist" value="${build.dir}/bin-dist"/>
+ <property name="build.src.dist" value="${build.dir}/src-dist"/>
<property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/>
<property name="src.dir" value="${basedir}/src/main"/>
<property name="src.etc.dir" value="${src.dir}/etc"/>
@@ -70,11 +71,17 @@
<available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
<available property="jboss.ejb3.available" file="${jboss.client}/jboss-ejb3-client.jar"/>
<available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
-
+
+ <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
+ <checksum file="version.properties" fileext=".md5"/>
+
<condition property="force.thirdparty.get">
- <not>
- <available file="${thirdparty.dir}" type="dir"/>
- </not>
+ <or>
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ <isfalse value="${checksum.ok}"/>
+ </or>
</condition>
<fail message="Not available: ${jboss.client}/jboss-ejb3-client.jar" unless="jboss.ejb3.available"/>
@@ -150,7 +157,6 @@
<javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/**"/>
- <include name="org/jboss/ws/transport/jms/**"/>
<classpath path="${build.classes14.dir}"/>
<classpath refid="integration.classpath"/>
</javac>
@@ -225,7 +231,6 @@
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
<exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
<fileset dir="${build.resources.dir}">
@@ -239,7 +244,6 @@
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss/**"/>
- <include name="org/jboss/ws/transport/jms/**"/>
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
</jar>
@@ -252,12 +256,9 @@
</jar>
<!-- Build jbossws.beans -->
- <jar jarfile="${build.lib.dir}/jbossws.beans" manifest="${build.etc.dir}/default.mf">
- <metainf dir="${build.resources.dir}/jbossws.beans/META-INF">
- <include name="jboss-beans.xml"/>
- </metainf>
- </jar>
-
+ <mkdir dir="${build.lib.dir}/jbossws.beans/META-INF"/>
+ <copy todir="${build.lib.dir}/jbossws.beans/META-INF" file="${build.resources.dir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+
<!-- Build jbossws-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
@@ -265,7 +266,6 @@
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
</fileset>
<fileset dir="${build.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -317,7 +317,7 @@
<include name="jbossws-context.war"/>
<include name="jbossws-core.jar"/>
<include name="jboss-jaxws.jar"/>
- <include name="jbossws.beans"/>
+ <include name="jbossws.beans/**"/>
</fileset>
<fileset dir="${thirdparty.dir}">
<include name="jaxb-api.jar"/>
@@ -357,7 +357,6 @@
<fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
<exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
<fileset dir="${build.resources.dir}">
@@ -366,16 +365,22 @@
</fileset>
</jar>
- <!-- Build jbossws-jboss-integration.jar -->
+ <!-- Build jbossws14-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss/**"/>
- <include name="org/jboss/ws/transport/jms/**"/>
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
</jar>
-
+
+ <!-- Build jbossws14-tomcat-integration.jar -->
+ <jar jarfile="${build.lib.dir}/jbossws14-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="org/jboss/ws/integration/tomcat/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws14-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes14.dir}">
@@ -383,7 +388,6 @@
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
</fileset>
<fileset dir="${build.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -406,7 +410,7 @@
<include name="jbossws14-core.jar"/>
<include name="jbossws-context.war"/>
<include name="jboss-jaxws14.jar"/>
- <include name="jbossws.beans"/>
+ <include name="jbossws.beans/**"/>
</fileset>
<fileset dir="${thirdparty.dir}">
<include name="wsdl4j.jar"/>
@@ -426,7 +430,6 @@
<!--
Retrotranslation
-->
-
<target name="jbossretro" depends="compile">
<!-- Weave the build.classes to build.classes14 -->
@@ -496,8 +499,8 @@
<!-- Deploy jbossws14 to the server -->
<target name="module-jars14-assert" unless="jboss.jdk14.home">
- <echo>ERROR: 'jboss.jdk14.home' is not set. </echo>
- <echo>Make sure to point it to your jboss confiuguration thagt should run under jdk 1.4</echo>
+ <echo>ERROR: 'jboss.jdk14.home' is not set. </echo>
+ <echo>Make sure to point it to your jboss configuration thagt should run under jdk 1.4</echo>
</target>
<target name="deploy-jbossws14" depends="main,module-jars14, module-jars14-assert" description="Deploy jbossws14" if="jboss.jdk14.home">
@@ -513,7 +516,6 @@
<!-- Deploy to jboss -->
<target name="deploy-to-server">
- <echo>Replacing jbossxb under ${jboss.deploy.home}/client and /lib</echo>
<copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
@@ -524,6 +526,7 @@
<!-- Deploy to jboss/thirdparty -->
<target name="deploy-to-thirdparty" if="jboss.source.dist.available">
+ <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
</target>
@@ -620,25 +623,35 @@
<target name="most" description="Builds almost everything." depends="jars"/>
- <target name="all" description="Create a distribution zip file" depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
-
- <mkdir dir="${build.dist.dir}"/>
- <mkdir dir="${build.dist.dir}/bin"/>
- <mkdir dir="${build.dist.dir}/samples"/>
- <mkdir dir="${build.dist.dir}/docs/html"/>
- <mkdir dir="${build.dist.dir}/lib/jboss-jdk1.5"/>
- <mkdir dir="${build.dist.dir}/lib/jboss-jdk1.4"/>
- <mkdir dir="${build.dist.dir}/lib/tomcat/common/endorsed"/>
- <mkdir dir="${build.dist.dir}/lib/tomcat/common/lib"/>
- <mkdir dir="${build.dist.dir}/lib/tomcat/webapps"/>
-
- <copy todir="${build.dist.dir}" filtering="true" overwrite="true">
+ <target name="all" description="Create a distribution zip file"
+ depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs,build-bin-dist,build-src-dist">
+ </target>
+
+ <!-- Build the documentation -->
+ <target name="build-docs" description="Build the documentation">
+ <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
+ </target>
+
+ <!-- Build the bin dist -->
+ <target name="build-bin-dist" description="Build the binary distribution">
+
+ <mkdir dir="${build.bin.dist}"/>
+ <mkdir dir="${build.bin.dist}/bin"/>
+ <mkdir dir="${build.bin.dist}/samples"/>
+ <mkdir dir="${build.bin.dist}/docs/html"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/>
+ <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/>
+ <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/>
+ <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/>
+
+ <copy todir="${build.bin.dist}" filtering="true" overwrite="true">
<fileset dir="${src.dist.dir}"/>
<filterset>
<filtersfile file="version.properties"/>
</filterset>
</copy>
- <copy todir="${build.dist.dir}/bin">
+ <copy todir="${build.bin.dist}/bin">
<fileset dir="${src.etc.dir}">
<include name="wstools.bat"/>
<include name="wstools.sh"/>
@@ -646,35 +659,35 @@
</copy>
<!-- samples -->
- <copy todir="${build.dist.dir}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
-
+ <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
+
<!-- documentation -->
- <copy todir="${build.dist.dir}/docs/html" overwrite="true">
+ <copy todir="${build.bin.dist}/docs/html" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/html"/>
</copy>
- <copy todir="${build.dist.dir}/docs" overwrite="true">
+ <copy todir="${build.bin.dist}/docs" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/pdf"/>
</copy>
<!-- lib/jdk1.5 -->
- <copy todir="${build.dist.dir}/lib/jboss-jdk1.5" overwrite="true">
+ <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
</copy>
<!-- lib/jdk1.4 -->
- <copy todir="${build.dist.dir}/lib/jboss-jdk1.4" overwrite="true">
+ <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
</copy>
<!-- lib/tomcat -->
- <copy todir="${build.dist.dir}/lib/tomcat/common/endorsed" overwrite="true">
+ <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true">
<fileset dir="${thirdparty.dir}">
<include name="serializer.jar"/>
<include name="xalan.jar"/>
<include name="xercesImpl.jar"/>
</fileset>
</copy>
- <copy todir="${build.dist.dir}/lib/tomcat/common/lib" overwrite="true">
+ <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true">
<fileset dir="${thirdparty.dir}">
<include name="activation.jar"/>
<include name="log4j.jar"/>
@@ -686,16 +699,26 @@
<include name="jbossws-thirdparty.jar"/>
</fileset>
</copy>
- <copy todir="${build.dist.dir}/lib/tomcat/webapps" overwrite="true">
+ <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws.war"/>
</copy>
-
- <!-- zip it -->
- <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.dist.dir}"/>
+
+ <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
</target>
-
- <target name="build-docs" description="build the documentation">
- <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
+
+ <!-- Build the src dist -->
+ <target name="build-src-dist" description="Build the source distribution">
+ <mkdir dir="${build.src.dist}/jbossws-${version.id}-src"/>
+ <copy todir="${build.src.dist}/jbossws-${version.id}-src">
+ <fileset dir="${basedir}">
+ <include name="ant.properties.example"/>
+ <include name="version.properties"/>
+ <include name="build.xml"/>
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+ <zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${build.src.dist}"
+ includes="jbossws-${version.id}/**"/>
</target>
</project>
Modified: trunk/src/ant/build-thirdparty.xml
===================================================================
--- trunk/src/ant/build-thirdparty.xml 2006-10-17 13:16:41 UTC (rev 1240)
+++ trunk/src/ant/build-thirdparty.xml 2006-10-17 13:57:51 UTC (rev 1241)
@@ -35,12 +35,13 @@
<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/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.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/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.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}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" 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}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
@@ -107,6 +108,7 @@
<pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
</path>
</target>
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-10-17 13:16:41 UTC (rev 1240)
+++ trunk/src/test/build.xml 2006-10-17 13:57:51 UTC (rev 1241)
@@ -42,6 +42,16 @@
<isset property="HAVE_JDK_1.5"/>
</condition>
+ <!-- Use -Ddebug=true for remote 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>
+
<property name="jboss.client" value="${jboss.home}/client"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
<property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
@@ -98,25 +108,27 @@
</target>
<!--
- Init the various classpaths
+ Init the various classpaths
-->
<target name="init" depends="prepare,thirdparty">
- <condition property="jbossws.client.jar" value="jbossws14-client.jar">
+ <condition property="jbossws.build" value="jbossws14">
<not>
<isset property="HAVE_JDK_1.5"/>
</not>
</condition>
- <condition property="jbossws.client.jar" value="jbossws-client.jar">
+ <condition property="jbossws.build" value="jbossws">
<isset property="HAVE_JDK_1.5"/>
</condition>
- <!-- Check that the latest build has been deployed -->
+ <property name="jbossws.client.jar" value="${jbossws.build}-client.jar"/>
+
+ <!-- Check that the latest build has been deployed -->
<condition property="jbossws.deployed">
<filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/>
- </condition>
- <fail message="jbossws not deployed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/>
-
+ </condition>
+ <fail message="jbossws not deployed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/>
+
<!-- Define excluded tests -->
<property name="jbossws.target.server.${jbossws.target.server}" value="true"/>
<condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt">
@@ -134,7 +146,6 @@
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss.client}/jboss-common.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
@@ -151,18 +162,18 @@
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${build.lib.dir}/jbossws-jboss-integration.jar"/>
- <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
</path>
- <!--
- The test client classpath which does not include the library classpath
- The idea is that we test agains the jar versions in the target container
+ <!--
+ The test client classpath which does not include the library classpath
+ The idea is that we test agains the jar versions in the target container
-->
<path id="test.client.classpath">
<path refid="jbossws.client.classpath"/>
- <pathelement location="${build.lib.dir}/jbossws-jboss-integration.jar"/>
- <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
<pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
<pathelement location="${jboss.lib}/jboss-system.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
@@ -173,7 +184,32 @@
<pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
</path>
+ <!-- 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" />
+
+ <!-- The jBPM BPEL classpath -->
+ <path id="jbpmbpel.classpath">
+ <path refid="jbossws.client.classpath" />
+ <fileset dir="${jboss.server.lib}">
+ <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" />
+ </fileset>
+ <path location="${jboss.server.deploy.jbpmbpel}" />
+ <path location="${test.etc.dir}" />
+ </path>
</target>
+
+ <target name="deploy-jbpmbpel" unless="jbpmbpel.available">
+ <mkdir dir="${jboss.server.deploy.jbpmbpel}" />
+ <unjar dest="${jboss.server.deploy.jbpmbpel}" src="${thirdparty.dir}/jbpm-bpel.sar" />
+ </target>
<!-- ================================================================== -->
<!-- Compiling -->
@@ -185,18 +221,8 @@
<mkdir dir="${build.test.dir}/classes"/>
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
- <!-- TODO - Remove dynamichandler once Java 5.0 code is removed -->
- <exclude name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/>
- <exclude name="org/jboss/test/ws/interop/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jsr181/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws1123/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws860/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws871/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws944/**"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/>
- <exclude name="org/jboss/test/ws/jaxws/wsaddressing/**"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/>
+ <exclude name="org/jboss/test/ws/interop/**"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
</javac>
@@ -207,6 +233,8 @@
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/**"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
@@ -215,6 +243,8 @@
<mkdir dir="${build.test.dir}/classes"/>
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${build.test.dir}/wstools/java"/>
+ <src path="${test.java.dir}"/>
+ <exclude name="org/jboss/test/ws/interop/**"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
@@ -253,13 +283,24 @@
<ant antfile="${test.dir}/ant/build-jars-jaxws.xml" target="build-jars" inheritall="true"/>
</target>
- <!--
- Generate samples sources
- -->
+ <!--
+ Generate samples sources
+ -->
<target name="generate-sources" depends="compile" description="Generate the deployment resources.">
+ <!--
+ <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
+ </zip>
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpmbpel.classpath" />
+ </taskdef>
+ <servicegen processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
+ -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="jbossws.client.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath location="${build.test.dir}/classes"/>
+ <classpath location="${build.test.dir}"/>
</taskdef>
<mkdir dir="${build.test.dir}/wstools/java"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
@@ -274,20 +315,16 @@
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
- <!-- wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/mtom/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/mtom/wstools-config.xml"/ -->
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
- <!-- wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/swa/wstools-config.xml"/-->
<wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/>
<wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
-
<move todir="${build.test.dir}/wstools/java">
<fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
- <fileset dir="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" includes="org/**"/>
</move>
</target>
@@ -356,7 +393,7 @@
</target>
<!--
- Run a collection of unit tests.
+ Run a collection of unit tests.
ant -Dtest=tools test
-->
<target name="test" if="test" description="Run all unit tests in a given directory">
@@ -406,7 +443,7 @@
-->
<target name="one-test" depends="init" if="test" description="Run a single unit 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=5007"--/>
+ <jvmarg line="${remote.debug.line}"/>
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
Modified: trunk/version.properties
===================================================================
--- trunk/version.properties 2006-10-17 13:16:41 UTC (rev 1240)
+++ trunk/version.properties 2006-10-17 13:57:51 UTC (rev 1241)
@@ -16,7 +16,7 @@
# thirdparty library versions that are referenced in component-info.xml
apache-xmlsec=1.3.0
ibm-wsdl4j=1.5.2jboss
-javassist=3.2.0.CR2
+javassist=3.3.0.GA
jboss-common=1.0.2
jboss-jbossxb=snapshot
jboss-microcontainer=snapshot
@@ -28,7 +28,8 @@
apache-xalan=j_2.7.0
apache-xerces=2.7.1
jboss-backport-concurrent=2.1.0.GA
-jboss-jbossretro=1.0.0.GA
+jboss-jbossretro=1.0.2.GA
+jbpm-bpel=1.1.Beta2
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
17 years, 7 months
- 1
- 0
JBossWS SVN: r1240 - branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 09:16:41 -0400 (Tue, 17 Oct 2006)
New Revision: 1240
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
Log:
Prevent NPE on on fault with no xmlType
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-17 13:14:35 UTC (rev 1239)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-17 13:16:41 UTC (rev 1240)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.deployment;
-// $Id: $
+// $Id$
import java.io.IOException;
import java.net.MalformedURLException;
@@ -254,6 +254,12 @@
QName xmlType = wsdlFault.getXmlType();
String javaTypeName = null;
+ if (xmlType == null)
+ {
+ log.warn("Cannot obtain fault type for element: " + xmlName);
+ xmlType = xmlName;
+ }
+
if (typesMetaData.getTypeMappingByXMLType(xmlType) != null)
javaTypeName = typesMetaData.getTypeMappingByXMLType(xmlType).getJavaTypeName();
17 years, 7 months
- 1
- 0
JBossWS SVN: r1239 - trunk/src/main/java/org/jboss/ws/utils
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 09:14:35 -0400 (Tue, 17 Oct 2006)
New Revision: 1239
Modified:
trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java
Log:
[JBWS-1303] Unmarshall issue with xsi:type specified bean property
Modified: trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-17 12:45:22 UTC (rev 1238)
+++ trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-17 13:14:35 UTC (rev 1239)
@@ -264,10 +264,18 @@
String atName = attr.getNodeName();
String atValue = normalize(attr.getNodeValue());
- if (atPrefix != null && (atPrefix.equals("xmlns") || atPrefix.equals("xml")) == false)
+ if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml"))
{
String nsURI = getNamespaceURI(atPrefix, element, rootNode);
nsMap.put(atPrefix, nsURI);
+
+ // xsi:type='ns1:SubType', xsi:type='xsd:string'
+ if (atName.equals(atPrefix + ":type") && nsURI.equals("http://www.w3.org/2001/XMLSchema-instance") && atValue.indexOf(":") > 0)
+ {
+ String typePrefix = atValue.substring(0, atValue.indexOf(":"));
+ String typeURI = getNamespaceURI(typePrefix, element, rootNode);
+ nsMap.put(typePrefix, typeURI);
+ }
}
out.print(" " + atName + "='" + atValue + "'");
17 years, 7 months
- 1
- 0
JBossWS SVN: r1238 - branches/jbossws-1.0/src/main/java/org/jboss/ws/utils
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 08:45:22 -0400 (Tue, 17 Oct 2006)
New Revision: 1238
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java
Log:
Optimize logic
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-17 12:35:24 UTC (rev 1237)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-17 12:45:22 UTC (rev 1238)
@@ -287,7 +287,7 @@
String atName = attr.getNodeName();
String atValue = normalize(attr.getNodeValue(), canonical);
- if (atPrefix != null && (atPrefix.equals("xmlns") || atPrefix.equals("xml")) == false)
+ if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml"))
{
String nsURI = getNamespaceURI(atPrefix, element, rootNode);
nsMap.put(atPrefix, nsURI);
17 years, 7 months
- 1
- 0
JBossWS SVN: r1237 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/utils test/java/org/jboss/test/ws/jaxrpc/jbws1303
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-10-17 08:35:24 -0400 (Tue, 17 Oct 2006)
New Revision: 1237
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java
Log:
[JBWS-1303] Unmarshall issue with xsi:type specified bean property
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-17 11:10:30 UTC (rev 1236)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-17 12:35:24 UTC (rev 1237)
@@ -291,6 +291,14 @@
{
String nsURI = getNamespaceURI(atPrefix, element, rootNode);
nsMap.put(atPrefix, nsURI);
+
+ // xsi:type='ns1:SubType', xsi:type='xsd:string'
+ if (atName.equals(atPrefix + ":type") && nsURI.equals("http://www.w3.org/2001/XMLSchema-instance") && atValue.indexOf(":") > 0)
+ {
+ String typePrefix = atValue.substring(0, atValue.indexOf(":"));
+ String typeURI = getNamespaceURI(typePrefix, element, rootNode);
+ nsMap.put(typePrefix, typeURI);
+ }
}
out.print(" " + atName + "='" + atValue + "'");
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-10-17 11:10:30 UTC (rev 1236)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-10-17 12:35:24 UTC (rev 1237)
@@ -61,11 +61,6 @@
public void testEndpoint() throws Exception
{
- if (true)
- {
- System.out.println("FIXME: JBWS-1303");
- return;
- }
Lastmod lastmod = new Lastmod("yesterday");
LastmodResponse lastmodRes = port.lastmod(lastmod);
assertEquals("yesterday", lastmodRes.getTimeChanged());
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-10-17 11:10:30 UTC (rev 1236)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-10-17 12:35:24 UTC (rev 1237)
@@ -27,8 +27,11 @@
import javax.xml.rpc.handler.soap.SOAPMessageContext;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPMessage;
+import org.jboss.ws.Constants;
+
public class ServerHandler extends GenericHandler
{
public QName[] getHeaders()
@@ -37,11 +40,11 @@
}
/**
- * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
* <env:Header/>
* <env:Body>
* <lastmodResponse xmlns='http://netid.msu.edu:8080/lastmod.pl'>
- * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='string'>yesterday</TimeChanged>
+ * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='xsd:string'>yesterday</TimeChanged>
* </lastmodResponse>
* </env:Body>
* </env:Envelope>
@@ -51,11 +54,13 @@
try
{
SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
+ SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope();
+ soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSD, Constants.NS_SCHEMA_XSD);
SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse");
bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl");
SOAPElement soapElement = bodyElement.addChildElement("TimeChanged");
- soapElement.addNamespaceDeclaration("xsi", "http://www.w3.org/2001/XMLSchema-instance");
- soapElement.setAttribute("xsi:type", "string");
+ soapElement.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI);
+ soapElement.setAttribute("xsi:type", "xsd:string");
soapElement.setValue("yesterday");
((SOAPMessageContext)msgContext).setMessage(soapMessage);
}
17 years, 7 months
- 1
- 0