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>