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