[jbossws-commits] JBossWS SVN: r4116 - in container/jboss42: trunk and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 12:39:02 -0400 (Thu, 02 Aug 2007) New Revision: 4116 Added: container/jboss42/trunk/ container/jboss42/trunk/ant-import/build-setup.xml container/jboss42/trunk/ant.properties.example container/jboss42/trunk/src/main/etc/default.mf container/jboss42/trunk/version.properties Modified: container/jboss42/trunk/.classpath container/jboss42/trunk/.project container/jboss42/trunk/ant-import/build-release.xml container/jboss42/trunk/ant-import/build-thirdparty.xml container/jboss42/trunk/build.xml container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java Log: Initial commit Copied: container/jboss42/trunk (from rev 4106, trunk/integration/jboss42) Property changes on: container/jboss42/trunk ___________________________________________________________________ Name: svn:ignore + ant.properties output* thirdparty version.properties.md5 Modified: container/jboss42/trunk/.classpath =================================================================== --- trunk/integration/jboss42/.classpath 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/.classpath 2007-08-02 16:39:02 UTC (rev 4116) @@ -4,7 +4,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> Modified: container/jboss42/trunk/.project =================================================================== --- trunk/integration/jboss42/.project 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/.project 2007-08-02 16:39:02 UTC (rev 4116) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-jboss42</name> + <name>container-jboss42</name> <comment></comment> <projects> </projects> Modified: container/jboss42/trunk/ant-import/build-release.xml =================================================================== --- trunk/integration/jboss42/ant-import/build-release.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/ant-import/build-release.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -21,14 +21,14 @@ <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="${int.jboss42.dir}/output/lib"> + <fileset dir="${jbws42.dir}/output/lib"> <include name="jbossws-jboss42.jar"/> <include name="jbossws-jboss42-src.zip"/> </fileset> </copy> <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="${build.dir}/version.properties"/> + <filtersfile file="${jbws42.dir}/version.properties"/> </filterset> </copy> Added: container/jboss42/trunk/ant-import/build-setup.xml =================================================================== --- container/jboss42/trunk/ant-import/build-setup.xml (rev 0) +++ container/jboss42/trunk/ant-import/build-setup.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id: build-setup.xml 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ --> + +<project> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <property name="jbws42.dir" value="${basedir}"/> + + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${jbws42.dir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${jbws42.dir}/ant.properties"/> + <property file="${jbws42.dir}/version.properties"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jboss42.available.file" value="${jboss42.client}/jboss-ejb3-client.jar"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <!-- JDK Detection --> + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + +</project> \ No newline at end of file Modified: container/jboss42/trunk/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/ant-import/build-thirdparty.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -17,28 +17,44 @@ <!-- Libraries --> <!-- ========= --> - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> + <target name="thirdparty-init" depends="prepare"> + + <property name="thirdparty.dir" value="${jbws42.dir}/thirdparty"/> + <checksum file="${jbws42.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="force.thirdparty"> + <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" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> + + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> + <checksum file="${jbws42.dir}/version.properties" fileext=".md5"/> + </target> - <!-- - thirdpartry-get - --> - <target name="thirdparty-get" depends="thirdparty-init" - description="Gets the thirdparty libraries"/> - <target name="thirdparty-classpath" depends="thirdparty-get"> <!-- The compile classpath for jboss42 integration --> <path id="jbws42.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> <pathelement location="${jboss42.lib}/jboss-common.jar"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> Added: container/jboss42/trunk/ant.properties.example =================================================================== --- container/jboss42/trunk/ant.properties.example (rev 0) +++ container/jboss42/trunk/ant.properties.example 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,26 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# JBoss Home +#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA + +# The JBoss settings +jboss.server.instance=default + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBossWS Release +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository + +# Force thirdparty HTTP get +#force.thirdparty.get=true + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Modified: container/jboss42/trunk/build.xml =================================================================== --- trunk/integration/jboss42/build.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/build.xml 2007-08-02 16:39:02 UTC (rev 4116) @@ -11,13 +11,12 @@ <!-- $Id$ --> -<project default="main" basedir="../.." name="JBossWS-JBoss42"> +<project default="main" basedir="." name="JBossWS-JBoss42"> - <import file="${basedir}/build/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${int.jboss42.dir}/ant-import/build-release.xml"/> - <import file="${int.jboss42.dir}/ant-import/build-thirdparty.xml"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> @@ -37,9 +36,8 @@ <!-- Initialization --> <!-- ================================================================== --> - <target name="init" depends="prepare, thirdparty"> + <target name="init" depends="prepare,thirdparty-get"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> </target> <!-- ================================================================== --> @@ -72,7 +70,7 @@ <target name="compile-etc" depends="init"> <mkdir dir="${jbws42.output.etc.dir}"/> <copy todir="${jbws42.output.etc.dir}" filtering="yes"> - <fileset dir="${build.dir}/etc"> + <fileset dir="${jbws42.etc.dir}"> <include name="default.mf"/> </fileset> <filterset> @@ -80,7 +78,7 @@ <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"/> + <filtersfile file="${jbws42.dir}/version.properties"/> </filterset> </copy> </target> @@ -142,6 +140,7 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${jbws42.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Added: container/jboss42/trunk/src/main/etc/default.mf =================================================================== --- container/jboss42/trunk/src/main/etc/default.mf (rev 0) +++ container/jboss42/trunk/src/main/etc/default.mf 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,10 @@ +Manifest-Version: 1.2 +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@ Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.framework.deployment.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.container.jboss42; -// $Id$ +// $Id: $ import java.util.ArrayList; import java.util.Iterator; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -26,7 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -29,7 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -30,7 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-02 15:05:43 UTC (rev 4106) +++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-08-02 16:39:02 UTC (rev 4116) @@ -34,7 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Added: container/jboss42/trunk/version.properties =================================================================== --- container/jboss42/trunk/version.properties (rev 0) +++ container/jboss42/trunk/version.properties 2007-08-02 16:39:02 UTC (rev 4116) @@ -0,0 +1,20 @@ + +# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ + +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 + +version.id=2.0.1.CR1 +repository.id=2.0.1.CR1 + +implementation.title=JBoss Web Services - Integration JBoss42 +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + +# Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +sun-jaxrpc=1.1 +sun-jaxws=2.1.1 \ No newline at end of file