May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3065 - in trunk: build and 40 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 21:12:02 -0400 (Sat, 12 May 2007) New Revision: 3065 Added: trunk/jbossws-core/src/test/resources/tests-jboss40-excludes.txt trunk/jbws-jboss40/ trunk/jbws-jboss40/.classpath trunk/jbws-jboss40/.project trunk/jbws-jboss40/ant-import/ trunk/jbws-jboss40/ant-import/build-deploy.xml trunk/jbws-jboss40/ant-import/build-release.xml trunk/jbws-jboss40/ant-import/build-testsuite.xml trunk/jbws-jboss40/ant-import/build-thirdparty.xml trunk/jbws-jboss40/build.xml trunk/jbws-jboss40/src/ trunk/jbws-jboss40/src/main/ trunk/jbws-jboss40/src/main/etc/ trunk/jbws-jboss40/src/main/etc/component-info.xml trunk/jbws-jboss40/src/main/java/ trunk/jbws-jboss40/src/main/java/org/ trunk/jbws-jboss40/src/main/java/org/jboss/ trunk/jbws-jboss40/src/main/java/org/jboss/ws/ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ApplicationMetaDataAdapter.java trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/InvocationHandlerEJB3.java trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapter.java trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapterFactory.java trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployer.java trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployerMBean.java trunk/jbws-jboss40/src/main/resources/ trunk/jbws-jboss40/src/main/resources/jbossws.beans/ trunk/jbws-jboss40/src/main/resources/jbossws.beans/META-INF/ trunk/jbws-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/jbws-jboss40/src/main/resources/jbossws.sar/ trunk/jbws-jboss40/src/main/resources/jbossws.sar/META-INF/ trunk/jbws-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml trunk/jbws-jboss40/src/test/ trunk/jbws-jboss40/src/test/java/ trunk/jbws-jboss40/src/test/resources/ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerHook.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptor.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21MBean.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3MBean.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSE.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSEMBean.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorMBean.java Removed: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/ trunk/build/hudson/hudson-home/jobs/TC-5.5/ trunk/jbossws-core/src/main/etc/JBossORG-EULA.txt trunk/jbossws-core/src/main/etc/default.mf trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt trunk/jbossws-spi/src/main/etc/JBossORG-EULA.txt trunk/jbossws-spi/src/main/etc/default.mf trunk/jbws-jboss40/.classpath trunk/jbws-jboss40/.project trunk/jbws-jboss40/build.xml trunk/jbws-jboss40/src/ trunk/jbws-jboss40/src/test/java/ trunk/jbws-jboss40/src/test/resources/ trunk/jbws-jboss42/src/main/etc/JBossORG-EULA.txt trunk/jbws-jboss42/src/main/etc/default.mf trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java trunk/jbws-jboss42/version.properties trunk/jbws-jboss50/src/main/etc/JBossORG-EULA.txt trunk/jbws-jboss50/src/main/etc/default.mf trunk/jbws-jboss50/version.properties trunk/sunri-jboss50/src/main/etc/JBossORG-EULA.txt trunk/sunri-jboss50/src/main/etc/default.mf Modified: trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-testsuite.xml trunk/build/ant.properties.example trunk/build/build.xml trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml trunk/jbossws-core/build.xml trunk/jbossws-spi/build.xml trunk/jbws-jboss42/ant-import/build-thirdparty.xml trunk/jbws-jboss42/build.xml trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java trunk/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/jbws-jboss50/build.xml trunk/sunri-jboss50/ant-import/build-thirdparty.xml trunk/sunri-jboss50/build.xml Log: Resurect jbws-jboss40 Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/build/ant-import/build-setup.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -50,19 +50,20 @@ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/> - <property name="tomcat.conf.dir" value="${tomcat.home}/conf"/> - <property name="tomcat.common.dir" value="${tomcat.home}/common"/> - <property name="tomcat.common.classes" value="${tomcat.home}/common/classes"/> - <property name="tomcat.common.lib" value="${tomcat.home}/common/lib"/> - <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> - + <property name="jboss40.lib" value="${jboss40.home}/lib"/> + <property name="jboss40.client" value="${jboss40.home}/client"/> + <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> + <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> + <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> + <property name="jboss40.thirdparty" value="${jboss40.home}/../../../thirdparty"/> + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> - <property name="tomcat.available.file" value="${tomcat.home}/server/lib/catalina.jar"/> + <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> - <available property="tomcat.available" file="${tomcat.available.file}"/> + <available property="jboss40.available" file="${jboss40.available.file}"/>  <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> @@ -76,7 +77,6 @@ <echo message="jboss50.home = ${jboss50.home}"/> <echo message="jboss42.home = ${jboss42.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -71,9 +71,6 @@ <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> <isset property="jboss.home"/> </condition> - <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="tomcat.home"/> - </condition> <fail message="Excludes file not set. Please run the testsuite from any of the integration projects" unless="excludesfile"/> @@ -183,9 +180,6 @@ <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="tomcat.home" value="${tomcat.home}"/> - <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> - <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> @@ -222,9 +216,6 @@ <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="tomcat.home" value="${tomcat.home}"/> - <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> - <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/>  + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy" depends="jbws40-jars,remove-jbossws,remove-jbwsri" description="Deploy jbossws"> + + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + + <copy todir="${jboss40.home}/client" overwrite="true"> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${core.thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss40.home}/lib" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws40.output.lib.dir}/jbossws40.sar"/> + </target> + +  + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + + <delete> + <fileset dir="${jboss40.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss40.home}/lib"> + <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + </target> + +  + <target name="remove-jbwsri" depends="prepare" description="Remove jbossws/sunri"> + + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + </target> + +</project> Property changes on: trunk/jbws-jboss40/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/ant-import/build-release.xml =================================================================== --- trunk/jbws-jboss40/ant-import/build-release.xml (rev 0) +++ trunk/jbws-jboss40/ant-import/build-release.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  + <target name="release" depends="jbws40-jars" + description="Release to jboss.local.repository"> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/lib" overwrite="true"> + <fileset dir="${jbws40.output.lib.dir}"> + <include name="jbossws-jboss40.jar"/> + <include name="jbossws40.sar"/> + <include name="jbossws40-src.zip"/> + </fileset> + </copy> + <copy tofile="${jboss.repository.dir}/jbossws-jboss40/${repository.id}/component-info.xml" file="${jbws40.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${basedir}/version.properties"/> + </filterset> + </copy> + + </target> + +</project> Property changes on: trunk/jbws-jboss40/ant-import/build-release.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/ant-import/build-testsuite.xml =================================================================== --- trunk/jbws-jboss40/ant-import/build-testsuite.xml (rev 0) +++ trunk/jbws-jboss40/ant-import/build-testsuite.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <property name="tests.dir" value="${basedir}/src/test"/> + + <property name="jboss.home" value="${jboss40.home}"/> + <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + +  + <target name="tests-init" depends="tests-prepare,spi-thirdparty"> + + <path id="jbossws.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + </path> + +  + <path id="javac.classpath"> + <path refid="jbossws.classpath"/> + <path refid="spi.thirdparty.classpath"/> + </path> + +  + <path id="tests.client.classpath"> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/javassist.jar"/> + <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}/mail.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <path refid="javac.classpath"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> + + <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + +</project> Property changes on: trunk/jbws-jboss40/ant-import/build-testsuite.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss40/ant-import/build-thirdparty.xml (rev 0) +++ trunk/jbws-jboss40/ant-import/build-thirdparty.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> + </target> + + <target name="thirdparty-init" depends="prepare"/> + +  + <target name="thirdparty-get" depends="thirdparty-init" + description="Gets the thirdparty libraries"/> + + <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> + +  + <path id="jbws40.integration.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${jboss40.lib}/jboss-jmx.jar"/> + <pathelement location="${jboss40.lib}/jboss-system.jar"/> + <pathelement location="${jboss40.server.lib}/jboss.jar"/> + <pathelement location="${jboss40.server.lib}/jboss-j2ee.jar"/> + <pathelement location="${jboss40.server.lib}/jboss-ejb3x.jar"/> + <pathelement location="${jboss40.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss40.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss40.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> + <path refid="core.thirdparty.classpath"/> + </path> + + </target> + +</project> Property changes on: trunk/jbws-jboss40/ant-import/build-thirdparty.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbws-jboss40/build.xml =================================================================== --- branches/jbossws-2.0/integration-jboss40/build.xml 2007-05-09 12:50:02 UTC (rev 3017) +++ trunk/jbws-jboss40/build.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,362 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="../integration-jboss40" name="JBossWS-jboss40" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="schema.xsd"> - - <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> - <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../integration-jboss42/build.xml"/> - <import file="${basedir}/../jbossws-core/build.xml"/> - - <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src"/> - <property name="jboss40.java.dir" value="${jboss40.src.dir}/java"/> - <property name="jboss40.resources.dir" value="${jboss40.src.dir}/resources"/> - <property name="jboss40.output.dir" value="${integration.jboss40.dir}/output"/> - <property name="jboss40.output.classes.dir" value="${jboss40.output.dir}/classes"/> - <property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/> - <property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/> - - <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/> - <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> - <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> - <property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/> - <property name="jboss42.output.classes.dir" value="${jboss42.output.dir}/classes"/> - <property name="jboss42.output.classes14.dir" value="${jboss42.output.dir}/classes14"/> - <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> - - <target name="jboss40-init" depends="prepare, thirdparty"> - <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> - <available file="${jboss40.client}/jboss-ejb3-client.jar" property="jboss40.ejb3.available"/> - </target> - -  -  -  - -  - - <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" description="Compile all source files."/> - -  - <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> - <mkdir dir="${jboss40.output.classes.dir}"/> - <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src location="${jboss42.java.dir}"/> - <src location="${jboss40.java.dir}"/> - <include name="org/jboss/ws/integration/jboss40/**"/> - <include name="org/jboss/ws/integration/jboss42/**"/> - <exclude name="org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java"/> - <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> - <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> - <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> - <classpath refid="jboss40.integration.classpath"/> - <classpath path="${core.output.classes14.dir}"/> - <classpath path="${core.output.classes.dir}"/> - </javac> - </target> - <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile,jboss40-check-ejb3-classes" if="jboss40.ejb3.available"> - <mkdir dir="${jboss40.output.classes.dir}"/> - <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src location="${jboss42.java.dir}"/> - <src location="${jboss40.java.dir}"/> - <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> - <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> - <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> - <classpath refid="jboss40.integration.classpath"/> - <classpath path="${core.output.classes14.dir}"/> - <classpath path="${core.output.classes.dir}"/> - </javac> - </target> - <target name="jboss40-check-ejb3-classes" depends="jboss40-init" unless="jboss40.ejb3.available"> - <echo message="****************************************"/> - <echo message="* EJB3 not available *"/> - <echo message="* jboss40 integartion layer will be *"/> - <echo message="* build without EJB3 support! *"/> - <echo message="****************************************"/> - </target> - -  - <target name="jboss40-compile-etc" depends="jboss40-init"> - </target> - -  -  -  - - <target name="jboss40-retro" depends="jboss40-compile,core-compile"> - -  - <taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro"> - <classpath> - <pathelement location="${thirdparty.dir}/javassist.jar"/> - <pathelement location="${thirdparty.dir}/jbossretro.jar"/> - </classpath> - </taskdef> - - <mkdir dir="${jboss40.output.classes14.dir}"/> - <retro destdir="${jboss40.output.classes14.dir}"> - <classpath> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${thirdparty.dir}/ant.jar"/> - <pathelement location="${thirdparty.dir}/javassist.jar"/> - <pathelement location="${thirdparty.dir}/jbossretro.jar"/> - <pathelement location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> - <pathelement path="${jboss40.output.classes.dir}"/> - <pathelement path="${core.dir}/output/classes"/> - </classpath> - <classpath refid="core.classpath"/> - <classpath refid="jboss40.integration.classpath"/> - <src path="${jboss40.output.classes.dir}"/> - <src path="${core.dir}/output/classes"/> - </retro> - </target> - -  -  -  - -  - <target name="jboss40-jars" depends="jboss40-compile,jboss40-module-jars" description="Builds all jar files."> - </target> - -  - <target name="jboss40-module-jars" depends="core-jars"> - -  - <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${jboss40.output.classes.dir}"> - <include name="org/jboss/ws/integration/jboss42/**"/> - <include name="org/jboss/ws/integration/jboss40/**"/> - </fileset> - <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> - </jar> - -  - <war warfile="${jboss40.output.lib.dir}/jbossws-context.war" webxml="${jboss42.resources.dir}/jbossws.war/WEB-INF/web.xml"> - <fileset dir="${core.resources.dir}/jbossws.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${jboss42.resources.dir}/jbossws.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <jar jarfile="${jboss40.output.lib.dir}/jbossws40.sar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws-jboss40-integration.jar"/> - <include name="jbossws-context.war"/> - </fileset> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxws.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${jboss40.resources.dir}"> - <include name="jbossws.beans/META-INF/jboss-beans.xml"/> - </fileset> - <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> - <include name="standard-jaxrpc-client-config.xml"/> - <include name="standard-jaxrpc-endpoint-config.xml"/> - <include name="standard-jaxws-client-config.xml"/> - <include name="standard-jaxws-endpoint-config.xml"/> - </metainf> - <metainf dir="${jboss40.resources.dir}/jbossws.sar/META-INF"> - <include name="jboss-service*.xml"/> - </metainf> - </jar> - -  - <zip zipfile="${jboss40.output.lib.dir}/jbossws40-src.zip" > - <fileset dir="${jboss40.java.dir}"/> - </zip> - - </target> - -  - <target name="jboss40-jars14" depends="jboss40-jars,jboss40-retro"> - -  - <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${jboss40.output.classes14.dir}"> - <include name="org/jboss/ws/**"/> - </fileset> - <fileset dir="${core.dir}/src/resources"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - </jar> - -  - <mkdir dir="${jboss40.output.lib.dir}"/> - <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${jboss40.output.classes14.dir}"> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - </fileset> - </jar> - -  - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${jboss40.output.classes14.dir}"> - <include name="org/jboss/ws/integration/jboss42/**"/> - <include name="org/jboss/ws/integration/jboss40/**"/> - </fileset> - <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> - </jar> - -  - <jar jarfile="${jboss40.output.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${core.output.classes14.dir}"> - <include name="javax/xml/rpc/**"/> - <include name="javax/xml/soap/**"/> - </fileset> - <fileset dir="${jboss40.output.classes14.dir}"> - <include name="org/jboss/ws/**"/> - <include name="javax/xml/ws/**"/> - <include name="javax/jws/**"/> - </fileset> - <fileset dir="${core.resources.dir}/jbossws.sar"> - <include name="META-INF/standard-jaxrpc-client-config.xml"/> - <include name="META-INF/standard-jaxws-client-config.xml"/> - </fileset> - <fileset dir="${core.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - <fileset dir="${build.etc.dir}"> - <include name="wstools.sh"/> - <include name="wstools.bat"/> - <include name="wstools-log4j.xml"/> - </fileset> - <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> - </jar> - - <mkdir dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"/> - <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" - file="${jboss40.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> - -  - <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-jboss40-integration.jar"/> - <include name="jbossws-context.war"/> - <include name="jbossws14-core.jar"/> - <include name="jboss-jaxws14.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - </fileset> - <fileset dir="${jboss40.resources.dir}"> - <include name="jbossws.beans/META-INF/jboss-beans.xml"/> - </fileset> - <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> - <include name="standard-jaxrpc-client-config.xml"/> - <include name="standard-jaxrpc-endpoint-config.xml"/> - </metainf> - <metainf dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - - </target> - -  -  -  - -  - <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> - <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss40" inheritall="true"/> -  - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-integration.jar"/> - <include name="jbossws-client.jar" /> - <include name="jbossws-core.jar" /> - <include name="jboss-jaxrpc.jar" /> - <include name="jboss-jaxws.jar" /> - <include name="jboss-saaj.jar" /> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws-jboss40-integration.jar" /> - </fileset> - </copy> - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> - </target> - -  - <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> - <ant antfile="../build/ant-import/build-deploy.xml" target="deploy-jboss40-jdk14" inheritall="true"/> -  - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossws14/lib" overwrite="true"> - <fileset dir="${core.output.lib.dir}"> - <include name="jboss-jaxrpc.jar" /> - <include name="jboss-saaj.jar" /> - </fileset> - <fileset dir="${jboss40.output.lib.dir}"> - <include name="jbossws14-client.jar" /> - <include name="jbossws14-core.jar" /> - <include name="jbossws14-jboss40-integration.jar" /> - </fileset> - </copy> - <copy todir="${jboss40.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true" /> - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jboss40.output.dir}"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jboss40-jars"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - -</project> \ No newline at end of file Copied: trunk/jbws-jboss40/build.xml (from rev 3064, branches/jbossws-2.0/integration-jboss40/build.xml) =================================================================== --- trunk/jbws-jboss40/build.xml (rev 0) +++ trunk/jbws-jboss40/build.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="../jbws-jboss40" name="JBossWS-JBoss40"> + + <import file="${basedir}/../build/ant-import/build-setup.xml"/> + + <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-testsuite.xml"/> + + <import file="${core.dir}/build.xml"/> + +  +  +  + + <property name="jbws40.dir" value="${basedir}"/> + <property name="jbws40.src.dir" value="${jbws40.dir}/src/main"/> + <property name="jbws40.etc.dir" value="${jbws40.src.dir}/etc"/> + <property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/> + <property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/> + <property name="jbws40.output.dir" value="${jbws40.dir}/output"/> + <property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/> + <property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/> + <property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/> + + <property name="jbws42.dir" value="${jbws.jboss42.dir}"/> + <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/> + <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/> + <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> + <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> + <property name="jbws42.output.dir" value="${jbws42.dir}/output"/> + <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/> + <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/> + <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/> + +  +  +  + + <target name="jbws40-init" depends="prepare, thirdparty"> + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + <available file="${jboss40.client}/jboss-ejb3-client.jar" property="jboss40.ejb3.available"/> + </target> + +  +  +  + +  + + <target name="jbws40-compile" depends="jbws40-init,core-compile,jbws40-compile-classes,jbws40-compile-etc" description="Compile all source files."/> + +  + <target name="jbws40-compile-classes" depends="jbws40-init"> + <mkdir dir="${jbws40.output.classes.dir}"/> + <javac sourcepath="" destdir="${jbws40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src location="${jbws42.java.dir}"/> + <src location="${jbws40.java.dir}"/> + <include name="org/jboss/ws/integration/jboss40/**"/> + <include name="org/jboss/ws/integration/jboss42/**"/> + <exclude name="org/jboss/ws/integration/jboss42/jms/**"/> + <exclude name="org/jboss/ws/integration/jboss42/jbossws/ApplicationMetaDataAdapter.java"/> + <exclude name="org/jboss/ws/integration/jboss42/jbossws/InvocationHandlerEJB3.java"/> + <classpath refid="jbws40.integration.classpath"/> + </javac> + </target> + +  + <target name="jbws40-compile-etc" depends="jbws40-init"> + <mkdir dir="${jbws40.output.etc.dir}"/> + <copy todir="${jbws40.output.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${jbws40.etc.dir}"> + <include name="component-info.xml"/> + </fileset> + <fileset dir="${build.dir}/etc"> + <include name="default.mf"/> + </fileset> + <filterset> + <filter token="java.vm.version" value="${java.vm.version}"/> + <filter token="java.vm.vendor" value="${java.vm.vendor}"/> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> + +  +  +  + +  + <target name="jbws40-jars" depends="jbws40-compile,core-jars,jbws40-module-jars" description="Builds all jar files."> + </target> + +  + <target name="jbws40-module-jars" depends="jbws40-init"> + +  + <mkdir dir="${jbws40.output.lib.dir}"/> + <jar jarfile="${jbws40.output.lib.dir}/jbossws-jboss40.jar" manifest="${jbws40.output.etc.dir}/default.mf"> + <fileset dir="${jbws40.output.classes.dir}"> + <include name="org/jboss/ws/integration/jboss40/**"/> + <include name="org/jboss/ws/integration/jboss42/**"/> + </fileset> + <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> + </jar> + +  + <war warfile="${jbws40.output.lib.dir}/jbossws-context.war" webxml="${jbws42.resources.dir}/jbossws.war/WEB-INF/web.xml"> + <fileset dir="${jbws42.resources.dir}/jbossws.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${jbws42.resources.dir}/jbossws.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <jar jarfile="${jbws40.output.lib.dir}/jbossws40.sar" manifest="${jbws40.output.etc.dir}/default.mf"> + <fileset dir="${jbws40.output.lib.dir}"> + <include name="jbossws-jboss40.jar"/> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxws.jar"/> + <include name="jbossws-core.jar"/> + </fileset> + <fileset dir="${core.thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="wsdl4j.jar"/> + <include name="xmlsec.jar"/> + </fileset> + <fileset dir="${jbws40.resources.dir}"> + <include name="jbossws.beans/META-INF/jboss-beans.xml"/> + </fileset> + <metainf dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </metainf> + <metainf dir="${jbws40.resources.dir}/jbossws.sar/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + </jar> + +  + <zip zipfile="${jbws40.output.lib.dir}/jbossws40-src.zip" > + <fileset dir="${jbws40.java.dir}"/> + </zip> + + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${jbws40.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jbws40-jars,tests-main"/> + + <target name="all" description="Create a distribution zip file" depends="main"> + </target> + +</project> Copied: trunk/jbws-jboss40/src (from rev 3064, branches/jbossws-2.0/integration-jboss40/src) Added: trunk/jbws-jboss40/src/main/etc/component-info.xml =================================================================== --- trunk/jbws-jboss40/src/main/etc/component-info.xml (rev 0) +++ trunk/jbws-jboss40/src/main/etc/component-info.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,30 @@ +<project name="jboss/jbossws-jboss40"> + + <component id="jboss/jbossws-jboss40" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-jboss40.jar"/> + <artifact id="jbossws40.sar"/> + <artifact id="jbossws40-src.zip"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@jboss-jbossws@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@jboss-jbossws-spi@"/> + </import> + + <export> + </export> + + </component> + +</project> Property changes on: trunk/jbws-jboss40/src/main/etc/component-info.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ApplicationMetaDataAdapter.java =================================================================== --- trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ApplicationMetaDataAdapter.java (rev 0) +++ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ApplicationMetaDataAdapter.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss40.jbossws; + +// $Id$ + +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.ws.integration.jboss42.jbossws.AbstractApplicationMetaDataAdapter; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ApplicationMetaDataAdapter extends AbstractApplicationMetaDataAdapter +{ + @Override + protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) + { + UnifiedBeanMetaData ubmd = null; + if (bmd instanceof SessionMetaData) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (bmd instanceof MessageDrivenMetaData) + { + ubmd = new UnifiedMessageDrivenMetaData(); + ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); + } + + if (ubmd != null) + { + ubmd.setEjbName(bmd.getEjbName()); + ubmd.setEjbClass(bmd.getEjbClass()); + ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); + ubmd.setHome(bmd.getHome()); + ubmd.setLocalHome(bmd.getLocalHome()); + ubmd.setJndiName(bmd.getJndiName()); + ubmd.setLocalJndiName(bmd.getLocalJndiName()); + + EjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); + upcmd.setPortComponentName(pcmd.getPortComponentName()); + upcmd.setPortComponentURI(pcmd.getPortComponentURI()); + upcmd.setAuthMethod(pcmd.getAuthMethod()); + upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); + //upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setPortComponent(upcmd); + } + } + return ubmd; + } +} Property changes on: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ApplicationMetaDataAdapter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/InvocationHandlerEJB3.java =================================================================== --- trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/InvocationHandlerEJB3.java (rev 0) +++ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/InvocationHandlerEJB3.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss40.jbossws; + +// $Id$ + +import java.lang.reflect.Method; + +import javax.management.ObjectName; + +import org.jboss.aop.Dispatcher; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.EndpointInvocation; +import org.jboss.ws.core.server.AbstractInvocationHandler; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.invocation.InvocationContext; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * Handles invocations on EJB3 endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class InvocationHandlerEJB3 extends AbstractInvocationHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(InvocationHandlerEJB3.class); + + private ObjectName objectName; + + /** Initialize the service endpoint */ + @Override + public void init(Endpoint endpoint) + { + super.init(endpoint); + + ServerEndpointMetaData sepMetaData = endpoint.getMetaData(ServerEndpointMetaData.class); + if (sepMetaData == null) + throw new IllegalStateException("Cannot obtain endpoint meta data"); + + String ejbName = sepMetaData.getLinkName(); + if (ejbName == null) + throw new WSException("Cannot obtain ejb-link from port component"); + + UnifiedDeploymentInfo udi = endpoint.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); + String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; + if (udi.parent != null) + { + nameStr += ",ear=" + udi.parent.simpleName; + } + + objectName = ObjectNameFactory.create(nameStr.toString()); + } + + /** Load the SEI implementation bean if necessary + */ + public Class loadServiceEndpoint() + { + Dispatcher dispatcher = Dispatcher.singleton; + if (dispatcher.getRegistered(objectName.getCanonicalName()) == null) + throw new WSException("Cannot find service endpoint target: " + objectName); + + return null; + } + + /** Create an instance of the SEI implementation bean if necessary */ + @Override + protected Object createServiceEndpointInstance(Class seiImplClass, InvocationContext context) throws Exception + { + return null; + } + + /** Invoke an instance of the SEI implementation bean */ + public void invokeServiceEndpointInstance(Object seiImpl, EndpointInvocation epInv) throws Exception + { + log.debug("invokeServiceEndpoint: " + epInv.getJavaMethod().getName()); + + // invoke on the container + try + { + // setup the invocation + Method seiMethod = epInv.getJavaMethod(); + Object[] args = epInv.getRequestPayload(); + + Dispatcher dispatcher = Dispatcher.singleton; + String canonicalName = objectName.getCanonicalName(); + StatelessContainer container = (StatelessContainer)dispatcher.getRegistered(canonicalName); + if (container == null) + throw new WSException("Cannot obtain container from Dispatcher: " + canonicalName); + + Class beanClass = container.getBeanClass(); + + Method implMethod = getImplMethod(beanClass, seiMethod); + Object retObj = container.localInvoke(implMethod, args); + + epInv.setReturnValue(retObj); + } + catch (Throwable th) + { + handleInvocationException(th); + } + } + + /** Create an instance of the SEI implementation bean if necessary */ + public void destroyServiceEndpointInstance(Object seiImpl) + { + // do nothing + } +} Property changes on: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/InvocationHandlerEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapter.java =================================================================== --- trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapter.java (rev 0) +++ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapter.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,131 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss40.jbossws; + +// $Id$ + +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; +import java.util.LinkedHashMap; +import java.util.Properties; + +import javax.xml.namespace.QName; + +import org.jboss.webservice.metadata.serviceref.HandlerMetaData; +import org.jboss.webservice.metadata.serviceref.InitParamMetaData; +import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; +import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * Build container independent service ref meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ServiceRefMetaDataAdapter +{ + public UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException + { + UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.vfRoot); + usrmd.setServiceRefName(srmd.getServiceRefName()); + usrmd.setServiceInterface(srmd.getServiceInterface()); + usrmd.setWsdlFile(srmd.getWsdlFile()); + usrmd.setMappingFile(srmd.getJaxrpcMappingFile()); + usrmd.setServiceQName(srmd.getServiceQName()); + + LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); + for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs()) + { + UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(usrmd); + upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); + upcmd.setPortComponentLink(pcmd.getPortComponentLink()); + Properties callProps = pcmd.getCallProperties(); + if (callProps != null) + { + Enumeration<Object> keys = callProps.keys(); + while(keys.hasMoreElements()) + { + String name = (String)keys.nextElement(); + String value = callProps.getProperty(name); + upcmd.addCallProperty(new UnifiedCallPropertyMetaData(name, value)); + } + } + pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd); + usrmd.addPortComponentRef(upcmd); + } + + for (HandlerMetaData hmd : srmd.getHandlers()) + { + UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null); + uhmd.setHandlerName(hmd.getHandlerName()); + uhmd.setHandlerClass(hmd.getHandlerClass()); + + for(String portname : hmd.getPortNames()) + { + uhmd.addPortName(portname); + } + for (InitParamMetaData ipmd : hmd.getInitParams()) + { + UnifiedInitParamMetaData ip = new UnifiedInitParamMetaData(); + ip.setParamName(ipmd.getParamName()); + ip.setParamValue(ipmd.getParamValue()); + uhmd.addInitParam(ip); + } + for (QName soapHeader : hmd.getSoapHeaders()) + { + uhmd.addSoapHeader(soapHeader); + } + for (String soapRole : hmd.getSoapRoles()) + { + uhmd.addSoapRole(soapRole); + } + usrmd.addHandler(uhmd); + } + + usrmd.setConfigName(srmd.getConfigName()); + usrmd.setConfigFile(srmd.getConfigFile()); + URL wsdlOverride = srmd.getWsdlOverride(); + if (wsdlOverride != null) + usrmd.setWsdlOverride(wsdlOverride.toExternalForm()); + + Properties callProps = srmd.getCallProperties(); + if (callProps != null) + { + Enumeration<Object> keys = callProps.keys(); + while(keys.hasMoreElements()) + { + String name = (String)keys.nextElement(); + String value = callProps.getProperty(name); + usrmd.addCallProperty(new UnifiedCallPropertyMetaData(name, value)); + } + } + + return usrmd; + } +} Property changes on: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapterFactory.java =================================================================== --- trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapterFactory.java (rev 0) +++ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapterFactory.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss40.jbossws; + +// $Id$ + +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 10-Mar-2007 + */ +public class ServiceRefMetaDataAdapterFactory +{ + // Hide ctor + private ServiceRefMetaDataAdapterFactory() + { + } + + public static ServiceRefMetaDataAdapter newInstance() + { + KernelRegistry registry = KernelLocator.getKernel().getRegistry(); + KernelRegistryEntry entry = registry.getEntry("WSServiceRefMetaDataAdapter"); + return (ServiceRefMetaDataAdapter)entry.getTarget(); + } +} Property changes on: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/ServiceRefMetaDataAdapterFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployer.java =================================================================== --- trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployer.java (rev 0) +++ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployer.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss40.jbossws; + +// $Id$ + +import java.util.Iterator; + +import javax.naming.Context; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; +import org.jboss.system.ServiceMBeanSupport; +import org.jboss.util.naming.Util; +import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; +import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; +import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.ws.integration.deployment.JAXRPCClientDeployment; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.integration.jboss42.jbossws.DeploymentInfoAdapterFactory; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +/** + * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the + * deployment descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class WebServiceClientDeployer extends ServiceMBeanSupport implements WebServiceClientDeployerMBean +{ + /** + * This binds a jaxrpc Service into the callers ENC for every service-ref element + * + * @param envCtx ENC to bind the javax.rpc.xml.Service object to + * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor + * @param di The client's deployment info + * @throws org.jboss.deployment.DeploymentException if it goes wrong + */ + public void setupServiceRefEnvironment(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException + { + try + { + while (serviceRefs.hasNext()) + { + ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); + String serviceRefName = serviceRef.getServiceRefName(); + + // Build the container independent deployment info + UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(DeploymentType.JAXRPC_CLIENT); + DeploymentInfoAdapterFactory.newInstance().buildDeploymentInfo(udi, di); + + UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(udi, serviceRef); + usr.setVfsRoot(new URLLoaderAdapter(udi.url)); + + ServiceReferenceable ref = new ServiceReferenceable(usr); + Util.bind(envCtx, serviceRefName, ref); + + log.debug("Webservice binding: java:comp/env/" + serviceRefName); + } + } + catch (Exception e) + { + throw new DeploymentException("Cannot bind webservice to client environment", e); + } + } + + private ServiceRefMetaDataAdapter getServiceRefMetaDataAdaptor() + { + // TODO Auto-generated method stub + return null; + } +} Property changes on: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployerMBean.java =================================================================== --- trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployerMBean.java (rev 0) +++ trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployerMBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,38 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.integration.jboss40.jbossws; + +import javax.management.ObjectName; + +import org.jboss.system.ServiceMBean; +import org.jboss.webservice.WebServiceClientDeployment; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface WebServiceClientDeployerMBean extends WebServiceClientDeployment, ServiceMBean +{ + // default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceClientDeployer"); +} Property changes on: trunk/jbws-jboss40/src/main/java/org/jboss/ws/integration/jboss40/jbossws/WebServiceClientDeployerMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/jbws-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml (rev 0) +++ trunk/jbws-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,209 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + +  + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.common.ManagedServerConfig"> +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.ws.core.server.ManagedEndpointRegistry"/> + +  + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> + +  +  + <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + +  + <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + +  + <bean name="WSDeployerManagerJSE" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSModifyWebMetaDataDeployer"/> + </list> + </property> + </bean> + <bean name="WSDeployerManagerEJB" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> + <inject bean="WSUnifiedDeploymentInfoDeployer"/> + <inject bean="WSUnifiedMetaDataDeployer"/> + <inject bean="WSUnifiedMetaDataAssociationDeployer"/> + <inject bean="WSWebAppGeneratorDeployer"/> + <inject bean="WSWebAppDeployerDeployer"/> + </list> + </property> + </bean> + <bean name="WSMainDeployerManager" class="org.jboss.ws.integration.deployment.BasicDeployerManager"> + <property name="deployers"> + <list class="java.util.LinkedList" elementClass="org.jboss.ws.integration.deployment.Deployer"> + <inject bean="WSEndpointNameDeployer"/> + <inject bean="WSEndpointHandlerDeployer"/> + <inject bean="WSPublishContractDeployer"/> + <inject bean="WSClassLoaderInjectionDeployer"/> + <inject bean="WSEagerInitializeDeployer"/> + <inject bean="WSEventingDeployer"/> + <inject bean="WSEndpointRegistryDeployer"/> + <inject bean="WSEndpointLifecycleDeployer"/> + </list> + </property> + </bean> + +  + <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss42.jbossws.ClassLoaderInjectionDeployer"/> + <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> + <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> + <property name="invocationHandler"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>JAXRPC_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> + <entry><key>JAXRPC_EJB21</key><value>org.jboss.ws.integration.jboss42.jbossws.InvocationHandlerEJB21</value></entry> + <entry><key>JAXWS_JSE</key><value>org.jboss.ws.core.server.InvocationHandlerJSE</value></entry> + <entry><key>JAXWS_EJB3</key><value>org.jboss.ws.integration.jboss40.jbossws.InvocationHandlerEJB3</value></entry> + </map> + </property> + </bean> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> + <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> + <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.ws.integration.jboss42.jbossws.ModifyWebMetaDataDeployer"> + <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> + </bean> + <bean name="WSPublishContractDeployer" class="org.jboss.ws.core.deployment.PublishContractDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.ws.integration.jboss42.jbossws.UnifiedDeploymentInfoDeployer"> + <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> + </bean> + <bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataAssociationDeployer"/> + <bean name="WSUnifiedMetaDataDeployer" class="org.jboss.ws.core.deployment.UnifiedMetaDataDeployer"/> + <bean name="WSWebAppGeneratorDeployer" class="org.jboss.ws.integration.jboss42.jbossws.WebAppGeneratorDeployer"/> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.ws.integration.jboss42.jbossws.WebAppDeployerDeployer"> + <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> + </bean> + +  + <bean name="WSServiceEndpointPublisher" class="org.jboss.ws.core.deployment.ServiceEndpointPublisher"> + <property name="servletClass">org.jboss.ws.core.server.ServiceEndpointServlet</property> + </bean> + <bean name="WSDeploymentInfoAdapter" class="org.jboss.ws.integration.jboss42.jbossws.DeploymentInfoAdapter"> + <property name="appMetaDataAdapter"><inject bean="WSAppMetaDataAdapter"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSAppMetaDataAdapter" class="org.jboss.ws.integration.jboss40.jbossws.ApplicationMetaDataAdapter"/> + <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.ws.integration.jboss40.jbossws.ServiceRefMetaDataAdapter"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.ws.integration.jboss42.jbossws.WebMetaDataAdapter"/> + +  + <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss42.jbossws.JAXRPCDeployerHookJSE"> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss42.jbossws.JAXRPCDeployerHookEJB21"> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss42.jbossws.JAXWSDeployerHookJSE"> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss42.jbossws.JAXWSDeployerHookEJB3"> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss42.jbossws.MainDeployerHook"> + <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + +</deployment> Property changes on: trunk/jbws-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml =================================================================== --- trunk/jbws-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml (rev 0) +++ trunk/jbws-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<server> + +  + <mbean name="jboss.ws:service=WebServiceClientDeployer" code="org.jboss.ws.integration.jboss40.jbossws.WebServiceClientDeployer"> + <depends>jboss:service=Naming</depends> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorJSE"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.web:service=WebServer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorEJB21"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> + </depends-list> + </mbean> + +  + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorEJB3"> + <depends-list optional-attribute-name="Interceptables"> + <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> + </depends-list> + </mbean> + +</server> Property changes on: trunk/jbws-jboss40/src/main/resources/jbossws.sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: trunk/jbws-jboss40/src/test (from rev 3060, trunk/jbws-jboss42/src/test) Copied: trunk/jbws-jboss40/src/test/java (from rev 3064, trunk/jbws-jboss42/src/test/java) Copied: trunk/jbws-jboss40/src/test/resources (from rev 3064, trunk/jbws-jboss42/src/test/resources) Modified: trunk/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -13,41 +13,20 @@ <project> - <property file="${basedir}/version.properties"/> -    - <target name="thirdparty" depends="thirdparty-init,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> </target> - <target name="thirdparty-init" depends="prepare"> - - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> - <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> - <condition property="jbws.force.thirdparty.get"> - <or> - <not> - <available file="${thirdparty.dir}" type="dir"/> - </not> - <isfalse value="${checksum.ok}"/> - <isset property="force.thirdparty.get"/> - </or> - </condition> - <echo message="checksum.ok = ${checksum.ok}"/> - </target> + <target name="thirdparty-init" depends="prepare"/>  - <target name="thirdparty-get" if="jbws.force.thirdparty.get" - description="Gets the thirdparty libraries"> - - <mkdir dir="${thirdparty.dir}"/> - - <checksum file="${basedir}/version.properties" fileext=".md5"/> - </target> + <target name="thirdparty-get" depends="thirdparty-init" + description="Gets the thirdparty libraries"/> <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> Modified: trunk/jbws-jboss42/build.xml =================================================================== --- trunk/jbws-jboss42/build.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/build.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -76,6 +76,8 @@ <copy todir="${jbws42.output.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${jbws42.etc.dir}"> <include name="component-info.xml"/> + </fileset> + <fileset dir="${build.dir}/etc"> <include name="default.mf"/> </fileset> <filterset> @@ -84,7 +86,6 @@ <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> - <filtersfile file="${basedir}/version.properties"/> </filterset> </copy> </target> Deleted: trunk/jbws-jboss42/src/main/etc/JBossORG-EULA.txt =================================================================== --- trunk/jbws-jboss42/src/main/etc/JBossORG-EULA.txt 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/etc/JBossORG-EULA.txt 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Deleted: trunk/jbws-jboss42/src/main/etc/default.mf =================================================================== --- trunk/jbws-jboss42/src/main/etc/default.mf 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/etc/default.mf 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ (build=(a)build.id@) -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@ Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; - -//$Id$ - - -/** - * An interface for all web service deployer hooks - * - * @author Thomas.Diesler(a)jboss.org - * @since 24-Apr-2007 - */ -public interface DeployerHook -{ - void deploy(DeploymentInfo unit) throws DeploymentException; - - void undeploy(DeploymentInfo unit); -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,153 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -//$Id$ - -import java.util.LinkedList; -import java.util.List; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.MainDeployerMBean; -import org.jboss.deployment.SubDeployerInterceptorSupport; -import org.jboss.mx.server.Invocation; -import org.jboss.mx.util.MBeanProxy; - -/** - * A deployer service that manages WS4EE compliant Web Services - * - * @author Thomas.Diesler(a)jboss.org - * @since 03-May-2007 - */ -public abstract class DeployerInterceptor extends SubDeployerInterceptorSupport implements DeployerInterceptorMBean -{ - // The main deployer - private MainDeployerMBean mainDeployer; - - private List<DeployerHook> phaseOneHooks = new LinkedList<DeployerHook>(); - private List<DeployerHook> phaseTwoHooks = new LinkedList<DeployerHook>(); - - public void addPhaseOneHook(DeployerHook hook) - { - log.debug("Add phase-one deployer hook: " + hook); - phaseOneHooks.add(hook); - } - - public void removePhaseOneHook(DeployerHook hook) - { - log.debug("Remove phase-one deployer hook: " + hook); - phaseOneHooks.remove(hook); - } - - public void addPhaseTwoHook(DeployerHook hook) - { - log.debug("Add phase-two deployer hook: " + hook); - phaseTwoHooks.add(hook); - } - - public void removePhaseTwoHook(DeployerHook hook) - { - log.debug("Remove phase-two deployer hook: " + hook); - phaseTwoHooks.remove(hook); - } - - @Override - protected final Object create(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseOneHooks) - deployer.deploy(unit); - - return retn; - } - - @Override - protected final Object start(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseTwoHooks) - deployer.deploy(unit); - - return retn; - } - - @Override - protected final Object stop(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseTwoHooks) - deployer.undeploy(unit); - - return retn; - } - - @Override - protected final Object destroy(Invocation invocation, DeploymentInfo unit) throws Throwable - { - Object retn = invokeNext(invocation); - - for (DeployerHook deployer : phaseOneHooks) - deployer.undeploy(unit); - - return retn; - } - - /** Create the deployer service - */ - protected void createService() throws Exception - { - mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); - super.attach(); - } - - /** Destroy the deployer service - */ - protected void destroyService() - { - super.detach(); - } - - /** - * Handle all webservice deployment exceptions. - * You can either simply log the problem and keep the EJB/WAR module - * alive or undeploy properly. - */ - protected void handleStartupException(DeploymentInfo di, Throwable th) - { - log.error("Cannot startup webservice for: " + di.shortName, th); - mainDeployer.undeploy(di); - } - - /** - * Handle all webservice deployment exceptions. - * - * You can either simply logs the problem and keep the EJB/WAR module - * alive or undeploy properly. - */ - protected void handleShutdownException(String moduleName, Throwable th) - { - log.error("Cannot shutdown webservice for: " + moduleName, th); - } -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -//$Id$ - -/** - * A deployer service that manages WS4EE compliant Web-Services for EJB-2.1 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Jan-2005 - */ -public class DeployerInterceptorEJB21 extends DeployerInterceptor implements DeployerInterceptorEJB21MBean -{ - -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -import javax.management.ObjectName; - -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorEJB21MBean extends DeployerInterceptorMBean -{ - //default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB21"); -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -// $Id$ - -/** - * A deployer service that manages WS4EE compliant Web-Services for EJB3 Endpoints - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2005 - */ -public class DeployerInterceptorEJB3 extends DeployerInterceptor implements DeployerInterceptorEJB3MBean -{ -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -import javax.management.ObjectName; - -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorEJB3MBean extends DeployerInterceptorMBean -{ - //default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB3"); -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -// $Id$ - -/** - * A deployer service that manages WS4EE compliant Web Services for WAR - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Jan-2005 - */ -public class DeployerInterceptorJSE extends DeployerInterceptor implements DeployerInterceptorJSEMBean -{ -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,37 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.integration.jboss42; - -import javax.management.ObjectName; - -import org.jboss.deployment.SubDeployerInterceptorMBean; -import org.jboss.ws.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorJSEMBean extends DeployerInterceptorMBean -{ - //default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerJSE"); -} Deleted: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.integration.jboss42; - -import org.jboss.deployment.SubDeployerInterceptorMBean; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface DeployerInterceptorMBean extends SubDeployerInterceptorMBean -{ - void addPhaseOneHook(DeployerHook deployer); - - void removePhaseOneHook(DeployerHook deployer); - - void addPhaseTwoHook(DeployerHook deployer); - - void removePhaseTwoHook(DeployerHook deployer); -} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerHook.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerHook.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerHook.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +import org.jboss.deployment.DeploymentException; +import org.jboss.deployment.DeploymentInfo; + +//$Id$ + + +/** + * An interface for all web service deployer hooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public interface DeployerHook +{ + void deploy(DeploymentInfo unit) throws DeploymentException; + + void undeploy(DeploymentInfo unit); +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptor.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptor.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptor.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,153 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +//$Id$ + +import java.util.LinkedList; +import java.util.List; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.deployment.MainDeployerMBean; +import org.jboss.deployment.SubDeployerInterceptorSupport; +import org.jboss.mx.server.Invocation; +import org.jboss.mx.util.MBeanProxy; + +/** + * A deployer service that manages WS4EE compliant Web Services + * + * @author Thomas.Diesler(a)jboss.org + * @since 03-May-2007 + */ +public abstract class DeployerInterceptor extends SubDeployerInterceptorSupport implements DeployerInterceptorMBean +{ + // The main deployer + private MainDeployerMBean mainDeployer; + + private List<DeployerHook> phaseOneHooks = new LinkedList<DeployerHook>(); + private List<DeployerHook> phaseTwoHooks = new LinkedList<DeployerHook>(); + + public void addPhaseOneHook(DeployerHook hook) + { + log.debug("Add phase-one deployer hook: " + hook); + phaseOneHooks.add(hook); + } + + public void removePhaseOneHook(DeployerHook hook) + { + log.debug("Remove phase-one deployer hook: " + hook); + phaseOneHooks.remove(hook); + } + + public void addPhaseTwoHook(DeployerHook hook) + { + log.debug("Add phase-two deployer hook: " + hook); + phaseTwoHooks.add(hook); + } + + public void removePhaseTwoHook(DeployerHook hook) + { + log.debug("Remove phase-two deployer hook: " + hook); + phaseTwoHooks.remove(hook); + } + + @Override + protected final Object create(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseOneHooks) + deployer.deploy(unit); + + return retn; + } + + @Override + protected final Object start(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseTwoHooks) + deployer.deploy(unit); + + return retn; + } + + @Override + protected final Object stop(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseTwoHooks) + deployer.undeploy(unit); + + return retn; + } + + @Override + protected final Object destroy(Invocation invocation, DeploymentInfo unit) throws Throwable + { + Object retn = invokeNext(invocation); + + for (DeployerHook deployer : phaseOneHooks) + deployer.undeploy(unit); + + return retn; + } + + /** Create the deployer service + */ + protected void createService() throws Exception + { + mainDeployer = (MainDeployerMBean)MBeanProxy.get(MainDeployerMBean.class, MainDeployerMBean.OBJECT_NAME, server); + super.attach(); + } + + /** Destroy the deployer service + */ + protected void destroyService() + { + super.detach(); + } + + /** + * Handle all webservice deployment exceptions. + * You can either simply log the problem and keep the EJB/WAR module + * alive or undeploy properly. + */ + protected void handleStartupException(DeploymentInfo di, Throwable th) + { + log.error("Cannot startup webservice for: " + di.shortName, th); + mainDeployer.undeploy(di); + } + + /** + * Handle all webservice deployment exceptions. + * + * You can either simply logs the problem and keep the EJB/WAR module + * alive or undeploy properly. + */ + protected void handleShutdownException(String moduleName, Throwable th) + { + log.error("Cannot shutdown webservice for: " + moduleName, th); + } +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +//$Id$ + +/** + * A deployer service that manages WS4EE compliant Web-Services for EJB-2.1 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class DeployerInterceptorEJB21 extends DeployerInterceptor implements DeployerInterceptorEJB21MBean +{ + +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21MBean.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21MBean.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21MBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +import javax.management.ObjectName; + +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorEJB21MBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB21"); +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +// $Id$ + +/** + * A deployer service that manages WS4EE compliant Web-Services for EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2005 + */ +public class DeployerInterceptorEJB3 extends DeployerInterceptor implements DeployerInterceptorEJB3MBean +{ +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3MBean.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3MBean.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3MBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +import javax.management.ObjectName; + +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorEJB3MBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerEJB3"); +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSE.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSE.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSE.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +// $Id$ + +/** + * A deployer service that manages WS4EE compliant Web Services for WAR + * + * @author Thomas.Diesler(a)jboss.org + * @since 15-Jan-2005 + */ +public class DeployerInterceptorJSE extends DeployerInterceptor implements DeployerInterceptorJSEMBean +{ +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSEMBean.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSEMBean.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSEMBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,36 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.integration.jboss42.common; + +import javax.management.ObjectName; + +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorJSEMBean extends DeployerInterceptorMBean +{ + //default object name + public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceDeployerJSE"); +} Copied: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorMBean.java (from rev 3054, trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java) =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorMBean.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorMBean.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +import org.jboss.deployment.SubDeployerInterceptorMBean; + +/** + * MBean interface. + * @since 19-Jan-2005 + */ +public interface DeployerInterceptorMBean extends SubDeployerInterceptorMBean +{ + void addPhaseOneHook(DeployerHook deployer); + + void removePhaseOneHook(DeployerHook deployer); + + void addPhaseTwoHook(DeployerHook deployer); + + void removePhaseTwoHook(DeployerHook deployer); +} Modified: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -35,8 +35,8 @@ import org.jboss.mx.util.MBeanServerLocator; import org.jboss.ws.integration.deployment.DeployerManager; import org.jboss.ws.integration.deployment.WSDeploymentException; -import org.jboss.ws.integration.jboss42.DeployerHook; -import org.jboss.ws.integration.jboss42.DeployerInterceptorMBean; +import org.jboss.ws.integration.jboss42.common.DeployerHook; +import org.jboss.ws.integration.jboss42.common.DeployerInterceptorMBean; /** * An abstract web service deployer. Modified: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/DeploymentInfoAdapterFactory.java 2007-05-13 01:12:02 UTC (rev 3065) @@ -41,7 +41,7 @@ public static DeploymentInfoAdapter newInstance() { KernelRegistry registry = KernelLocator.getKernel().getRegistry(); - KernelRegistryEntry entry = registry.getEntry("DeploymentInfoAdapter"); + KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter"); return (DeploymentInfoAdapter)entry.getTarget(); } } Modified: trunk/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml =================================================================== --- trunk/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -7,7 +7,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.ws.integration.jboss42.DeployerInterceptorJSE"> + <mbean name="jboss.ws:service=DeployerInterceptorJSE" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorJSE"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.web:service=WebServer</depends-list-element> </depends-list> @@ -16,7 +16,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB21"> + <mbean name="jboss.ws:service=DeployerInterceptorEJB21" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorEJB21"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.ejb:service=EJBDeployer</depends-list-element> </depends-list> @@ -25,7 +25,7 @@  - <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3"> + <mbean name="jboss.ws:service=DeployerInterceptorEJB3" code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorEJB3"> <depends-list optional-attribute-name="Interceptables"> <depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element> </depends-list> Deleted: trunk/jbws-jboss42/version.properties =================================================================== --- trunk/jbws-jboss42/version.properties 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss42/version.properties 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,4 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -# No versions different from core \ No newline at end of file Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -13,41 +13,20 @@ <project> - <property file="${basedir}/version.properties"/> -    - <target name="thirdparty" depends="thirdparty-init,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> </target> - <target name="thirdparty-init" depends="prepare"> - - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> - <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> - <condition property="jbws.force.thirdparty.get"> - <or> - <not> - <available file="${thirdparty.dir}" type="dir"/> - </not> - <isfalse value="${checksum.ok}"/> - <isset property="force.thirdparty.get"/> - </or> - </condition> - <echo message="checksum.ok = ${checksum.ok}"/> - </target> + <target name="thirdparty-init" depends="prepare"/>  - <target name="thirdparty-get" if="jbws.force.thirdparty.get" - description="Gets the thirdparty libraries"> - - <mkdir dir="${thirdparty.dir}"/> - - <checksum file="${basedir}/version.properties" fileext=".md5"/> - </target> + <target name="thirdparty-get" depends="thirdparty-init" + description="Gets the thirdparty libraries"/> <target name="thirdparty-classpath" depends="thirdparty-init,core-jars"> Modified: trunk/jbws-jboss50/build.xml =================================================================== --- trunk/jbws-jboss50/build.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss50/build.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -74,6 +74,8 @@ <copy todir="${jbws50.output.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${jbws50.etc.dir}"> <include name="component-info.xml"/> + </fileset> + <fileset dir="${build.dir}/etc"> <include name="default.mf"/> </fileset> <filterset> @@ -82,7 +84,6 @@ <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> <filtersfile file="${build.dir}/version.properties"/> - <filtersfile file="${basedir}/version.properties"/> </filterset> </copy> </target> Deleted: trunk/jbws-jboss50/src/main/etc/JBossORG-EULA.txt =================================================================== --- trunk/jbws-jboss50/src/main/etc/JBossORG-EULA.txt 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss50/src/main/etc/JBossORG-EULA.txt 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Deleted: trunk/jbws-jboss50/src/main/etc/default.mf =================================================================== --- trunk/jbws-jboss50/src/main/etc/default.mf 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss50/src/main/etc/default.mf 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ (build=(a)build.id@) -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@ Deleted: trunk/jbws-jboss50/version.properties =================================================================== --- trunk/jbws-jboss50/version.properties 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/jbws-jboss50/version.properties 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,4 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -# No versions different from core \ No newline at end of file Modified: trunk/sunri-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -19,11 +19,10 @@   - <target name="thirdparty" depends="thirdparty-init,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> </target> <target name="thirdparty-init" depends="prepare"> - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty.get"> @@ -39,7 +38,7 @@  - <target name="thirdparty-get" if="force.thirdparty.get" + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> Modified: trunk/sunri-jboss50/build.xml =================================================================== --- trunk/sunri-jboss50/build.xml 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/sunri-jboss50/build.xml 2007-05-13 01:12:02 UTC (rev 3065) @@ -74,6 +74,8 @@ <copy todir="${sunri50.output.etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${sunri50.etc.dir}"> <include name="component-info.xml"/> + </fileset> + <fileset dir="${build.dir}/etc"> <include name="default.mf"/> </fileset> <filterset> Deleted: trunk/sunri-jboss50/src/main/etc/JBossORG-EULA.txt =================================================================== --- trunk/sunri-jboss50/src/main/etc/JBossORG-EULA.txt 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/sunri-jboss50/src/main/etc/JBossORG-EULA.txt 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Deleted: trunk/sunri-jboss50/src/main/etc/default.mf =================================================================== --- trunk/sunri-jboss50/src/main/etc/default.mf 2007-05-12 22:32:35 UTC (rev 3064) +++ trunk/sunri-jboss50/src/main/etc/default.mf 2007-05-13 01:12:02 UTC (rev 3065) @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @sunri.implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ (build=(a)build.id@) -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3064 - trunk/jbossws-core/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 18:32:35 -0400 (Sat, 12 May 2007) New Revision: 3064 Modified: trunk/jbossws-core/ant-import/build-deploy.xml Log: Add deploy-jboss40 Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-12 22:31:43 UTC (rev 3063) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-12 22:32:35 UTC (rev 3064) @@ -13,10 +13,6 @@ <project> -  -  -  -  <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> <ant antfile="${jbws.jboss50.dir}/build.xml" target="deploy" inheritall="false"/> @@ -27,4 +23,9 @@ <ant antfile="${jbws.jboss42.dir}/build.xml" target="deploy" inheritall="false"/> </target> +  + <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws"> + <ant antfile="${jbws.jboss40.dir}/build.xml" target="deploy" inheritall="false"/> + </target> + </project>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3063 - trunk/jbossws-core/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 18:31:43 -0400 (Sat, 12 May 2007) New Revision: 3063 Modified: trunk/jbossws-core/ant-import/build-deploy.xml Log: Add deploy-jboss42 Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-12 22:15:42 UTC (rev 3062) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-12 22:31:43 UTC (rev 3063) @@ -22,4 +22,9 @@ <ant antfile="${jbws.jboss50.dir}/build.xml" target="deploy" inheritall="false"/> </target> +  + <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws"> + <ant antfile="${jbws.jboss42.dir}/build.xml" target="deploy" inheritall="false"/> + </target> + </project>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3062 - in trunk: build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2 and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 18:15:42 -0400 (Sat, 12 May 2007) New Revision: 3062 Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbws-jboss42/ant-import/build-thirdparty.xml trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/sunri-jboss50/ant-import/build-thirdparty.xml Log: Fix hudson AS runs Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,7 +27,7 @@ # # deploy to jboss # -cd $JBWSDIR/build +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss40 # Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,7 +27,7 @@ # # deploy to jboss # -cd $JBWSDIR/build +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss42 # Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,7 +27,7 @@ # # deploy to jboss # -cd $JBWSDIR/build +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss50 # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss40 # @@ -37,7 +38,6 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss40 # @@ -37,7 +38,6 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss42 # @@ -37,7 +38,6 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -3,7 +3,21 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-AS-4.0.5, JBWS-Tests-AS-4.0.5-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-AS-4.0.5, JBWS-Samples-TC-5.5</childProjects> + <childProjects> + JBWS-Tests-AS-5.0, + JBWS-Tests-AS-4.2, + JBWS-Tests-AS-4.0, + JBWS-Tests-AS-4.0.5, + JBWS-Tests-TC-5.5, + JBAS-Tests-AS-5.0, + JBAS-Tests-AS-4.2, + JBAS-Tests-AS-4.0, + JBWS-Samples-AS-5.0, + JBWS-Samples-AS-4.2, + JBWS-Samples-AS-4.0, + JBWS-Samples-AS-4.0.5, + JBWS-Samples-TC-5.5 + </childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -105,12 +105,12 @@ <checksum file="${core.dir}/version.properties" fileext=".md5"/> </target> - <target name="core-thirdparty-classpath" depends="core-thirdparty-init,spi-thirdparty-classpath"> + <target name="core-thirdparty-classpath" depends="core-thirdparty-init,spi-jars">  <path id="core.thirdparty.classpath"> <path refid="spi.thirdparty.classpath"/> - <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${core.thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${core.thirdparty.dir}/activation.jar"/> Modified: trunk/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -49,13 +49,15 @@ <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> + <target name="thirdparty-classpath" depends="thirdparty-init,core-jars">  <path id="jbws42.integration.classpath"> - <pathelement location="${spi.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes14"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -49,13 +49,15 @@ <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> + <target name="thirdparty-classpath" depends="thirdparty-init,core-jars">  <path id="jbws50.integration.classpath"> - <pathelement location="${spi.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes"/> - <pathelement location="${core.dir}/output/classes14"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> Modified: trunk/sunri-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 21:46:32 UTC (rev 3061) +++ trunk/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-12 22:15:42 UTC (rev 3062) @@ -81,12 +81,12 @@ <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" depends="spi-thirdparty-classpath"> + <target name="thirdparty-classpath" depends="thirdparty-init,spi-jars">  <path id="sunri50.integration.classpath"> <path refid="spi.thirdparty.classpath"/> - <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3061 - trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 17:46:32 -0400 (Sat, 12 May 2007) New Revision: 3061 Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml Log: Fix jbws42 hudson Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12 21:35:09 UTC (rev 3060) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12 21:46:32 UTC (rev 3061) @@ -10,37 +10,20 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws -SPIDIR=$WORKSPACE/jbossws-spi -INTDIR=$WORKSPACE/jbws-jboss42 JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # -# Build jbossws-spi +# copy ant.properties # -cd $SPIDIR -cp ant.properties.example ant.properties -ant $ENVIRONMENT thirdparty -ant $ENVIRONMENT clean main - -# -# Build jbossws -# cd $JBWSDIR/build cp ant.properties.example ant.properties -ant $ENVIRONMENT thirdparty -cp $SPIDIR/output/lib/jbossws-spi.jar $JBWSDIR/build/thirdparty/jbossws-spi -ant $ENVIRONMENT clean main - + # # Build jbws-jboss42 # -cd $INTDIR -cp ant.properties.example ant.properties -ant $ENVIRONMENT thirdparty -cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/thirdparty/jbossws-spi -cp $JBWSDIR/jbossws-core/output/lib/*.jar $INTDIR/thirdparty/jbossws-core -ant $ENVIRONMENT clean main +cd $JBWSDIR/jbws-jboss42 +ant $ENVIRONMENT clean deploy # # stop jbossas @@ -48,12 +31,6 @@ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# deploy to jboss -# -cd $INTDIR -ant $ENVIRONMENT deploy - -# # start jbossas # $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start @@ -62,7 +39,6 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3060 - in trunk: build/ant-import and 23 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 17:35:09 -0400 (Sat, 12 May 2007) New Revision: 3060 Added: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt trunk/jbossws-tests/src/resources/dummy-excludes.txt trunk/jbws-jboss42/ant-import/build-testsuite.xml trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java trunk/jbws-jboss42/src/test/ trunk/jbws-jboss42/src/test/java/ trunk/jbws-jboss42/src/test/resources/ trunk/jbws-jboss42/src/test/resources/excludes.txt trunk/sunri-jboss50/src/test/java/ Removed: trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/build.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/version.properties trunk/jbossws-core/.classpath trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/build.xml trunk/jbossws-core/version.properties trunk/jbossws-spi/.classpath trunk/jbossws-spi/ant-import/build-thirdparty.xml trunk/jbossws-spi/build.xml trunk/jbossws-tests/ trunk/jbossws-tests/.classpath trunk/jbossws-tests/ant-import/build-testsuite.xml trunk/jbossws-tests/build.xml trunk/jbws-jboss42/ trunk/jbws-jboss42/.classpath trunk/jbws-jboss42/ant-import/build-deploy.xml trunk/jbws-jboss42/ant-import/build-release.xml trunk/jbws-jboss42/ant-import/build-thirdparty.xml trunk/jbws-jboss42/build.xml trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/jbws-jboss42/version.properties trunk/jbws-jboss50/.classpath trunk/jbws-jboss50/ant-import/build-deploy.xml trunk/jbws-jboss50/ant-import/build-release.xml trunk/jbws-jboss50/ant-import/build-testsuite.xml trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/jbws-jboss50/build.xml trunk/sunri-jboss50/.classpath trunk/sunri-jboss50/ant-import/build-testsuite.xml trunk/sunri-jboss50/build.xml Log: Resurect jboss42 integration Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -90,6 +90,46 @@ </target>  +  +  + + <macrodef name="copy-test-resources"> + <attribute name="srcdir"/> + <sequential> + <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> + <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> + +  + <copy todir="${tests.output.dir}/classes"> + <fileset dir="@{srcdir}/java"> + <include name="**/*.xml"/> + </fileset> + </copy> + +  + <copy todir="${tests.output.dir}/resources"> + <fileset dir="@{srcdir}/resources"> + <include name="**/*.wsdl"/> + <include name="**/*.xml"/> + <exclude name="jaxrpc/samples-override/**"/> + </fileset> + <filterset> + <filter token="jbosstest.host.name" value="${node0}"/> + <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> + </filterset> + </copy> + +  + <copy todir="${tests.output.dir}/resources"> + <fileset dir="@{srcdir}/resources"> + <exclude name="**/*.wsdl"/> + <exclude name="**/*.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + +    Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -28,26 +28,45 @@ | Build all jar files. --> <target name="jars" depends="prepare" description="Builds all jar files."> - <ant antfile="${spi.dir}/build.xml" dir="${spi.dir}" target="spi-jars"/> - <ant antfile="${core.dir}/build.xml" dir="${core.dir}" target="core-jars"/> + <ant antfile="${spi.dir}/build.xml" target="spi-jars" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="core-jars" inheritall="false"/> </target> +  +  +  + <target name="clean" depends="prepare" description="Cleans up most generated files."> <ant antfile="${spi.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> -  </target> - <target name="main" description="Executes the default target (most)." depends="most"> + <target name="clobber" depends="prepare" description="Cleans up all generated files."> + <ant antfile="${spi.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${jbws.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${jbws.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> + <ant antfile="${sunri.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="jars"> <echo message="***********************************"/> <echo message="* JBossWS core successfully build *"/> <echo message="* ant hudson-setup *"/> <echo message="***********************************"/> </target> - <target name="most" description="Builds almost everything." depends="jars"/> + <target name="most" description="Builds almost everything." depends="prepare"> + <ant antfile="${spi.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${testsuite.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${jbws.jboss50.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${jbws.jboss42.dir}/build.xml" target="most" inheritall="false"/> + <ant antfile="${sunri.jboss50.dir}/build.xml" target="most" inheritall="false"/> + </target> - <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> + <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist,build-src-dist"> </target> </project> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -50,7 +50,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-core/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/build/version.properties 2007-05-12 21:35:09 UTC (rev 3060) @@ -17,7 +17,9 @@ jboss-common-core=2.0.2.GA jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA +jboss-javaee=5.0.0-SNAPSHOT jboss-jbossxb=2.0.0.CR2 jboss-microcontainer=2.0.0.Beta3 +junit=3.8.1 sun-jaxws=2.1.1 sun-servlet=2.5 Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -4,7 +4,6 @@ <classpathentry kind="src" path="output-tests/wsconsume/java"/> <classpathentry excluding="org/jboss/test/ws/benchmark/|org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/getopt.jar"/> @@ -31,8 +30,9 @@ <classpathentry kind="lib" path="thirdparty/qdox.jar"/> <classpathentry kind="lib" path="thirdparty/ant.jar"/> <classpathentry kind="lib" path="thirdparty/policy.jar"/> - <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -248,44 +248,15 @@ </javac> </target> -  - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> - -  - <copy todir="${tests.output.dir}/classes"> - <fileset dir="${tests.java.dir}"> - <include name="**/*.xml"/> - </fileset> - </copy> - -  - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - <exclude name="jaxrpc/samples-override/**"/> - </fileset> - <filterset> - <filter token="jbosstest.host.name" value="${node0}"/> - <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> - </filterset> - </copy> - -  - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <exclude name="**/*.wsdl"/> - <exclude name="**/*.xml"/> - </fileset> - </copy> - </target> -    +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + <target name="tests-main" depends="wsconsume,tests-compile,tests-copy-resources,tests-generate-resources" description="Build the deployments."> <ant antfile="${core.dir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> <ant antfile="${core.dir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -85,7 +85,6 @@ <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${core.thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${core.thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${core.thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> - <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${core.thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${core.thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${core.thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${core.thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -215,9 +215,14 @@ <delete dir="${core.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + <delete dir="${basedir}/thirdparty"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="core-jars"/> + <target name="most" description="Builds almost everything." depends="core-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Added: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt (rev 0) +++ trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,13 @@ +# Always excludes +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/serviceref/** + +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Property changes on: trunk/jbossws-core/src/test/resources/tests-jboss42-excludes.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt (rev 0) +++ trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,28 @@ +# Always excludes +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxrpc/jbws1011/** +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.* +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/jbws723/** +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/samples/jaxr/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/** Property changes on: trunk/jbossws-core/src/test/resources/tests-tomcat-excludes.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-core/version.properties 2007-05-12 21:35:09 UTC (rev 3060) @@ -28,7 +28,6 @@ jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA -junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 sun-hudson=1.93 Modified: trunk/jbossws-spi/.classpath =================================================================== --- trunk/jbossws-spi/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-spi/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,5 +14,6 @@ <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> + <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -44,6 +44,7 @@ <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${spi.thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${spi.thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${spi.thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${spi.thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${spi.thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${spi.thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${spi.thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> @@ -53,6 +54,7 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${spi.thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${spi.thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${spi.thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${spi.thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${spi.thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${spi.thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${spi.thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> @@ -67,6 +69,7 @@ <pathelement location="${spi.thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-logging-spi.jar"/> + <pathelement location="${spi.thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${spi.thirdparty.dir}/jboss-xml-binding.jar"/> <pathelement location="${spi.thirdparty.dir}/jaxws-api.jar"/> Modified: trunk/jbossws-spi/build.xml =================================================================== --- trunk/jbossws-spi/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-spi/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -141,6 +141,10 @@ <delete dir="${spi.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/thirdparty"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> <target name="most" description="Builds almost everything." depends="spi-jars"/> Property changes on: trunk/jbossws-tests ___________________________________________________________________ Name: svn:ignore - output-eclipse output + output-eclipse output output* Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="output/wsconsume/java"/> <classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/java"/> - <classpathentry kind="src" path="output/wstools/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/sunri-jboss50"/> - <classpathentry kind="lib" path="/jbossws-core/thirdparty/junit.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/jsr181-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/saaj-api.jar"/> <classpathentry kind="lib" path="/sunri-jboss50/thirdparty/servlet-api.jar"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbossws-tests/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,17 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - <project> - <import file="${basedir}/../build/ant-import/build-testsuite.xml"/> + <property name="tests.dir" value="${testsuite.dir}/src"/> + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> + + <property name="excludesfile" value="${testsuite.dir}/src/resources/dummy-excludes.txt"/> + +  + <target name="tests-init" depends="tests-prepare,spi-thirdparty"> + +  + <path id="javac.classpath"> + <pathelement location="${spi.dir}/output/classes"/> + <path refid="spi.thirdparty.classpath"/> + </path> + + </target> +    @@ -27,45 +35,17 @@ </javac> </target> -  - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> - -  - <copy todir="${tests.output.dir}/classes"> - <fileset dir="${tests.java.dir}"> - <include name="**/*.xml"/> - </fileset> - </copy> - -  - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filter token="jbosstest.host.name" value="${node0}"/> - <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> - </filterset> - </copy> - -  - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <exclude name="**/*.wsdl"/> - <exclude name="**/*.xml"/> - </fileset> - </copy> - </target> -    +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${basedir}/src"/> + </target> + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> </target> - + </project> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -10,558 +10,12 @@ <project default="main" basedir="../jbossws-tests" name="JBossWS-Tests"> - <import file="${basedir}/../build/ant-import/build-deploy.xml"/> - <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/ant-import/build-testsuite.xml"/> + <import file="${spi.dir}/build.xml"/> - <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> - - <property name="core.output.dir" value="${core.dir}/output"/> - <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> - <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> - <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> - - <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> - <property name="tests.java.dir" value="${tests.dir}/src/java"/> - <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> - <property name="tests.output.dir" value="${tests.dir}/output"/>  -  -  - -  - <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> - <isset property="debug"/> - </condition> - <condition property="remote.debug.line" value=""> - <not> - <isset property="debug"/> - </not> - </condition> - -  - <property name="integration.target.${jbossws.integration.target}" value="true"/> - -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <condition property="jbossws.integration.target.jboss"> - <isset property="jboss.home"/> - </condition> - <condition property="jbossws.integration.target.tomcat"> - <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> - </condition> - - <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"/> - -  - <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.integration.target.jboss"/> - </condition> - <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="jbossws.integration.target.tomcat"/> - </condition> - -  - <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> - -  - <property name="node0" value="localhost"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> - -  -  -  - - <target name="prepare"> - - <mkdir dir="${tests.output.dir}/log"/> - <touch file="${tests.output.dir}/log/test.log"/> - - <tstamp> - <format property="build.id" pattern="yyyyMMddHHmm"/> - </tstamp> - -  - <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> - <or> - <available file="${jboss.client}/jboss-ejb3-client.jar"/> - <isset property="integration.target.tomcat"/> - </or> - </condition> - <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/> - <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> - - <echo/> - <echo message="-----------------------------------------------"/> - <echo message="jboss.home = ${jboss.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo message="java.home = ${java.home}"/> - <echo message="endorsed = ${endorsed.dirs}"/> - <echo message="excludesfile = ${excludes-short-name}"/> - <echo message="-----------------------------------------------"/> - - </target> - -  - <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/> - - <target name="common-classpath" depends="prepare,thirdparty"> - - <path id="jbossws.classpath"> - <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> - <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> - <pathelement location="${core.output.lib.dir}/jbossws-core.jar"/> - <pathelement location="${core.output.lib.dir}/jbossws-client.jar"/> - </path> - -  - <path id="javac.classpath"> - <path refid="core.classpath"/> - <path refid="jbossws.classpath"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> - <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> - <pathelement location="${thirdparty.dir}/junit.jar"/> - <pathelement location="${thirdparty.dir}/mail.jar"/> - <pathelement location="${thirdparty.dir}/qdox.jar"/> - <pathelement location="${thirdparty.dir}/policy.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> - <pathelement location="${thirdparty.dir}/stax-api.jar"/> - <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-jboss50.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-jboss42.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - </path> - </target> - - <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss"> - -  - <path id="test.client.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jbossretro-rt.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss.server.lib}/hibernate3.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <path refid="javac.classpath"/> - </path> - -  - <path id="jbpm.bpel.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${thirdparty.dir}/jbpm-bpel"/>  - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/commons-collections.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/jaxen.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> -  - </path> - </target> - - <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> - <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/> - <path id="test.client.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/> - <path refid="javac.classpath"/> - </path> - </target> - -  -  -  - - <target name="wsconsume" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5"> - -  - <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> - <classpath refid="core.classpath"/> - <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> - </taskdef> - - <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> - <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> - <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> - </target> - -  - <target name="servicegen" depends="compile" description="Generate the BPEL resources."> -  - <mkdir dir="${tests.output.dir}/libs"/> - <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> - </zip> -  - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> - -  - <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> - <classpath refid="jbpm.bpel.classpath"/> - </taskdef> - <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" - outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" - bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> - </target> - -  - <target name="wstools" depends="compile" description="Generate the JAX-RPC artifacts."> - -  - <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="core.classpath"/> - <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> - <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> - <classpath location="${tests.output.dir}/classes"/> - <classpath location="${tests.output.dir}"/> - </taskdef> - -  - <mkdir dir="${tests.output.dir}/wstools/java"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> - </move> - -  - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.output.dir}/wstools/resources"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - </fileset> - </copy> -  - <copy todir="${tests.output.dir}/resources/jaxrpc/samples" overwrite="true"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> - <filterset> - <filter token="jbosstest.host.name" value="${node0}"/> - </filterset> - </copy> - </target> - -  - <target name="wsprovide" depends="compile" description="Provide the JAX-WS contracts." if="HAVE_JDK_1.5"> - -  - <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> - <classpath refid="core.classpath"/> - <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> - <classpath location="${tests.output.dir}/classes"/> - </taskdef> - - <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> - </target> - - <target name="generate-resources" depends="servicegen,wstools,wsprovide"> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src path="${tests.output.dir}/wstools/java"/> - <exclude name="org/jboss/test/ws/interop/**"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - -  -  -  - - <target name="compile" depends="wsconsume,compile15" description="Compile sources"/> - - <target name="compile15" depends="init" if="HAVE_JDK_1.5"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <src path="${tests.output.dir}/wsconsume/java"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - -  - <target name="copy-resources" depends="init" description="Copy the deployment resources."> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> - -  - <copy todir="${tests.output.dir}/classes"> - <fileset dir="${tests.java.dir}"> - <include name="**/*.xml"/> - </fileset> - </copy> - -  - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - <exclude name="jaxrpc/samples-override/**"/> - </fileset> - <filterset> - <filter token="jbosstest.host.name" value="${node0}"/> - <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> - </filterset> - </copy> - -  - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <exclude name="**/*.wsdl"/> - <exclude name="**/*.xml"/> - </fileset> - </copy> - </target> - -  -  -  - - <target name="main" depends="wsconsume,compile,copy-resources,generate-resources" description="Build the deployments."> - <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> - </target> - - <target name="publish-interop-endpoints" depends="main"> - <copy todir="${jboss.server.deploy}"> - <fileset dir="${tests.output.dir}/libs/"> - <include name="*interop*.war"/> - </fileset> - </copy> - </target> - -  -  -  - -  - <target name="tests" depends="main" description="Run all unit tests and generate a report"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - <antcall target="tests-report"/> - </target> - -  - <target name="tests-samples" depends="init" description="Run samples unit tests"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> -  - <param name="haltonfailure" value="true"/> - </antcall> - <antcall target="tests-report"/> - </target> - -  - <target name="tests-tools" depends="init" description="Run tools unit tests"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - <antcall target="tests-report"/> - </target> - -  - <target name="test" depends="init" if="test" description="Run all unit tests in a given directory"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> - <param name="exclude.wildcard" value="no-wildcard-exclude-see-excludesfile"/> - <param name="haltonfailure" value="false"/> - </antcall> - </target> - -  - <target name="tests-main" depends="init"> - <mkdir dir="${tests.output.dir}/reports"/> - <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}" haltonfailure="${haltonfailure}"> - <jvmarg value="-Djava.security.manager"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> - <sysproperty key="client.scenario" value="${client.scenario}"/> - <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> - <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> - <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jbosstest.host.name" value="${node0}"/> - <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="tomcat.home" value="${tomcat.home}"/> - <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> - <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/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> - <path refid="test.client.classpath"/> - <pathelement location="${tests.output.dir}/classes"/> - </classpath> - <formatter type="plain" usefile="true"/> - <formatter type="xml" usefile="true"/> - <batchtest todir="${tests.output.dir}/reports" fork="true"> - <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/> - </batchtest> - </junit> - </target> - -  - <target name="one-test" depends="init" if="test" description="Run a single unit test"> - <mkdir dir="${tests.output.dir}/reports"/> - <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> - <jvmarg line="${remote.debug.line}"/> - <jvmarg value="-Djava.security.manager"/> - <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> - <sysproperty key="client.scenario" value="${client.scenario}"/> - <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> - <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> - <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jbosstest.host.name" value="${node0}"/> - <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> - <sysproperty key="tomcat.home" value="${tomcat.home}"/> - <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> - <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> -  -  - <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/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> - <path refid="test.client.classpath"/> - <pathelement location="${tests.output.dir}/classes"/> - </classpath> - <formatter type="plain" usefile="true"/> - <formatter type="xml" usefile="true"/> - <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/> - </junit> - </target> - -  -  -  - -  - <target name="tests-report" depends="init" description="Build the tests report"> - <junitreport todir="${tests.output.dir}/reports"> - <fileset dir="${tests.output.dir}/reports"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${tests.output.dir}/reports/html"/> - </junitreport> - <zip destfile="${tests.output.dir}/test-report-${build.id}.zip"> - <fileset dir="${tests.output.dir}" includes="reports/**"/> - </zip> - </target> - -    @@ -569,4 +23,8 @@ <delete dir="${tests.output.dir}"/> </target> + <target name="main" description="Builds almost everything." depends="tests-main"/> + + <target name="most" description="Builds almost everything." depends="main"/> + </project> Copied: trunk/jbossws-tests/src/resources/dummy-excludes.txt (from rev 3054, trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt) =================================================================== --- trunk/jbossws-tests/src/resources/dummy-excludes.txt (rev 0) +++ trunk/jbossws-tests/src/resources/dummy-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,13 @@ +# Always excludes +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/serviceref/** + +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Deleted: trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,13 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/serviceref/** - -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* Deleted: trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/src/resources/tests-jboss50-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,20 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# Fix before JBoss50 goes final -org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* -org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* -org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* -org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* -org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.* -org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.* -org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.* -org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.* -org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.* -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -org/jboss/test/ws/jaxrpc/wsdlpublish/** - Deleted: trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,28 +0,0 @@ -# Always excludes -org/jboss/test/ws/interop/** -org/jboss/test/ws/benchmark/** - -# EJB3/Injection excludes -org/jboss/test/ws/jaxrpc/jbws1011/** -org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* -org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* -org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* -org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* -org/jboss/test/ws/jaxws/samples/jsr181ejb/** -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceEJB3TestCase.* -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# JBoss excludes -org/jboss/test/ws/jaxrpc/jbws723/** -org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* -org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* -org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* -org/jboss/test/ws/jaxws/jbws1581/** -org/jboss/test/ws/jaxws/samples/jaxr/** - -# TODO: Why are these excluded -# [JBWS-1471] - Remove unwanted tomcat excludes -org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* -org/jboss/test/ws/jaxws/samples/wseventing/** Property changes on: trunk/jbws-jboss42 ___________________________________________________________________ Name: svn:ignore - output* + output* thirdparty version.properties.md5 Modified: trunk/jbws-jboss42/.classpath =================================================================== --- trunk/jbws-jboss42/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -3,17 +3,8 @@ <classpathentry excluding="org/jboss/ws/integration/jboss42/jms/" kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-container.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbws-jboss42/ant-import/build-deploy.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-deploy.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/ant-import/build-deploy.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -18,22 +18,18 @@   - <target name="deploy" depends="jboss42-jars" description="Deploy jbossws"> + <target name="deploy" depends="jbws42-jars,remove-jbossws,remove-jbwsri" description="Deploy jbossws"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <copy todir="${jboss42.home}/bin" overwrite="true"> - <fileset dir="${thirdparty.dir}/jbossws-resources"> - <include name="*.bat"/> - <include name="*.sh"/> - </fileset> - </copy> <copy todir="${jboss42.home}/client" overwrite="true"> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${core.thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -41,16 +37,53 @@ <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws42.output.lib.dir}/jbossws42.sar"/> </target> +  + <target name="remove-jbossws" depends="prepare" description="Remove jbossws"> + + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="wsdl4j.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + </target> + +  + <target name="remove-jbwsri" depends="prepare" description="Remove jbossws/sunri"> + + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> + </target> + </project> Modified: trunk/jbws-jboss42/ant-import/build-release.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-release.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/ant-import/build-release.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,20 +14,20 @@ <project>  - <target name="release" depends="jboss42-jars" + <target name="release" depends="jbws42-jars" description="Release to jboss.local.repository">  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true"> - <fileset dir="${jboss42.output.lib.dir}"> + <fileset dir="${jbws42.output.lib.dir}"> <include name="jbossws-jboss42.jar"/> <include name="jbossws42.sar"/> <include name="jbossws42-src.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jboss42.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${basedir}/version.properties"/> </filterset> Added: trunk/jbws-jboss42/ant-import/build-testsuite.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-testsuite.xml (rev 0) +++ trunk/jbws-jboss42/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <property name="tests.dir" value="${basedir}/src/test"/> + + <property name="jboss.home" value="${jboss42.home}"/> + <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + +  + <target name="tests-init" depends="tests-prepare,spi-thirdparty"> + + <path id="jbossws.classpath"> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + </path> + +  + <path id="javac.classpath"> + <path refid="jbossws.classpath"/> + <path refid="spi.thirdparty.classpath"/> + </path> + +  + <path id="tests.client.classpath"> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/javassist.jar"/> + <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}/mail.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <path refid="javac.classpath"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> + + <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + +</project> Property changes on: trunk/jbws-jboss42/ant-import/build-testsuite.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbws-jboss42/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -13,81 +13,49 @@ <project> + <property file="${basedir}/version.properties"/> +    - <target name="thirdparty" depends="prepare,jbossws-spi-get,jbossws-core-get,thirdparty-get,thirdparty-classpath"> + <target name="thirdparty" depends="thirdparty-init,thirdparty-get,thirdparty-classpath"> </target> -  - <target name="jbossws-spi-get" if="force.thirdparty.get" - description="Gets the jbossws-core libraries"> - - <mkdir dir="${thirdparty.dir}/jbossws-spi"/> - <get src="${jboss.repository}/jboss/jbossws-spi/${jboss-jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <target name="thirdparty-init" depends="prepare"> + <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="jbws.force.thirdparty.get"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> + </or> + </condition> + <echo message="checksum.ok = ${checksum.ok}"/> </target> - +  - <target name="jbossws-core-get" if="force.thirdparty.get" - description="Gets the jbossws-core libraries"> - - <mkdir dir="${thirdparty.dir}/jbossws-core"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-client.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-core.jar" dest="${thirdparty.dir}/jbossws-core/jbossws-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-resources.zip" dest="${thirdparty.dir}/jbossws-core/jbossws-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jbossws-core/jboss-saaj.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar" usetimestamp="true" verbose="true"/> - - <mkdir dir="${thirdparty.dir}/jbossws-resources"/> - <unzip dest="${thirdparty.dir}/jbossws-resources" src="${thirdparty.dir}/jbossws-core/jbossws-resources.zip"/> - - </target> - -  - <target name="thirdparty-get" if="force.thirdparty.get" + <target name="thirdparty-get" if="jbws.force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.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/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.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}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> + + <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> - <target name="thirdparty-classpath" > + <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath">  - <path id="jboss42.integration.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-spi/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jbossws-core.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxrpc.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jboss-jaxws.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-core/jboss-saaj.jar"/> + <path id="jbws42.integration.classpath"> + <pathelement location="${spi.dir}/output/classes"/> + <pathelement location="${core.dir}/output/classes"/> + <pathelement location="${core.dir}/output/classes14"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/> @@ -97,15 +65,7 @@ <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <path refid="core.thirdparty.classpath"/> </path> </target> Modified: trunk/jbws-jboss42/build.xml =================================================================== --- trunk/jbws-jboss42/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,31 +14,33 @@ <project default="main" basedir="../jbws-jboss42" name="JBossWS-JBoss42"> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../jbossws-core/build.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-testsuite.xml"/> + <import file="${core.dir}/build.xml"/> +    - <property name="jboss42.dir" value="${basedir}"/> - <property name="jboss42.src.dir" value="${jboss42.dir}/src/main"/> - <property name="jboss42.etc.dir" value="${jboss42.src.dir}/etc"/> - <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> - <property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/> - <property name="jboss42.output.dir" value="${jboss42.dir}/output"/> - <property name="jboss42.output.classes.dir" value="${jboss42.output.dir}/classes"/> - <property name="jboss42.output.etc.dir" value="${jboss42.output.dir}/etc"/> - <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> + <property name="jbws42.dir" value="${basedir}"/> + <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/> + <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/> + <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> + <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> + <property name="jbws42.output.dir" value="${jbws42.dir}/output"/> + <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/> + <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/> + <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/>    - <target name="jboss42-init" depends="prepare, thirdparty"> + <target name="jbws42-init" depends="prepare, thirdparty"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <available file="${jboss42.client}/jboss-ejb3-client.jar" property="jboss42.ejb3.available"/> </target> @@ -55,24 +57,24 @@ | documentation compiles. --> - <target name="jboss42-compile" depends="jboss42-init,core-compile,jboss42-compile-classes,jboss42-compile-etc" description="Compile all source files."/> + <target name="jbws42-compile" depends="jbws42-init,core-compile,jbws42-compile-classes,jbws42-compile-etc" description="Compile all source files."/>  - <target name="jboss42-compile-classes" depends="jboss42-init"> - <mkdir dir="${jboss42.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <target name="jbws42-compile-classes" depends="jbws42-init"> + <mkdir dir="${jbws42.output.classes.dir}"/> + <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <exclude name="org/jboss/ws/integration/jboss42/jms/**"/> <include name="org/jboss/ws/integration/jboss42/**"/> - <classpath refid="jboss42.integration.classpath"/> + <classpath refid="jbws42.integration.classpath"/> </javac> </target>  - <target name="jboss42-compile-etc" depends="jboss42-init"> - <mkdir dir="${jboss42.output.etc.dir}"/> - <copy todir="${jboss42.output.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${jboss42.etc.dir}"> + <target name="jbws42-compile-etc" depends="jbws42-init"> + <mkdir dir="${jbws42.output.etc.dir}"/> + <copy todir="${jbws42.output.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${jbws42.etc.dir}"> <include name="component-info.xml"/> <include name="default.mf"/> </fileset> @@ -94,48 +96,48 @@  - <target name="jboss42-jars" depends="jboss42-compile,core-jars,jboss42-module-jars" description="Builds all jar files."> + <target name="jbws42-jars" depends="jbws42-compile,core-jars,jbws42-module-jars" description="Builds all jar files."> </target>  - <target name="jboss42-module-jars" depends="jboss42-init"> + <target name="jbws42-module-jars" depends="jbws42-init">  - <mkdir dir="${jboss42.output.lib.dir}"/> - <jar jarfile="${jboss42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jboss42.output.etc.dir}/default.mf"> - <fileset dir="${jboss42.output.classes.dir}"> + <mkdir dir="${jbws42.output.lib.dir}"/> + <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf"> + <fileset dir="${jbws42.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> </fileset> - <metainf dir="${jboss42.resources.dir}/jbossws-jboss42.jar/META-INF"/> + <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> </jar>  - <war warfile="${jboss42.output.lib.dir}/jbossws-context.war" webxml="${jboss42.resources.dir}/jbossws.war/WEB-INF/web.xml"> - <fileset dir="${jboss42.resources.dir}/jbossws.war"> + <war warfile="${jbws42.output.lib.dir}/jbossws-context.war" webxml="${jbws42.resources.dir}/jbossws.war/WEB-INF/web.xml"> + <fileset dir="${jbws42.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jboss42.resources.dir}/jbossws.war/WEB-INF"> + <webinf dir="${jbws42.resources.dir}/jbossws.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war>  - <jar jarfile="${jboss42.output.lib.dir}/jbossws42.sar" manifest="${jboss42.output.etc.dir}/default.mf"> - <fileset dir="${jboss42.output.lib.dir}"> + <jar jarfile="${jbws42.output.lib.dir}/jbossws42.sar" manifest="${jbws42.output.etc.dir}/default.mf"> + <fileset dir="${jbws42.output.lib.dir}"> <include name="jbossws-jboss42.jar"/> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${thirdparty.dir}/jbossws-spi"> + <fileset dir="${spi.dir}/output/lib"> <include name="jbossws-spi.jar"/> </fileset> - <fileset dir="${thirdparty.dir}/jbossws-core"> + <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxws.jar"/> <include name="jbossws-core.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="policy.jar"/> @@ -143,20 +145,20 @@ <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> - <fileset dir="${jboss42.resources.dir}"> + <fileset dir="${jbws42.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/> </fileset> - <metainf dir="${thirdparty.dir}/jbossws-resources"> + <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jbws42.resources.dir}/jbossws.sar/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar>  - <zip zipfile="${jboss42.output.lib.dir}/jbossws42-src.zip" > - <fileset dir="${jboss42.java.dir}"/> + <zip zipfile="${jbws42.output.lib.dir}/jbossws42-src.zip" > + <fileset dir="${jbws42.java.dir}"/> </zip> </target> @@ -166,12 +168,16 @@  <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jboss42.output.dir}"/> + <delete dir="${jbws42.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="jboss42-jars"/> + <target name="most" description="Builds almost everything." depends="jbws42-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Added: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerFactory; + +import org.jboss.logging.Logger; +import org.jboss.ws.integration.management.BasicServerConfig; + +/** + * A Service Endpoint Registry + * + * @author Thomas.Diesler(a)jboss.org + * @since 04-May-2007 + */ +public class ManagedServerConfig extends BasicServerConfig implements ManagedServerConfigMBean +{ + // provide logging + private static final Logger log = Logger.getLogger(ManagedServerConfig.class); + + public void create() throws Exception + { + log.debug("WebServiceHost: " + getWebServiceHost()); + log.debug("WebServicePort: " + getWebServicePort()); + log.debug("WebServiceSecurePort: " + getWebServiceSecurePort()); + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.registerMBean(this, OBJECT_NAME); + } + } + + public void destroy() throws Exception + { + MBeanServer server = getMBeanServer(); + if (server != null) + { + server.unregisterMBean(OBJECT_NAME); + } + } + + private MBeanServer getMBeanServer() + { + MBeanServer server = null; + ArrayList servers = MBeanServerFactory.findMBeanServer(null); + if (servers.size() > 0) + { + server = (MBeanServer)servers.get(0); + } + return server; + } +} Property changes on: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java (rev 0) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.jboss42.common; + +import org.jboss.ws.integration.management.ServerConfig; + +/** + * MBean interface. + * @since 15-April-2004 + */ +public interface ManagedServerConfigMBean extends ServerConfig +{ +} Property changes on: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java =================================================================== --- trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/UnifiedDeploymentInfoDeployer.java 2007-05-12 21:35:09 UTC (rev 3060) @@ -23,26 +23,13 @@ //$Id$ -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - import org.jboss.deployment.DeploymentInfo; -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.WSException; import org.jboss.ws.integration.deployment.AbstractDeployer; import org.jboss.ws.integration.deployment.Deployment; import org.jboss.ws.integration.deployment.JAXRPCDeployment; import org.jboss.ws.integration.deployment.JAXWSDeployment; import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; import org.jboss.ws.integration.deployment.Deployment.DeploymentType; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.webservices.WebservicesMetaData; /** Modified: trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -3,7 +3,7 @@ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">  - <bean name="WSServerConfig" class="org.jboss.ws.core.server.ManagedServerConfig"> + <bean name="WSServerConfig" class="org.jboss.ws.integration.jboss42.common.ManagedServerConfig">  <bean name="WSClassLoaderInjectionDeployer" class="org.jboss.ws.integration.jboss42.jbossws.ClassLoaderInjectionDeployer"/> <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> - <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.core.deployment.EndpointHandlerDeployer"> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.integration.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.ws.core.server.RequestHandlerImpl</property> <property name="lifecycleHandler">org.jboss.ws.core.server.LifecycleHandlerImpl</property> <property name="invocationHandler"> @@ -130,7 +130,7 @@ </map> </property> </bean> - <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.core.deployment.EndpointLifecycleDeployer"/> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.integration.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.ws.core.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.ws.integration.deployment.EndpointRegistryDeployer"/> <bean name="WSEventingDeployer" class="org.jboss.ws.core.deployment.EventingDeployer"/> Added: trunk/jbws-jboss42/src/test/resources/excludes.txt =================================================================== --- trunk/jbws-jboss42/src/test/resources/excludes.txt (rev 0) +++ trunk/jbws-jboss42/src/test/resources/excludes.txt 2007-05-12 21:35:09 UTC (rev 3060) @@ -0,0 +1,2 @@ + +# Nothing to exclude Property changes on: trunk/jbws-jboss42/src/test/resources/excludes.txt ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbws-jboss42/version.properties =================================================================== --- trunk/jbws-jboss42/version.properties 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss42/version.properties 2007-05-12 21:35:09 UTC (rev 3060) @@ -1,32 +1,4 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.1 - -version.id=2.1.0.DEV -repository.id=SNAPSHOT - -implementation.title=JBoss Web Services - JBossWS -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# Thirdparty library versions -apache-xmlsec=1.3.0 -ibm-wsdl4j=1.6.2 -jboss-common-core=2.0.2.GA -jboss-common-logging-log4j=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-jaxr=1.2.0.GA -jboss-jbossws=SNAPSHOT -jboss-jbossws-spi=SNAPSHOT -jboss-jbossxb=1.0.0.CR10 -jboss-microcontainer=1.0.2 -jbossws-wsconsume-impl=2.0.0 -stax-api=1.0 -sun-jaxb=2.0.3jboss -sun-servlet=2.4 -wscommons-policy=1.0 - +# No versions different from core \ No newline at end of file Modified: trunk/jbws-jboss50/.classpath =================================================================== --- trunk/jbws-jboss50/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -3,16 +3,9 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-container.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-deployers.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-log4j.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-security-spi.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/> + <classpathentry kind="lib" path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/> + <classpathentry kind="lib" path="/jbossws-core/thirdparty/jbosssx-client.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/jbws-jboss50/ant-import/build-deploy.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -18,7 +18,7 @@   - <target name="deploy" depends="jboss50-jars,remove-jbossws,remove-jbosswsri" description="Deploy jbossws"> + <target name="deploy" depends="jbws50-jars,remove-jbossws,remove-jbwsri" description="Deploy jbossws"> <copy todir="${jboss50.home}/client" overwrite="true"> <fileset dir="${core.dir}/output/lib"> @@ -52,10 +52,10 @@ </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws50.output.lib.dir}/jbossws50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/> - <copy file="${jboss50.output.lib.dir}/jbossws50-context.war" tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws50.output.lib.dir}/jbossws50.sar"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws50.output.lib.dir}/jbossws50-context.war" overwrite="true"/> </target>  @@ -84,7 +84,7 @@ </target>  - <target name="remove-jbosswsri" depends="prepare" description="Remove jbossws/sunri"> + <target name="remove-jbwsri" depends="prepare" description="Remove jbossws/sunri"> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/> Modified: trunk/jbws-jboss50/ant-import/build-release.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-release.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-release.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -14,21 +14,21 @@ <project>  - <target name="release" depends="jboss50-jars" + <target name="release" depends="jbws50-jars" description="Release to jboss.local.repository">  <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> - <fileset dir="${jboss50.output.lib.dir}"> + <fileset dir="${jbws50.output.lib.dir}"> <include name="jbossws-jboss50.jar"/> <include name="jbossws50.sar"/> <include name="jbossws50-deployer.zip"/> <include name="jbossws50-src.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jboss50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${basedir}/version.properties"/> </filterset> Modified: trunk/jbws-jboss50/ant-import/build-testsuite.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -10,19 +10,17 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.dir" value="${basedir}/src/test"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="jbossws.integration.target" value="jboss50"/> <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + <import file="${build.dir}/ant-import/build-testsuite.xml"/> +  - <target name="tests-init" depends="tests-prepare"> + <target name="tests-init" depends="tests-prepare,spi-thirdparty"> <path id="jbossws.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -36,15 +34,11 @@  <path id="javac.classpath"> <path refid="jbossws.classpath"/> - <pathelement location="${core.dir}/thirdparty/junit.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> + <path refid="spi.thirdparty.classpath"/> </path>  <path id="tests.client.classpath"> - <path refid="jbossws.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> @@ -60,4 +54,34 @@ </target> +  +  +  + + <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> + + <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + </project> Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -52,7 +52,7 @@ <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath">  - <path id="jboss50.integration.classpath"> + <path id="jbws50.integration.classpath"> <pathelement location="${spi.dir}/output/classes"/> <pathelement location="${core.dir}/output/classes"/> <pathelement location="${core.dir}/output/classes14"/> Modified: trunk/jbws-jboss50/build.xml =================================================================== --- trunk/jbws-jboss50/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/jbws-jboss50/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -26,21 +26,21 @@   - <property name="jboss50.dir" value="${basedir}"/> - <property name="jboss50.src.dir" value="${jboss50.dir}/src/main"/> - <property name="jboss50.etc.dir" value="${jboss50.src.dir}/etc"/> - <property name="jboss50.java.dir" value="${jboss50.src.dir}/java"/> - <property name="jboss50.resources.dir" value="${jboss50.src.dir}/resources"/> - <property name="jboss50.output.dir" value="${jboss50.dir}/output"/> - <property name="jboss50.output.classes.dir" value="${jboss50.output.dir}/classes"/> - <property name="jboss50.output.etc.dir" value="${jboss50.output.dir}/etc"/> - <property name="jboss50.output.lib.dir" value="${jboss50.output.dir}/lib"/> + <property name="jbws50.dir" value="${basedir}"/> + <property name="jbws50.src.dir" value="${jbws50.dir}/src/main"/> + <property name="jbws50.etc.dir" value="${jbws50.src.dir}/etc"/> + <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/> + <property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/> + <property name="jbws50.output.dir" value="${jbws50.dir}/output"/> + <property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/> + <property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/> + <property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/>    - <target name="jboss50-init" depends="prepare,thirdparty"> + <target name="jbws50-init" depends="prepare,thirdparty"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> </target> @@ -56,23 +56,23 @@ | documentation compiles. --> - <target name="jboss50-compile" depends="jboss50-init,core-compile,jboss50-compile-classes,jboss50-compile-etc" description="Compile all source files."/> + <target name="jbws50-compile" depends="jbws50-init,core-compile,jbws50-compile-classes,jbws50-compile-etc" description="Compile all source files."/>  - <target name="jboss50-compile-classes" depends="jboss50-init"> - <mkdir dir="${jboss50.output.classes.dir}"/> - <javac srcdir="${jboss50.java.dir}" sourcepath="" destdir="${jboss50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <target name="jbws50-compile-classes" depends="jbws50-init"> + <mkdir dir="${jbws50.output.classes.dir}"/> + <javac srcdir="${jbws50.java.dir}" sourcepath="" destdir="${jbws50.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss50/**"/> - <classpath refid="jboss50.integration.classpath"/> + <classpath refid="jbws50.integration.classpath"/> </javac> </target>  - <target name="jboss50-compile-etc" depends="jboss50-init"> - <mkdir dir="${jboss50.output.etc.dir}"/> - <copy todir="${jboss50.output.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${jboss50.etc.dir}"> + <target name="jbws50-compile-etc" depends="jbws50-init"> + <mkdir dir="${jbws50.output.etc.dir}"/> + <copy todir="${jbws50.output.etc.dir}" filtering="yes" overwrite="yes"> + <fileset dir="${jbws50.etc.dir}"> <include name="component-info.xml"/> <include name="default.mf"/> </fileset> @@ -94,38 +94,38 @@  - <target name="jboss50-jars" depends="jboss50-compile,core-jars,jboss50-module-jars" description="Builds all jar files."> + <target name="jbws50-jars" depends="jbws50-compile,core-jars,jbws50-module-jars" description="Builds all jar files."> </target>  - <target name="jboss50-module-jars" depends="jboss50-init"> + <target name="jbws50-module-jars" depends="jbws50-init">  - <mkdir dir="${jboss50.output.lib.dir}"/> - <jar jarfile="${jboss50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jboss50.output.etc.dir}/default.mf"> - <fileset dir="${jboss50.output.classes.dir}"> + <mkdir dir="${jbws50.output.lib.dir}"/> + <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50.jar" manifest="${jbws50.output.etc.dir}/default.mf"> + <fileset dir="${jbws50.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> - <metainf dir="${jboss50.resources.dir}/jbossws-jboss50.jar/META-INF"/> + <metainf dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/> </jar>  - <war warfile="${jboss50.output.lib.dir}/jbossws50-context.war" webxml="${jboss50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${jboss50.resources.dir}/jbossws-context.war"> + <war warfile="${jbws50.output.lib.dir}/jbossws50-context.war" webxml="${jbws50.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${jbws50.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jboss50.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${jbws50.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war>  - <jar jarfile="${jboss50.output.lib.dir}/jbossws50.sar" manifest="${jboss50.output.etc.dir}/default.mf"> + <jar jarfile="${jbws50.output.lib.dir}/jbossws50.sar" manifest="${jbws50.output.etc.dir}/default.mf">  @@ -140,24 +140,24 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jboss50.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar>  - <zip zipfile="${jboss50.output.lib.dir}/jbossws50-deployer.zip"> - <fileset dir="${jboss50.output.lib.dir}"> + <zip zipfile="${jbws50.output.lib.dir}/jbossws50-deployer.zip"> + <fileset dir="${jbws50.output.lib.dir}"> <include name="jbossws-jboss50.jar"/> </fileset> - <fileset dir="${jboss50.resources.dir}/jbossws.deployer"> + <fileset dir="${jbws50.resources.dir}/jbossws.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip>  - <zip zipfile="${jboss50.output.lib.dir}/jbossws50-src.zip" > - <fileset dir="${jboss50.java.dir}"/> + <zip zipfile="${jbws50.output.lib.dir}/jbossws50-src.zip" > + <fileset dir="${jbws50.java.dir}"/> </zip> </target> @@ -167,12 +167,16 @@  <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jboss50.output.dir}"/> + <delete dir="${jbws50.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="jboss50-jars"/> + <target name="most" description="Builds almost everything." depends="jbws50-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target> Modified: trunk/sunri-jboss50/.classpath =================================================================== --- trunk/sunri-jboss50/.classpath 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/sunri-jboss50/.classpath 2007-05-12 21:35:09 UTC (rev 3060) @@ -30,6 +30,5 @@ <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/> <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> - <classpathentry kind="lib" path="/jbossws-core/thirdparty/junit.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/sunri-jboss50/ant-import/build-testsuite.xml =================================================================== --- trunk/sunri-jboss50/ant-import/build-testsuite.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/sunri-jboss50/ant-import/build-testsuite.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -10,19 +10,21 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.dir" value="${basedir}/src/test"/> - <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="jbossws.integration.target" value="jboss50"/> <property name="excludesfile" value="${basedir}/src/test/resources/excludes.txt"/> + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + +  +  +  +  - <target name="tests-init" depends="tests-prepare"> + <target name="tests-init" depends="tests-prepare,spi-thirdparty,thirdparty"> <path id="sunri.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -45,15 +47,13 @@  <path id="javac.classpath"> <path refid="sunri.classpath"/> - <pathelement location="${core.dir}/thirdparty/junit.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> + <path refid="spi.thirdparty.classpath"/> </path>  <path id="tests.client.classpath"> <path refid="sunri.classpath"/> + <path refid="spi.thirdparty.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> @@ -61,9 +61,38 @@ <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> - <path refid="javac.classpath"/> </path> </target> +  +  +  + + <target name="tests-compile" depends="tests-compile15" description="Compile sources"/> + + <target name="tests-compile15" depends="tests-init" if="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${testsuite.dir}/src/java"/> + <src path="${tests.java.dir}"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> + <copy-test-resources srcdir="${testsuite.dir}/src"/> + <copy-test-resources srcdir="${basedir}/src/test"/> + </target> + + <target name="tests-main" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + </project> Modified: trunk/sunri-jboss50/build.xml =================================================================== --- trunk/sunri-jboss50/build.xml 2007-05-12 14:56:13 UTC (rev 3059) +++ trunk/sunri-jboss50/build.xml 2007-05-12 21:35:09 UTC (rev 3060) @@ -174,9 +174,14 @@ <delete dir="${sunri50.output.dir}"/> </target> + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${basedir}/output-tests"/> + <delete dir="${basedir}/thirdparty"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="sunri50-jars"/> + <target name="most" description="Builds almost everything." depends="sunri50-jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="main"> </target>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3059 - trunk/build/hudson/hudson-home.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 10:56:13 -0400 (Sat, 12 May 2007) New Revision: 3059 Modified: trunk/build/hudson/hudson-home/config.xml Log: Add integration views Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-05-12 14:51:03 UTC (rev 3058) +++ trunk/build/hudson/hudson-home/config.xml 2007-05-12 14:56:13 UTC (rev 3059) @@ -55,7 +55,7 @@ <string>JBWS-Integration-AS-4.2</string> <string>JBWS-Integration-AS-5.0</string> </jobNames> - <name>JBossWS Integration Testsuite</name> + <name>JBossWS Integration</name> <description> <![CDATA[ Run the integration testsuite against JBossWS. @@ -72,7 +72,7 @@ <no-comparator/> <string>JBRI-Integration-AS-5.0</string> </jobNames> - <name>JBossWS/SunRI Integration Testsuite</name> + <name>SunRI Integration</name> <description> <![CDATA[ Run the integration testsuite against JBossWS/SunRI.

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3058 - trunk/build/hudson/hudson-home.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 10:51:03 -0400 (Sat, 12 May 2007) New Revision: 3058 Modified: trunk/build/hudson/hudson-home/config.xml Log: Add integration views Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-05-12 14:43:44 UTC (rev 3057) +++ trunk/build/hudson/hudson-home/config.xml 2007-05-12 14:51:03 UTC (rev 3058) @@ -47,27 +47,41 @@ </description> </view> -  <view> <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>JBWS-Local-Sanity-AS-5.0</string> - <string>JBWS-Local-Sanity-AS-4.2</string> - <string>JBWS-Local-Tests-AS-5.0</string> - <string>JBWS-Local-Tests-AS-4.2</string> + <string>JBWS-Integration-AS-4.2</string> + <string>JBWS-Integration-AS-5.0</string> </jobNames> - <name>JBossWS Local Testsuite</name> + <name>JBossWS Integration Testsuite</name> <description> <![CDATA[ - Run the JBossWS testsuite from: @svn.basedir.local@ + Run the integration testsuite against JBossWS. <p/> Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> ]]> </description> </view> - --> +  + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> + <string>JBRI-Integration-AS-5.0</string> + </jobNames> + <name>JBossWS/SunRI Integration Testsuite</name> + <description> +<![CDATA[ + Run the integration testsuite against JBossWS/SunRI. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> +  <view> <owner reference="../../.."/>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3057 - in trunk: build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2 and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 10:43:44 -0400 (Sat, 12 May 2007) New Revision: 3057 Added: trunk/jbossws-tests/README.txt Modified: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml trunk/jbws-jboss50/ant-import/build-deploy.xml trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/jbws-jboss50/build.xml trunk/jbws-jboss50/version.properties Log: Reuse core.thirdparty Modified: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) +++ trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml 2007-05-12 14:43:44 UTC (rev 3057) @@ -51,7 +51,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/sunri-jboss50/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12 08:05:23 UTC (rev 3056) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12 14:43:44 UTC (rev 3057) @@ -75,7 +75,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbws-jboss42/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-12 14:43:44 UTC (rev 3057) @@ -51,7 +51,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbws-jboss50/output-tests/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Added: trunk/jbossws-tests/README.txt =================================================================== --- trunk/jbossws-tests/README.txt (rev 0) +++ trunk/jbossws-tests/README.txt 2007-05-12 14:43:44 UTC (rev 3057) @@ -0,0 +1,6 @@ +# $Id$ + +This is the general collection of JAXWS test cases that should run with all +supported web service stackes on all supported containers. In your testcases +you MUST use the standard API only. In addition to that, the public API +from jbossws-spi.jar MAY be used. Property changes on: trunk/jbossws-tests/README.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbws-jboss50/ant-import/build-deploy.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 08:05:23 UTC (rev 3056) +++ trunk/jbws-jboss50/ant-import/build-deploy.xml 2007-05-12 14:43:44 UTC (rev 3057) @@ -27,7 +27,7 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> @@ -36,7 +36,7 @@ </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> </fileset> Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 14:43:44 UTC (rev 3057) @@ -45,30 +45,6 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar" dest="${thirdparty.dir}/jboss-common-core-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.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/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.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-dependency-src.zip" dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip" dest="${thirdparty.dir}/jboss-deployers-src.zip" 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/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar" dest="${thirdparty.dir}/jboss-security-spi.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> @@ -77,7 +53,6 @@  <path id="jboss50.integration.classpath"> - <path refid="core.thirdparty.classpath"/> <pathelement location="${spi.dir}/output/classes"/> <pathelement location="${core.dir}/output/classes"/> <pathelement location="${core.dir}/output/classes14"/> @@ -94,16 +69,7 @@ <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> - <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> - <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> - <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/> - <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <path refid="core.thirdparty.classpath"/> </path> </target> Modified: trunk/jbws-jboss50/build.xml =================================================================== --- trunk/jbws-jboss50/build.xml 2007-05-12 08:05:23 UTC (rev 3056) +++ trunk/jbws-jboss50/build.xml 2007-05-12 14:43:44 UTC (rev 3057) @@ -40,7 +40,7 @@   - <target name="jboss50-init" depends="prepare, thirdparty"> + <target name="jboss50-init" depends="prepare,thirdparty"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> </target> @@ -132,7 +132,7 @@ <fileset dir="${core.dir}/output/lib"> <include name="jbossws-core.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> + <fileset dir="${core.thirdparty.dir}"> <include name="policy.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> Modified: trunk/jbws-jboss50/version.properties =================================================================== --- trunk/jbws-jboss50/version.properties 2007-05-12 08:05:23 UTC (rev 3056) +++ trunk/jbws-jboss50/version.properties 2007-05-12 14:43:44 UTC (rev 3057) @@ -1,32 +1,4 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.1 - -version.id=2.1.0.DEV -repository.id=SNAPSHOT - -implementation.title=JBoss Web Services - JBossWS -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# Thirdparty library versions -apache-xmlsec=1.3.0 -ibm-wsdl4j=1.6.2 -jboss-common-core=2.0.2.GA -jboss-common-logging-log4j=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-jaxr=1.2.0.GA -jboss-jbossws=SNAPSHOT -jboss-jbossws-spi=SNAPSHOT -jboss-jbossxb=2.0.0.CR2 -jboss-microcontainer=2.0.0.Beta3 -jboss-security-spi=2.0.0.Beta -jbossws-wsconsume-impl=2.0.0 -sun-jaxb=2.0.3jboss -sun-servlet=2.4 -wscommons-policy=1.0 - +# No versions different from core \ No newline at end of file

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3056 - in trunk: build/ant-import and 23 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-12 04:05:23 -0400 (Sat, 12 May 2007) New Revision: 3056 Added: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/ trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml trunk/jbossws-core/ant-import/build-deploy.xml Removed: trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl trunk/jbossws-spi/version.properties Modified: trunk/build/ant-import/build-hudson.xml trunk/build/ant.properties.example trunk/build/build.xml trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/version.properties trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/build.xml trunk/jbossws-spi/ trunk/jbossws-spi/ant-import/build-thirdparty.xml trunk/jbws-jboss42/ trunk/jbws-jboss50/ trunk/jbws-jboss50/ant-import/build-thirdparty.xml trunk/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ trunk/sunri-jboss50/ Log: Add JBRI to Hudson Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/ant-import/build-hudson.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -32,6 +32,11 @@ <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> <property name="hudson.password.${hudson.password}" value="true"/> <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> + + <property name="thirdparty.dir" value="${core.dir}/thirdparty"/> + <mkdir dir="${build.output.dir}"/> + <mkdir dir="${thirdparty.dir}"/> + </target>    Added: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -0,0 +1,84 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBRI-Integration-AS-5.0 + +WORKSPACE=`pwd` +JBWSDIR=$WORKSPACE/jbossws +JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ +ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" + +# +# copy ant.properties +# +cd $JBWSDIR/build +cp ant.properties.example ant.properties + +# +# Build sunri-jboss50 +# +cd $JBWSDIR/sunri-jboss50 +ant $ENVIRONMENT clean deploy + +# +# stop jbossas +# +$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop + +# +# start jbossas +# +$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start +sleep 60 + +# +# execute tests +# +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# stop jbossas +# +$JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@svn.url@</remote> + <local>jbossws</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description>Build and test jbossws-(a)version.id@ against AS-5.0</description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Property changes on: trunk/build/hudson/hudson-home/jobs/JBRI-Integration-AS-5.0/config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -57,12 +57,13 @@ # start jbossas # $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start +sleep 60 # # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # @@ -89,14 +90,6 @@ <remote>@svn.url@</remote> <local>jbossws</local> </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.jbossws-spi.url@</remote> - <local>jbossws-spi</local> - </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.jbws-jboss42.url@</remote> - <local>jbws-jboss42</local> - </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -10,37 +10,20 @@ WORKSPACE=`pwd` JBWSDIR=$WORKSPACE/jbossws -SPIDIR=$WORKSPACE/jbossws-spi -INTDIR=$WORKSPACE/jbws-jboss50 JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ ENVIRONMENT="-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" # -# Build jbossws-spi +# copy ant.properties # -cd $SPIDIR -cp ant.properties.example ant.properties -ant $ENVIRONMENT thirdparty -ant $ENVIRONMENT clean main - -# -# Build jbossws -# cd $JBWSDIR/build cp ant.properties.example ant.properties -ant $ENVIRONMENT thirdparty -cp $SPIDIR/output/lib/jbossws-spi.jar $JBWSDIR/build/thirdparty/jbossws-spi -ant $ENVIRONMENT clean main - + # # Build jbws-jboss50 # -cd $INTDIR -cp ant.properties.example ant.properties -ant $ENVIRONMENT thirdparty -cp $SPIDIR/output/lib/jbossws-spi.jar $INTDIR/thirdparty/jbossws-spi -cp $JBWSDIR/jbossws-core/output/lib/*.jar $INTDIR/thirdparty/jbossws-core -ant $ENVIRONMENT clean main +cd $JBWSDIR/jbws-jboss50 +ant $ENVIRONMENT clean deploy # # stop jbossas @@ -48,21 +31,15 @@ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# deploy to jboss -# -cd $INTDIR -ant $ENVIRONMENT deploy - -# # start jbossas # $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start +sleep 60 # # execute tests # -cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # @@ -89,14 +66,6 @@ <remote>@svn.url@</remote> <local>jbossws</local> </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.jbossws-spi.url@</remote> - <local>jbossws-spi</local> - </hudson.scm.SubversionSCM-ModuleLocation> - <hudson.scm.SubversionSCM-ModuleLocation> - <remote>@hudson.jbws-jboss50.url@</remote> - <local>jbws-jboss50</local> - </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -45,7 +45,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -43,7 +43,7 @@ # cd $JBWSDIR/build/output/jbossws-samples-(a)version.id@ cp ant.properties.example ant.properties -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -38,7 +38,7 @@ # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -38,7 +38,7 @@ # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -38,7 +38,7 @@ # execute tests # cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -27,6 +27,7 @@ # # deploy to jboss # +cd $JBWSDIR/jbossws-core ant $ENVIRONMENT clean deploy-jboss50 # @@ -37,8 +38,7 @@ # # execute tests # -cd $JBWSDIR/jbossws-tests -ant $ENVIRONMENT clean tests 2>&1 | tee $WORKSPACE/tests.out +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/build/version.properties 2007-05-12 08:05:23 UTC (rev 3056) @@ -8,7 +8,7 @@ version.id=2.1.0.DEV repository.id=SNAPSHOT -implementation.title=JBoss Web Services +implementation.title=JBoss Web Services - JBossWS implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org Added: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml (rev 0) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> + <ant antfile="${jbws.jboss50.dir}/build.xml" target="deploy" inheritall="false"/> + </target> + +</project> Property changes on: trunk/jbossws-core/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -14,9 +14,31 @@ <import file="${build.dir}/ant-import/build-testsuite.xml"/> - <property name="jboss.home" value="${jboss50.home}"/> - <property name="jbossws.integration.target" value="jboss50"/> - <property name="excludesfile" value="${basedir}/src/test/resources/tests-jboss50-excludes.txt"/> +  + <property name="integration.target.${jbossws.integration.target}" value="true"/> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + <condition property="jboss.home" value="${jboss40.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> + </condition> + +  + <condition property="jbossws.integration.target.jboss"> + <isset property="jboss.home"/> + </condition> + <condition property="jbossws.integration.target.tomcat"> + <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> + </condition> + +  + <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> + <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/>  <path id="jbpm.bpel.classpath"> <path refid="jbossws.classpath"/> - <pathelement location="${thirdparty.dir}/jbpm-bpel"/>  - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/commons-collections.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/jaxen.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> + <pathelement location="${core.thirdparty.dir}/jbpm-bpel"/>  + <pathelement location="${core.thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> + <pathelement location="${core.thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> + <pathelement location="${core.thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> + <pathelement location="${core.thirdparty.dir}/commons-collections.jar"/> + <pathelement location="${core.thirdparty.dir}/commons-logging.jar"/> + <pathelement location="${core.thirdparty.dir}/dom4j.jar"/> + <pathelement location="${core.thirdparty.dir}/jaxen.jar"/> + <pathelement location="${core.thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${core.thirdparty.dir}/jboss-logging-log4j.jar"/>  </path> @@ -96,8 +118,8 @@  <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> + <classpath location="${core.thirdparty.dir}/jbossws-wsconsume-impl.jar"/> + <classpath location="${core.thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> @@ -119,7 +141,7 @@ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> </zip>  - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> + <copy file="${core.thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/>  <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> @@ -137,11 +159,11 @@  <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> - <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath refid="core.thirdparty.classpath"/> + <classpath location="${core.thirdparty.dir}/jbossretro-rt.jar"/> + <classpath location="${core.thirdparty.dir}/jboss-backport-concurrent.jar"/> + <classpath location="${core.thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef> @@ -193,9 +215,9 @@  <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> - <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath refid="core.thirdparty.classpath"/> + <classpath location="${core.thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> </taskdef> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -25,22 +25,23 @@ <target name="core-thirdparty-init" depends="prepare"> <property name="core.thirdparty.dir" value="${core.dir}/thirdparty"/> - <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${core.dir}/version.properties" fileext=".md5" verifyproperty="core.checksum.ok"/> <condition property="core.force.thirdparty"> <or> <not> <available file="${core.thirdparty.dir}" type="dir"/> </not> - <isfalse value="${checksum.ok}"/> + <isfalse value="${core.checksum.ok}"/> <isset property="force.thirdparty.get"/> </or> </condition> + <echo message="checksum.ok = ${core.checksum.ok}"/> </target>  - <target name="core-thirdparty-get" if="core.force.thirdparty" + <target name="core-thirdparty-get" depends="core-thirdparty-init" if="core.force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${core.thirdparty.dir}"/> Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/build.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -16,6 +16,7 @@ <import file="${basedir}/../build/ant-import/build-setup.xml"/> <import file="${spi.dir}/build.xml"/> + <import file="${core.dir}/ant-import/build-deploy.xml"/> <import file="${core.dir}/ant-import/build-thirdparty.xml"/> <import file="${core.dir}/ant-import/build-testsuite.xml"/> Deleted: trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl =================================================================== --- trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-core/src/test/resources/jaxws/holder/META-INF/wsdl/old.wsdl 2007-05-12 08:05:23 UTC (rev 3056) @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<definitions name='HolderService' targetNamespace='http://holder.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://holder.jaxws.ws.test.jboss.org/' version='1.0' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:element name='echoInOuts' type='tns:echoInOuts'/> - <xs:element name='echoInOutsResponse' type='tns:echoInOutsResponse'/> - <xs:element name='echoMixed' type='tns:echoMixed'/> - <xs:element name='echoMixedResponse' type='tns:echoMixedResponse'/> - <xs:element name='echoOuts' type='tns:echoOuts'/> - <xs:element name='echoOutsResponse' type='tns:echoOutsResponse'/> - <xs:element name='in' nillable='true' type='xs:string'/> - <xs:element name='inout' nillable='true' type='xs:string'/> - <xs:element name='out' nillable='true' type='xs:string'/> - <xs:complexType name='echoOuts'> - <xs:sequence> - <xs:element minOccurs='0' name='in1' type='xs:int'/> - <xs:element minOccurs='0' name='in2' type='xs:string'/> - <xs:element minOccurs='0' name='in3' type='xs:long'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoOutsResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:long'/> - <xs:element minOccurs='0' name='out1' type='xs:int'/> - <xs:element minOccurs='0' name='out2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoInOuts'> - <xs:sequence> - <xs:element minOccurs='0' name='in1' type='xs:long'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoInOutsResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:long'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoMixed'> - <xs:sequence> - <xs:element minOccurs='0' name='in1' type='xs:int'/> - <xs:element minOccurs='0' name='in2' type='xs:string'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - <xs:element minOccurs='0' name='in3' type='xs:long'/> - </xs:sequence> - </xs:complexType> - <xs:complexType name='echoMixedResponse'> - <xs:sequence> - <xs:element minOccurs='0' name='return' type='xs:long'/> - <xs:element minOccurs='0' name='inout1' type='xs:int'/> - <xs:element minOccurs='0' name='inout2' type='xs:string'/> - <xs:element minOccurs='0' name='out1' type='xs:int'/> - <xs:element minOccurs='0' name='out2' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='Holder_echoBareOutResponse'> - <part element='tns:out' name='out'/> - </message> - <message name='Holder_echoOutsResponse'> - <part element='tns:echoOutsResponse' name='echoOutsResponse'/> - </message> - <message name='Holder_echoMixed'> - <part element='tns:echoMixed' name='echoMixed'/> - </message> - <message name='Holder_echoInOuts'> - <part element='tns:echoInOuts' name='echoInOuts'/> - </message> - <message name='Holder_echoBareOut'> - <part element='tns:in' name='in'/> - </message> - <message name='Holder_echoBareInOut'> - <part element='tns:inout' name='inout'/> - </message> - <message name='Holder_echoMixedResponse'> - <part element='tns:echoMixedResponse' name='echoMixedResponse'/> - </message> - <message name='Holder_echoInOutsResponse'> - <part element='tns:echoInOutsResponse' name='echoInOutsResponse'/> - </message> - <message name='Holder_echoOuts'> - <part element='tns:echoOuts' name='echoOuts'/> - </message> - <message name='Holder_echoBareInOutResponse'> - <part element='tns:inout' name='inout'/> - </message> - <portType name='Holder'> - <operation name='echoBareInOut' parameterOrder='inout'> - <input message='tns:Holder_echoBareInOut'/> - <output message='tns:Holder_echoBareInOutResponse'/> - </operation> - <operation name='echoBareOut' parameterOrder='in out'> - <input message='tns:Holder_echoBareOut'/> - <output message='tns:Holder_echoBareOutResponse'/> - </operation> - <operation name='echoInOuts' parameterOrder='echoInOuts'> - <input message='tns:Holder_echoInOuts'/> - <output message='tns:Holder_echoInOutsResponse'/> - </operation> - <operation name='echoMixed' parameterOrder='echoMixed'> - <input message='tns:Holder_echoMixed'/> - <output message='tns:Holder_echoMixedResponse'/> - </operation> - <operation name='echoOuts' parameterOrder='echoOuts'> - <input message='tns:Holder_echoOuts'/> - <output message='tns:Holder_echoOutsResponse'/> - </operation> - </portType> - <binding name='HolderBinding' type='tns:Holder'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoBareInOut'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoBareOut'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoInOuts'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoMixed'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - <operation name='echoOuts'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal'/> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='HolderService'> - <port binding='tns:HolderBinding' name='HolderPort'> - <soap:address location='http:///@jbosstest.host.name@:8080/jaxws-holder/HolderService'/> - </port> - </service> -</definitions> Property changes on: trunk/jbossws-spi ___________________________________________________________________ Name: svn:ignore + output* thirdparty Modified: trunk/jbossws-spi/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-spi/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -23,19 +23,20 @@ <target name="spi-thirdparty-init" depends="prepare"> <property name="spi.thirdparty.dir" value="${spi.dir}/thirdparty"/> - <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="spi.checksum.ok"/> <condition property="spi.force.thirdparty"> <or> <not> <available file="${spi.thirdparty.dir}" type="dir"/> </not> - <isfalse value="${checksum.ok}"/> + <isfalse value="${spi.checksum.ok}"/> <isset property="force.thirdparty.get"/> </or> </condition> + <echo message="checksum.ok = ${spi.checksum.ok}"/> </target> - <target name="spi-thirdparty-get" if="spi.force.thirdparty" + <target name="spi-thirdparty-get" depends="spi-thirdparty-init" if="spi.force.thirdparty" description="Gets the thirdparty libraries"> <mkdir dir="${spi.thirdparty.dir}"/> Deleted: trunk/jbossws-spi/version.properties =================================================================== --- trunk/jbossws-spi/version.properties 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbossws-spi/version.properties 2007-05-12 08:05:23 UTC (rev 3056) @@ -1,76 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -specification.title=JBossWS-SPI -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-spi-2.1 - -version.id=2.1.0.DEV -repository.id=SNAPSHOT - -implementation.title=JBoss Web Services - JBossWS/SPI -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - - -# Thirdparty library versions -jboss-common-core=2.0.2.GA -jboss-common-logging-log4j=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-jbossxb=1.0.0.CR10 -jboss-microcontainer=2.0.0.Beta3 -sun-jaxws=2.1.1 -sun-servlet=2.5 - - - - - - - - - - - -apache-xmlsec=1.3.0 -ibm-wsdl4j=1.6.2 -javassist=3.5.0.CR1 -jbossws-wsconsume-impl=2.0.0 -jbpm-bpel=1.1.0.Beta5 -sun-jaxb=2.0.3jboss -stax-api=1.0 - -# Build and Tomcat -jboss-jbossxb=1.0.0.CR10 -jboss-remoting=2.0.0.GA - -# thirdparty library versions -apache-ant=1.6.5 -apache-collections=3.1 -apache-log4j=1.2.8 -apache-logging=1.1.0.jboss -apache-tomcat=5.5.20 -apache-xalan=j_2.7.0 -apache-xerces=2.9.0 -dom4j=1.6.1 -eclipse-compiler=3.2.2 -gnu-getopt=1.0.10 -hibernate=3.2.1.GA -jaxen=1.1-beta-10 -jboss-backport-concurrent=2.1.0.GA -jboss-ejb3=1.0.0.CR9-jboss4.0.5 -jboss-jaxr=1.2.0.GA -jboss-jbossretro=1.0.4.GA -jboss-security=4.0.5.GA -jboss-vfs=2.0.0.Beta2 -jbossas-core-libs=4.0.5.GA -junit=3.8.1 -qdox=1.4 -sun-hudson=1.93 -sun-jaf=1.1 -sun-javamail=1.4 -sun-servlet=2.4 -woodstox=3.1.1 -wscommons-policy=1.0 -xmlunit=1.0 Property changes on: trunk/jbws-jboss42 ___________________________________________________________________ Name: svn:ignore + output* Property changes on: trunk/jbws-jboss50 ___________________________________________________________________ Name: svn:ignore + output* thirdparty version.properties.md5 Modified: trunk/jbws-jboss50/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 05:49:15 UTC (rev 3055) +++ trunk/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-12 08:05:23 UTC (rev 3056) @@ -26,20 +26,22 @@ <property name="thirdparty.dir" value="${basedir}/thirdparty"/> <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> - <condition property="force.thirdparty.get"> + <condition property="jbws.force.thirdparty.get"> <or> <not> <available file="${thirdparty.dir}" type="dir"/> </not> <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> </or> </condition> + <echo message="checksum.ok = ${checksum.ok}"/> </target>  - <target name="thirdparty-get" if="force.thirdparty.get" + <target name="thirdparty-get" if="jbws.force.thirdparty.get" description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> @@ -67,6 +69,8 @@ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> + + <checksum file="${basedir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-init,core-thirdparty-classpath"> Property changes on: trunk/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50 ___________________________________________________________________ Name: svn:externals + common https://svn.jboss.org/repos/jbossws/trunk/sunri-jboss50/src/main/java/org... Property changes on: trunk/sunri-jboss50 ___________________________________________________________________ Name: svn:ignore + output* version.properties.md5 thirdparty

17 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2007