May 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3034 - in projects/wsintegration: sunri-jboss50 and 21 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-10 03:12:44 -0400 (Thu, 10 May 2007) New Revision: 3034 Added: projects/wsintegration/sunri-jboss50/ projects/wsintegration/sunri-jboss50/trunk/ projects/wsintegration/sunri-jboss50/trunk/.classpath projects/wsintegration/sunri-jboss50/trunk/.project projects/wsintegration/sunri-jboss50/trunk/ant.properties.example projects/wsintegration/sunri-jboss50/trunk/build.xml projects/wsintegration/sunri-jboss50/trunk/src/ projects/wsintegration/sunri-jboss50/trunk/src/main/ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/JBossORG-EULA.txt projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-release.xml projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml projects/wsintegration/sunri-jboss50/trunk/src/main/etc/default.mf projects/wsintegration/sunri-jboss50/trunk/src/main/java/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws-jboss50.jar/META-INF/services/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/index.html projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/styles.css projects/wsintegration/sunri-jboss50/trunk/version.properties Log: Add sunri-jboss50 Added: projects/wsintegration/sunri-jboss50/trunk/.classpath =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/.classpath (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/.classpath 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,19 @@ +<?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 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-spi"/> + <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/> + <classpathentry kind="output" path="output-eclipse"/> +</classpath> Added: projects/wsintegration/sunri-jboss50/trunk/.project =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/.project (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/.project 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>sunri-jboss50</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: projects/wsintegration/sunri-jboss50/trunk/ant.properties.example =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/ant.properties.example (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/ant.properties.example 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,26 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 2870 2007-04-15 14:54:22Z thomas.diesler(a)jboss.com $ + +# JBoss Home +#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 + +# The JBoss server instance +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=yes +javac.fail.onerror=yes +javac.verbose=no Added: projects/wsintegration/sunri-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/build.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/build.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS-SunRI-JBoss50"> + + <import file="${basedir}/src/main/etc/ant-import/build-deploy.xml"/> + <import file="${basedir}/src/main/etc/ant-import/build-release.xml"/> + <import file="${basedir}/src/main/etc/ant-import/build-thirdparty.xml"/> + +  +  +  + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property environment="env"/> + + <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.thirdparty" value="${jboss50.home}/../../../thirdparty"/> + + <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="thirdparty.dir" value="${basedir}/thirdparty"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <available property="jboss50.available" file="${jboss50.available.file}"/> + +  +  +  + + <target name="prepare"> + + <mkdir dir="${jboss50.output.dir}"/> + + <checksum file="${basedir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${basedir}/version.properties" fileext=".md5"/> + + <condition property="force.thirdparty.get"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + </or> + </condition> + + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + + </target> + + <target name="jboss50-init" depends="prepare, thirdparty"> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + </target> + +  +  +  + +  + + <target name="jboss50-compile" depends="jboss50-init,jboss50-compile-classes,jboss50-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}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/ws/integration/jboss50/**"/> + <classpath refid="jboss50.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}"> + <include name="component-info.xml"/> + <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="${basedir}/version.properties"/> + </filterset> + </copy> + </target> + +  +  +  + +  + <target name="jboss50-jars" depends="jboss50-compile,jboss50-module-jars" description="Builds all jar files."> + </target> + +  + <target name="jboss50-module-jars" depends="jboss50-init"> + +  + <mkdir dir="${jboss50.output.lib.dir}"/> + <jar jarfile="${jboss50.output.lib.dir}/jbosswsri50.jar" manifest="${jboss50.etc.dir}/default.mf"> + <fileset dir="${jboss50.output.classes.dir}"> + <include name="org/jboss/ws/integration/jboss50/**"/> + </fileset> + </jar> + +  + <war warfile="${jboss50.output.lib.dir}/jbosswsri50-context.war" webxml="${jboss50.resources.dir}/jbossws.war/WEB-INF/web.xml"> + <fileset dir="${jboss50.resources.dir}/jbossws.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${jboss50.resources.dir}/jbossws.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> + +  + <jar jarfile="${jboss50.output.lib.dir}/jbosswsri50.sar" manifest="${jboss50.etc.dir}/default.mf"> +  + <fileset dir="${thirdparty.dir}"> + </fileset> + <metainf dir="${jboss50.resources.dir}/jbossws.sar/META-INF"> + <include name="jbossws-beans.xml"/> + </metainf> + </jar> + +  + <zip zipfile="${jboss50.output.lib.dir}/jbosswsri50-deployer.zip"> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbosswsri50.jar"/> + </fileset> + <fileset dir="${jboss50.resources.dir}/jbossws.deployer"> + <include name="META-INF/jbossws-deployer-beans.xml"/> + </fileset> + </zip> + +  + <zip zipfile="${jboss50.output.lib.dir}/jbosswsri50-src.zip" > + <fileset dir="${jboss50.java.dir}"/> + </zip> + + </target> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${jboss50.output.dir}"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jboss50-jars"/> + + <target name="all" description="Create a distribution zip file" depends="main"> + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/JBossORG-EULA.txt =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/JBossORG-EULA.txt (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/JBossORG-EULA.txt 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,107 @@ +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 + Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/JBossORG-EULA.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project name="JBossWS-Deploy"> + +  +  +  + +  + <target name="deploy-jboss50" depends="jboss50-jars" description="Deploy jbossws"> + + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <copy todir="${jboss50.home}/bin" overwrite="true"> + <fileset dir="${thirdparty.dir}/jbossws-resources"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <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="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <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"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <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 todir="${jboss50.home}/server/${jboss.server.instance}/deploy" file="${jboss50.output.lib.dir}/jbossws-context.war" overwrite="true"/> + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-release.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-release.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-release.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="release" name="JBossWS Release"> + +  + <target name="release" depends="jboss50-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}"> + <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"> + <filterset> + <filtersfile file="${basedir}/version.properties"/> + </filterset> + </copy> + + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-release.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="thirdparty" name="JBossWS-Thirdparty"> + +  +  +  + + <target name="thirdparty" depends="prepare,jbossws-spi-get,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> + +  + <target name="thirdparty-get" if="force.thirdparty.get" + description="Gets the thirdparty libraries"> + + <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/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-jaxws/${sun-jaxws}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar" dest="${thirdparty.dir}/http.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/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr173_api.jar" dest="${thirdparty.dir}/jsr173_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/jsr250-api.jar" dest="${thirdparty.dir}/jsr250-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-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.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"/> + </target> + + <target name="thirdparty-classpath" > + +  + <path id="jboss50.integration.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-spi/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"/> + <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.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> + <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> + <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}/jaxws-api.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}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + </path> + + </target> + +</project> Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/ant-import/build-thirdparty.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,31 @@ +<project name="jboss/jbossws-jboss50"> + + <component id="jboss/jbossws-jboss50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-jboss50.jar"/> + <artifact id="jbossws50.sar"/> + <artifact id="jbossws50-deployer.zip"/> + <artifact id="jbossws50-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: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/component-info.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/etc/default.mf =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/etc/default.mf (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/etc/default.mf 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,10 @@ +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@ Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,60 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.deployment.DeployerManager; + +/** + * An abstract web service deployer. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHook implements DeployerHook +{ + // provide logging + protected final Logger log = Logger.getLogger(getClass()); + + protected DeployerManager deployerManager; + + public DeployerManager getDeployerManager() + { + return deployerManager; + } + + public void setDeployerManager(DeployerManager deploymentManager) + { + this.deployerManager = deploymentManager; + } + + /** Return true if this deployment should be ignored + */ + public boolean ignoreDeployment(DeploymentUnit unit) + { + String name = unit.getName(); + return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHook.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -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.jboss50.common; + +//$Id$ + +/** + * An abstract deployer for EJB Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook +{ +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookEJB.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,44 @@ +/* + * 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.jboss50.common; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; + +//$Id$ + +/** + * An abstract deployer for JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook +{ + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (unit.getAttachment(WebMetaData.class) == null) + return false; + + return true; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractDeployerHookJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,72 @@ +/* + * 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.jboss50.common; + +import java.util.LinkedList; +import java.util.List; + +import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; + +//$Id$ + +/** + * This deployer that calls the registered DeployerHooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer +{ + // provide logging + private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class); + + private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>(); + + public void addDeployerHook(DeployerHook deployer) + { + log.debug("Add deployer hook: " + deployer); + deployerHooks.add(deployer); + } + + public void removeDeployerHook(DeployerHook deployer) + { + log.debug("Remove deployer hook: " + deployer); + deployerHooks.remove(deployer); + } + + @Override + public void deploy(DeploymentUnit unit) throws DeploymentException + { + for (DeployerHook deployer : deployerHooks) + deployer.deploy(unit); + } + + @Override + public void undeploy(DeploymentUnit unit) + { + for (DeployerHook deployer : deployerHooks) + deployer.undeploy(unit); + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/AbstractWebServiceDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,163 @@ +/* + * 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.jboss50.common; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; +import org.jboss.metadata.ApplicationMetaData.Webservices; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +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; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ApplicationMetaDataAdaptor +{ + // logging support + private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptor.class); + + public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); + udi.addAttachment(ApplicationMetaData.class, appMetaData); + + UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); + buildUnifiedBeanMetaData(umd, appMetaData); + buildWebservicesMetaData(umd, appMetaData); + umd.setSecurityDomain(appMetaData.getSecurityDomain()); + return umd; + } + + private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd) + { + Webservices webservices = apmd.getWebservices(); + if (webservices != null) + { + String contextRoot = webservices.getContextRoot(); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); + + List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescription wsd = wsDescriptions.get(0); + umd.setConfigName(wsd.getConfigName()); + umd.setConfigFile(wsd.getConfigFile()); + } + + umd.setWebServiceContextRoot(contextRoot); + } + } + + private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) + { + if (wsd.getDescriptionName().equals(name)) + { + wsdlPublishLocation = wsd.getWsdlPublishLocation(); + } + } + return wsdlPublishLocation; + } + }; + } + + private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData) + { + List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + Iterator it = appMetaData.getEnterpriseBeans(); + while (it.hasNext()) + { + BeanMetaData bmd = (BeanMetaData)it.next(); + buildUnifiedBeanMetaData(beans, bmd); + } + umd.setEnterpriseBeans(beans); + } + + private static UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, 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); + } + + beans.add(ubmd); + } + return ubmd; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,167 @@ +/* + * 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.jboss50.common; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ejb3.Container; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.ejb3.SessionContainer; +import org.jboss.ejb3.mdb.MessagingContainer; +import org.jboss.ejb3.metamodel.Ejb3PortComponent; +import org.jboss.ejb3.metamodel.EjbJarDD; +import org.jboss.ejb3.metamodel.EnterpriseBean; +import org.jboss.ejb3.metamodel.WebserviceDescription; +import org.jboss.ejb3.metamodel.Webservices; +import org.jboss.logging.Logger; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +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; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Apr-2007 + */ +public class ApplicationMetaDataAdaptorEJB3 +{ + // logging support + private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class); + + public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + udi.addAttachment(Ejb3Deployment.class, ejb3Deployment); + + EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class); + UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); + buildUnifiedBeanMetaData(umd, ejb3Deployment); + buildWebservicesMetaData(umd, jarDD); + return umd; + } + + private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD) + { + // nothing to do + if (jarDD == null) + return; + + Webservices webservices = jarDD.getWebservices(); + if (webservices != null) + { + String contextRoot = webservices.getContextRoot(); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); + + List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescription wsd = wsDescriptions.get(0); + umd.setConfigName(wsd.getConfigName()); + umd.setConfigFile(wsd.getConfigFile()); + + // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1 + // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress + if (contextRoot == null) + contextRoot = "/" + wsd.getDescriptionName(); + } + + umd.setWebServiceContextRoot(contextRoot); + } + } + + private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment) + { + List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>(); + Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + UnifiedBeanMetaData ubmd = null; + if (container instanceof SessionContainer) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (container instanceof MessagingContainer) + { + ubmd = new UnifiedMessageDrivenMetaData(); + log.warn("No implemented: initialize MDB destination"); + //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination()); + } + + if (ubmd != null) + { + ubmd.setEjbName(container.getEjbName()); + ubmd.setEjbClass(container.getBeanClassName()); + + EnterpriseBean bean = container.getXml(); + Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null); + if (pcMetaData != null) + { + UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData(); + ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName()); + ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI()); + ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod()); + ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee()); + ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess()); + + ubmd.setPortComponent(ejbPortComp); + } + + ubmdList.add(ubmd); + } + } + umd.setEnterpriseBeans(ubmdList); + } + + private static PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) + { + if (wsd.getDescriptionName().equals(name)) + { + wsdlPublishLocation = wsd.getWsdlPublishLocation(); + } + } + return wsdlPublishLocation; + } + }; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ApplicationMetaDataAdaptorEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,150 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import java.net.URL; + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.virtual.VirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.WSDeploymentException; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.integration.jboss50.common.AbstractDeployerHook; +import org.jboss.ws.metadata.webservices.WebservicesFactory; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.DOMUtils; +import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; +import org.w3c.dom.Element; + +/** + * An abstract web service deployer. + * + * deploy(unit) + * if(isWebServiceDeployment) + * dep = createDeployment(unit) + * deploy(dep) + * + * undeploy(unit) + * dep = getDeployment(unit) + * undeploy(dep) + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public abstract class ArchiveDeployerHook extends AbstractDeployerHook +{ + /** Get the deployemnt type this deployer can handle + */ + public abstract DeploymentType getDeploymentType(); + + /** Depending on the type of deployment, this method should return true + * if the deployment contains web service endpoints. + */ + public abstract boolean isWebServiceDeployment(DeploymentUnit unit); + + /** Create the Deployment for a given DeploymentUnit + */ + public abstract Deployment createDeployment(DeploymentUnit unit); + + /** Get the Deployment for a given DeploymentUnit + */ + public Deployment getDeployment(DeploymentUnit unit) + { + Deployment dep = unit.getAttachment(Deployment.class); + return (dep != null && dep.getType() == getDeploymentType() ? dep : null); + } + + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + if (isWebServiceDeployment(unit)) + { + log.debug("deploy: " + unit.getName()); + Deployment dep = getDeployment(unit); + if (dep == null) + { + dep = createDeployment(unit); + dep.getContext().addAttachment(DeploymentUnit.class, unit); + } + + deployerManager.deploy(dep); + unit.addAttachment(Deployment.class, dep); + } + } + + public void undeploy(DeploymentUnit unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = getDeployment(unit); + if (dep != null) + { + log.debug("undeploy: " + unit.getName()); + deployerManager.undeploy(dep); + unit.removeAttachment(Deployment.class); + } + } + + /** Unmrashall the webservices.xml if there is one + */ + protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class); + UnifiedVirtualFile vfWebservices = getWebservicesFile(unit); + if (wsMetaData == null && vfWebservices != null) + { + try + { + URL wsURL = vfWebservices.toURL(); + Element root = DOMUtils.parse(wsURL.openStream()); + String namespaceURI = root.getNamespaceURI(); + if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee")) + { + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + ObjectModelFactory factory = new WebservicesFactory(wsURL); + wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null); + unit.addAttachment(WebservicesMetaData.class, wsMetaData); + } + } + catch (Exception ex) + { + throw new WSDeploymentException(ex); + } + } + return wsMetaData; + } + + private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit) + { + VirtualFile vf = unit.getMetaDataFile("webservices.xml"); + return (vf != null ? new VirtualFileAdaptor(vf) : null); + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/ArchiveDeployerHook.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,40 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; + +/** + * An interface for all web service deployer hooks + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public interface DeployerHook +{ + void deploy(DeploymentUnit unit) throws DeploymentException; + + void undeploy(DeploymentUnit unit); +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeployerHook.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,100 @@ +/* + * 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.jboss50.common; + +import java.net.URL; +import java.net.URLClassLoader; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; + +// $Id$ + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class DeploymentInfoAdapter +{ + // logging support + private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); + + public static void buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + udi.addAttachment(DeploymentUnit.class, unit); + + try + { + if (unit.getDeploymentContext().getParent() != null) + { + udi.parent = new UnifiedDeploymentInfo(null); + buildDeploymentInfo(udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit()); + } + + udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()); + + udi.name = unit.getName(); + udi.simpleName = unit.getSimpleName(); + udi.url = udi.vfRoot.toURL(); + + buildMetaData(udi, unit); + + // Since we create temporary classes, we need to create a delegate loader + // This prevents CCE problems where the parent loader is available at deploy time, + // and a child loader is available at start time. + udi.classLoader = new URLClassLoader(new URL[] {}, unit.getClassLoader()); + + log.debug("UnifiedDeploymentInfo:\n" + udi); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new IllegalStateException(ex); + } + } + + private static void buildMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) throws Exception + { + if (unit.getAttachment(Ejb3Deployment.class) != null) + { + udi.metaData = ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(udi, unit); + } + else if (unit.getAttachment(ApplicationMetaData.class) != null) + { + udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(udi, unit); + } + else if (unit.getAttachment(WebMetaData.class) != null) + { + udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(udi, unit); + udi.webappURL = udi.vfRoot.toURL(); + } + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/DeploymentInfoAdapter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,116 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.PortComponentMetaData; +import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC EJB21 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_EJB21; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + ApplicationMetaData appmd = unit.getAttachment(ApplicationMetaData.class); + if (appmd == null) + throw new IllegalStateException("Deployment unit does not contain application meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(ApplicationMetaData.class, appmd); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String ejbLink = pcmd.getEjbLink(); + if (ejbLink == null) + throw new IllegalStateException("ejb-link cannot be null"); + + BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink); + if (beanMetaData == null) + throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink); + + String ejbClass = beanMetaData.getEjbClass(); + try + { + ClassLoader loader = unit.getClassLoader(); + Class<?> epBean = loader.loadClass(ejbClass.trim()); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + ejbClass); + } + } + } + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return wsMetaData != null && unit.getAllMetaData(ApplicationMetaData.class).size() > 0; + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookEJB21.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -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.jboss50.common; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.metadata.webservices.PortComponentMetaData; +import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.ws.metadata.webservices.WebservicesMetaData; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXRPC JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXRPC_JSE; + } + + /** + * Create an endpoint for every servlet-link in webservices.xml + */ + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + if (wsMetaData == null) + throw new IllegalStateException("Deployment unit does not contain webservices meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + String servletLink = pcmd.getServletLink(); + if (servletLink == null) + throw new IllegalStateException("servlet-link cannot be null"); + + Servlet servlet = getServletForName(webMetaData, servletLink); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = unit.getClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + } + } + } + + return dep; + } + + private Servlet getServletForName(WebMetaData wmd, String servletLink) + { + for (Servlet servlet : wmd.getServlets()) + { + if (servletLink.equals(servlet.getName())) + { + return servlet; + } + } + throw new IllegalStateException("Cannot find servlet for link: " + servletLink); + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + WebservicesMetaData wsMetaData = getWebservicesMetaData(unit); + return wsMetaData != null; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXRPCDeployerHookJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,129 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import java.util.Iterator; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXWS EJB3 Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_EJB3; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment == null) + throw new IllegalStateException("Deployment unit does not contain ejb3 deployment"); + + // Copy the attachments + dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment); + + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + if (isWebServiceBean(container)) + { + String ejbName = container.getEjbName(); + Class epBean = container.getBeanClass(); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); + if (ejb3Deployment == null) + return false; + + boolean isWebServiceDeployment = false; + + Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + if (isWebServiceBean(container)) + { + isWebServiceDeployment = true; + break; + } + } + + return isWebServiceDeployment; + } + + private boolean isWebServiceBean(EJBContainer container) + { + boolean isWebServiceBean = false; + if (container instanceof StatelessContainer) + { + boolean isWebService = container.resolveAnnotation(WebService.class) != null; + boolean isWebServiceProvider = container.resolveAnnotation(WebServiceProvider.class) != null; + isWebServiceBean = isWebService || isWebServiceProvider; + } + return isWebServiceBean; + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,150 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import java.util.ArrayList; +import java.util.List; + +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.Servlet; +import org.jboss.ws.integration.BasicEndpoint; +import org.jboss.ws.integration.Endpoint; +import org.jboss.ws.integration.Service; +import org.jboss.ws.integration.deployment.BasicDeploymentImpl; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.deployment.Deployment.DeploymentType; +import org.jboss.ws.utils.ObjectNameFactory; + +/** + * A deployer JAXWS JSE Endpoints + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE +{ + /** Get the deployemnt type this deployer can handle + */ + public DeploymentType getDeploymentType() + { + return DeploymentType.JAXWS_JSE; + } + + @Override + public Deployment createDeployment(DeploymentUnit unit) + { + Deployment dep = new BasicDeploymentImpl(); + dep.setType(getDeploymentType()); + dep.setClassLoader(unit.getClassLoader()); + + Service service = dep.getService(); + + WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); + if (webMetaData == null) + throw new IllegalStateException("Deployment unit does not contain web meta data"); + + // Copy the attachments + dep.getContext().addAttachment(WebMetaData.class, webMetaData); + + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + for (Servlet servlet : servlets) + { + String servletName = servlet.getName(); + String servletClass = servlet.getServletClass(); + + try + { + ClassLoader loader = unit.getClassLoader(); + Class<?> epBean = loader.loadClass(servletClass.trim()); + + // Create the endpoint + Endpoint endpoint = new BasicEndpoint(service, epBean); + String nameStr = Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName; + endpoint.setName(ObjectNameFactory.create(nameStr)); + + service.addEndpoint(endpoint); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClass); + continue; + } + } + + return dep; + } + + @Override + public boolean isWebServiceDeployment(DeploymentUnit unit) + { + if (super.isWebServiceDeployment(unit) == false) + return false; + + boolean isWebServiceDeployment = false; + try + { + WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + isWebServiceDeployment = servlets.size() > 0; + } + catch (Exception ex) + { + log.error("Cannot process web deployment", ex); + } + + return isWebServiceDeployment; + } + + private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader loader) + { + List<Servlet> servlets = new ArrayList<Servlet>(); + for (Servlet servlet : webMetaData.getServlets()) + { + String servletClassName = servlet.getServletClass(); + + // Skip JSPs + if (servletClassName == null || servletClassName.length() == 0) + continue; + + try + { + Class<?> servletClass = loader.loadClass(servletClassName.trim()); + boolean isWebService = servletClass.isAnnotationPresent(WebService.class); + boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class); + if (isWebService || isWebServiceProvider) + servlets.add(servlet); + } + catch (ClassNotFoundException ex) + { + log.warn("Cannot load servlet class: " + servletClassName); + continue; + } + } + return servlets; + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/JAXWSDeployerHookJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,62 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.ws.integration.deployment.Deployment; +import org.jboss.ws.integration.jboss50.common.AbstractDeployerHook; + +/** + * A basic hook that delegates a deployment manger. + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class MainDeployerHook extends AbstractDeployerHook +{ + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = unit.getAttachment(Deployment.class); + if (dep != null) + { + deployerManager.deploy(dep); + } + } + + public void undeploy(DeploymentUnit unit) + { + if (ignoreDeployment(unit)) + return; + + Deployment dep = unit.getAttachment(Deployment.class); + if (dep != null) + { + deployerManager.undeploy(dep); + } + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/MainDeployerHook.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,69 @@ +/* + * 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.jboss50.common; + +//$Id$ + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +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.webservices.WebservicesMetaData; + +/** + * A deployer that builds the UnifiedDeploymentInfo + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class UnifiedDeploymentInfoDeployer extends AbstractDeployer +{ + @Override + public void create(Deployment dep) + { + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + if (udi == null) + { + DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployment unit"); + + DeploymentType type = dep.getType(); + if (type.toString().startsWith("JAXWS")) + { + udi = new JAXWSDeployment(type); + DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + else + { + WebservicesMetaData wsMetaData = dep.getContext().getAttachment(WebservicesMetaData.class); + udi = new JAXRPCDeployment(type, wsMetaData); + DeploymentInfoAdapter.buildDeploymentInfo(udi, unit); + } + + dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); + } + } +} \ No newline at end of file Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/UnifiedDeploymentInfoDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,66 @@ +/* + * 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.jboss50.common; + +import java.io.IOException; +import java.net.URL; + +import org.jboss.virtual.VirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; + +// $Id$ + +/** + * A JBoss50 VirtualFile adaptor + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class VirtualFileAdaptor implements UnifiedVirtualFile +{ + private static final long serialVersionUID = 6547394037548338042L; + + private VirtualFile root; + + public VirtualFileAdaptor(VirtualFile root) + { + this.root = root; + } + + public UnifiedVirtualFile findChild(String child) throws IOException + { + VirtualFile vf = root.findChild(child); + return new VirtualFileAdaptor(vf); + } + + public URL toURL() + { + try + { + return root.toURL(); + } + catch (Exception e) + { + return null; + } + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/VirtualFileAdaptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,136 @@ +/* + * 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.jboss50.common; + +// $Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.jboss.deployers.spi.deployer.DeploymentUnit; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ServletMapping; +import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class WebMetaDataAdaptor +{ + public static UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit) + { + WebMetaData wmd = unit.getAttachment(WebMetaData.class); + udi.addAttachment(WebMetaData.class, wmd); + + UnifiedWebMetaData umd = new UnifiedWebMetaData(); + umd.setContextRoot(wmd.getContextRoot()); + umd.setServletMappings(getServletMappings(wmd)); + umd.setServletClassNames(getServletClassMap(wmd)); + umd.setConfigName(wmd.getConfigName()); + umd.setConfigFile(wmd.getConfigFile()); + umd.setSecurityDomain(wmd.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); + umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); + + return umd; + } + + private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + return wmd.getWsdlPublishLocationByName(name); + } + }; + } + + protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + Map<String, WebResourceCollection> resources = securityMetaData.getWebResources(); + for (WebResourceCollection webResource : resources.values()) + { + UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + } + + return unifiedsecurityMetaData; + } + + private static Map<String, String> getServletMappings(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServletMappings().iterator(); + while (it.hasNext()) + { + ServletMapping sm = (ServletMapping)it.next(); + // FIXME - Add support for multiple mappings + mappings.put(sm.getName(), sm.getUrlPatterns().get(0)); + } + return mappings; + } + + private static Map<String, String> getServletClassMap(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServlets().iterator(); + while (it.hasNext()) + { + Servlet servlet = (Servlet)it.next(); + // Skip JSPs + if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) + continue; + + mappings.put(servlet.getName(), servlet.getServletClass()); + } + return mappings; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebMetaDataAdaptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,53 @@ +/* + * 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.jboss50.common; + +//$Id$ + +/** + * This web service deployer for EJB + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerEJB extends AbstractWebServiceDeployer +{ + private int relOrderEJB2x; + private int relOrderEJB3; + + public void setRelOrderEJB2x(int relOrderEJB2x) + { + this.relOrderEJB2x = relOrderEJB2x; + } + + public void setRelOrderEJB3(int relOrderEJB3) + { + this.relOrderEJB3 = relOrderEJB3; + } + + @Override + public int getRelativeOrder() + { + return Math.max(relOrderEJB2x, relOrderEJB3) + 1; + } + +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerEJB.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,46 @@ +/* + * 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.jboss50.common; + +//$Id$ + +/** + * This web service deployer for JSE + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceDeployerJSE extends AbstractWebServiceDeployer +{ + private int relOrderWar; + + public void setRelOrderWar(int relOrderWar) + { + this.relOrderWar = relOrderWar; + } + + @Override + public int getRelativeOrder() + { + return relOrderWar - 1; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceDeployerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,52 @@ +/* + * 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.jboss50.common; + +//$Id$ + +/** + * The main web service deployer + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Apr-2007 + */ +public class WebServiceMainDeployer extends AbstractWebServiceDeployer +{ + private int relOrderJSE; + private int relOrderEJB; + + public void setRelOrderEJB(int relOrderEJB) + { + this.relOrderEJB = relOrderEJB; + } + + public void setRelOrderJSE(int relOrderJSE) + { + this.relOrderJSE = relOrderJSE; + } + + @Override + public int getRelativeOrder() + { + return Math.max(relOrderEJB, relOrderJSE) + 1; + } +} Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/java/org/jboss/ws/integration/jboss50/common/WebServiceMainDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="WebServiceDeployerEJB" class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB"> + <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> + <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> + <install bean="MainDeployer" method="addDeployer"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="MainDeployer" method="removeDeployer"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>EJB2xDeployer</depends> + <depends>EJBRegistrationDeployer</depends> + </bean> + +  + <bean name="WebServiceDeployerJSE" class="org.jboss.ws.integration.jboss50.WebServiceDeployerJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <install bean="MainDeployer" method="addDeployer"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="MainDeployer" method="removeDeployer"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebAppParsingDeployer</depends> + </bean> + +  + <bean name="WebServiceMainDeployer" class="org.jboss.ws.integration.jboss50.WebServiceMainDeployer"> + <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> + <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> + <install bean="MainDeployer" method="addDeployer"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="MainDeployer" method="removeDeployer"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WarDeployer</depends> + <depends>WebServiceDeployerEJB</depends> + <depends>WebServiceDeployerJSE</depends> + </bean> + +</deployment> Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,241 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="WSServerConfig" class="org.jboss.ws.core.server.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.jboss50.jbossws.ClassLoaderInjectionDeployer"/> + <bean name="WSEagerInitializeDeployer" class="org.jboss.ws.core.deployment.EagerInitializeDeployer"/> + <bean name="WSEndpointHandlerDeployer" class="org.jboss.ws.core.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.jboss50.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.jboss50.jbossws.InvocationHandlerEJB3</value></entry> + </map> + </property> + </bean> + <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.core.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.jboss50.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.jboss50.jbossws.UnifiedDeploymentInfoDeployer"/> + <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.jboss50.jbossws.WebAppGeneratorDeployer"/> + <bean name="WSWebAppDeployerDeployer" class="org.jboss.ws.integration.jboss50.jbossws.WebAppDeployerDeployer"> + <property name="serviceEndpointPublisher"><inject bean="WSServiceEndpointPublisher"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></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="WSDeployerHook_JAXRPC_JSE" class="org.jboss.ws.integration.jboss50.jbossws.JAXRPCDeployerHookJSE"> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE</depends> + </bean> + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.ws.integration.jboss50.jbossws.JAXRPCDeployerHookEJB21"> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.ws.integration.jboss50.jbossws.JAXWSDeployerHookJSE"> + <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property> + <install bean="WebServiceDeployerJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerJSE</depends> + </bean> + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.ws.integration.jboss50.jbossws.JAXWSDeployerHookEJB3"> + <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + <bean name="WSMainDeployerHook" class="org.jboss.ws.integration.jboss50.jbossws.MainDeployerHook"> + <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property> + <install bean="WebServiceMainDeployer" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceMainDeployer" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceMainDeployer</depends> + </bean> + +</deployment> Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE jboss-web + PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> + +<jboss-web> + +  + <context-root>jbossws</context-root> + +</jboss-web> Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>JBossWS</display-name> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.jboss.ws.core.server.ContextServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PortComponentLinkServlet</servlet-name> + <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class> + </servlet> + +  + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PortComponentLinkServlet</servlet-name> + <url-pattern>/pclink</url-pattern> + </servlet-mapping> + +  + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Property changes on: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/index.html =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/index.html (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/index.html 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,63 @@ +<html><head> +<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> +<title>JBossWS / jbossws-2.0.0.CR3 (date=200702012001)</title> +<link rel='stylesheet' href='./styles.css'> +</head> +<body> + +<div class='pageHeader'>Welcome to JBoss Web Services</div> + +<div class="pageSection"> +<h2>J2EE compatible web services</h2> +JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. +</div> + +<div class="pageSection"> +<h3>Administration</h3> + +<fieldset> + <legend><b>Runtime information</b></legend> +<ul> + <li><a href="services">View a list of deployed services</a></li> +  + <li><a href="/jmx-console/">Access JMX console</a></li> +</ul> +</fieldset> +</div> + +<div class="pageSection"> +<h3>Project information</h3> + +<fieldset> + <legend><b>Documentation</b></legend> + +<ul> + <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> + <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBWSFAQ">FAQ</a></li> + <li><a href="http://labs.jboss.com/jbossws/user-guide/en/html/index.html">User guide</a></li> + <li><a href="http://www.jboss.org/wiki/Wiki.jsp?page=JBossWS">JBossWS WIKI</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Community</b></legend> +<ul> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=200">User forum</a></li> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li> + <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Source repository</b></legend> +<ul> + <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceRepository">Subversion repository</a></li> + <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> +</ul> +</fieldset> +</div> + +</body> +</html> Added: projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/styles.css =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/styles.css (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/src/main/resources/jbossws.war/styles.css 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,186 @@ + +/* table for list views */ +.table_list { +} + +/* table for detail views */ +.table_form { +} + +.pageHeader { + font-size: 14pt; + font-weight: BOLD; + color: #ffffff; + border-bottom-width:1px; + border-bottom-style:solid; + border-color:#000066; + margin-bottom:15px; + padding-left:15px; + padding-top:5px; + padding-bottom:5px; + background-color: #aaaadd; + max-width: 900px; +} + +.pageSection { + padding-left:15px; + margin-bottom: 5px; + max-width: 900px; +} + +.metrics +{ + font-size: 6pt; + background-color: #dddddd; + width: 100%; +} + +/* table row header */ +.list_tr_head { + font-family: Verdana, sans-serif; + font-size: 8pt; + font-weight: 600; + text-align: center; + background-color: #aaaadd; +} + +/* table row list view */ +.list_tr { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view odd lines */ +.list_tr_even { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view even lines */ +.list_tr_odd { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; +} + +/* form label */ +.form_label { + font-family: Verdana, sans-serif; + font-weight: 500; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; + padding-top: 2px; + padding-bottom: 2px; +} + +/* form value */ +.form_value { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: baseline; +} + +/* tiny writing */ +.tiny { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #666666; +} + +/* required input fields */ +.inputmust { + background-color: #dddddd; +} + +/* error message */ +.error { + font-family: Courier New; + color: #990000; +} + +/* error message */ +.error_trace { + font-family: Courier New; +} + +/* active tree node */ +.tree_active_label { + font-weight: bold; +} + +body { + font-family: Verdana,, sans-serif; + font-size: 8pt; + color: #000066; + background-color: #ffffff; +} + +/* title style */ +h1 { + font-family: Verdana, sans-serif; + font-size: 14pt; + font-weight: 600; + color: #000066; +} + +h2 { + font-family: Verdana, sans-serif; + font-size: 12pt; + font-weight: 600; + color: #000066; +} + +h3 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 600; + color: #000066; +} + +h4 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 500; + color: #000066; +} + +/* table desk */ +td { + font-family: Verdana, sans-serif; + font-size: 8pt; + padding-left: 5px; + padding-right: 5px; +} + +input, textarea, select, option { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; +} + +a { + font-family: Verdana, sans-serif; + color: #0000dd; + text-decoration: none; +} + +a:hover{ + font-family: Verdana, sans-serif; + color: #cc0000; + text-decoration: none; +} + +pre { + background:#dddddd +} \ No newline at end of file Added: projects/wsintegration/sunri-jboss50/trunk/version.properties =================================================================== --- projects/wsintegration/sunri-jboss50/trunk/version.properties (rev 0) +++ projects/wsintegration/sunri-jboss50/trunk/version.properties 2007-05-10 07:12:44 UTC (rev 3034) @@ -0,0 +1,28 @@ + +# $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 +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-spi=SNAPSHOT +jboss-jbossxb=2.0.0.CR2 +jboss-microcontainer=2.0.0.Beta3 +jboss-security-spi=2.0.0.Beta +sun-jaxb=2.1.3 +sun-jaxws=2.1.1 +sun-servlet=2.4 +

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3033 - in trunk/build: hudson/hudson-home/jobs/JBWS-Samples-AS-4.0 and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 23:28:26 -0400 (Wed, 09 May 2007) New Revision: 3033 Modified: trunk/build/ant-import/build-hudson.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-TC-5.5/config.xml Log: use jbossws instead of svnbase Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-05-09 21:52:50 UTC (rev 3032) +++ trunk/build/ant-import/build-hudson.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -76,9 +76,6 @@ <xmlproperty file="${build.output.dir}/svn-info.xml"/> <property name="svn.url" value="${info.entry.url}"/> - <exec executable="basename" outputproperty="svn.basename"> - <arg value="${svn.url}"/> - </exec> <exec executable="dirname" outputproperty="svn.basedir.local"> <arg value="${basedir}"/> </exec> @@ -92,7 +89,6 @@ </fileset> <filterset> <filter token="svn.basedir.local" value="${svn.basedir.local}"/> - <filter token="svn.basename" value="${svn.basename}"/> <filter token="svn.url" value="${svn.url}"/> <filter token="hudson.home" value="${hudson.home}"/> <filtersfile file="${build.dir}/version.properties"/> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> + <testResults>jbossws/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> + <testResults>jbossws/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> + <testResults>jbossws/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> + <testResults>jbossws/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-TC-5.5/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -55,7 +55,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> + <testResults>jbossws/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -50,7 +50,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -50,7 +50,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> 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-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -50,7 +50,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-05-09 21:52:50 UTC (rev 3032) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-TC-5.5/config.xml 2007-05-10 03:28:26 UTC (rev 3033) @@ -50,7 +50,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults> + <testResults>jbossws/jbossws-tests/output/reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3032 - in branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder: jaxws and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: palin Date: 2007-05-09 17:52:50 -0400 (Wed, 09 May 2007) New Revision: 3032 Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java Log: Bug fix: publish the user provided wsdl (if available) even if some processing on policies has been done. Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-09 21:27:34 UTC (rev 3031) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-09 21:52:50 UTC (rev 3032) @@ -480,23 +480,28 @@ localPolicyRegistry.register(policy.getPolicyURI(), policy); } - WSDLService wsdlService = wsdlDefinitions.getService(epMetaData.getServiceMetaData().getServiceName().getLocalPart()); - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(epMetaData.getPortName()); - WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(epMetaData.getPortTypeName()); - WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(epMetaData.getPortTypeName()); - //Port scope - if (wsdlEndpoint != null) + WSDLService wsdlService = wsdlDefinitions.getService(epMetaData.getServiceMetaData().getServiceName()); + if (wsdlService != null) { - List<WSDLExtensibilityElement> portPolicyRefList = wsdlEndpoint.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE); - deployPolicies(portPolicyRefList, PolicyScopeLevel.WSDL_PORT, localPolicyRegistry, epMetaData); + WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(epMetaData.getPortName()); + if (wsdlEndpoint != null) + { + List<WSDLExtensibilityElement> portPolicyRefList = wsdlEndpoint.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE); + deployPolicies(portPolicyRefList, PolicyScopeLevel.WSDL_PORT, localPolicyRegistry, epMetaData); + } + else + { + log.warn("Cannot get port '"+epMetaData.getPortName()+"' from the given wsdl definitions! Eventual policies attached to this port won't be considered."); + } } else { - log.warn("Cannot get port '"+epMetaData.getPortName()+"' from the given wsdl definitions!"); + log.warn("Cannot get service '"+epMetaData.getServiceMetaData().getServiceName()+"' from the given wsdl definitions! Eventual policies attached to this service won't be considered."); } //Binding scope + WSDLBinding wsdlBinding = wsdlDefinitions.getBindingByInterfaceName(epMetaData.getPortTypeName()); if (wsdlBinding != null) { List<WSDLExtensibilityElement> bindingPolicyRefList = wsdlBinding.getExtensibilityElements(Constants.WSDL_ELEMENT_POLICYREFERENCE); @@ -504,10 +509,11 @@ } else { - log.warn("Cannot get binding for portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions!"); + log.warn("Cannot get binding for portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions! Eventual policies attached to this binding won't be considered."); } //PortType scope + WSDLInterface wsdlInterface = wsdlDefinitions.getInterface(epMetaData.getPortTypeName()); if (wsdlInterface != null) { List<WSDLExtensibilityElement> portTypePolicyRefList = wsdlInterface.getExtensibilityElements(Constants.WSDL_PROPERTY_POLICYURIS); @@ -515,7 +521,7 @@ } else { - log.warn("Cannot get portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions!"); + log.warn("Cannot get portType '"+epMetaData.getPortTypeName()+"' from the given wsdl definitions! Eventual policies attached to this portType won't be considered."); } } Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-09 21:27:34 UTC (rev 3031) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-09 21:52:50 UTC (rev 3032) @@ -354,21 +354,19 @@ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); if (wsdlLocation != null) { - //we can no longer use the user provided wsdl without parsing it right now, - //since we need to look for policies, eventually choose the supported - //policy alternatives and generate the final wsdl - //serviceMetaData.setWsdlLocation(wsdlLocation); + //we can no longer use the user provided wsdl without parsing it right now, since we + //need to look for policies and eventually choose the supported policy alternatives WSDLDefinitions wsdlDefinitions = factory.parse(wsdlLocation); processPolicyMetaDataExtension(epMetaData, wsdlDefinitions); - if (policyLocation == null) + if (policyLocation != null) { //process wsdl fragment with additional policies WSDLDefinitions policyDefinitions = factory.parse(policyLocation); processPolicyMetaDataExtension(epMetaData, policyDefinitions); } - //generate the wsdl4j model again for the actual UMDM containing policy data - WSDLDefinitions actualWsdlDefinitions = generator.generate(serviceMetaData); - writeWsdl(serviceMetaData,actualWsdlDefinitions,epMetaData); + //now we have the UMDM containing policy data; anyway we can't write a new wsdl file with + //the supported alternatives and so on, since we need to publish the file the user provided + serviceMetaData.setWsdlLocation(wsdlLocation); } else {

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3031 - trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 17:27:34 -0400 (Wed, 09 May 2007) New Revision: 3031 Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml Log: Fix deploy target 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-09 21:10:07 UTC (rev 3030) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-05-09 21:27:34 UTC (rev 3031) @@ -27,7 +27,7 @@ # # deploy to jboss # -ant $ENVIRONMENT clean deploy-jboss42 +ant $ENVIRONMENT clean deploy-jboss50 # # start jbossas

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3030 - projects/wsintegration/jbws-jboss42/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 17:10:07 -0400 (Wed, 09 May 2007) New Revision: 3030 Modified: projects/wsintegration/jbws-jboss42/trunk/build.xml Log: Fix jbossws42.sar Modified: projects/wsintegration/jbws-jboss42/trunk/build.xml =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/build.xml 2007-05-09 21:05:55 UTC (rev 3029) +++ projects/wsintegration/jbws-jboss42/trunk/build.xml 2007-05-09 21:10:07 UTC (rev 3030) @@ -162,6 +162,13 @@ <include name="jbossws-jboss42.jar"/> <include name="jbossws-context.war"/> </fileset> + <fileset dir="${thirdparty.dir}/jbossws-spi"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${thirdparty.dir}/jbossws-core"> + <include name="jboss-jaxws.jar"/> + <include name="jbossws-core.jar"/> + </fileset> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> @@ -169,8 +176,6 @@ <include name="stax-api.jar"/> <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jbossws-core.jar"/> </fileset> <fileset dir="${jboss42.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3029 - projects/wsintegration/jbws-jboss42/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 17:05:55 -0400 (Wed, 09 May 2007) New Revision: 3029 Modified: projects/wsintegration/jbws-jboss42/trunk/build.xml Log: Exclude JMS transport Modified: projects/wsintegration/jbws-jboss42/trunk/build.xml =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/build.xml 2007-05-09 20:53:58 UTC (rev 3028) +++ projects/wsintegration/jbws-jboss42/trunk/build.xml 2007-05-09 21:05:55 UTC (rev 3029) @@ -97,6 +97,7 @@ <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}" 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"/> </javac>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3028 - 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-09 16:53:58 -0400 (Wed, 09 May 2007) New Revision: 3028 Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml Log: Fix jboss branch name 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-09 20:33:14 UTC (rev 3027) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Integration-AS-4.2/config.xml 2007-05-09 20:53:58 UTC (rev 3028) @@ -12,7 +12,7 @@ JBWSDIR=$WORKSPACE/jbossws SPIDIR=$WORKSPACE/jbossws-spi INTDIR=$WORKSPACE/jbws-jboss42 -JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/trunk/build/output/(a)hudson.jboss42.build@ +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" #

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3027 - in projects/wsintegration: jbws-jboss42/trunk and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 16:33:14 -0400 (Wed, 09 May 2007) New Revision: 3027 Modified: projects/wsintegration/jbossws-spi/trunk/src/main/etc/component-info.xml projects/wsintegration/jbws-jboss42/trunk/build.xml projects/wsintegration/jbws-jboss42/trunk/src/main/etc/component-info.xml projects/wsintegration/jbws-jboss50/trunk/build.xml projects/wsintegration/jbws-jboss50/trunk/src/main/etc/component-info.xml projects/wsintegration/jbws-jboss50/trunk/version.properties Log: Fix component-info.xml Modified: projects/wsintegration/jbossws-spi/trunk/src/main/etc/component-info.xml =================================================================== --- projects/wsintegration/jbossws-spi/trunk/src/main/etc/component-info.xml 2007-05-09 19:52:19 UTC (rev 3026) +++ projects/wsintegration/jbossws-spi/trunk/src/main/etc/component-info.xml 2007-05-09 20:33:14 UTC (rev 3027) @@ -1,4 +1,4 @@ -<project name="jboss/jbossws"> +<project name="jboss/jbossws-spi"> <component id="jboss/jbossws-spi" description="JBossWS SPI" @@ -7,13 +7,6 @@ <artifact id="jbossws-spi.jar"/> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb@"/> - </import> - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <export> <include input="jbossws-spi.jar"/> </export> Modified: projects/wsintegration/jbws-jboss42/trunk/build.xml =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/build.xml 2007-05-09 19:52:19 UTC (rev 3026) +++ projects/wsintegration/jbws-jboss42/trunk/build.xml 2007-05-09 20:33:14 UTC (rev 3027) @@ -170,7 +170,6 @@ <include name="xmlsec.jar"/> <include name="jboss-jaxws.jar"/> <include name="jbossws-core.jar"/> - <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${jboss42.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/> Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/etc/component-info.xml =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/src/main/etc/component-info.xml 2007-05-09 19:52:19 UTC (rev 3026) +++ projects/wsintegration/jbws-jboss42/trunk/src/main/etc/component-info.xml 2007-05-09 20:33:14 UTC (rev 3027) @@ -9,6 +9,12 @@ <artifact id="jbossws42.sar"/> <artifact id="jbossws42-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> Modified: projects/wsintegration/jbws-jboss50/trunk/build.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-09 19:52:19 UTC (rev 3026) +++ projects/wsintegration/jbws-jboss50/trunk/build.xml 2007-05-09 20:33:14 UTC (rev 3027) @@ -180,9 +180,6 @@  <zip zipfile="${jboss50.output.lib.dir}/jbossws50-deployer.zip"> - <fileset dir="${thirdparty.dir}/jbossws-spi"> - <include name="jbossws-spi.jar"/> - </fileset> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-jboss50.jar"/> </fileset> Modified: projects/wsintegration/jbws-jboss50/trunk/src/main/etc/component-info.xml =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/src/main/etc/component-info.xml 2007-05-09 19:52:19 UTC (rev 3026) +++ projects/wsintegration/jbws-jboss50/trunk/src/main/etc/component-info.xml 2007-05-09 20:33:14 UTC (rev 3027) @@ -10,6 +10,12 @@ <artifact id="jbossws50-deployer.zip"/> <artifact id="jbossws50-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> Modified: projects/wsintegration/jbws-jboss50/trunk/version.properties =================================================================== --- projects/wsintegration/jbws-jboss50/trunk/version.properties 2007-05-09 19:52:19 UTC (rev 3026) +++ projects/wsintegration/jbws-jboss50/trunk/version.properties 2007-05-09 20:33:14 UTC (rev 3027) @@ -22,7 +22,7 @@ jboss-jaxr=1.2.0.GA jboss-jbossws=SNAPSHOT jboss-jbossws-spi=SNAPSHOT -jboss-jbossxb=1.0.0.CR10 +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

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3026 - projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 15:52:19 -0400 (Wed, 09 May 2007) New Revision: 3026 Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml Log: Add eventing deployer Modified: projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-09 19:50:32 UTC (rev 3025) +++ projects/wsintegration/jbws-jboss42/trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-09 19:52:19 UTC (rev 3026) @@ -105,6 +105,7 @@ <inject bean="WSPublishContractDeployer"/> <inject bean="WSClassLoaderInjectionDeployer"/> <inject bean="WSEagerInitializeDeployer"/> + <inject bean="WSEventingDeployer"/> <inject bean="WSEndpointRegistryDeployer"/> <inject bean="WSEndpointLifecycleDeployer"/> </list> @@ -132,6 +133,7 @@ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.ws.core.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>

17 years, 1 month

1
0
0 / 0

JBossWS SVN: r3025 - trunk/build.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-05-09 15:50:32 -0400 (Wed, 09 May 2007) New Revision: 3025 Modified: trunk/build/ant.properties.example Log: Fix svn url to wsintegration Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-05-09 19:30:33 UTC (rev 3024) +++ trunk/build/ant.properties.example 2007-05-09 19:50:32 UTC (rev 3025) @@ -30,11 +30,11 @@ hudson.jdk15=/usr/java/jdk1.5 hudson.jdk14=/usr/java/jdk1.4 -hudson.jbossws-spi.url=https://svn.jboss.org/repos/jbossws/projects/jbossws-spi/trunk -hudson.jbws-jboss50.url=https://svn.jboss.org/repos/jbossws/projects/jbws-jboss50/trunk -hudson.jbws-jboss42.url=https://svn.jboss.org/repos/jbossws/projects/jbws-jboss42/trunk -hudson.jbws-jboss40.url=https://svn.jboss.org/repos/jbossws/projects/jbws-jboss40/trunk -hudson.jbws-tc55.url=https://svn.jboss.org/repos/jbossws/projects/jbws-tc55/trunk +hudson.jbossws-spi.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbossws-spi/trunk +hudson.jbws-jboss50.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-jboss50/trunk +hudson.jbws-jboss42.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-jboss42/trunk +hudson.jbws-jboss40.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-jboss40/trunk +hudson.jbws-tc55.url=https://svn.jboss.org/repos/jbossws/projects/wsintegration/jbws-tc55/trunk hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk hudson.jboss50.build=jboss-5.0.0.Beta3

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