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

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 09:36:49 -0400 (Thu, 02 Aug 2007) New Revision: 4099 Added: container/jboss50/trunk/ container/jboss50/trunk/.classpath container/jboss50/trunk/ant-import/build-setup.xml container/jboss50/trunk/ant-import/build-thirdparty.xml container/jboss50/trunk/ant.properties.example container/jboss50/trunk/src/main/etc/default.mf container/jboss50/trunk/version.properties Removed: container/jboss50/trunk/.classpath container/jboss50/trunk/ant-import/build-thirdparty.xml container/jboss50/trunk/int-50.iml Modified: container/jboss50/trunk/.project container/jboss50/trunk/ant-import/build-release.xml container/jboss50/trunk/build.xml container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java Log: Initial Copied: container/jboss50/trunk (from rev 4091, trunk/integration/jboss50) Property changes on: container/jboss50/trunk ___________________________________________________________________ Name: svn:ignore + ant.properties output* thirdparty version.properties.md5 Deleted: container/jboss50/trunk/.classpath =================================================================== --- trunk/integration/jboss50/.classpath 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/.classpath 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <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 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"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="output" path="output/eclipse"/> -</classpath> Copied: container/jboss50/trunk/.classpath (from rev 4094, trunk/integration/jboss50/.classpath) =================================================================== --- container/jboss50/trunk/.classpath (rev 0) +++ container/jboss50/trunk/.classpath 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <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 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"/> + <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry kind="output" path="output/eclipse"/> +</classpath> Modified: container/jboss50/trunk/.project =================================================================== --- trunk/integration/jboss50/.project 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/.project 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-jboss50</name> + <name>container-jboss50</name> <comment></comment> <projects> </projects> Modified: container/jboss50/trunk/ant-import/build-release.xml =================================================================== --- trunk/integration/jboss50/ant-import/build-release.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/ant-import/build-release.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -21,7 +21,7 @@ <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="${int.jboss50.dir}/output/lib"> + <fileset dir="${jbws50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> <include name="jbossws-jboss50-deployer.zip"/> <include name="jbossws-jboss50-src.zip"/> @@ -29,7 +29,7 @@ </copy> <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="${build.dir}/version.properties"/> + <filtersfile file="${jbws50.dir}/version.properties"/> </filterset> </copy> Added: container/jboss50/trunk/ant-import/build-setup.xml =================================================================== --- container/jboss50/trunk/ant-import/build-setup.xml (rev 0) +++ container/jboss50/trunk/ant-import/build-setup.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,55 @@ +<?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="jbws50.dir" value="${basedir}"/> + + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${jbws50.dir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${jbws50.dir}/ant.properties"/> + <property file="${jbws50.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <available property="jboss50.available" file="${jboss50.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 Deleted: container/jboss50/trunk/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/ant-import/build-thirdparty.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,66 +0,0 @@ -<?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$ --> - -<project> - - <!-- ========= --> - <!-- Libraries --> - <!-- ========= --> - - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> - </target> - - <target name="thirdparty-init" depends="prepare"/> - - <!-- - 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 jboss50 integration --> - <path id="jbws50.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.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="${jboss50.lib}/dom4j.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - - </path> - - </target> - -</project> Copied: container/jboss50/trunk/ant-import/build-thirdparty.xml (from rev 4092, trunk/integration/jboss50/ant-import/build-thirdparty.xml) =================================================================== --- container/jboss50/trunk/ant-import/build-thirdparty.xml (rev 0) +++ container/jboss50/trunk/ant-import/build-thirdparty.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,83 @@ +<?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$ --> + +<project> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + + <target name="thirdparty-init" depends="prepare"> + + <property name="thirdparty.dir" value="${jbws50.dir}/thirdparty"/> + <checksum file="${jbws50.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-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="${jbws50.dir}/version.properties" fileext=".md5"/> + </target> + + <target name="thirdparty-classpath" depends="thirdparty-get"> + + <!-- The compile classpath for jboss50 integration --> + <path id="jbws50.integration.classpath"> + <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="${jboss50.lib}/dom4j.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-system.jar"/> + <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> + <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + + </path> + + </target> + +</project> Added: container/jboss50/trunk/ant.properties.example =================================================================== --- container/jboss50/trunk/ant.properties.example (rev 0) +++ container/jboss50/trunk/ant.properties.example 2007-08-02 13:36:49 UTC (rev 4099) @@ -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 +#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 + +# 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/jboss50/trunk/build.xml =================================================================== --- trunk/integration/jboss50/build.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/build.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -11,18 +11,16 @@ <!-- $Id$ --> -<project default="main" basedir="../.." name="Integration-JBoss50"> +<project default="main" basedir="." name="Integration-JBoss50"> - <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.jboss50.dir}/ant-import/build-release.xml"/> - <import file="${int.jboss50.dir}/ant-import/build-thirdparty.xml"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <property name="jbws50.dir" value="${int.jboss50.dir}"/> <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"/> @@ -37,9 +35,8 @@ <!-- Initialization --> <!-- ================================================================== --> - <target name="init" depends="prepare,thirdparty"> + <target name="init" depends="prepare,thirdparty-get"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> </target> <!-- ================================================================== --> @@ -70,7 +67,7 @@ <target name="compile-etc" depends="init"> <mkdir dir="${jbws50.output.etc.dir}"/> <copy todir="${jbws50.output.etc.dir}" filtering="yes"> - <fileset dir="${build.dir}/etc"> + <fileset dir="${jbws50.etc.dir}"> <include name="default.mf"/> </fileset> <filterset> @@ -78,7 +75,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="${jbws50.dir}/version.properties"/> </filterset> </copy> </target> @@ -147,7 +144,7 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.jboss50.dir}/output/tests"/> + <delete dir="${jbws50.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Deleted: container/jboss50/trunk/int-50.iml =================================================================== --- trunk/integration/jboss50/int-50.iml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/int-50.iml 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/output/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="spi" /> - <orderEntry type="module" module-name="as-server" /> - <orderEntry type="module" module-name="as-system" /> - <orderEntry type="module" module-name="as-tomcat" /> - <orderEntry type="module" module-name="as-ejb3" /> - <orderEntry type="library" name="jaxws-api" level="application" /> - <orderEntry type="library" name="jboss-javaee" level="application" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="library" name="jboss-aop-jdk50" level="application" /> - <orderEntry type="library" name="jboss-jaxrpc" level="application" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-vfs.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-logging-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-deployers.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/dom4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> - </component> -</module> - Added: container/jboss50/trunk/src/main/etc/default.mf =================================================================== --- container/jboss50/trunk/src/main/etc/default.mf (rev 0) +++ container/jboss50/trunk/src/main/etc/default.mf 2007-08-02 13:36:49 UTC (rev 4099) @@ -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/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-08-02 13:36:49 UTC (rev 4099) @@ -42,7 +42,7 @@ import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext; +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.InvocationType; @@ -132,7 +132,7 @@ { EJBContext ejbCtx = beanCtx.getEJBContext(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + ExtensibleWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); wsContext.addAttachment(EJBContext.class, ejbCtx); beanProp.set(beanCtx.getInstance(), wsContext); } Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java 2007-08-02 13:36:49 UTC (rev 4099) @@ -40,7 +40,7 @@ import org.jboss.virtual.VirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.framework.DefaultExtensible; +import org.jboss.wsf.spi.AbstractExtensible; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.http.HttpContext; @@ -56,7 +56,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 07-Jul-2006 */ -public class WebAppDeployingHttpServer extends DefaultExtensible implements HttpServer +public class WebAppDeployingHttpServer extends AbstractExtensible implements HttpServer { private DeployerClient mainDeployer; private Map<String, Deployment> deploymentMap = new HashMap<String, Deployment>(); Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java 2007-08-02 13:36:49 UTC (rev 4099) @@ -31,9 +31,9 @@ */ public class WebServiceContextFactoryImpl extends WebServiceContextFactory { - public ExtendableWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) + public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) { - ExtendableWebServiceContext context = null; + ExtensibleWebServiceContext context = null; if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) context = new WebServiceContextEJB(messageContext); Added: container/jboss50/trunk/version.properties =================================================================== --- container/jboss50/trunk/version.properties (rev 0) +++ container/jboss50/trunk/version.properties 2007-08-02 13:36:49 UTC (rev 4099) @@ -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 JBoss50 +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