Author: thomas.diesler(a)jboss.com
Date: 2007-05-15 01:13:16 -0400 (Tue, 15 May 2007)
New Revision: 3095
Added:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor
branches/tdiesler/trunk/integration/jbws-jboss42/
branches/tdiesler/trunk/integration/jbws-jboss42/.classpath
branches/tdiesler/trunk/integration/jbws-jboss42/.project
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/
branches/tdiesler/trunk/integration/jbws-jboss42/build.xml
branches/tdiesler/trunk/integration/jbws-jboss42/src/
branches/tdiesler/trunk/integration/jbws-jboss50/
branches/tdiesler/trunk/integration/jbws-jboss50/.classpath
branches/tdiesler/trunk/integration/jbws-jboss50/.project
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/
branches/tdiesler/trunk/integration/jbws-jboss50/build.xml
branches/tdiesler/trunk/integration/jbws-jboss50/src/
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java
branches/tdiesler/trunk/integration/sunri-jboss50/
branches/tdiesler/trunk/integration/sunri-jboss50/.classpath
branches/tdiesler/trunk/integration/sunri-jboss50/.project
branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/
branches/tdiesler/trunk/integration/sunri-jboss50/build.xml
branches/tdiesler/trunk/integration/sunri-jboss50/src/
branches/tdiesler/trunk/integration/sunri-jboss50/version.properties
Removed:
branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml
branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/jboss42/src/main/etc/
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jms/
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.beans/
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.sar/
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.war/
branches/tdiesler/trunk/integration/jboss42/src/test/
branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml
branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/jboss50/src/main/etc/
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-context.war/
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.deployer/
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.sar/
branches/tdiesler/trunk/integration/jboss50/src/test/
branches/tdiesler/trunk/integration/jbws-jboss42/.classpath
branches/tdiesler/trunk/integration/jbws-jboss42/.project
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/
branches/tdiesler/trunk/integration/jbws-jboss42/build.xml
branches/tdiesler/trunk/integration/jbws-jboss42/src/
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws-jboss42.jar/
branches/tdiesler/trunk/integration/jbws-jboss50/.classpath
branches/tdiesler/trunk/integration/jbws-jboss50/.project
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/
branches/tdiesler/trunk/integration/jbws-jboss50/build.xml
branches/tdiesler/trunk/integration/jbws-jboss50/src/
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws-jboss50.jar/
branches/tdiesler/trunk/integration/sunri-jboss50/.classpath
branches/tdiesler/trunk/integration/sunri-jboss50/.project
branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/
branches/tdiesler/trunk/integration/sunri-jboss50/build.xml
branches/tdiesler/trunk/integration/sunri-jboss50/src/
branches/tdiesler/trunk/integration/sunri-jboss50/version.properties
branches/tdiesler/trunk/integration/sunri/
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java
Modified:
branches/tdiesler/trunk/build/ant-import/build-setup.xml
branches/tdiesler/trunk/build/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/jboss42/.classpath
branches/tdiesler/trunk/integration/jboss42/.project
branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jboss42/build.xml
branches/tdiesler/trunk/integration/jboss50/.classpath
branches/tdiesler/trunk/integration/jboss50/.project
branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jboss50/build.xml
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
branches/tdiesler/trunk/integration/spi/.classpath
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-release.xml
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
branches/tdiesler/trunk/testsuite/.classpath
branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml
branches/tdiesler/trunk/testsuite/build.xml
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java
Log:
restructure
Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-15 05:10:13 UTC (rev
3094)
+++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-05-15 05:13:16 UTC (rev
3095)
@@ -21,9 +21,12 @@
<property name="spi.dir"
value="${basedir}/integration/spi"/>
<property name="core.dir" value="${basedir}/jbossws"/>
<property name="testsuite.dir"
value="${basedir}/testsuite"/>
+ <property name="int.jboss50.dir"
value="${basedir}/integration/jboss50"/>
<property name="int.jboss42.dir"
value="${basedir}/integration/jboss42"/>
- <property name="int.jboss50.dir"
value="${basedir}/integration/jboss50"/>
- <property name="int.sunri.dir"
value="${basedir}/integration/sunri"/>
+ <property name="int.jbws50.dir"
value="${basedir}/integration/jbws-jboss50"/>
+ <property name="int.jbws42.dir"
value="${basedir}/integration/jbws-jboss42"/>
+ <property name="int.sunri50.dir"
value="${basedir}/integration/sunri-jboss50"/>
+ <property name="int.sunri42.dir"
value="${basedir}/integration/sunri-jboss42"/>
<property file="${build.dir}/ant.properties"/>
<property file="${build.dir}/version.properties"/>
Modified: branches/tdiesler/trunk/build/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-15 05:10:13 UTC
(rev 3094)
+++ branches/tdiesler/trunk/build/ant-import/build-testsuite.xml 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -13,7 +13,6 @@
<property name="tests.etc.dir" value="${tests.dir}/etc"/>
<property name="tests.java.dir" value="${tests.dir}/java"/>
<property name="tests.resources.dir"
value="${tests.dir}/resources"/>
- <property name="tests.output.dir"
value="${basedir}/output-tests"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -132,7 +131,7 @@
<!-- Run all unit tests and generate a report -->
<target name="tests" depends="tests-jars" description="Run
all unit tests and generate a report">
- <antcall target="test-main-local">
+ <antcall target="tests-run-internal">
<param name="include.wildcard"
value="org/jboss/test/ws/**/*TestCase.class"/>
<param name="exclude.wildcard"
value="no-wildcard-exclude-see-excludesfile"/>
<param name="haltonfailure" value="false"/>
@@ -142,7 +141,7 @@
<!-- Run samples test cases -->
<target name="tests-samples" depends="tests-init"
description="Run samples unit tests">
- <antcall target="test-main-local">
+ <antcall target="tests-run-internal">
<param name="include.wildcard"
value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
<param name="exclude.wildcard"
value="org/jboss/test/ws/*/samples/jaxr/**"/>
<!--
@@ -159,7 +158,7 @@
ant -Dtest=tools test
-->
<target name="test" depends="tests-init" if="test"
description="Run all unit tests in a given directory">
- <antcall target="test-main-local">
+ <antcall target="tests-run-internal">
<param name="include.wildcard"
value="org/jboss/test/ws/${test}/**/*TestCase.class"/>
<param name="exclude.wildcard"
value="no-wildcard-exclude-see-excludesfile"/>
<param name="haltonfailure" value="false"/>
@@ -167,7 +166,7 @@
</target>
<!-- Common test target -->
- <target name="test-main-local" depends="tests-init">
+ <target name="tests-run-internal" depends="tests-init">
<mkdir dir="${tests.output.dir}/reports"/>
<junit printsummary="yes" showoutput="yes"
dir="${tests.output.dir}" haltonfailure="${haltonfailure}">
<jvmarg value="-Djava.security.manager"/>
Modified: branches/tdiesler/trunk/integration/jboss42/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-15 05:10:13 UTC (rev
3094)
+++ branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-15 05:13:16 UTC (rev
3095)
@@ -2,9 +2,7 @@
<classpath>
<classpathentry excluding="org/jboss/ws/integration/jboss42/jms/"
kind="src" path="src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-core"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-spi"/>
<classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/>
- <classpathentry kind="lib"
path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/spi"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/jboss42/.project
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/.project 2007-05-15 05:10:13 UTC (rev
3094)
+++ branches/tdiesler/trunk/integration/jboss42/.project 2007-05-15 05:13:16 UTC (rev
3095)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>integration-jboss42</name>
+ <name>jboss42</name>
<comment></comment>
<projects>
</projects>
Deleted: branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,89 +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>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss42 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss42 -->
- <target name="deploy"
depends="jbws42-jars,remove-jbossws,remove-jbwsri" description="Deploy
jbossws">
-
- <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
-
- <copy todir="${jboss42.home}/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="${jboss42.home}/lib" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jbws42.output.lib.dir}/jbossws42.sar"/>
- </target>
-
- <!-- Remove jbossws from jboss42 -->
- <target name="remove-jbossws" depends="prepare"
description="Remove jbossws">
-
- <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
-
- <delete>
- <fileset dir="${jboss42.home}/client">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/lib">
- <include name="jbossws-integration.jar"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset
dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss42 -->
- <target name="remove-jbwsri" depends="prepare"
description="Remove jbossws/sunri">
-
- <delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/>
- </target>
-
-</project>
Deleted: branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,38 +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>
-
- <!-- Release to jboss.local.repository -->
- <target name="release" depends="jbws42-jars"
- description="Release to jboss.local.repository">
-
- <!-- jboss/jbossws-jboss42 -->
- <property name="jboss.repository.dir"
value="${jboss.local.repository}/jboss"/>
- <mkdir
dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
- <copy
todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"
overwrite="true">
- <fileset dir="${jbws42.output.lib.dir}">
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws42.sar"/>
- <include name="jbossws42-src.zip"/>
- </fileset>
- </copy>
- <copy
tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml"
file="${jbws42.etc.dir}/component-info.xml" filtering="true"
overwrite="true">
- <filterset>
- <filtersfile file="${basedir}/version.properties"/>
- </filterset>
- </copy>
-
- </target>
-
-</project>
Deleted: branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,87 +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>
-
- <property name="tests.dir" value="${basedir}/src/test"/>
-
- <property name="jboss.home" value="${jboss42.home}"/>
- <property name="excludesfile"
value="${basedir}/src/test/resources/excludes.txt"/>
-
- <import file="${build.dir}/ant-import/build-testsuite.xml"/>
-
- <!--
- 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>
Modified: branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -28,15 +28,12 @@
<target name="thirdparty-get" depends="thirdparty-init"
description="Gets the thirdparty libraries"/>
- <target name="thirdparty-classpath"
depends="thirdparty-init,core-jars">
+ <target name="thirdparty-classpath"
depends="thirdparty-init">
<!-- The compile classpath for jboss42 integration -->
<path id="jbws42.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="${jboss42.lib}/jboss-common.jar"/>
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss42.lib}/jboss-system.jar"/>
<pathelement location="${jboss42.server.lib}/jboss.jar"/>
@@ -46,7 +43,6 @@
<pathelement
location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
<pathelement
location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement
location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
- <path refid="core.thirdparty.classpath"/>
</path>
</target>
Modified: branches/tdiesler/trunk/integration/jboss42/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-15 05:10:13 UTC (rev
3094)
+++ branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-15 05:13:16 UTC (rev
3095)
@@ -11,22 +11,17 @@
<!-- $Id$ -->
-<project default="main" basedir="../jbws-jboss42"
name="JBossWS-JBoss42">
+<project default="main" basedir="../.."
name="JBossWS-JBoss42">
- <import file="${basedir}/../build/ant-import/build-setup.xml"/>
+ <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="${int.jboss42.dir}/ant-import/build-thirdparty.xml"/>
- <import file="${core.dir}/build.xml"/>
-
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
- <property name="jbws42.dir" value="${basedir}"/>
+ <property name="jbws42.dir" value="${int.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"/>
@@ -40,9 +35,9 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="jbws42-init" depends="prepare, thirdparty">
+ <target name="init" depends="prepare, thirdparty">
<fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
- <available file="${jboss42.client}/jboss-ejb3-client.jar"
property="jboss42.ejb3.available"/>
+ <ant antfile="${spi.dir}/build.xml" target="main"
inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -57,26 +52,22 @@
| documentation compiles.
-->
- <target name="jbws42-compile"
depends="jbws42-init,core-compile,jbws42-compile-classes,jbws42-compile-etc"
description="Compile all source files."/>
+ <target name="compile"
depends="init,compile-classes,compile-etc" description="Compile all source
files."/>
<!-- Compile integration java sources -->
- <target name="jbws42-compile-classes" depends="jbws42-init">
+ <target name="compile-classes" depends="init">
<mkdir dir="${jbws42.output.classes.dir}"/>
<javac srcdir="${jbws42.java.dir}" sourcepath=""
destdir="${jbws42.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
- <exclude name="org/jboss/ws/integration/jboss42/jms/**"/>
<include name="org/jboss/ws/integration/jboss42/**"/>
<classpath refid="jbws42.integration.classpath"/>
</javac>
</target>
<!-- Compile etc files (manifests and such) -->
- <target name="jbws42-compile-etc" depends="jbws42-init">
+ <target name="compile-etc" depends="init">
<mkdir dir="${jbws42.output.etc.dir}"/>
<copy todir="${jbws42.output.etc.dir}" filtering="yes"
overwrite="yes">
- <fileset dir="${jbws42.etc.dir}">
- <include name="component-info.xml"/>
- </fileset>
<fileset dir="${build.dir}/etc">
<include name="default.mf"/>
</fileset>
@@ -97,13 +88,13 @@
<!--
| Build all jar files.
-->
- <target name="jbws42-jars"
depends="jbws42-compile,core-jars,jbws42-module-jars" description="Builds
all jar files.">
+ <target name="jars" depends="compile,module-jars"
description="Builds all jar files.">
</target>
<!--
| Build all jar files.
-->
- <target name="jbws42-module-jars" depends="jbws42-init">
+ <target name="module-jars" depends="init">
<!-- Build jbossws-jboss42.jar -->
<mkdir dir="${jbws42.output.lib.dir}"/>
@@ -114,51 +105,8 @@
<metainf
dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/>
</jar>
- <!-- Build jbossws-context.war -->
- <war warfile="${jbws42.output.lib.dir}/jbossws-context.war"
webxml="${jbws42.resources.dir}/jbossws.war/WEB-INF/web.xml">
- <fileset dir="${jbws42.resources.dir}/jbossws.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${jbws42.resources.dir}/jbossws.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws42.sar -->
- <jar jarfile="${jbws42.output.lib.dir}/jbossws42.sar"
manifest="${jbws42.output.etc.dir}/default.mf">
- <fileset dir="${jbws42.output.lib.dir}">
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${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="${jbws42.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="${jbws42.resources.dir}/jbossws.sar/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
-
<!-- Build jbossws42-src.zip -->
- <zip zipfile="${jbws42.output.lib.dir}/jbossws42-src.zip" >
+ <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-src.zip" >
<fileset dir="${jbws42.java.dir}"/>
</zip>
@@ -173,12 +121,11 @@
</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="jbws42-jars,tests-main"/>
+ <target name="most" description="Builds almost everything."
depends="jars"/>
<target name="all" description="Create a distribution zip file"
depends="main">
</target>
Copied:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerHook.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerHook.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptor.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+//$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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+//$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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB21MBean.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21MBean.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+// $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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorEJB3MBean.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3MBean.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSE.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+// $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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorJSEMBean.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSEMBean.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/DeployerInterceptorMBean.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorMBean.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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;
+
+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:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfig.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfig.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ws.integration.jboss42;
+
+// $Id$
+
+import java.util.ArrayList;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.management.BasicServerConfig;
+
+/**
+ * A Service Endpoint Registry
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 04-May-2007
+ */
+public class ManagedServerConfig extends BasicServerConfig implements
ManagedServerConfigMBean
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ManagedServerConfig.class);
+
+ public void create() throws Exception
+ {
+ log.debug("WebServiceHost: " + getWebServiceHost());
+ log.debug("WebServicePort: " + getWebServicePort());
+ log.debug("WebServiceSecurePort: " + getWebServiceSecurePort());
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.registerMBean(this, OBJECT_NAME);
+ }
+ }
+
+ public void destroy() throws Exception
+ {
+ MBeanServer server = getMBeanServer();
+ if (server != null)
+ {
+ server.unregisterMBean(OBJECT_NAME);
+ }
+ }
+
+ private MBeanServer getMBeanServer()
+ {
+ MBeanServer server = null;
+ ArrayList servers = MBeanServerFactory.findMBeanServer(null);
+ if (servers.size() > 0)
+ {
+ server = (MBeanServer)servers.get(0);
+ }
+ return server;
+ }
+}
Copied:
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java
(from rev 3086,
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/common/ManagedServerConfigMBean.java)
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/ManagedServerConfigMBean.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ws.integration.jboss42;
+
+import org.jboss.ws.integration.management.ServerConfig;
+
+/**
+ * MBean interface.
+ * @since 15-April-2004
+ */
+public interface ManagedServerConfigMBean extends ServerConfig
+{
+}
Modified: branches/tdiesler/trunk/integration/jboss50/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-15 05:10:13 UTC (rev
3094)
+++ branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-15 05:13:16 UTC (rev
3095)
@@ -3,9 +3,8 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-core"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-spi"/>
- <classpathentry kind="lib"
path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib"
path="/jbossws-core/thirdparty/jbosssx-client.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/spi"/>
+ <classpathentry kind="lib"
path="/spi/thirdparty/jaxws-api.jar"/>
+ <classpathentry kind="lib"
path="/spi/thirdparty/jsr181-api.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/integration/jboss50/.project
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/.project 2007-05-15 05:10:13 UTC (rev
3094)
+++ branches/tdiesler/trunk/integration/jboss50/.project 2007-05-15 05:13:16 UTC (rev
3095)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>integration-jboss50</name>
+ <name>jboss50</name>
<comment></comment>
<projects>
</projects>
Deleted: branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,93 +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>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss50 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to jboss50 -->
- <target name="deploy"
depends="jbws50-jars,remove-jbossws,remove-jbwsri" description="Deploy
jbossws">
-
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="${core.dir}/output/lib">
- <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="${jboss50.home}/lib" overwrite="true">
- <fileset dir="${core.thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib"
overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <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="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="${jbws50.output.lib.dir}/jbossws50-deployer.zip"/>
- <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jbws50.output.lib.dir}/jbossws50.sar"/>
- <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="${jbws50.output.lib.dir}/jbossws50-context.war"
overwrite="true"/>
- </target>
-
- <!-- Remove jbossws from jboss50 -->
- <target name="remove-jbossws" depends="prepare"
description="Remove jbossws">
-
- <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
-
- <delete>
- <fileset dir="${jboss50.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="${jboss50.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="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete
file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
- </target>
-
- <!-- Remove jbossws/sunri from jboss50 -->
- <target name="remove-jbwsri" depends="prepare"
description="Remove jbossws/sunri">
-
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/>
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/>
- </target>
-
-</project>
Deleted: branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-release.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,39 +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>
-
- <!-- Release to jboss.local.repository -->
- <target name="release" depends="jbws50-jars"
- description="Release to jboss.local.repository">
-
- <!-- jboss/jbossws-jboss50 -->
- <property name="jboss.repository.dir"
value="${jboss.local.repository}/jboss"/>
- <mkdir
dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/>
- <copy
todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"
overwrite="true">
- <fileset dir="${jbws50.output.lib.dir}">
- <include name="jbossws-jboss50.jar"/>
- <include name="jbossws50.sar"/>
- <include name="jbossws50-deployer.zip"/>
- <include name="jbossws50-src.zip"/>
- </fileset>
- </copy>
- <copy
tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml"
file="${jbws50.etc.dir}/component-info.xml" filtering="true"
overwrite="true">
- <filterset>
- <filtersfile file="${basedir}/version.properties"/>
- </filterset>
- </copy>
-
- </target>
-
-</project>
Deleted: branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,87 +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>
-
- <property name="tests.dir" value="${basedir}/src/test"/>
-
- <property name="jboss.home" value="${jboss50.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>
Modified: branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-15
05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -33,27 +33,18 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jbws50.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="${spi.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
- <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
- <pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
- <pathelement location="${jboss50.lib}/jboss-system.jar"/>
- <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/>
<pathelement location="${jboss50.server.lib}/jboss.jar"/>
<pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/>
- <pathelement location="${jboss50.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss50.server.lib}/jnpserver.jar"/>
- <pathelement
location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
- <pathelement
location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement
location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/>
- <pathelement
location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/>
+
</path>
</target>
Modified: branches/tdiesler/trunk/integration/jboss50/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-15 05:10:13 UTC (rev
3094)
+++ branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-15 05:13:16 UTC (rev
3095)
@@ -37,7 +37,7 @@
<target name="init" depends="prepare,thirdparty">
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
- <ant antfile="${core.dir}/build.xml" target="main"
inheritall="false"/>
+ <ant antfile="${spi.dir}/build.xml" target="main"
inheritall="false"/>
</target>
<!-- ================================================================== -->
@@ -68,9 +68,6 @@
<target name="compile-etc" depends="init">
<mkdir dir="${jbws50.output.etc.dir}"/>
<copy todir="${jbws50.output.etc.dir}" filtering="yes"
overwrite="yes">
- <fileset dir="${jbws50.etc.dir}">
- <include name="component-info.xml"/>
- </fileset>
<fileset dir="${build.dir}/etc">
<include name="default.mf"/>
</fileset>
@@ -108,52 +105,8 @@
<metainf
dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/>
</jar>
- <!-- Build jbossws-context.war -->
- <war warfile="${jbws50.output.lib.dir}/jbossws50-context.war"
webxml="${jbws50.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
- <fileset dir="${jbws50.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${jbws50.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws50.sar -->
- <jar jarfile="${jbws50.output.lib.dir}/jbossws50.sar"
manifest="${jbws50.output.etc.dir}/default.mf">
- <!-- [JBAS-4379] MC beans deployed twice because of jacc service
- <fileset dir="${jbws50.output.lib.dir}">
- <include name="jbossws-context.war"/>
- </fileset>
- -->
- <fileset dir="${core.dir}/output/lib">
- <include name="jbossws-core.jar"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="policy.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="xmlsec.jar"/>
- </fileset>
- <metainf dir="${core.dir}/src/main/resources/standard-config">
- <include name="standard-*-config.xml"/>
- </metainf>
- <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF">
- <include name="jbossws-beans.xml"/>
- </metainf>
- </jar>
-
- <!-- Build jbossws50.deployer -->
- <zip zipfile="${jbws50.output.lib.dir}/jbossws50-deployer.zip">
- <fileset dir="${jbws50.output.lib.dir}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${jbws50.resources.dir}/jbossws.deployer">
- <include name="META-INF/jbossws-deployer-beans.xml"/>
- </fileset>
- </zip>
-
<!-- Build jbossws50-src.zip -->
- <zip zipfile="${jbws50.output.lib.dir}/jbossws50-src.zip" >
+ <zip zipfile="${jbws50.output.lib.dir}/jbossws-jboss50-src.zip" >
<fileset dir="${jbws50.java.dir}"/>
</zip>
Added:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ws.integration.jboss50;
+
+//$Id$
+
+import java.util.Iterator;
+
+import org.jboss.metadata.NameValuePair;
+import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.web.Servlet;
+import org.jboss.ws.integration.Endpoint;
+import org.jboss.ws.integration.deployment.AbstractDeployer;
+import org.jboss.ws.integration.deployment.Deployment;
+
+/**
+ * A deployer that modifies the web.xml meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class ModifyWebMetaDataDeployer extends AbstractDeployer
+{
+ private String servletClass;
+
+ public void setServletClass(String servletClass)
+ {
+ this.servletClass = servletClass;
+ }
+
+ @Override
+ public void create(Deployment dep)
+ {
+ WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class);
+ if (webMetaData != null)
+ {
+ for (Servlet servlet : webMetaData.getServlets())
+ {
+ String orgServletClass = servlet.getServletClass();
+
+ // JSP
+ if (orgServletClass == null || orgServletClass.length() == 0)
+ {
+ log.debug("Innore servlet class: " + orgServletClass);
+ continue;
+ }
+
+ // Nothing to do if we have an <init-param>
+ if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass,
dep.getClassLoader()))
+ {
+ servlet.setServletClass(servletClass);
+ NameValuePair initParam = new
NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass);
+ servlet.addInitParam(initParam);
+ }
+ }
+ }
+ }
+
+ private boolean isJavaxServlet(String orgServletClass, ClassLoader loader)
+ {
+ boolean isServlet = false;
+ if (loader != null)
+ {
+ try
+ {
+ Class servletClass = loader.loadClass(orgServletClass);
+ isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass);
+ if (isServlet == true)
+ {
+ log.info("Ignore servlet: " + orgServletClass);
+ }
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.warn("Cannot load servlet class: " + orgServletClass);
+ }
+ }
+ return isServlet;
+ }
+
+ private boolean isAlreadyModified(Servlet servlet)
+ {
+ Iterator itParams = servlet.getInitParams().iterator();
+ while (itParams.hasNext())
+ {
+ NameValuePair pair = (NameValuePair)itParams.next();
+ if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName()))
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
Property changes on:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ModifyWebMetaDataDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ws.integration.jboss50;
+
+//$Id$
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.AssemblyDescriptorMetaData;
+import org.jboss.ws.integration.deployment.SecurityRolesHandler;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.utils.DOMUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Generate a service endpoint deployment for EJB endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class ServiceEndpointGeneratorEJB21 implements SecurityRolesHandler
+{
+ // logging support
+ protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB21.class);
+
+ /** Add the roles from ejb-jar.xml to the security roles
+ */
+ public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi)
+ {
+ // Fix:
http://jira.jboss.org/jira/browse/JBWS-309
+ ApplicationMetaData applMetaData =
(ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class);
+ AssemblyDescriptorMetaData assemblyDescriptor =
applMetaData.getAssemblyDescriptor();
+ if (assemblyDescriptor != null)
+ {
+ Map securityRoles = assemblyDescriptor.getSecurityRoles();
+ if (securityRoles != null)
+ {
+ Iterator it = securityRoles.keySet().iterator();
+ while (it.hasNext())
+ {
+ Element securityRole =
(Element)webApp.appendChild(DOMUtils.createElement("security-role"));
+ Element roleName =
(Element)securityRole.appendChild(DOMUtils.createElement("role-name"));
+ roleName.appendChild(DOMUtils.createTextNode((String)it.next()));
+ }
+ }
+ }
+ }
+}
Property changes on:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB21.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ws.integration.jboss50;
+
+//$Id$
+
+import java.util.Iterator;
+
+import javax.annotation.security.RolesAllowed;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.deployment.SecurityRolesHandler;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.utils.DOMUtils;
+import org.w3c.dom.Element;
+
+/**
+ * Generate a service endpoint deployment for EJB endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class ServiceEndpointGeneratorEJB3 implements SecurityRolesHandler
+{
+ // logging support
+ protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB3.class);
+
+ /** Add the roles from ejb-jar.xml to the security roles
+ */
+ public void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi)
+ {
+ Ejb3Deployment ejb3Deployment = udi.getAttachment(Ejb3Deployment.class);
+ if (ejb3Deployment != null)
+ {
+ Iterator it = ejb3Deployment.getEjbContainers().values().iterator();
+ while (it.hasNext())
+ {
+ EJBContainer container = (EJBContainer)it.next();
+ RolesAllowed anRolesAllowed =
(RolesAllowed)container.resolveAnnotation(RolesAllowed.class);
+ if (anRolesAllowed != null)
+ {
+ for (String role : anRolesAllowed.value())
+ {
+ Element securityRole =
(Element)webApp.appendChild(DOMUtils.createElement("security-role"));
+ Element roleName =
(Element)securityRole.appendChild(DOMUtils.createElement("role-name"));
+ roleName.appendChild(DOMUtils.createTextNode(role));
+ }
+ }
+ }
+ }
+ }
+}
Property changes on:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB3.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,138 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.jboss.ws.integration.jboss50;
+
+// $Id$
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
+import org.jboss.deployers.spi.deployment.MainDeployer;
+import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.structure.DeploymentState;
+import org.jboss.logging.Logger;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.ws.integration.deployment.Deployer;
+import org.jboss.ws.integration.deployment.Deployment;
+import org.jboss.ws.integration.deployment.ServiceEndpointPublisher;
+import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.deployment.WSDeploymentException;
+
+/**
+ * Publish the HTTP service endpoint to Tomcat
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class WebAppDeployerDeployer implements Deployer
+{
+ // provide logging
+ private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class);
+
+ private MainDeployer mainDeployer;
+ private ServiceEndpointPublisher serviceEndpointPublisher;
+ private Map<String, DeploymentContext> contextMap = new HashMap<String,
DeploymentContext>();
+
+ public void setMainDeployer(MainDeployer mainDeployer)
+ {
+ this.mainDeployer = mainDeployer;
+ }
+
+ public void setServiceEndpointPublisher(ServiceEndpointPublisher
serviceEndpointPublisher)
+ {
+ this.serviceEndpointPublisher = serviceEndpointPublisher;
+ }
+
+ public void create(Deployment dep)
+ {
+ UnifiedDeploymentInfo udi =
dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
+ if (udi == null)
+ throw new IllegalStateException("Cannot obtain unified deployement
info");
+
+ URL warURL = udi.webappURL;
+
+ log.debug("publishServiceEndpoint: " + warURL);
+ try
+ {
+ serviceEndpointPublisher.rewriteWebXml(udi);
+ DeploymentContext context = createDeploymentContext(warURL);
+
+ mainDeployer.addDeploymentContext(context);
+ mainDeployer.process();
+
+ contextMap.put(warURL.toExternalForm(), context);
+ }
+ catch (Exception ex)
+ {
+ WSDeploymentException.rethrow(ex);
+ }
+ }
+
+ public void destroy(Deployment dep)
+ {
+ UnifiedDeploymentInfo udi =
dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
+ if (udi == null)
+ throw new IllegalStateException("Cannot obtain unified deployement
info");
+
+ URL warURL = udi.webappURL;
+ if (warURL == null)
+ {
+ log.error("Cannot obtain warURL for: " + udi.name);
+ return;
+ }
+
+ log.debug("destroyServiceEndpoint: " + warURL);
+ try
+ {
+ DeploymentContext context = contextMap.get(warURL.toExternalForm());
+ if (context != null)
+ {
+ context.setState(DeploymentState.UNDEPLOYING);
+ mainDeployer.process();
+ mainDeployer.removeDeploymentContext(context.getName());
+
+ contextMap.remove(warURL.toExternalForm());
+ }
+ }
+ catch (Exception ex)
+ {
+ WSDeploymentException.rethrow(ex);
+ }
+ }
+
+ private DeploymentContext createDeploymentContext(URL warURL) throws Exception
+ {
+ VirtualFile file = VFS.getRoot(warURL);
+ return new AbstractDeploymentContext(file);
+ }
+
+ public void start(Deployment dep)
+ {
+ }
+
+ public void stop(Deployment dep)
+ {
+ }
+}
Property changes on:
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebAppDeployerDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted:
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-15
05:10:13 UTC (rev 3094)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1 +0,0 @@
-org.jboss.ws.integration.jboss50.jbossws.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
Added:
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor
(rev 0)
+++
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.ws.integration.invocation.SecurityAssociationAdaptor 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1 @@
+org.jboss.ws.integration.jboss50.SecurityAssociationAdaptorFactoryImpl
\ No newline at end of file
Copied: branches/tdiesler/trunk/integration/jbws-jboss42 (from rev 3086,
branches/tdiesler/trunk/integration/jboss42)
Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/.classpath 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/jbws-jboss42/.classpath 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="org/jboss/ws/integration/jboss42/jms/"
kind="src" path="src/main/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-core"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-spi"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/>
- <classpathentry kind="lib"
path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
-</classpath>
Copied: branches/tdiesler/trunk/integration/jbws-jboss42/.classpath (from rev 3093,
branches/tdiesler/trunk/integration/jboss42/.classpath)
===================================================================
--- branches/tdiesler/trunk/integration/jbws-jboss42/.classpath
(rev 0)
+++ branches/tdiesler/trunk/integration/jbws-jboss42/.classpath 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry excluding="org/jboss/ws/integration/jboss42/jms/"
kind="src" path="src/main/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/jbossws"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/jboss42"/>
+ <classpathentry kind="output" path="output-eclipse"/>
+</classpath>
Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/.project
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/.project 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/jbws-jboss42/.project 2007-05-15 05:13:16 UTC (rev
3095)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbws-jboss42</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: branches/tdiesler/trunk/integration/jbws-jboss42/.project (from rev 3093,
branches/tdiesler/trunk/integration/jboss42/.project)
===================================================================
--- branches/tdiesler/trunk/integration/jbws-jboss42/.project (rev
0)
+++ branches/tdiesler/trunk/integration/jbws-jboss42/.project 2007-05-15 05:13:16 UTC (rev
3095)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbws-jboss42</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: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import (from rev 3093,
branches/tdiesler/trunk/integration/jboss42/ant-import)
Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-deploy.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-deploy.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<!-- Deploy jbossws to jboss42 -->
- <target name="deploy"
depends="jbws42-jars,remove-jbossws,remove-jbwsri" description="Deploy
jbossws">
+ <target name="deploy" depends="jars,undeploy"
description="Deploy jbossws">
<fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
@@ -29,7 +29,7 @@
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
- <fileset dir="${core.thirdparty.dir}">
+ <fileset dir="${core.dir}/thirdparty">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -50,11 +50,11 @@
</fileset>
</copy>
<mkdir
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jbws42.output.lib.dir}/jbossws42.sar"/>
+ <unjar
dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jbws42.output.lib.dir}/jbossws-jbws42.sar"/>
</target>
<!-- Remove jbossws from jboss42 -->
- <target name="remove-jbossws" depends="prepare"
description="Remove jbossws">
+ <target name="undeploy" depends="prepare"
description="Remove jbossws">
<fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
@@ -68,7 +68,7 @@
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
<fileset dir="${jboss42.home}/lib">
- <include name="jbossws-integration.jar"/>
+ <include name="jbossws-integration.jar"/> <!-- The old
integration jar-->
<include name="jbossws-spi.jar"/>
</fileset>
<fileset
dir="${jboss42.home}/server/${jboss.server.instance}/lib">
@@ -80,10 +80,4 @@
<delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
</target>
- <!-- Remove jbossws/sunri from jboss42 -->
- <target name="remove-jbwsri" depends="prepare"
description="Remove jbossws/sunri">
-
- <delete
dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/>
- </target>
-
</project>
Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-release.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-release.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -14,7 +14,7 @@
<project>
<!-- Release to jboss.local.repository -->
- <target name="release" depends="jbws42-jars"
+ <target name="release" depends="jars"
description="Release to jboss.local.repository">
<!-- jboss/jbossws-jboss42 -->
@@ -29,7 +29,7 @@
</copy>
<copy
tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml"
file="${jbws42.etc.dir}/component-info.xml" filtering="true"
overwrite="true">
<filterset>
- <filtersfile file="${basedir}/version.properties"/>
+ <filtersfile file="${int.jbws42.dir}/version.properties"/>
</filterset>
</copy>
Modified: branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-testsuite.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-testsuite.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -10,17 +10,18 @@
<project>
- <property name="tests.dir" value="${basedir}/src/test"/>
+ <property name="tests.dir"
value="${int.jbws42.dir}/src/test"/>
+ <property name="tests.output.dir"
value="${int.jbws42.dir}/output-tests"/>
<property name="jboss.home" value="${jboss42.home}"/>
- <property name="excludesfile"
value="${basedir}/src/test/resources/excludes.txt"/>
+ <property name="excludesfile"
value="${int.jbws42.dir}/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">
+ <target name="tests-init" depends="tests-prepare">
<path id="jbossws.classpath">
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
@@ -34,7 +35,8 @@
<!-- The combined compile classpath -->
<path id="javac.classpath">
<path refid="jbossws.classpath"/>
- <path refid="spi.thirdparty.classpath"/>
+ <pathelement location="${jboss.client}/jboss-common-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
</path>
<!-- The test client classpath -->
@@ -58,9 +60,7 @@
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="tests-compile15"
description="Compile sources"/>
-
- <target name="tests-compile15" depends="tests-init"
if="HAVE_JDK_1.5">
+ <target name="tests-compile" depends="tests-init"
description="Compile sources">
<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}">
@@ -77,11 +77,13 @@
<!-- 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"/>
+ <copy-test-resources srcdir="${int.jbws42.dir}/src/test"/>
</target>
- <target name="tests-main"
depends="tests-compile,tests-copy-resources" description="Build the
deployments.">
+ <target name="tests-jars"
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>
+ <target name="tests-main" depends="tests-jars"
description="Build the deployments."/>
+
</project>
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/ant-import/build-thirdparty.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -28,7 +28,7 @@
<target name="thirdparty-get" depends="thirdparty-init"
description="Gets the thirdparty libraries"/>
- <target name="thirdparty-classpath"
depends="thirdparty-init,core-jars">
+ <target name="thirdparty-classpath"
depends="thirdparty-init">
<!-- The compile classpath for jboss42 integration -->
<path id="jbws42.integration.classpath">
@@ -37,16 +37,22 @@
<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="${int.jboss42.dir}/output/lib/jbossws-jboss42.jar"/>
+
+ <pathelement location="${jboss42.lib}/jboss-common.jar"/>
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss42.lib}/jboss-system.jar"/>
+ <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/>
<pathelement location="${jboss42.server.lib}/jboss.jar"/>
<pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/>
<pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/>
<pathelement location="${jboss42.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss42.server.lib}/servlet-api.jar"/>
<pathelement
location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <pathelement
location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/>
+ <pathelement
location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/>
<pathelement
location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement
location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
- <path refid="core.thirdparty.classpath"/>
</path>
</target>
Deleted: branches/tdiesler/trunk/integration/jbws-jboss42/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/build.xml 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/jbws-jboss42/build.xml 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -1,186 +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="../jbws-jboss42"
name="JBossWS-JBoss42">
-
- <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="jbws42.dir" value="${basedir}"/>
- <property name="jbws42.src.dir"
value="${jbws42.dir}/src/main"/>
- <property name="jbws42.etc.dir"
value="${jbws42.src.dir}/etc"/>
- <property name="jbws42.java.dir"
value="${jbws42.src.dir}/java"/>
- <property name="jbws42.resources.dir"
value="${jbws42.src.dir}/resources"/>
- <property name="jbws42.output.dir"
value="${jbws42.dir}/output"/>
- <property name="jbws42.output.classes.dir"
value="${jbws42.output.dir}/classes"/>
- <property name="jbws42.output.etc.dir"
value="${jbws42.output.dir}/etc"/>
- <property name="jbws42.output.lib.dir"
value="${jbws42.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="jbws42-init" depends="prepare, thirdparty">
- <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
- <available file="${jboss42.client}/jboss-ejb3-client.jar"
property="jboss42.ejb3.available"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- 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="jbws42-compile"
depends="jbws42-init,core-compile,jbws42-compile-classes,jbws42-compile-etc"
description="Compile all source files."/>
-
- <!-- Compile integration java sources -->
- <target name="jbws42-compile-classes" depends="jbws42-init">
- <mkdir dir="${jbws42.output.classes.dir}"/>
- <javac srcdir="${jbws42.java.dir}" sourcepath=""
destdir="${jbws42.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
- <exclude name="org/jboss/ws/integration/jboss42/jms/**"/>
- <include name="org/jboss/ws/integration/jboss42/**"/>
- <classpath refid="jbws42.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="jbws42-compile-etc" depends="jbws42-init">
- <mkdir dir="${jbws42.output.etc.dir}"/>
- <copy todir="${jbws42.output.etc.dir}" filtering="yes"
overwrite="yes">
- <fileset dir="${jbws42.etc.dir}">
- <include name="component-info.xml"/>
- </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="jbws42-jars"
depends="jbws42-compile,core-jars,jbws42-module-jars" description="Builds
all jar files.">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="jbws42-module-jars" depends="jbws42-init">
-
- <!-- Build jbossws-jboss42.jar -->
- <mkdir dir="${jbws42.output.lib.dir}"/>
- <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar"
manifest="${jbws42.output.etc.dir}/default.mf">
- <fileset dir="${jbws42.output.classes.dir}">
- <include name="org/jboss/ws/integration/jboss42/**"/>
- </fileset>
- <metainf
dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <war warfile="${jbws42.output.lib.dir}/jbossws-context.war"
webxml="${jbws42.resources.dir}/jbossws.war/WEB-INF/web.xml">
- <fileset dir="${jbws42.resources.dir}/jbossws.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${jbws42.resources.dir}/jbossws.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws42.sar -->
- <jar jarfile="${jbws42.output.lib.dir}/jbossws42.sar"
manifest="${jbws42.output.etc.dir}/default.mf">
- <fileset dir="${jbws42.output.lib.dir}">
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${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="${jbws42.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="${jbws42.resources.dir}/jbossws.sar/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
-
- <!-- Build jbossws42-src.zip -->
- <zip zipfile="${jbws42.output.lib.dir}/jbossws42-src.zip" >
- <fileset dir="${jbws42.java.dir}"/>
- </zip>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans
up most generated files.">
- <delete dir="${jbws42.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans
up all generated files.">
- <delete dir="${basedir}/output-tests"/>
- </target>
-
- <target name="main" description="Executes the default target
(most)." depends="most"/>
-
- <target name="most" description="Builds almost everything."
depends="jbws42-jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file"
depends="main">
- </target>
-
-</project>
Copied: branches/tdiesler/trunk/integration/jbws-jboss42/build.xml (from rev 3093,
branches/tdiesler/trunk/integration/jboss42/build.xml)
===================================================================
--- branches/tdiesler/trunk/integration/jbws-jboss42/build.xml
(rev 0)
+++ branches/tdiesler/trunk/integration/jbws-jboss42/build.xml 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -0,0 +1,187 @@
+<?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="../.."
name="JBossWS-JBoss42">
+
+ <import file="${basedir}/build/ant-import/build-setup.xml"/>
+
+ <import file="${int.jbws42.dir}/ant-import/build-deploy.xml"/>
+ <import file="${int.jbws42.dir}/ant-import/build-release.xml"/>
+ <import file="${int.jbws42.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${int.jbws42.dir}/ant-import/build-testsuite.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="jbws42.dir" value="${int.jbws42.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="init" depends="prepare, thirdparty">
+ <fail message="Not available: ${jboss42.available.file}"
unless="jboss42.available"/>
+ <ant antfile="${int.jboss42.dir}/build.xml" target="main"
inheritall="false"/>
+ <ant antfile="${core.dir}/build.xml" target="main"
inheritall="false"/>
+ </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="compile"
depends="init,compile-classes,compile-etc" description="Compile all source
files."/>
+
+ <!-- Compile integration java sources -->
+ <target name="compile-classes" depends="init">
+ <mkdir dir="${jbws42.output.classes.dir}"/>
+ <javac srcdir="${jbws42.java.dir}" sourcepath=""
destdir="${jbws42.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
+ <exclude name="org/jboss/ws/integration/jboss42/jms/**"/>
+ <include name="org/jboss/ws/integration/jboss42/**"/>
+ <classpath refid="jbws42.integration.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${jbws42.output.etc.dir}"/>
+ <copy todir="${jbws42.output.etc.dir}" filtering="yes"
overwrite="yes">
+ <fileset dir="${jbws42.etc.dir}">
+ <include name="component-info.xml"/>
+ </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="jars" depends="compile,module-jars"
description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" depends="init">
+
+ <!-- Build jbossws-jbws42.jar -->
+ <mkdir dir="${jbws42.output.lib.dir}"/>
+ <jar jarfile="${jbws42.output.lib.dir}/jbossws-jbws42.jar"
manifest="${jbws42.output.etc.dir}/default.mf">
+ <fileset dir="${jbws42.output.classes.dir}">
+ <include name="org/jboss/ws/integration/jboss42/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbossws-context.war -->
+ <war warfile="${jbws42.output.lib.dir}/jbossws-jbws42-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 jbossws42.sar -->
+ <jar jarfile="${jbws42.output.lib.dir}/jbossws-jbws42.sar"
manifest="${jbws42.output.etc.dir}/default.mf">
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${jbws42.output.lib.dir}">
+ <include name="jbossws-jbws42.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.dir}/thirdparty">
+ <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="${jbws42.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="${jbws42.resources.dir}/jbossws.sar/META-INF">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- Build jbossws42-src.zip -->
+ <zip zipfile="${jbws42.output.lib.dir}/jbossws-jbws42-src.zip" >
+ <fileset dir="${jbws42.java.dir}"/>
+ </zip>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans
up most generated files.">
+ <delete dir="${jbws42.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans
up all generated files.">
+ <delete dir="${int.jbws42.dir}/output-tests"/>
+ </target>
+
+ <target name="main" description="Executes the default target
(most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything."
depends="jars"/>
+
+ <target name="all" description="Create a distribution zip file"
depends="main,tests-main">
+ </target>
+
+</project>
Copied: branches/tdiesler/trunk/integration/jbws-jboss42/src (from rev 3093,
branches/tdiesler/trunk/integration/jboss42/src)
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/AbstractDeployerHook.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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.common.DeployerHook;
-import org.jboss.ws.integration.jboss42.common.DeployerInterceptorMBean;
+import org.jboss.ws.integration.jboss42.DeployerHook;
+import org.jboss.ws.integration.jboss42.DeployerInterceptorMBean;
/**
* An abstract web service deployer.
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/ModifyWebMetaDataDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -23,12 +23,12 @@
//$Id$
-import org.jboss.ws.core.deployment.ServiceEndpointPublisher;
-import org.jboss.ws.core.deployment.ServiceEndpointPublisher.RewriteResults;
import org.jboss.ws.integration.Endpoint;
import org.jboss.ws.integration.deployment.AbstractDeployer;
import org.jboss.ws.integration.deployment.Deployment;
+import org.jboss.ws.integration.deployment.ServiceEndpointPublisher;
import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
+import org.jboss.ws.integration.deployment.ServiceEndpointPublisher.RewriteResults;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
/**
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,57 +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.jbossws;
-
-// $Id$
-
-import java.security.Principal;
-
-import org.jboss.security.SecurityAssociation;
-import org.jboss.ws.extensions.security.SecurityAssociationAdaptor;
-import org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory;
-
-/**
- * A JBoss specific SecurityAdaptorFactory
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class SecurityAssociationAdaptorFactoryImpl implements
SecurityAssociationAdaptorFactory
-{
- public SecurityAssociationAdaptor getSecurityAssociationAdaptor()
- {
- return new SecurityAccociationAdaptorImpl();
- }
-
- public class SecurityAccociationAdaptorImpl implements SecurityAssociationAdaptor
- {
- public void setPrincipal(Principal pricipal)
- {
- SecurityAssociation.setPrincipal(pricipal);
- }
-
- public void setCredential(Object credential)
- {
- SecurityAssociation.setCredential(credential);
- }
- }
-}
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/java/org/jboss/ws/integration/jboss42/jbossws/WebAppDeployerDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -33,9 +33,9 @@
import org.jboss.mx.util.MBeanProxy;
import org.jboss.mx.util.MBeanProxyCreationException;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.ws.core.deployment.ServiceEndpointPublisher;
import org.jboss.ws.integration.deployment.Deployer;
import org.jboss.ws.integration.deployment.Deployment;
+import org.jboss.ws.integration.deployment.ServiceEndpointPublisher;
import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.integration.deployment.WSDeploymentException;
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -3,7 +3,7 @@
<deployment
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig"
class="org.jboss.ws.integration.jboss42.common.ManagedServerConfig">
+ <bean name="WSServerConfig"
class="org.jboss.ws.integration.jboss42.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.
Modified:
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml
===================================================================
---
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss42/src/main/resources/jbossws.sar/META-INF/jboss-service.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -7,7 +7,7 @@
<!--
A deployer service for JSE endpoints.
-->
- <mbean name="jboss.ws:service=DeployerInterceptorJSE"
code="org.jboss.ws.integration.jboss42.common.DeployerInterceptorJSE">
+ <mbean name="jboss.ws:service=DeployerInterceptorJSE"
code="org.jboss.ws.integration.jboss42.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.common.DeployerInterceptorEJB21">
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB21"
code="org.jboss.ws.integration.jboss42.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.common.DeployerInterceptorEJB3">
+ <mbean name="jboss.ws:service=DeployerInterceptorEJB3"
code="org.jboss.ws.integration.jboss42.DeployerInterceptorEJB3">
<depends-list optional-attribute-name="Interceptables">
<depends-list-element>jboss.ejb3:service=EJB3Deployer</depends-list-element>
</depends-list>
Copied: branches/tdiesler/trunk/integration/jbws-jboss50 (from rev 3086,
branches/tdiesler/trunk/integration/jboss50)
Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/.classpath 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/jbws-jboss50/.classpath 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-core"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-spi"/>
- <classpathentry kind="lib"
path="/jbossws-spi/thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib"
path="/jbossws-core/thirdparty/jbosssx-client.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
-</classpath>
Copied: branches/tdiesler/trunk/integration/jbws-jboss50/.classpath (from rev 3093,
branches/tdiesler/trunk/integration/jboss50/.classpath)
===================================================================
--- branches/tdiesler/trunk/integration/jbws-jboss50/.classpath
(rev 0)
+++ branches/tdiesler/trunk/integration/jbws-jboss50/.classpath 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/jbossws"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/jboss50"/>
+ <classpathentry kind="output" path="output-eclipse"/>
+</classpath>
Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/.project
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/.project 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/jbws-jboss50/.project 2007-05-15 05:13:16 UTC (rev
3095)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jbws-jboss50</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Copied: branches/tdiesler/trunk/integration/jbws-jboss50/.project (from rev 3093,
branches/tdiesler/trunk/integration/jboss50/.project)
===================================================================
--- branches/tdiesler/trunk/integration/jbws-jboss50/.project (rev
0)
+++ branches/tdiesler/trunk/integration/jbws-jboss50/.project 2007-05-15 05:13:16 UTC (rev
3095)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbws-jboss50</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Copied: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import (from rev 3093,
branches/tdiesler/trunk/integration/jboss50/ant-import)
Modified: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-deploy.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-deploy.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<!-- Deploy jbossws to jboss50 -->
- <target name="deploy"
depends="jbws50-jars,remove-jbossws,remove-jbwsri" description="Deploy
jbossws">
+ <target name="deploy" depends="jars,undeploy"
description="Deploy jbossws">
<copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="${core.dir}/output/lib">
@@ -27,7 +27,7 @@
<include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
- <fileset dir="${core.thirdparty.dir}">
+ <fileset dir="${core.dir}/thirdparty">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -36,7 +36,7 @@
</fileset>
</copy>
<copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="${core.thirdparty.dir}">
+ <fileset dir="${core.dir}/thirdparty">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
@@ -52,17 +52,19 @@
</fileset>
</copy>
<mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="${jbws50.output.lib.dir}/jbossws50-deployer.zip"/>
+ <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="${jbws50.output.lib.dir}/jbossws-jbws50-deployer.zip"/>
<mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jbws50.output.lib.dir}/jbossws50.sar"/>
- <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="${jbws50.output.lib.dir}/jbossws50-context.war"
overwrite="true"/>
+ <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"
src="${jbws50.output.lib.dir}/jbossws-jbws50.sar"/>
+ <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="${jbws50.output.lib.dir}/jbossws-jbws50-context.war"
overwrite="true"/>
</target>
<!-- Remove jbossws from jboss50 -->
- <target name="remove-jbossws" depends="prepare"
description="Remove jbossws">
+ <target name="undeploy" depends="prepare"
description="Remove jbossws">
<fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
+ <ant antfile="${int.sunri50.dir}/build.xml" target="undeploy"
inheritall="false"/>
+
<delete>
<fileset dir="${jboss50.home}/client">
<include name="jboss-jaxrpc.jar"/>
@@ -83,11 +85,4 @@
<delete
file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
</target>
- <!-- Remove jbossws/sunri from jboss50 -->
- <target name="remove-jbwsri" depends="prepare"
description="Remove jbossws/sunri">
-
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/>
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/>
- </target>
-
</project>
Modified: branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-testsuite.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-testsuite.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -10,17 +10,18 @@
<project>
- <property name="tests.dir" value="${basedir}/src/test"/>
+ <property name="tests.dir"
value="${int.jbws50.dir}/src/test"/>
+ <property name="tests.output.dir"
value="${int.jbws50.dir}/output-tests"/>
<property name="jboss.home" value="${jboss50.home}"/>
- <property name="excludesfile"
value="${basedir}/src/test/resources/excludes.txt"/>
+ <property name="excludesfile"
value="${int.jbws50.dir}/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">
+ <target name="tests-init" depends="tests-prepare">
<path id="jbossws.classpath">
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
@@ -34,7 +35,9 @@
<!-- The combined compile classpath -->
<path id="javac.classpath">
<path refid="jbossws.classpath"/>
- <path refid="spi.thirdparty.classpath"/>
+ <pathelement location="${jboss.client}/jboss-common-core.jar"/>
+ <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
</path>
<!-- The test client classpath -->
@@ -58,9 +61,7 @@
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="tests-compile15"
description="Compile sources"/>
-
- <target name="tests-compile15" depends="tests-init"
if="HAVE_JDK_1.5">
+ <target name="tests-compile" depends="tests-init"
description="Compile sources">
<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}">
@@ -77,11 +78,13 @@
<!-- 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"/>
+ <copy-test-resources srcdir="${int.jbws50.dir}/src/test"/>
</target>
- <target name="tests-main"
depends="tests-compile,tests-copy-resources" description="Build the
deployments.">
+ <target name="tests-jars"
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>
+ <target name="tests-main" depends="tests-jars"
description="Build the deployments."/>
+
</project>
Modified:
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/ant-import/build-thirdparty.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -37,6 +37,8 @@
<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="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/>
+
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
<pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
Deleted: branches/tdiesler/trunk/integration/jbws-jboss50/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/build.xml 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/jbws-jboss50/build.xml 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -1,185 +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="../jbws-jboss50"
name="JBossWS-JBoss50">
-
- <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="jbws50.dir" value="${basedir}"/>
- <property name="jbws50.src.dir"
value="${jbws50.dir}/src/main"/>
- <property name="jbws50.etc.dir"
value="${jbws50.src.dir}/etc"/>
- <property name="jbws50.java.dir"
value="${jbws50.src.dir}/java"/>
- <property name="jbws50.resources.dir"
value="${jbws50.src.dir}/resources"/>
- <property name="jbws50.output.dir"
value="${jbws50.dir}/output"/>
- <property name="jbws50.output.classes.dir"
value="${jbws50.output.dir}/classes"/>
- <property name="jbws50.output.etc.dir"
value="${jbws50.output.dir}/etc"/>
- <property name="jbws50.output.lib.dir"
value="${jbws50.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="jbws50-init" depends="prepare,thirdparty">
- <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.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="jbws50-compile"
depends="jbws50-init,core-compile,jbws50-compile-classes,jbws50-compile-etc"
description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="jbws50-compile-classes" depends="jbws50-init">
- <mkdir dir="${jbws50.output.classes.dir}"/>
- <javac srcdir="${jbws50.java.dir}" sourcepath=""
destdir="${jbws50.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/jboss50/**"/>
- <classpath refid="jbws50.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="jbws50-compile-etc" depends="jbws50-init">
- <mkdir dir="${jbws50.output.etc.dir}"/>
- <copy todir="${jbws50.output.etc.dir}" filtering="yes"
overwrite="yes">
- <fileset dir="${jbws50.etc.dir}">
- <include name="component-info.xml"/>
- </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="jbws50-jars"
depends="jbws50-compile,core-jars,jbws50-module-jars" description="Builds
all jar files.">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="jbws50-module-jars" depends="jbws50-init">
-
- <!-- Build jbossws-jboss50.jar -->
- <mkdir dir="${jbws50.output.lib.dir}"/>
- <jar jarfile="${jbws50.output.lib.dir}/jbossws-jboss50.jar"
manifest="${jbws50.output.etc.dir}/default.mf">
- <fileset dir="${jbws50.output.classes.dir}">
- <include name="org/jboss/ws/integration/jboss50/**"/>
- </fileset>
- <metainf
dir="${jbws50.resources.dir}/jbossws-jboss50.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <war warfile="${jbws50.output.lib.dir}/jbossws50-context.war"
webxml="${jbws50.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
- <fileset dir="${jbws50.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${jbws50.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws50.sar -->
- <jar jarfile="${jbws50.output.lib.dir}/jbossws50.sar"
manifest="${jbws50.output.etc.dir}/default.mf">
- <!-- [JBAS-4379] MC beans deployed twice because of jacc service
- <fileset dir="${jbws50.output.lib.dir}">
- <include name="jbossws-context.war"/>
- </fileset>
- -->
- <fileset dir="${core.dir}/output/lib">
- <include name="jbossws-core.jar"/>
- </fileset>
- <fileset dir="${core.thirdparty.dir}">
- <include name="policy.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="xmlsec.jar"/>
- </fileset>
- <metainf dir="${core.dir}/src/main/resources/standard-config">
- <include name="standard-*-config.xml"/>
- </metainf>
- <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF">
- <include name="jbossws-beans.xml"/>
- </metainf>
- </jar>
-
- <!-- Build jbossws50.deployer -->
- <zip zipfile="${jbws50.output.lib.dir}/jbossws50-deployer.zip">
- <fileset dir="${jbws50.output.lib.dir}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${jbws50.resources.dir}/jbossws.deployer">
- <include name="META-INF/jbossws-deployer-beans.xml"/>
- </fileset>
- </zip>
-
- <!-- Build jbossws50-src.zip -->
- <zip zipfile="${jbws50.output.lib.dir}/jbossws50-src.zip" >
- <fileset dir="${jbws50.java.dir}"/>
- </zip>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans
up most generated files.">
- <delete dir="${jbws50.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans
up all generated files.">
- <delete dir="${basedir}/output-tests"/>
- </target>
-
- <target name="main" description="Executes the default target
(most)." depends="most"/>
-
- <target name="most" description="Builds almost everything."
depends="jbws50-jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file"
depends="main">
- </target>
-
-</project>
Copied: branches/tdiesler/trunk/integration/jbws-jboss50/build.xml (from rev 3093,
branches/tdiesler/trunk/integration/jboss50/build.xml)
===================================================================
--- branches/tdiesler/trunk/integration/jbws-jboss50/build.xml
(rev 0)
+++ branches/tdiesler/trunk/integration/jbws-jboss50/build.xml 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -0,0 +1,186 @@
+<?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="../.."
name="Integration-JBoss50">
+
+ <import file="${basedir}/build/ant-import/build-setup.xml"/>
+
+ <import file="${int.jbws50.dir}/ant-import/build-deploy.xml"/>
+ <import file="${int.jbws50.dir}/ant-import/build-testsuite.xml"/>
+ <import file="${int.jbws50.dir}/ant-import/build-thirdparty.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="jbws50.dir" value="${int.jbws50.dir}"/>
+ <property name="jbws50.src.dir"
value="${jbws50.dir}/src/main"/>
+ <property name="jbws50.etc.dir"
value="${jbws50.src.dir}/etc"/>
+ <property name="jbws50.java.dir"
value="${jbws50.src.dir}/java"/>
+ <property name="jbws50.resources.dir"
value="${jbws50.src.dir}/resources"/>
+ <property name="jbws50.output.dir"
value="${jbws50.dir}/output"/>
+ <property name="jbws50.output.classes.dir"
value="${jbws50.output.dir}/classes"/>
+ <property name="jbws50.output.etc.dir"
value="${jbws50.output.dir}/etc"/>
+ <property name="jbws50.output.lib.dir"
value="${jbws50.output.dir}/lib"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare,thirdparty">
+ <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
+ <ant antfile="${core.dir}/build.xml" target="main"
inheritall="false"/>
+ <ant antfile="${int.jboss50.dir}/build.xml" target="main"
inheritall="false"/>
+ </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="compile"
depends="init,compile-classes,compile-etc" description="Compile all source
files."/>
+
+ <!-- Compile java sources -->
+ <target name="compile-classes" depends="init">
+ <mkdir dir="${jbws50.output.classes.dir}"/>
+ <javac srcdir="${jbws50.java.dir}" sourcepath=""
destdir="${jbws50.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/jboss50/**"/>
+ <classpath refid="jbws50.integration.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${jbws50.output.etc.dir}"/>
+ <copy todir="${jbws50.output.etc.dir}" filtering="yes"
overwrite="yes">
+ <fileset dir="${jbws50.etc.dir}">
+ <include name="component-info.xml"/>
+ </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="jars" depends="compile,module-jars"
description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" depends="init">
+
+ <!-- Build jbossws-jbws50.jar -->
+ <mkdir dir="${jbws50.output.lib.dir}"/>
+ <jar jarfile="${jbws50.output.lib.dir}/jbossws-jbws50.jar"
manifest="${jbws50.output.etc.dir}/default.mf">
+ <fileset dir="${jbws50.output.classes.dir}">
+ <include name="org/jboss/ws/integration/jboss50/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbossws-context.war -->
+ <war warfile="${jbws50.output.lib.dir}/jbossws-jbws50-context.war"
webxml="${jbws50.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
+ <fileset dir="${jbws50.resources.dir}/jbossws-context.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ </fileset>
+ <webinf dir="${jbws50.resources.dir}/jbossws-context.war/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- Build jbossws50.sar -->
+ <jar jarfile="${jbws50.output.lib.dir}/jbossws-jbws50.sar"
manifest="${jbws50.output.etc.dir}/default.mf">
+ <!-- [JBAS-4379] MC beans deployed twice because of jacc service
+ <fileset dir="${jbws50.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+ -->
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jbossws-core.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/thirdparty">
+ <include name="policy.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="xmlsec.jar"/>
+ </fileset>
+ <metainf dir="${core.dir}/src/main/resources/standard-config">
+ <include name="standard-*-config.xml"/>
+ </metainf>
+ <metainf dir="${jbws50.resources.dir}/jbossws.sar/META-INF">
+ <include name="jbossws-beans.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- Build jbossws50.deployer -->
+ <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-deployer.zip">
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${jbws50.output.lib.dir}">
+ <include name="jbossws-jbws50.jar"/>
+ </fileset>
+ <fileset dir="${jbws50.resources.dir}/jbossws.deployer">
+ <include name="META-INF/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </zip>
+
+ <!-- Build jbossws50-src.zip -->
+ <zip zipfile="${jbws50.output.lib.dir}/jbossws-jbws50-src.zip" >
+ <fileset dir="${jbws50.java.dir}"/>
+ </zip>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans
up most generated files.">
+ <delete dir="${jbws50.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans
up all generated files.">
+ <delete dir="${int.jbws50.dir}/output-tests"/>
+ </target>
+
+ <target name="main" description="Executes the default target
(most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything."
depends="jars"/>
+
+ <target name="all" description="Create a distribution zip file"
depends="most">
+ </target>
+
+</project>
Copied: branches/tdiesler/trunk/integration/jbws-jboss50/src (from rev 3093,
branches/tdiesler/trunk/integration/jboss50/src)
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHook.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,60 +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.jboss50;
-
-//$Id$
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.deployment.DeployerManager;
-
-/**
- * An abstract web service deployer.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public abstract class AbstractDeployerHook implements DeployerHook
-{
- // provide logging
- protected final Logger log = Logger.getLogger(getClass());
-
- protected DeployerManager deployerManager;
-
- public DeployerManager getDeployerManager()
- {
- return deployerManager;
- }
-
- public void setDeployerManager(DeployerManager deploymentManager)
- {
- this.deployerManager = deploymentManager;
- }
-
- /** Return true if this deployment should be ignored
- */
- public boolean ignoreDeployment(DeploymentUnit unit)
- {
- String name = unit.getName();
- return (name.startsWith("jboss:id=") &&
name.indexOf("service=jacc") > 0);
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookEJB.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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.jboss50;
-
-//$Id$
-
-/**
- * An abstract deployer for EJB Endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook
-{
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployerHookJSE.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,44 +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.jboss50;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.metadata.WebMetaData;
-
-//$Id$
-
-/**
- * An abstract deployer for JSE Endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public abstract class AbstractDeployerHookJSE extends ArchiveDeployerHook
-{
- public boolean isWebServiceDeployment(DeploymentUnit unit)
- {
- if (unit.getAttachment(WebMetaData.class) == null)
- return false;
-
- return true;
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/AbstractWebServiceDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,72 +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.jboss50;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.logging.Logger;
-
-//$Id$
-
-/**
- * This deployer that calls the registered DeployerHooks
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Apr-2007
- */
-public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer
-{
- // provide logging
- private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
-
- private List<DeployerHook> deployerHooks = new
LinkedList<DeployerHook>();
-
- public void addDeployerHook(DeployerHook deployer)
- {
- log.debug("Add deployer hook: " + deployer);
- deployerHooks.add(deployer);
- }
-
- public void removeDeployerHook(DeployerHook deployer)
- {
- log.debug("Remove deployer hook: " + deployer);
- deployerHooks.remove(deployer);
- }
-
- @Override
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- for (DeployerHook deployer : deployerHooks)
- deployer.deploy(unit);
- }
-
- @Override
- public void undeploy(DeploymentUnit unit)
- {
- for (DeployerHook deployer : deployerHooks)
- deployer.undeploy(unit);
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,163 +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.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
-import org.jboss.metadata.EjbPortComponentMetaData;
-import org.jboss.metadata.MessageDrivenMetaData;
-import org.jboss.metadata.SessionMetaData;
-import org.jboss.metadata.ApplicationMetaData.WebserviceDescription;
-import org.jboss.metadata.ApplicationMetaData.Webservices;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
-
-/**
- * Build container independent application meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class ApplicationMetaDataAdaptor
-{
- // logging support
- private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptor.class);
-
- public static UnifiedApplicationMetaData
buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit)
- {
- ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class);
- udi.addAttachment(ApplicationMetaData.class, appMetaData);
-
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, appMetaData);
- buildWebservicesMetaData(umd, appMetaData);
- umd.setSecurityDomain(appMetaData.getSecurityDomain());
- return umd;
- }
-
- private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd,
ApplicationMetaData apmd)
- {
- Webservices webservices = apmd.getWebservices();
- if (webservices != null)
- {
- String contextRoot = webservices.getContextRoot();
- umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
-
- List<WebserviceDescription> wsDescriptions =
webservices.getWebserviceDescriptions();
- if (wsDescriptions.size() > 1)
- log.warn("Multiple <webservice-description> elements not
supported");
-
- if (wsDescriptions.size() > 0)
- {
- WebserviceDescription wsd = wsDescriptions.get(0);
- umd.setConfigName(wsd.getConfigName());
- umd.setConfigFile(wsd.getConfigFile());
- }
-
- umd.setWebServiceContextRoot(contextRoot);
- }
- }
-
- private static PublishLocationAdapter getPublishLocationAdpater(final Webservices
webservices)
- {
- return new PublishLocationAdapter()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- String wsdlPublishLocation = null;
- for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
- {
- if (wsd.getDescriptionName().equals(name))
- {
- wsdlPublishLocation = wsd.getWsdlPublishLocation();
- }
- }
- return wsdlPublishLocation;
- }
- };
- }
-
- private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd,
ApplicationMetaData appMetaData)
- {
- List<UnifiedBeanMetaData> beans = new
ArrayList<UnifiedBeanMetaData>();
- Iterator it = appMetaData.getEnterpriseBeans();
- while (it.hasNext())
- {
- BeanMetaData bmd = (BeanMetaData)it.next();
- buildUnifiedBeanMetaData(beans, bmd);
- }
- umd.setEnterpriseBeans(beans);
- }
-
- private static UnifiedBeanMetaData
buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd)
- {
- UnifiedBeanMetaData ubmd = null;
- if (bmd instanceof SessionMetaData)
- {
- ubmd = new UnifiedSessionMetaData();
- }
- else if (bmd instanceof MessageDrivenMetaData)
- {
- ubmd = new UnifiedMessageDrivenMetaData();
-
((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
- }
-
- if (ubmd != null)
- {
- ubmd.setEjbName(bmd.getEjbName());
- ubmd.setEjbClass(bmd.getEjbClass());
- ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
- ubmd.setHome(bmd.getHome());
- ubmd.setLocalHome(bmd.getLocalHome());
- ubmd.setJndiName(bmd.getJndiName());
- ubmd.setLocalJndiName(bmd.getLocalJndiName());
-
- EjbPortComponentMetaData pcmd = bmd.getPortComponent();
- if (pcmd != null)
- {
- UnifiedEjbPortComponentMetaData upcmd = new
UnifiedEjbPortComponentMetaData();
- upcmd.setPortComponentName(pcmd.getPortComponentName());
- upcmd.setPortComponentURI(pcmd.getPortComponentURI());
- upcmd.setAuthMethod(pcmd.getAuthMethod());
- upcmd.setTransportGuarantee(pcmd.getTransportGuarantee());
- upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
- ubmd.setPortComponent(upcmd);
- }
-
- beans.add(ubmd);
- }
- return ubmd;
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptorEJB3.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,167 +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.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.Container;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.SessionContainer;
-import org.jboss.ejb3.mdb.MessagingContainer;
-import org.jboss.ejb3.metamodel.Ejb3PortComponent;
-import org.jboss.ejb3.metamodel.EjbJarDD;
-import org.jboss.ejb3.metamodel.EnterpriseBean;
-import org.jboss.ejb3.metamodel.WebserviceDescription;
-import org.jboss.ejb3.metamodel.Webservices;
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
-
-/**
- * Build container independent application meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 14-Apr-2007
- */
-public class ApplicationMetaDataAdaptorEJB3
-{
- // logging support
- private static Logger log = Logger.getLogger(ApplicationMetaDataAdaptorEJB3.class);
-
- public static UnifiedApplicationMetaData
buildUnifiedApplicationMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit)
- {
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
- udi.addAttachment(Ejb3Deployment.class, ejb3Deployment);
-
- EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class);
- UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData();
- buildUnifiedBeanMetaData(umd, ejb3Deployment);
- buildWebservicesMetaData(umd, jarDD);
- return umd;
- }
-
- private static void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD
jarDD)
- {
- // nothing to do
- if (jarDD == null)
- return;
-
- Webservices webservices = jarDD.getWebservices();
- if (webservices != null)
- {
- String contextRoot = webservices.getContextRoot();
- umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
-
- List<WebserviceDescription> wsDescriptions =
webservices.getWebserviceDescriptions();
- if (wsDescriptions.size() > 1)
- log.warn("Multiple <webservice-description> elements not
supported");
-
- if (wsDescriptions.size() > 0)
- {
- WebserviceDescription wsd = wsDescriptions.get(0);
- umd.setConfigName(wsd.getConfigName());
- umd.setConfigFile(wsd.getConfigFile());
-
- // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1
- // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress
- if (contextRoot == null)
- contextRoot = "/" + wsd.getDescriptionName();
- }
-
- umd.setWebServiceContextRoot(contextRoot);
- }
- }
-
- private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd,
Ejb3Deployment ejb3Deployment)
- {
- List<UnifiedBeanMetaData> ubmdList = new
ArrayList<UnifiedBeanMetaData>();
- Iterator<Container> it =
ejb3Deployment.getEjbContainers().values().iterator();
- while (it.hasNext())
- {
- EJBContainer container = (EJBContainer)it.next();
- UnifiedBeanMetaData ubmd = null;
- if (container instanceof SessionContainer)
- {
- ubmd = new UnifiedSessionMetaData();
- }
- else if (container instanceof MessagingContainer)
- {
- ubmd = new UnifiedMessageDrivenMetaData();
- log.warn("No implemented: initialize MDB destination");
-
//((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination());
- }
-
- if (ubmd != null)
- {
- ubmd.setEjbName(container.getEjbName());
- ubmd.setEjbClass(container.getBeanClassName());
-
- EnterpriseBean bean = container.getXml();
- Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() :
null);
- if (pcMetaData != null)
- {
- UnifiedEjbPortComponentMetaData ejbPortComp = new
UnifiedEjbPortComponentMetaData();
- ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName());
- ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI());
- ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod());
- ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee());
- ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess());
-
- ubmd.setPortComponent(ejbPortComp);
- }
-
- ubmdList.add(ubmd);
- }
- }
- umd.setEnterpriseBeans(ubmdList);
- }
-
- private static PublishLocationAdapter getPublishLocationAdpater(final Webservices
webservices)
- {
- return new PublishLocationAdapter()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- String wsdlPublishLocation = null;
- for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
- {
- if (wsd.getDescriptionName().equals(name))
- {
- wsdlPublishLocation = wsd.getWsdlPublishLocation();
- }
- }
- return wsdlPublishLocation;
- }
- };
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ArchiveDeployerHook.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,150 +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.jboss50;
-
-//$Id$
-
-import java.net.URL;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.WSDeploymentException;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-import org.jboss.ws.integration.jboss50.AbstractDeployerHook;
-import org.jboss.ws.metadata.webservices.WebservicesFactory;
-import org.jboss.ws.metadata.webservices.WebservicesMetaData;
-import org.jboss.ws.utils.DOMUtils;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.w3c.dom.Element;
-
-/**
- * An abstract web service deployer.
- *
- * deploy(unit)
- * if(isWebServiceDeployment)
- * dep = createDeployment(unit)
- * deploy(dep)
- *
- * undeploy(unit)
- * dep = getDeployment(unit)
- * undeploy(dep)
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public abstract class ArchiveDeployerHook extends AbstractDeployerHook
-{
- /** Get the deployemnt type this deployer can handle
- */
- public abstract DeploymentType getDeploymentType();
-
- /** Depending on the type of deployment, this method should return true
- * if the deployment contains web service endpoints.
- */
- public abstract boolean isWebServiceDeployment(DeploymentUnit unit);
-
- /** Create the Deployment for a given DeploymentUnit
- */
- public abstract Deployment createDeployment(DeploymentUnit unit);
-
- /** Get the Deployment for a given DeploymentUnit
- */
- public Deployment getDeployment(DeploymentUnit unit)
- {
- Deployment dep = unit.getAttachment(Deployment.class);
- return (dep != null && dep.getType() == getDeploymentType() ? dep : null);
- }
-
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- if (ignoreDeployment(unit))
- return;
-
- if (isWebServiceDeployment(unit))
- {
- log.debug("deploy: " + unit.getName());
- Deployment dep = getDeployment(unit);
- if (dep == null)
- {
- dep = createDeployment(unit);
- dep.getContext().addAttachment(DeploymentUnit.class, unit);
- }
-
- deployerManager.deploy(dep);
- unit.addAttachment(Deployment.class, dep);
- }
- }
-
- public void undeploy(DeploymentUnit unit)
- {
- if (ignoreDeployment(unit))
- return;
-
- Deployment dep = getDeployment(unit);
- if (dep != null)
- {
- log.debug("undeploy: " + unit.getName());
- deployerManager.undeploy(dep);
- unit.removeAttachment(Deployment.class);
- }
- }
-
- /** Unmrashall the webservices.xml if there is one
- */
- protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit)
- {
- WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class);
- UnifiedVirtualFile vfWebservices = getWebservicesFile(unit);
- if (wsMetaData == null && vfWebservices != null)
- {
- try
- {
- URL wsURL = vfWebservices.toURL();
- Element root = DOMUtils.parse(wsURL.openStream());
- String namespaceURI = root.getNamespaceURI();
- if (
namespaceURI.equals("http://java.sun.com/xml/ns/j2ee"))
- {
- Unmarshaller unmarshaller =
UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WebservicesFactory(wsURL);
- wsMetaData =
(WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null);
- unit.addAttachment(WebservicesMetaData.class, wsMetaData);
- }
- }
- catch (Exception ex)
- {
- throw new WSDeploymentException(ex);
- }
- }
- return wsMetaData;
- }
-
- private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
- {
- VirtualFile vf = unit.getMetaDataFile("webservices.xml");
- return (vf != null ? new VirtualFileAdaptor(vf) : null);
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeployerHook.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,40 +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.jboss50;
-
-//$Id$
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-
-/**
- * An interface for all web service deployer hooks
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Apr-2007
- */
-public interface DeployerHook
-{
- void deploy(DeploymentUnit unit) throws DeploymentException;
-
- void undeploy(DeploymentUnit unit);
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdapter.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,100 +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.jboss50;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-
-// $Id$
-
-/**
- * Build container independent deployment info.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class DeploymentInfoAdapter
-{
- // logging support
- private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class);
-
- public static void buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentUnit
unit)
- {
- udi.addAttachment(DeploymentUnit.class, unit);
-
- try
- {
- if (unit.getDeploymentContext().getParent() != null)
- {
- udi.parent = new UnifiedDeploymentInfo(null);
- buildDeploymentInfo(udi.parent,
unit.getDeploymentContext().getParent().getDeploymentUnit());
- }
-
- udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
-
- udi.name = unit.getName();
- udi.simpleName = unit.getSimpleName();
- udi.url = udi.vfRoot.toURL();
-
- buildMetaData(udi, unit);
-
- // Since we create temporary classes, we need to create a delegate loader
- // This prevents CCE problems where the parent loader is available at deploy
time,
- // and a child loader is available at start time.
- udi.classLoader = new URLClassLoader(new URL[] {}, unit.getClassLoader());
-
- log.debug("UnifiedDeploymentInfo:\n" + udi);
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new IllegalStateException(ex);
- }
- }
-
- private static void buildMetaData(UnifiedDeploymentInfo udi, DeploymentUnit unit)
throws Exception
- {
- if (unit.getAttachment(Ejb3Deployment.class) != null)
- {
- udi.metaData =
ApplicationMetaDataAdaptorEJB3.buildUnifiedApplicationMetaData(udi, unit);
- }
- else if (unit.getAttachment(ApplicationMetaData.class) != null)
- {
- udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData(udi,
unit);
- }
- else if (unit.getAttachment(WebMetaData.class) != null)
- {
- udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData(udi, unit);
- udi.webappURL = udi.vfRoot.toURL();
- }
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookEJB21.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,116 +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.jboss50;
-
-//$Id$
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
-import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.BasicEndpoint;
-import org.jboss.ws.integration.Service;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-import org.jboss.ws.metadata.webservices.PortComponentMetaData;
-import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
-import org.jboss.ws.metadata.webservices.WebservicesMetaData;
-import org.jboss.ws.utils.ObjectNameFactory;
-
-/**
- * A deployer JAXRPC EJB21 Endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHookEJB
-{
- /** Get the deployemnt type this deployer can handle
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXRPC_EJB21;
- }
-
- @Override
- public Deployment createDeployment(DeploymentUnit unit)
- {
- Deployment dep = new BasicDeploymentImpl();
- dep.setType(getDeploymentType());
- dep.setClassLoader(unit.getClassLoader());
-
- Service service = dep.getService();
-
- ApplicationMetaData appmd = unit.getAttachment(ApplicationMetaData.class);
- if (appmd == null)
- throw new IllegalStateException("Deployment unit does not contain
application meta data");
-
- WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
- if (wsMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain
webservices meta data");
-
- // Copy the attachments
- dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData);
- dep.getContext().addAttachment(ApplicationMetaData.class, appmd);
-
- for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
- {
- for (PortComponentMetaData pcmd : wsd.getPortComponents())
- {
- String ejbLink = pcmd.getEjbLink();
- if (ejbLink == null)
- throw new IllegalStateException("ejb-link cannot be null");
-
- BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink);
- if (beanMetaData == null)
- throw new IllegalStateException("Cannot obtain bean meta data for:
" + ejbLink);
-
- String ejbClass = beanMetaData.getEjbClass();
- try
- {
- ClassLoader loader = unit.getClassLoader();
- Class<?> epBean = loader.loadClass(ejbClass.trim());
-
- // Create the endpoint
- Endpoint endpoint = new BasicEndpoint(service, epBean);
- String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbLink;
- endpoint.setName(ObjectNameFactory.create(nameStr));
-
- service.addEndpoint(endpoint);
- }
- catch (ClassNotFoundException ex)
- {
- log.warn("Cannot load servlet class: " + ejbClass);
- }
- }
- }
- return dep;
- }
-
- @Override
- public boolean isWebServiceDeployment(DeploymentUnit unit)
- {
- WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
- return wsMetaData != null &&
unit.getAllMetaData(ApplicationMetaData.class).size() > 0;
- }
-}
\ No newline at end of file
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerHookJSE.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,133 +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.jboss50;
-
-//$Id$
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.metadata.web.Servlet;
-import org.jboss.ws.integration.BasicEndpoint;
-import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.Service;
-import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-import org.jboss.ws.metadata.webservices.PortComponentMetaData;
-import org.jboss.ws.metadata.webservices.WebserviceDescriptionMetaData;
-import org.jboss.ws.metadata.webservices.WebservicesMetaData;
-import org.jboss.ws.utils.ObjectNameFactory;
-
-/**
- * A deployer JAXRPC JSE Endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class JAXRPCDeployerHookJSE extends AbstractDeployerHookJSE
-{
- /** Get the deployemnt type this deployer can handle
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXRPC_JSE;
- }
-
- /**
- * Create an endpoint for every servlet-link in webservices.xml
- */
- @Override
- public Deployment createDeployment(DeploymentUnit unit)
- {
- Deployment dep = new BasicDeploymentImpl();
- dep.setType(getDeploymentType());
- dep.setClassLoader(unit.getClassLoader());
-
- Service service = dep.getService();
-
- WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
- if (webMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain web meta
data");
-
- WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
- if (wsMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain
webservices meta data");
-
- // Copy the attachments
- dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData);
- dep.getContext().addAttachment(WebMetaData.class, webMetaData);
-
- for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
- {
- for (PortComponentMetaData pcmd : wsd.getPortComponents())
- {
- String servletLink = pcmd.getServletLink();
- if (servletLink == null)
- throw new IllegalStateException("servlet-link cannot be null");
-
- Servlet servlet = getServletForName(webMetaData, servletLink);
- String servletClass = servlet.getServletClass();
-
- try
- {
- ClassLoader loader = unit.getClassLoader();
- Class<?> epBean = loader.loadClass(servletClass.trim());
-
- // Create the endpoint
- Endpoint endpoint = new BasicEndpoint(service, epBean);
- String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletLink;
- endpoint.setName(ObjectNameFactory.create(nameStr));
-
- service.addEndpoint(endpoint);
- }
- catch (ClassNotFoundException ex)
- {
- log.warn("Cannot load servlet class: " + servletClass);
- }
- }
- }
-
- return dep;
- }
-
- private Servlet getServletForName(WebMetaData wmd, String servletLink)
- {
- for (Servlet servlet : wmd.getServlets())
- {
- if (servletLink.equals(servlet.getName()))
- {
- return servlet;
- }
- }
- throw new IllegalStateException("Cannot find servlet for link: " +
servletLink);
- }
-
- @Override
- public boolean isWebServiceDeployment(DeploymentUnit unit)
- {
- if (super.isWebServiceDeployment(unit) == false)
- return false;
-
- WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
- return wsMetaData != null;
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookEJB3.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,129 +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.jboss50;
-
-//$Id$
-
-import java.util.Iterator;
-
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceProvider;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.ejb3.stateless.StatelessContainer;
-import org.jboss.ws.integration.BasicEndpoint;
-import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.Service;
-import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-import org.jboss.ws.utils.ObjectNameFactory;
-
-/**
- * A deployer JAXWS EJB3 Endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class JAXWSDeployerHookEJB3 extends AbstractDeployerHookEJB
-{
- /** Get the deployemnt type this deployer can handle
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXWS_EJB3;
- }
-
- @Override
- public Deployment createDeployment(DeploymentUnit unit)
- {
- Deployment dep = new BasicDeploymentImpl();
- dep.setType(getDeploymentType());
- dep.setClassLoader(unit.getClassLoader());
-
- Service service = dep.getService();
-
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
- if (ejb3Deployment == null)
- throw new IllegalStateException("Deployment unit does not contain ejb3
deployment");
-
- // Copy the attachments
- dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment);
-
- Iterator it = ejb3Deployment.getEjbContainers().values().iterator();
- while (it.hasNext())
- {
- EJBContainer container = (EJBContainer)it.next();
- if (isWebServiceBean(container))
- {
- String ejbName = container.getEjbName();
- Class epBean = container.getBeanClass();
-
- // Create the endpoint
- Endpoint endpoint = new BasicEndpoint(service, epBean);
- String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ejbName;
- endpoint.setName(ObjectNameFactory.create(nameStr));
-
- service.addEndpoint(endpoint);
- }
- }
-
- return dep;
- }
-
- @Override
- public boolean isWebServiceDeployment(DeploymentUnit unit)
- {
- Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
- if (ejb3Deployment == null)
- return false;
-
- boolean isWebServiceDeployment = false;
-
- Iterator it = ejb3Deployment.getEjbContainers().values().iterator();
- while (it.hasNext())
- {
- EJBContainer container = (EJBContainer)it.next();
- if (isWebServiceBean(container))
- {
- isWebServiceDeployment = true;
- break;
- }
- }
-
- return isWebServiceDeployment;
- }
-
- private boolean isWebServiceBean(EJBContainer container)
- {
- boolean isWebServiceBean = false;
- if (container instanceof StatelessContainer)
- {
- boolean isWebService = container.resolveAnnotation(WebService.class) != null;
- boolean isWebServiceProvider =
container.resolveAnnotation(WebServiceProvider.class) != null;
- isWebServiceBean = isWebService || isWebServiceProvider;
- }
- return isWebServiceBean;
- }
-}
\ No newline at end of file
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerHookJSE.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,150 +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.jboss50;
-
-//$Id$
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceProvider;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.metadata.web.Servlet;
-import org.jboss.ws.integration.BasicEndpoint;
-import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.Service;
-import org.jboss.ws.integration.deployment.BasicDeploymentImpl;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-import org.jboss.ws.utils.ObjectNameFactory;
-
-/**
- * A deployer JAXWS JSE Endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class JAXWSDeployerHookJSE extends AbstractDeployerHookJSE
-{
- /** Get the deployemnt type this deployer can handle
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXWS_JSE;
- }
-
- @Override
- public Deployment createDeployment(DeploymentUnit unit)
- {
- Deployment dep = new BasicDeploymentImpl();
- dep.setType(getDeploymentType());
- dep.setClassLoader(unit.getClassLoader());
-
- Service service = dep.getService();
-
- WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
- if (webMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain web meta
data");
-
- // Copy the attachments
- dep.getContext().addAttachment(WebMetaData.class, webMetaData);
-
- List<Servlet> servlets = getRelevantServlets(webMetaData,
unit.getClassLoader());
- for (Servlet servlet : servlets)
- {
- String servletName = servlet.getName();
- String servletClass = servlet.getServletClass();
-
- try
- {
- ClassLoader loader = unit.getClassLoader();
- Class<?> epBean = loader.loadClass(servletClass.trim());
-
- // Create the endpoint
- Endpoint endpoint = new BasicEndpoint(service, epBean);
- String nameStr = Endpoint.SEPID_DOMAIN + ":" +
Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName;
- endpoint.setName(ObjectNameFactory.create(nameStr));
-
- service.addEndpoint(endpoint);
- }
- catch (ClassNotFoundException ex)
- {
- log.warn("Cannot load servlet class: " + servletClass);
- continue;
- }
- }
-
- return dep;
- }
-
- @Override
- public boolean isWebServiceDeployment(DeploymentUnit unit)
- {
- if (super.isWebServiceDeployment(unit) == false)
- return false;
-
- boolean isWebServiceDeployment = false;
- try
- {
- WebMetaData webMetaData = unit.getAttachment(WebMetaData.class);
- List<Servlet> servlets = getRelevantServlets(webMetaData,
unit.getClassLoader());
- isWebServiceDeployment = servlets.size() > 0;
- }
- catch (Exception ex)
- {
- log.error("Cannot process web deployment", ex);
- }
-
- return isWebServiceDeployment;
- }
-
- private List<Servlet> getRelevantServlets(WebMetaData webMetaData, ClassLoader
loader)
- {
- List<Servlet> servlets = new ArrayList<Servlet>();
- for (Servlet servlet : webMetaData.getServlets())
- {
- String servletClassName = servlet.getServletClass();
-
- // Skip JSPs
- if (servletClassName == null || servletClassName.length() == 0)
- continue;
-
- try
- {
- Class<?> servletClass = loader.loadClass(servletClassName.trim());
- boolean isWebService = servletClass.isAnnotationPresent(WebService.class);
- boolean isWebServiceProvider =
servletClass.isAnnotationPresent(WebServiceProvider.class);
- if (isWebService || isWebServiceProvider)
- servlets.add(servlet);
- }
- catch (ClassNotFoundException ex)
- {
- log.warn("Cannot load servlet class: " + servletClassName);
- continue;
- }
- }
- return servlets;
- }
-}
\ No newline at end of file
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/MainDeployerHook.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,62 +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.jboss50;
-
-//$Id$
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.jboss50.AbstractDeployerHook;
-
-/**
- * A basic hook that delegates a deployment manger.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class MainDeployerHook extends AbstractDeployerHook
-{
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- if (ignoreDeployment(unit))
- return;
-
- Deployment dep = unit.getAttachment(Deployment.class);
- if (dep != null)
- {
- deployerManager.deploy(dep);
- }
- }
-
- public void undeploy(DeploymentUnit unit)
- {
- if (ignoreDeployment(unit))
- return;
-
- Deployment dep = unit.getAttachment(Deployment.class);
- if (dep != null)
- {
- deployerManager.undeploy(dep);
- }
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfig.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,76 +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.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.integration.management.BasicServerConfig;
-
-/**
- * A Service Endpoint Registry
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-May-2007
- */
-public class ManagedServerConfig extends BasicServerConfig implements
ManagedServerConfigMBean
-{
- // provide logging
- private static final Logger log = Logger.getLogger(ManagedServerConfig.class);
-
- public void create() throws Exception
- {
- log.debug("WebServiceHost: " + getWebServiceHost());
- log.debug("WebServicePort: " + getWebServicePort());
- log.debug("WebServiceSecurePort: " + getWebServiceSecurePort());
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.registerMBean(this, OBJECT_NAME);
- }
- }
-
- public void destroy() throws Exception
- {
- MBeanServer server = getMBeanServer();
- if (server != null)
- {
- server.unregisterMBean(OBJECT_NAME);
- }
- }
-
- private MBeanServer getMBeanServer()
- {
- MBeanServer server = null;
- ArrayList servers = MBeanServerFactory.findMBeanServer(null);
- if (servers.size() > 0)
- {
- server = (MBeanServer)servers.get(0);
- }
- return server;
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ManagedServerConfigMBean.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,32 +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.jboss50;
-
-import org.jboss.ws.integration.management.ServerConfig;
-
-/**
- * MBean interface.
- * @since 15-April-2004
- */
-public interface ManagedServerConfigMBean extends ServerConfig
-{
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedDeploymentInfoDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,69 +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.jboss50;
-
-//$Id$
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ws.integration.deployment.AbstractDeployer;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.JAXRPCDeployment;
-import org.jboss.ws.integration.deployment.JAXWSDeployment;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.integration.deployment.Deployment.DeploymentType;
-import org.jboss.ws.metadata.webservices.WebservicesMetaData;
-
-/**
- * A deployer that builds the UnifiedDeploymentInfo
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class UnifiedDeploymentInfoDeployer extends AbstractDeployer
-{
- @Override
- public void create(Deployment dep)
- {
- UnifiedDeploymentInfo udi =
dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- {
- DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class);
- if (unit == null)
- throw new IllegalStateException("Cannot obtain deployment unit");
-
- DeploymentType type = dep.getType();
- if (type.toString().startsWith("JAXWS"))
- {
- udi = new JAXWSDeployment(type);
- DeploymentInfoAdapter.buildDeploymentInfo(udi, unit);
- }
- else
- {
- WebservicesMetaData wsMetaData =
dep.getContext().getAttachment(WebservicesMetaData.class);
- udi = new JAXRPCDeployment(type, wsMetaData);
- DeploymentInfoAdapter.buildDeploymentInfo(udi, unit);
- }
-
- dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi);
- }
- }
-}
\ No newline at end of file
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,66 +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.jboss50;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-
-// $Id$
-
-/**
- * A JBoss50 VirtualFile adaptor
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class VirtualFileAdaptor implements UnifiedVirtualFile
-{
- private static final long serialVersionUID = 6547394037548338042L;
-
- private VirtualFile root;
-
- public VirtualFileAdaptor(VirtualFile root)
- {
- this.root = root;
- }
-
- public UnifiedVirtualFile findChild(String child) throws IOException
- {
- VirtualFile vf = root.findChild(child);
- return new VirtualFileAdaptor(vf);
- }
-
- public URL toURL()
- {
- try
- {
- return root.toURL();
- }
- catch (Exception e)
- {
- return null;
- }
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,136 +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.jboss50;
-
-// $Id$
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.metadata.WebSecurityMetaData;
-import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
-import org.jboss.metadata.web.Servlet;
-import org.jboss.metadata.web.ServletMapping;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
-import
org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
-
-/**
- * Build container independent web meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class WebMetaDataAdaptor
-{
- public static UnifiedWebMetaData buildUnifiedWebMetaData(UnifiedDeploymentInfo udi,
DeploymentUnit unit)
- {
- WebMetaData wmd = unit.getAttachment(WebMetaData.class);
- udi.addAttachment(WebMetaData.class, wmd);
-
- UnifiedWebMetaData umd = new UnifiedWebMetaData();
- umd.setContextRoot(wmd.getContextRoot());
- umd.setServletMappings(getServletMappings(wmd));
- umd.setServletClassNames(getServletClassMap(wmd));
- umd.setConfigName(wmd.getConfigName());
- umd.setConfigFile(wmd.getConfigFile());
- umd.setSecurityDomain(wmd.getSecurityDomain());
- umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
- umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
-
- return umd;
- }
-
- private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData
wmd)
- {
- return new PublishLocationAdapter()
- {
- public String getWsdlPublishLocationByName(String name)
- {
- return wmd.getWsdlPublishLocationByName(name);
- }
- };
- }
-
- protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final
Iterator securityConstraints)
- {
- ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new
ArrayList<UnifiedWebSecurityMetaData>();
-
- while (securityConstraints.hasNext())
- {
- WebSecurityMetaData securityMetaData =
(WebSecurityMetaData)securityConstraints.next();
-
- UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData();
- unifiedsecurityMetaData.add(current);
-
- current.setTransportGuarantee(securityMetaData.getTransportGuarantee());
-
- Map<String, WebResourceCollection> resources =
securityMetaData.getWebResources();
- for (WebResourceCollection webResource : resources.values())
- {
- UnifiedWebResourceCollection currentResource =
current.addWebResource(webResource.getName());
- for (String currentPattern : webResource.getUrlPatterns())
- {
- currentResource.addPattern(currentPattern);
- }
- }
- }
-
- return unifiedsecurityMetaData;
- }
-
- private static Map<String, String> getServletMappings(WebMetaData wmd)
- {
- Map<String, String> mappings = new HashMap<String, String>();
- Iterator it = wmd.getServletMappings().iterator();
- while (it.hasNext())
- {
- ServletMapping sm = (ServletMapping)it.next();
- // FIXME - Add support for multiple mappings
- mappings.put(sm.getName(), sm.getUrlPatterns().get(0));
- }
- return mappings;
- }
-
- private static Map<String, String> getServletClassMap(WebMetaData wmd)
- {
- Map<String, String> mappings = new HashMap<String, String>();
- Iterator it = wmd.getServlets().iterator();
- while (it.hasNext())
- {
- Servlet servlet = (Servlet)it.next();
- // Skip JSPs
- if (servlet.getServletClass() == null || servlet.getServletClass().length() ==
0)
- continue;
-
- mappings.put(servlet.getName(), servlet.getServletClass());
- }
- return mappings;
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerEJB.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,53 +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.jboss50;
-
-//$Id$
-
-/**
- * This web service deployer for EJB
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Apr-2007
- */
-public class WebServiceDeployerEJB extends AbstractWebServiceDeployer
-{
- private int relOrderEJB2x;
- private int relOrderEJB3;
-
- public void setRelOrderEJB2x(int relOrderEJB2x)
- {
- this.relOrderEJB2x = relOrderEJB2x;
- }
-
- public void setRelOrderEJB3(int relOrderEJB3)
- {
- this.relOrderEJB3 = relOrderEJB3;
- }
-
- @Override
- public int getRelativeOrder()
- {
- return Math.max(relOrderEJB2x, relOrderEJB3) + 1;
- }
-
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceDeployerJSE.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,46 +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.jboss50;
-
-//$Id$
-
-/**
- * This web service deployer for JSE
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Apr-2007
- */
-public class WebServiceDeployerJSE extends AbstractWebServiceDeployer
-{
- private int relOrderWar;
-
- public void setRelOrderWar(int relOrderWar)
- {
- this.relOrderWar = relOrderWar;
- }
-
- @Override
- public int getRelativeOrder()
- {
- return relOrderWar - 1;
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceMainDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,52 +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.jboss50;
-
-//$Id$
-
-/**
- * The main web service deployer
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Apr-2007
- */
-public class WebServiceMainDeployer extends AbstractWebServiceDeployer
-{
- private int relOrderJSE;
- private int relOrderEJB;
-
- public void setRelOrderEJB(int relOrderEJB)
- {
- this.relOrderEJB = relOrderEJB;
- }
-
- public void setRelOrderJSE(int relOrderJSE)
- {
- this.relOrderJSE = relOrderJSE;
- }
-
- @Override
- public int getRelativeOrder()
- {
- return Math.max(relOrderEJB, relOrderJSE) + 1;
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ModifyWebMetaDataDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,113 +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.jboss50.jbossws;
-
-//$Id$
-
-import java.util.Iterator;
-
-import org.jboss.metadata.NameValuePair;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.metadata.web.Servlet;
-import org.jboss.ws.core.deployment.ServiceEndpointPublisher;
-import org.jboss.ws.core.utils.JavaUtils;
-import org.jboss.ws.integration.Endpoint;
-import org.jboss.ws.integration.deployment.AbstractDeployer;
-import org.jboss.ws.integration.deployment.Deployment;
-
-/**
- * A deployer that modifies the web.xml meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class ModifyWebMetaDataDeployer extends AbstractDeployer
-{
- private ServiceEndpointPublisher serviceEndpointPublisher;
-
- public void setServiceEndpointPublisher(ServiceEndpointPublisher
serviceEndpointPublisher)
- {
- this.serviceEndpointPublisher = serviceEndpointPublisher;
- }
-
- @Override
- public void create(Deployment dep)
- {
- WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class);
- if (webMetaData != null)
- {
- for (Servlet servlet : webMetaData.getServlets())
- {
- String orgServletClass = servlet.getServletClass();
-
- // JSP
- if (orgServletClass == null || orgServletClass.length() == 0)
- {
- log.debug("Innore servlet class: " + orgServletClass);
- continue;
- }
-
- // Nothing to do if we have an <init-param>
- if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass,
dep.getClassLoader()))
- {
- servlet.setServletClass(serviceEndpointPublisher.getServletClass());
- NameValuePair initParam = new
NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass);
- servlet.addInitParam(initParam);
- }
- }
- }
- }
-
- private boolean isJavaxServlet(String orgServletClass, ClassLoader loader)
- {
- boolean isServlet = false;
- if (loader != null)
- {
- try
- {
- Class servletClass = loader.loadClass(orgServletClass);
- isServlet = JavaUtils.isAssignableFrom(javax.servlet.Servlet.class,
servletClass);
- if (isServlet == true)
- {
- log.info("Ignore servlet: " + orgServletClass);
- }
- }
- catch (ClassNotFoundException e)
- {
- log.warn("Cannot load servlet class: " + orgServletClass);
- }
- }
- return isServlet;
- }
-
- private boolean isAlreadyModified(Servlet servlet)
- {
- Iterator itParams = servlet.getInitParams().iterator();
- while (itParams.hasNext())
- {
- NameValuePair pair = (NameValuePair)itParams.next();
- if (Endpoint.SEPID_DOMAIN_ENDPOINT.equals(pair.getName()))
- return true;
- }
- return false;
- }
-}
\ No newline at end of file
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/SecurityAssociationAdaptorFactoryImpl.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,57 +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.jboss50.jbossws;
-
-// $Id$
-
-import java.security.Principal;
-
-import org.jboss.security.SecurityAssociation;
-import org.jboss.ws.extensions.security.SecurityAssociationAdaptor;
-import org.jboss.ws.extensions.security.SecurityAssociationAdaptorFactory;
-
-/**
- * A JBoss specific SecurityAdaptorFactory
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class SecurityAssociationAdaptorFactoryImpl implements
SecurityAssociationAdaptorFactory
-{
- public SecurityAssociationAdaptor getSecurityAssociationAdaptor()
- {
- return new SecurityAccociationAdaptorImpl();
- }
-
- public class SecurityAccociationAdaptorImpl implements SecurityAssociationAdaptor
- {
- public void setPrincipal(Principal pricipal)
- {
- SecurityAssociation.setPrincipal(pricipal);
- }
-
- public void setCredential(Object credential)
- {
- SecurityAssociation.setCredential(credential);
- }
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB21.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,70 +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.jboss50.jbossws;
-
-//$Id$
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.AssemblyDescriptorMetaData;
-import org.jboss.ws.core.server.ServiceEndpointGeneratorEJB;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.utils.DOMUtils;
-import org.w3c.dom.Element;
-
-/**
- * Generate a service endpoint deployment for EJB endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class ServiceEndpointGeneratorEJB21 extends ServiceEndpointGeneratorEJB
-{
- // logging support
- protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB21.class);
-
- /** Add the roles from ejb-jar.xml to the security roles
- */
- protected void addEJBSecurityRoles(Element webApp, UnifiedDeploymentInfo udi)
- {
- // Fix:
http://jira.jboss.org/jira/browse/JBWS-309
- ApplicationMetaData applMetaData =
(ApplicationMetaData)udi.getAttachment(ApplicationMetaData.class);
- AssemblyDescriptorMetaData assemblyDescriptor =
applMetaData.getAssemblyDescriptor();
- if (assemblyDescriptor != null)
- {
- Map securityRoles = assemblyDescriptor.getSecurityRoles();
- if (securityRoles != null)
- {
- Iterator it = securityRoles.keySet().iterator();
- while (it.hasNext())
- {
- Element securityRole =
(Element)webApp.appendChild(DOMUtils.createElement("security-role"));
- Element roleName =
(Element)securityRole.appendChild(DOMUtils.createElement("role-name"));
- roleName.appendChild(DOMUtils.createTextNode((String)it.next()));
- }
- }
- }
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/ServiceEndpointGeneratorEJB3.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,73 +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.jboss50.jbossws;
-
-//$Id$
-
-import java.util.Iterator;
-
-import javax.annotation.security.RolesAllowed;
-
-import org.jboss.ejb3.EJBContainer;
-import org.jboss.ejb3.Ejb3Deployment;
-import org.jboss.logging.Logger;
-import org.jboss.ws.core.server.ServiceEndpointGeneratorEJB;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.utils.DOMUtils;
-import org.w3c.dom.Element;
-
-/**
- * Generate a service endpoint deployment for EJB endpoints
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class ServiceEndpointGeneratorEJB3 extends ServiceEndpointGeneratorEJB
-{
- // logging support
- protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB3.class);
-
- /** Add the roles from ejb-jar.xml to the security roles
- */
- protected void addEJBSecurityRoles(Element webApp, UnifiedDeploymentInfo udi)
- {
- Ejb3Deployment ejb3Deployment = udi.getAttachment(Ejb3Deployment.class);
- if (ejb3Deployment != null)
- {
- Iterator it = ejb3Deployment.getEjbContainers().values().iterator();
- while (it.hasNext())
- {
- EJBContainer container = (EJBContainer)it.next();
- RolesAllowed anRolesAllowed =
(RolesAllowed)container.resolveAnnotation(RolesAllowed.class);
- if (anRolesAllowed != null)
- {
- for (String role : anRolesAllowed.value())
- {
- Element securityRole =
(Element)webApp.appendChild(DOMUtils.createElement("security-role"));
- Element roleName =
(Element)securityRole.appendChild(DOMUtils.createElement("role-name"));
- roleName.appendChild(DOMUtils.createTextNode(role));
- }
- }
- }
- }
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppDeployerDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,138 +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.jboss50.jbossws;
-
-// $Id$
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.deployers.plugins.structure.AbstractDeploymentContext;
-import org.jboss.deployers.spi.deployment.MainDeployer;
-import org.jboss.deployers.spi.structure.DeploymentContext;
-import org.jboss.deployers.spi.structure.DeploymentState;
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.ws.core.deployment.ServiceEndpointPublisher;
-import org.jboss.ws.integration.deployment.Deployer;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.integration.deployment.WSDeploymentException;
-
-/**
- * Publish the HTTP service endpoint to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class WebAppDeployerDeployer implements Deployer
-{
- // provide logging
- private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class);
-
- private MainDeployer mainDeployer;
- private ServiceEndpointPublisher serviceEndpointPublisher;
- private Map<String, DeploymentContext> contextMap = new HashMap<String,
DeploymentContext>();
-
- public void setMainDeployer(MainDeployer mainDeployer)
- {
- this.mainDeployer = mainDeployer;
- }
-
- public void setServiceEndpointPublisher(ServiceEndpointPublisher
serviceEndpointPublisher)
- {
- this.serviceEndpointPublisher = serviceEndpointPublisher;
- }
-
- public void create(Deployment dep)
- {
- UnifiedDeploymentInfo udi =
dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement
info");
-
- URL warURL = udi.webappURL;
-
- log.debug("publishServiceEndpoint: " + warURL);
- try
- {
- serviceEndpointPublisher.rewriteWebXml(udi);
- DeploymentContext context = createDeploymentContext(warURL);
-
- mainDeployer.addDeploymentContext(context);
- mainDeployer.process();
-
- contextMap.put(warURL.toExternalForm(), context);
- }
- catch (Exception ex)
- {
- WSDeploymentException.rethrow(ex);
- }
- }
-
- public void destroy(Deployment dep)
- {
- UnifiedDeploymentInfo udi =
dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement
info");
-
- URL warURL = udi.webappURL;
- if (warURL == null)
- {
- log.error("Cannot obtain warURL for: " + udi.name);
- return;
- }
-
- log.debug("destroyServiceEndpoint: " + warURL);
- try
- {
- DeploymentContext context = contextMap.get(warURL.toExternalForm());
- if (context != null)
- {
- context.setState(DeploymentState.UNDEPLOYING);
- mainDeployer.process();
- mainDeployer.removeDeploymentContext(context.getName());
-
- contextMap.remove(warURL.toExternalForm());
- }
- }
- catch (Exception ex)
- {
- WSDeploymentException.rethrow(ex);
- }
- }
-
- private DeploymentContext createDeploymentContext(URL warURL) throws Exception
- {
- VirtualFile file = VFS.getRoot(warURL);
- return new AbstractDeploymentContext(file);
- }
-
- public void start(Deployment dep)
- {
- }
-
- public void stop(Deployment dep)
- {
- }
-}
Deleted:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/java/org/jboss/ws/integration/jboss50/jbossws/WebAppGeneratorDeployer.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,61 +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.jboss50.jbossws;
-
-//$Id$
-
-import org.jboss.ws.integration.deployment.AbstractDeployer;
-import org.jboss.ws.integration.deployment.Deployment;
-import org.jboss.ws.integration.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-
-/**
- * A deployer that generates a webapp for an EJB endpoint
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class WebAppGeneratorDeployer extends AbstractDeployer
-{
- @Override
- public void create(Deployment dep)
- {
- UnifiedDeploymentInfo udi =
dep.getContext().getAttachment(UnifiedDeploymentInfo.class);
- if (udi == null)
- throw new IllegalStateException("Cannot obtain unified deployement
info");
-
- UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class);
- if (umd == null)
- throw new IllegalStateException("Cannot obtain unified meta data");
-
- if (dep.getType().toString().endsWith("EJB21"))
- {
- ServiceEndpointGeneratorEJB21 generator = new ServiceEndpointGeneratorEJB21();
- udi.webappURL = generator.generatWebDeployment(umd, udi);
- }
- else if (dep.getType().toString().endsWith("EJB3"))
- {
- ServiceEndpointGeneratorEJB3 generator = new ServiceEndpointGeneratorEJB3();
- udi.webappURL = generator.generatWebDeployment(umd, udi);
- }
- }
-}
\ No newline at end of file
Modified:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -5,7 +5,7 @@
<!--
A web service deployer that hooks in after the EJB deployers
-->
- <bean name="WebServiceDeployerEJB"
class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerEJB">
+ <bean name="WebServiceDeployerEJB"
class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB">
<property name="relOrderEJB2x"><inject
bean="EJB2xDeployer" property="relativeOrder"/></property>
<property name="relOrderEJB3"><inject
bean="EJBRegistrationDeployer"
property="relativeOrder"/></property>
<install bean="MainDeployer" method="addDeployer">
@@ -25,7 +25,7 @@
<!--
A web service deployer that hooks in before the WAR deployer
-->
- <bean name="WebServiceDeployerJSE"
class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerJSE">
+ <bean name="WebServiceDeployerJSE"
class="org.jboss.ws.integration.jboss50.WebServiceDeployerJSE">
<property name="relOrderWar"><inject bean="WarDeployer"
property="relativeOrder"/></property>
<install bean="MainDeployer" method="addDeployer">
<parameter>
@@ -43,7 +43,7 @@
<!--
A web service deployer that hooks in after the web service WAR/EJB deployers
-->
- <bean name="WebServiceMainDeployer"
class="org.jboss.ws.integration.jboss50.common.WebServiceMainDeployer">
+ <bean name="WebServiceMainDeployer"
class="org.jboss.ws.integration.jboss50.WebServiceMainDeployer">
<property name="relOrderJSE"><inject
bean="WebServiceDeployerJSE"
property="relativeOrder"/></property>
<property name="relOrderEJB"><inject
bean="WebServiceDeployerEJB"
property="relativeOrder"/></property>
<install bean="MainDeployer" method="addDeployer">
Modified:
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
===================================================================
---
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/jbws-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig"
class="org.jboss.ws.integration.jboss50.common.ManagedServerConfig">
+ <bean name="WSServerConfig"
class="org.jboss.ws.integration.jboss50.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.
@@ -150,7 +150,7 @@
<property name="serviceEndpointPublisher"><inject
bean="WSServiceEndpointPublisher"/></property>
</bean>
<bean name="WSPublishContractDeployer"
class="org.jboss.ws.core.deployment.PublishContractDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer"
class="org.jboss.ws.integration.jboss50.common.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer"
class="org.jboss.ws.integration.jboss50.UnifiedDeploymentInfoDeployer"/>
<bean name="WSUnifiedMetaDataAssociationDeployer"
class="org.jboss.ws.core.deployment.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer"
class="org.jboss.ws.core.deployment.UnifiedMetaDataDeployer"/>
<bean name="WSWebAppGeneratorDeployer"
class="org.jboss.ws.integration.jboss50.jbossws.WebAppGeneratorDeployer"/>
@@ -167,7 +167,7 @@
<!--
Register DeployerHooks with JBoss deployers
-->
- <bean name="WSDeployerHook_JAXRPC_JSE"
class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookJSE">
+ <bean name="WSDeployerHook_JAXRPC_JSE"
class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookJSE">
<property name="deployerManager"><inject
bean="WSDeployerManagerJSE"/></property>
<install bean="WebServiceDeployerJSE"
method="addDeployerHook">
<parameter>
@@ -181,7 +181,7 @@
</uninstall>
<depends>WebServiceDeployerJSE</depends>
</bean>
- <bean name="WSDeployerHook_JAXRPC_EJB21"
class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookEJB21">
+ <bean name="WSDeployerHook_JAXRPC_EJB21"
class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookEJB21">
<property name="deployerManager"><inject
bean="WSDeployerManagerEJB"/></property>
<install bean="WebServiceDeployerEJB"
method="addDeployerHook">
<parameter>
@@ -195,7 +195,7 @@
</uninstall>
<depends>WebServiceDeployerEJB</depends>
</bean>
- <bean name="WSDeployerHook_JAXWS_JSE"
class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookJSE">
+ <bean name="WSDeployerHook_JAXWS_JSE"
class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookJSE">
<property name="deployerManager"><inject
bean="WSDeployerManagerJSE"/></property>
<install bean="WebServiceDeployerJSE"
method="addDeployerHook">
<parameter>
@@ -209,7 +209,7 @@
</uninstall>
<depends>WebServiceDeployerJSE</depends>
</bean>
- <bean name="WSDeployerHook_JAXWS_EJB3"
class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookEJB3">
+ <bean name="WSDeployerHook_JAXWS_EJB3"
class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookEJB3">
<property name="deployerManager"><inject
bean="WSDeployerManagerEJB"/></property>
<install bean="WebServiceDeployerEJB"
method="addDeployerHook">
<parameter>
@@ -223,7 +223,7 @@
</uninstall>
<depends>WebServiceDeployerEJB</depends>
</bean>
- <bean name="WSMainDeployerHook"
class="org.jboss.ws.integration.jboss50.common.MainDeployerHook">
+ <bean name="WSMainDeployerHook"
class="org.jboss.ws.integration.jboss50.MainDeployerHook">
<property name="deployerManager"><inject
bean="WSMainDeployerManager"/></property>
<install bean="WebServiceMainDeployer"
method="addDeployerHook">
<parameter>
Modified: branches/tdiesler/trunk/integration/spi/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/spi/.classpath 2007-05-15 05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/integration/spi/.classpath 2007-05-15 05:13:16 UTC (rev 3095)
@@ -15,5 +15,6 @@
<classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib"
path="thirdparty/servlet-api.jar"/>
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Copied:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java
(from rev 3086,
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/utils/IOUtils.java)
===================================================================
---
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java
(rev 0)
+++
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/core/utils/IOUtils.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,142 @@
+/*
+ * 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.core.utils;
+
+// $Id$
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
+
+import javax.activation.DataHandler;
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.integration.management.ServerConfig;
+import org.jboss.ws.integration.management.ServerConfigFactory;
+
+/**
+ * IO utilites
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public final class IOUtils
+{
+ private static Logger log = Logger.getLogger(IOUtils.class);
+
+ // Hide the constructor
+ private IOUtils()
+ {
+ }
+
+ public static Writer getCharsetFileWriter(File file, String charset) throws
IOException
+ {
+ return new OutputStreamWriter(new FileOutputStream(file), charset);
+ }
+
+ /** Copy the input stream to the output stream
+ */
+ public static void copyStream(OutputStream outs, InputStream ins) throws IOException
+ {
+ byte[] bytes = new byte[1024];
+ int r = ins.read(bytes);
+ while (r > 0)
+ {
+ outs.write(bytes, 0, r);
+ r = ins.read(bytes);
+ }
+ }
+
+ /** Copy the reader to the output stream
+ */
+ public static void copyReader(OutputStream outs, Reader reader) throws IOException
+ {
+ OutputStreamWriter writer = new OutputStreamWriter(outs);
+ char[] bytes = new char[1024];
+ int r = reader.read(bytes);
+ while (r > 0)
+ {
+ writer.write(bytes, 0, r);
+ r = reader.read(bytes);
+ }
+ }
+
+ public static byte[] convertToBytes(DataHandler dh)
+ {
+ try
+ {
+ ByteArrayOutputStream buffOS= new ByteArrayOutputStream();
+ dh.writeTo(buffOS);
+ return buffOS.toByteArray();
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException("Unable to convert DataHandler to byte[]:
" + e.getMessage());
+ }
+ }
+
+ /**
+ * Transform a Reader to an InputStream
+ * Background is that DocumentBuilder.parse() cannot take the Reader directly
+ */
+ public static InputStream transformReader(Reader reader) throws IOException
+ {
+ int capacity = 1024;
+ char[] charBuffer = new char[capacity];
+ StringBuffer strBuffer = new StringBuffer(capacity);
+
+ int len = reader.read(charBuffer, 0, capacity);
+ while (len > 0)
+ {
+ strBuffer.append(charBuffer, 0, len);
+ len = reader.read(charBuffer, 0, capacity);
+ }
+ return new ByteArrayInputStream(strBuffer.toString().getBytes());
+ }
+
+ public static File createTempDirectory() throws IOException
+ {
+ File tmpdir = null;
+
+ try
+ {
+ ServerConfigFactory factory = ServerConfigFactory.getInstance();
+ ServerConfig config = factory.getServerConfig();
+
+ tmpdir = new File(config.getServerTempDir().getCanonicalPath() +
"/jbossws");
+ tmpdir.mkdirs();
+ }
+ catch (Throwable t)
+ {
+ // Use the Java temp directory if there is no server config (the client)
+ }
+
+ return tmpdir;
+ }
+}
Added:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java
===================================================================
---
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java
(rev 0)
+++
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,10 @@
+package org.jboss.ws.integration.deployment;
+
+import org.w3c.dom.Element;
+
+public interface SecurityRolesHandler
+{
+ /** Add the roles from ejb-jar.xml to the security roles
+ */
+ void addSecurityRoles(Element webApp, UnifiedDeploymentInfo udi);
+}
Property changes on:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/SecurityRolesHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java
(from rev 3086,
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/core/deployment/ServiceEndpointPublisher.java)
===================================================================
---
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java
(rev 0)
+++
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/deployment/ServiceEndpointPublisher.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,262 @@
+/*
+ * 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.deployment;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.ws.WebServiceException;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.utils.DOMWriter;
+import org.jboss.ws.core.utils.IOUtils;
+import org.jboss.ws.integration.Endpoint;
+import org.jboss.ws.utils.DOMUtils;
+import org.w3c.dom.Element;
+
+/**
+ * The publisher for web service endpoints
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class ServiceEndpointPublisher
+{
+ // logging support
+ private static Logger log = Logger.getLogger(ServiceEndpointPublisher.class);
+
+ // The configured service endpoint servlet
+ private String servletClass;
+
+ // The results of the URL rewriting
+ public class RewriteResults
+ {
+ // The URL to the rewrittn web.xml
+ public URL webXML;
+ // Maps the servlet name to the target bean
+ public Map<String, String> sepTargetMap = new HashMap<String,
String>();
+ }
+
+ public String getServletClass()
+ {
+ return servletClass;
+ }
+
+ public void setServletClass(String servletClass)
+ {
+ this.servletClass = servletClass;
+ }
+
+ public RewriteResults rewriteWebXml(UnifiedDeploymentInfo udi)
+ {
+ URL warURL = udi.webappURL;
+ File warFile = new File(warURL.getFile());
+ if (warFile.isDirectory() == false)
+ throw new WebServiceException("Expected a war directory: " + warURL);
+
+ File webXML = new File(warURL.getFile() + "/WEB-INF/web.xml");
+ if (webXML.isFile() == false)
+ throw new WebServiceException("Cannot find web.xml: " + webXML);
+
+ try
+ {
+ // After redeployment there might be a stale copy of the original
web.xml.org,
we delete it
+ File orgWebXML = new File(webXML.getCanonicalPath() + ".org");
+ orgWebXML.delete();
+
+ // Rename the web.xml
+ if (webXML.renameTo(orgWebXML) == false)
+ throw new WebServiceException("Cannot rename web.xml: " +
orgWebXML);
+
+ FileInputStream stream = new FileInputStream(orgWebXML);
+ return rewriteWebXml(stream, webXML, udi.classLoader);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+
+ public RewriteResults rewriteWebXml(InputStream source, File dest, ClassLoader loader)
throws Exception
+ {
+ if (dest == null)
+ {
+ dest = File.createTempFile("jbossws-alt-web", "xml",
IOUtils.createTempDirectory());
+ dest.deleteOnExit();
+ }
+
+ Element root = DOMUtils.parse(source);
+ RewriteResults results = modifyServletConfig(root, loader);
+ results.webXML = dest.toURL();
+
+ FileOutputStream fos = new FileOutputStream(dest);
+ new DOMWriter(fos).setPrettyprint(true).print(root);
+ fos.flush();
+ fos.close();
+
+ return results;
+ }
+
+ private RewriteResults modifyServletConfig(Element root, ClassLoader loader) throws
ClassNotFoundException
+ {
+ RewriteResults results = new RewriteResults();
+ Iterator itServlets = DOMUtils.getChildElements(root, "servlet");
+ while (itServlets.hasNext())
+ {
+ Element servletElement = (Element)itServlets.next();
+ String linkName =
DOMUtils.getTextContent(DOMUtils.getFirstChildElement(servletElement,
"servlet-name"));
+
+ // find the servlet-class
+ Element classElement = DOMUtils.getFirstChildElement(servletElement,
"servlet-class");
+
+ // JSP
+ if (classElement == null)
+ continue;
+
+ String orgServletClassName = DOMUtils.getTextContent(classElement).trim();
+
+ // Get the servlet class
+ Class orgServletClass = null;
+ if (loader != null)
+ {
+ try
+ {
+ orgServletClass = loader.loadClass(orgServletClassName);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + orgServletClassName);
+ }
+ }
+
+ String targetBeanName = null;
+
+ // Nothing to do if we have an <init-param>
+ if (isAlreadyModified(servletElement))
+ {
+ Iterator itParams = DOMUtils.getChildElements(servletElement,
"init-param");
+ while (itParams.hasNext())
+ {
+ Element elParam = (Element)itParams.next();
+ Element elParamName = DOMUtils.getFirstChildElement(elParam,
"param-name");
+ Element elParamValue = DOMUtils.getFirstChildElement(elParam,
"param-value");
+ if
(Endpoint.SEPID_DOMAIN_ENDPOINT.equals(DOMUtils.getTextContent(elParamName)))
+ {
+ targetBeanName = DOMUtils.getTextContent(elParamValue);
+ }
+ }
+ }
+ else
+ {
+ // Check if it is a real servlet that we can ignore
+ if (orgServletClass != null &&
javax.servlet.Servlet.class.isAssignableFrom(orgServletClass))
+ {
+ log.info("Ignore servlet: " + orgServletClassName);
+ continue;
+ }
+ else if (orgServletClassName.endsWith("Servlet"))
+ {
+ log.info("Ignore <servlet-class> that ends with
'Servlet': " + orgServletClassName);
+ continue;
+ }
+
+ // build a list of detached elements that come after <servlet-class>
+ boolean startDetach = false;
+ List<Element> detachedElements = new ArrayList<Element>();
+ Iterator itDetached = DOMUtils.getChildElements(servletElement);
+ while (itDetached.hasNext())
+ {
+ Element el = (Element)itDetached.next();
+ if (startDetach == true)
+ {
+ detachedElements.add(el);
+ servletElement.removeChild(el);
+ }
+ if (el.equals(classElement))
+ {
+ servletElement.removeChild(el);
+ startDetach = true;
+ }
+ }
+
+ // replace the class name
+ classElement = (Element)DOMUtils.createElement("servlet-class");
+ classElement.appendChild(DOMUtils.createTextNode(servletClass));
+ classElement =
(Element)servletElement.getOwnerDocument().importNode(classElement, true);
+ servletElement.appendChild(classElement);
+
+ // add additional init params
+ if (orgServletClassName.equals(servletClass) == false)
+ {
+ Element paramElement = DOMUtils.createElement("init-param");
+
paramElement.appendChild(DOMUtils.createElement("param-name")).appendChild(DOMUtils.createTextNode(Endpoint.SEPID_DOMAIN_ENDPOINT));
+
paramElement.appendChild(DOMUtils.createElement("param-value")).appendChild(DOMUtils.createTextNode(orgServletClassName));
+ paramElement =
(Element)servletElement.getOwnerDocument().importNode(paramElement, true);
+ servletElement.appendChild(paramElement);
+ targetBeanName = orgServletClassName;
+ }
+
+ // reattach the elements
+ itDetached = detachedElements.iterator();
+ while (itDetached.hasNext())
+ {
+ Element el = (Element)itDetached.next();
+ servletElement.appendChild(el);
+ }
+ }
+
+ if (targetBeanName == null)
+ throw new IllegalStateException("Cannot obtain service endpoint bean
for: " + linkName);
+
+ // remember the target bean name
+ results.sepTargetMap.put(linkName, targetBeanName.trim());
+ }
+
+ return results;
+ }
+
+ // Return true if the web.xml is already modified
+ private boolean isAlreadyModified(Element servletElement)
+ {
+ Iterator itParams = DOMUtils.getChildElements(servletElement,
"init-param");
+ while (itParams.hasNext())
+ {
+ Element elParam = (Element)itParams.next();
+ Element elParamName = DOMUtils.getFirstChildElement(elParam,
"param-name");
+ if
(Endpoint.SEPID_DOMAIN_ENDPOINT.equals(DOMUtils.getTextContent(elParamName)))
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
Copied:
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java
(from rev 3086,
branches/tdiesler/trunk/jbossws/src/main/java/org/jboss/ws/extensions/security/SecurityAssociationAdaptor.java)
===================================================================
---
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java
(rev 0)
+++
branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/ws/integration/invocation/SecurityAssociationAdaptor.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -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.invocation;
+
+// $Id$
+
+import java.security.Principal;
+
+/**
+ * A container idependent security adaptor
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 10-May-2005
+ */
+public interface SecurityAssociationAdaptor
+{
+ void setPrincipal(Principal pricipal);
+ void setCredential(Object credential);
+}
Copied: branches/tdiesler/trunk/integration/sunri-jboss50 (from rev 3086,
branches/tdiesler/trunk/integration/sunri)
Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/.classpath
===================================================================
--- branches/tdiesler/trunk/integration/sunri/.classpath 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/.classpath 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-common-core.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-container.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-dependency.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-deployers.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-logging-log4j.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-logging-spi.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-microcontainer.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-security-spi.jar"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-spi"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib"
path="thirdparty/FastInfoset.jar"/>
- <classpathentry kind="lib" path="thirdparty/http.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"
sourcepath="thirdparty/jaxws-ri-src.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jaxws-tools.jar"/>
- <classpathentry kind="lib"
path="thirdparty/jboss-common-core-sources.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/>
- <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/>
- <classpathentry kind="lib"
path="thirdparty/streambuffer.jar"/>
- <classpathentry kind="output" path="output-eclipse"/>
-</classpath>
Copied: branches/tdiesler/trunk/integration/sunri-jboss50/.classpath (from rev 3093,
branches/tdiesler/trunk/integration/sunri/.classpath)
===================================================================
--- branches/tdiesler/trunk/integration/sunri-jboss50/.classpath
(rev 0)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/.classpath 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/FastInfoset.jar"/>
+ <classpathentry kind="lib" path="thirdparty/http.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"
sourcepath="thirdparty/jaxws-ri-src.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/jaxws-tools.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jsr173_api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jsr250-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/saaj-impl.jar"/>
+ <classpathentry kind="lib" path="thirdparty/sjsxp.jar"/>
+ <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/>
+ <classpathentry kind="lib"
path="thirdparty/streambuffer.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/spi"/>
+ <classpathentry kind="lib"
path="thirdparty/servlet-api.jar"/>
+ <classpathentry kind="output" path="output-eclipse"/>
+</classpath>
Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/.project
===================================================================
--- branches/tdiesler/trunk/integration/sunri/.project 2007-05-13 15:42:19 UTC (rev 3086)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/.project 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>sunri-jboss50</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Copied: branches/tdiesler/trunk/integration/sunri-jboss50/.project (from rev 3093,
branches/tdiesler/trunk/integration/sunri/.project)
===================================================================
--- branches/tdiesler/trunk/integration/sunri-jboss50/.project
(rev 0)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/.project 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>sunri-jboss50</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt
===================================================================
--- branches/tdiesler/trunk/integration/sunri/IntegrationIssues.txt 2007-05-13 15:42:19
UTC (rev 3086)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,11 +0,0 @@
-# $Id$
-
-* WSServletContextListener is final and loads sun-jaxws.xml from context classloader.
-We need to provide sun-jaxws.xml dynamically.
-
-* WSServletException is package protected
-
-* WSServlet is final
-
-* WSServletDelegate is final
-
Copied: branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt (from rev
3093, branches/tdiesler/trunk/integration/sunri/IntegrationIssues.txt)
===================================================================
--- branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt
(rev 0)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/IntegrationIssues.txt 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,11 @@
+# $Id$
+
+* WSServletContextListener is final and loads sun-jaxws.xml from context classloader.
+We need to provide sun-jaxws.xml dynamically.
+
+* WSServletException is package protected
+
+* WSServlet is final
+
+* WSServletDelegate is final
+
Copied: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import (from rev 3093,
branches/tdiesler/trunk/integration/sunri/ant-import)
Modified: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-deploy.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -18,8 +18,10 @@
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss50 -->
- <target name="deploy" depends="sunri50-jars,remove-jbossws"
description="Deploy jbossws">
+ <target name="deploy" depends="jars,undeploy"
description="Deploy jbossws">
+ <ant antfile="${int.jbws50.dir}/build.xml" target="undeploy"
inheritall="false"/>
+
<copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="${thirdparty.dir}">
<include name="jaxb-api.jar"/>
@@ -38,36 +40,16 @@
<include name="jbossws-spi.jar"/>
</fileset>
</copy>
- <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"/>
- <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbosswsri.deployer"
src="${sunri50.output.lib.dir}/jbosswsri50-deployer.zip"/>
- <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"/>
- <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbosswsri.sar"
src="${sunri50.output.lib.dir}/jbosswsri50.sar"/>
- <copy file="${sunri50.output.lib.dir}/jbosswsri50-context.war"
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
overwrite="true"/>
+ <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip
dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"
src="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip"/>
+ <mkdir
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar
dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"
src="${sunri50.output.lib.dir}/jbossws-sunri50.sar"/>
+ <copy
tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"
file="${sunri50.output.lib.dir}/jbossws-sunri50-context.war"
overwrite="true"/>
</target>
- <!-- Remove jbossws from jboss50 -->
- <target name="remove-jbossws" depends="prepare"
description="Remove jbossws">
-
- <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
-
- <delete>
- <fileset dir="${jboss50.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="${jboss50.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="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete
file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
+ <!-- Remove jbossws/sunri from jboss50 -->
+ <target name="undeploy" depends="prepare"
description="Remove jbossws/sunri">
+ <delete
dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
</target>
</project>
Modified: branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-release.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-release.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -14,7 +14,7 @@
<project>
<!-- Release to jboss.local.repository -->
- <target name="release" depends="sunri50-jars"
+ <target name="release" depends="jars"
description="Release to jboss.local.repository">
Modified:
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-testsuite.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -10,10 +10,11 @@
<project>
- <property name="tests.dir" value="${basedir}/src/test"/>
+ <property name="tests.dir"
value="${int.sunri50.dir}/src/test"/>
+ <property name="tests.output.dir"
value="${int.sunri50.dir}/output-tests"/>
<property name="jboss.home" value="${jboss50.home}"/>
- <property name="excludesfile"
value="${basedir}/src/test/resources/excludes.txt"/>
+ <property name="excludesfile"
value="${int.sunri50.dir}/src/test/resources/excludes.txt"/>
<import file="${build.dir}/ant-import/build-testsuite.xml"/>
@@ -24,10 +25,9 @@
<!--
Init the various classpaths
-->
- <target name="tests-init"
depends="tests-prepare,spi-thirdparty,thirdparty">
+ <target name="tests-init"
depends="tests-prepare,thirdparty">
<path id="sunri.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
<pathelement location="${thirdparty.dir}/http.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
@@ -47,13 +47,15 @@
<!-- The combined compile classpath -->
<path id="javac.classpath">
<path refid="sunri.classpath"/>
- <path refid="spi.thirdparty.classpath"/>
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${jboss.client}/jboss-common-core.jar"/>
+ <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
</path>
<!-- The test client classpath -->
<path id="tests.client.classpath">
<path refid="sunri.classpath"/>
- <path refid="spi.thirdparty.classpath"/>
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
@@ -69,9 +71,7 @@
<!-- Compiling -->
<!-- ================================================================== -->
- <target name="tests-compile" depends="tests-compile15"
description="Compile sources"/>
-
- <target name="tests-compile15" depends="tests-init"
if="HAVE_JDK_1.5">
+ <target name="tests-compile" depends="tests-init"
description="Compile sources">
<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}">
@@ -88,11 +88,13 @@
<!-- 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"/>
+ <copy-test-resources srcdir="${int.sunri50.dir}/src/test"/>
</target>
- <target name="tests-main"
depends="tests-compile,tests-copy-resources" description="Build the
deployments.">
+ <target name="tests-jars"
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>
+ <target name="tests-main" depends="tests-jars"
description="Build the deployments."/>
+
</project>
Modified:
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/sunri-jboss50/ant-import/build-thirdparty.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -13,7 +13,7 @@
<project>
- <property file="${basedir}/version.properties"/>
+ <property file="${int.sunri50.dir}/version.properties"/>
<!-- ========= -->
<!-- Libraries -->
@@ -23,8 +23,8 @@
</target>
<target name="thirdparty-init" depends="prepare">
- <property name="thirdparty.dir"
value="${basedir}/thirdparty"/>
- <checksum file="${basedir}/version.properties" fileext=".md5"
verifyproperty="checksum.ok"/>
+ <property name="thirdparty.dir"
value="${int.sunri50.dir}/thirdparty"/>
+ <checksum file="${int.sunri50.dir}/version.properties"
fileext=".md5" verifyproperty="checksum.ok"/>
<condition property="force.thirdparty.get">
<or>
<not>
@@ -42,21 +42,7 @@
description="Gets the thirdparty libraries">
<mkdir dir="${thirdparty.dir}"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar"
dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core-sources.jar"
dest="${thirdparty.dir}/jboss-common-core-sources.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar"
dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar"
dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar"
dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar"
dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar"
dest="${thirdparty.dir}/jboss-xml-binding-sources.jar"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar"
dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar"
dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency-src.zip"
dest="${thirdparty.dir}/jboss-dependency-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar"
dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers-src.zip"
dest="${thirdparty.dir}/jboss-deployers-src.zip" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar"
dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true"
verbose="true"/>
- <get
src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip"
dest="${thirdparty.dir}/jboss-microcontainer-src.zip"
usetimestamp="true" verbose="true"/>
- <get
src="${jboss.repository}/jboss/security-spi/${jboss-security-spi}/lib/jboss-security-spi.jar"
dest="${thirdparty.dir}/jboss-security-spi.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar"
dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar"
dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true"
verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar"
dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true"
verbose="true"/>
@@ -77,23 +63,28 @@
<get
src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-ri-src.jar"
dest="${thirdparty.dir}/jaxws-ri-src.jar" usetimestamp="true"
verbose="true"/>
<get
src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar"
dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true"
verbose="true"/>
- <checksum file="${basedir}/version.properties"
fileext=".md5"/>
+ <checksum file="${int.sunri50.dir}/version.properties"
fileext=".md5"/>
</target>
- <target name="thirdparty-classpath"
depends="thirdparty-init,spi-jars">
+ <target name="thirdparty-classpath"
depends="thirdparty-init">
<!-- The compile classpath for jboss50 integration -->
<path id="sunri50.integration.classpath">
- <path refid="spi.thirdparty.classpath"/>
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-dependency.jar"/>
<pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-microcontainer.jar"/>
<pathelement location="${jboss50.lib}/jboss-system.jar"/>
<pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/>
<pathelement location="${jboss50.lib}/jboss-vfs.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/>
<pathelement location="${jboss50.server.lib}/jboss.jar"/>
<pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/>
+ <pathelement
location="${jboss50.server.lib}/jboss-security-spi.jar"/>
<pathelement location="${jboss50.server.lib}/jnpserver.jar"/>
<pathelement
location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
<pathelement
location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
@@ -105,12 +96,6 @@
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement
location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-security-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/build.xml 2007-05-13 15:42:19 UTC (rev
3086)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/build.xml 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -1,191 +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="../sunri-jboss50"
name="JBossWS-SunRI-JBoss50">
-
- <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-testsuite.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
-
- <import file="${spi.dir}/build.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="sunri50.dir" value="${basedir}"/>
- <property name="sunri50.src.dir"
value="${sunri50.dir}/src/main"/>
- <property name="sunri50.etc.dir"
value="${sunri50.src.dir}/etc"/>
- <property name="sunri50.java.dir"
value="${sunri50.src.dir}/java"/>
- <property name="sunri50.resources.dir"
value="${sunri50.src.dir}/resources"/>
- <property name="sunri50.output.dir"
value="${sunri50.dir}/output"/>
- <property name="sunri50.output.classes.dir"
value="${sunri50.output.dir}/classes"/>
- <property name="sunri50.output.etc.dir"
value="${sunri50.output.dir}/etc"/>
- <property name="sunri50.output.lib.dir"
value="${sunri50.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="sunri50-init" depends="prepare,thirdparty">
- <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.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="sunri50-compile"
depends="sunri50-init,spi-compile,sunri50-compile-classes,sunri50-compile-etc"
description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="sunri50-compile-classes"
depends="sunri50-init">
- <mkdir dir="${sunri50.output.classes.dir}"/>
- <javac srcdir="${sunri50.java.dir}" sourcepath=""
destdir="${sunri50.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/jboss50/**"/>
- <classpath refid="sunri50.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="sunri50-compile-etc" depends="sunri50-init">
- <mkdir dir="${sunri50.output.etc.dir}"/>
- <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>
- <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-sunri-${version.id}"/>
- <filtersfile file="${build.dir}/version.properties"/>
- <filtersfile file="${basedir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="sunri50-jars"
depends="sunri50-compile,spi-jars,sunri50-module-jars" description="Builds
all jar files.">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="sunri50-module-jars" depends="sunri50-init">
-
- <!-- Build jbosswsri.jar -->
- <mkdir dir="${sunri50.output.lib.dir}"/>
- <jar jarfile="${sunri50.output.lib.dir}/jbosswsri50.jar"
manifest="${sunri50.output.etc.dir}/default.mf">
- <fileset dir="${sunri50.output.classes.dir}">
- <include name="org/jboss/ws/integration/jboss50/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbosswsri-context.war -->
- <war warfile="${sunri50.output.lib.dir}/jbosswsri50-context.war"
webxml="${sunri50.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
- <fileset dir="${sunri50.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf
dir="${sunri50.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbosswsri.sar -->
- <jar jarfile="${sunri50.output.lib.dir}/jbosswsri50.sar"
manifest="${sunri50.output.etc.dir}/default.mf">
- <!-- [JBAS-4379] MC beans deployed twice because of jacc service
- <fileset dir="${sunri50.output.lib.dir}">
- <include name="jbossws-context.war"/>
- </fileset>
- -->
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jsr173_api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="jsr250-api.jar"/>
- <include name="resolver.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- </fileset>
- <metainf dir="${sunri50.resources.dir}/jbossws.sar/META-INF">
- <include name="jbossws-beans.xml"/>
- </metainf>
- </jar>
-
- <!-- Build jbosswsri-deployer -->
- <zip zipfile="${sunri50.output.lib.dir}/jbosswsri50-deployer.zip">
- <fileset dir="${sunri50.output.lib.dir}">
- <include name="jbosswsri50.jar"/>
- </fileset>
- <fileset dir="${sunri50.resources.dir}/jbossws.deployer">
- <include name="META-INF/jbossws-deployer-beans.xml"/>
- </fileset>
- </zip>
-
- <!-- Build jbosswsri50-src.zip -->
- <zip zipfile="${sunri50.output.lib.dir}/jbosswsri50-src.zip" >
- <fileset dir="${sunri50.java.dir}"/>
- </zip>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans
up most generated files.">
- <delete dir="${sunri50.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans
up all generated files.">
- <delete dir="${basedir}/output-tests"/>
- <delete dir="${basedir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target
(most)." depends="most"/>
-
- <target name="most" description="Builds almost everything."
depends="sunri50-jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file"
depends="main">
- </target>
-
-</project>
Copied: branches/tdiesler/trunk/integration/sunri-jboss50/build.xml (from rev 3093,
branches/tdiesler/trunk/integration/sunri/build.xml)
===================================================================
--- branches/tdiesler/trunk/integration/sunri-jboss50/build.xml
(rev 0)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/build.xml 2007-05-15 05:13:16 UTC
(rev 3095)
@@ -0,0 +1,193 @@
+<?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="../.."
name="JBossWS-SunRI-JBoss50">
+
+ <import file="${basedir}/build/ant-import/build-setup.xml"/>
+
+ <import file="${int.sunri50.dir}/ant-import/build-deploy.xml"/>
+ <import file="${int.sunri50.dir}/ant-import/build-release.xml"/>
+ <import file="${int.sunri50.dir}/ant-import/build-testsuite.xml"/>
+ <import file="${int.sunri50.dir}/ant-import/build-thirdparty.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="sunri50.dir" value="${int.sunri50.dir}"/>
+ <property name="sunri50.src.dir"
value="${sunri50.dir}/src/main"/>
+ <property name="sunri50.etc.dir"
value="${sunri50.src.dir}/etc"/>
+ <property name="sunri50.java.dir"
value="${sunri50.src.dir}/java"/>
+ <property name="sunri50.resources.dir"
value="${sunri50.src.dir}/resources"/>
+ <property name="sunri50.output.dir"
value="${sunri50.dir}/output"/>
+ <property name="sunri50.output.classes.dir"
value="${sunri50.output.dir}/classes"/>
+ <property name="sunri50.output.etc.dir"
value="${sunri50.output.dir}/etc"/>
+ <property name="sunri50.output.lib.dir"
value="${sunri50.output.dir}/lib"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare,thirdparty">
+ <fail message="Not available: ${jboss50.available.file}"
unless="jboss50.available"/>
+ <ant antfile="${int.jboss50.dir}/build.xml" target="main"
inheritall="false"/>
+ </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="compile"
depends="init,compile-classes,compile-etc" description="Compile all source
files."/>
+
+ <!-- Compile java sources -->
+ <target name="compile-classes" depends="init">
+ <mkdir dir="${sunri50.output.classes.dir}"/>
+ <javac srcdir="${sunri50.java.dir}" sourcepath=""
destdir="${sunri50.output.classes.dir}" encoding="utf-8"
debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/jboss50/**"/>
+ <classpath refid="sunri50.integration.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${sunri50.output.etc.dir}"/>
+ <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>
+ <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-sunri-${version.id}"/>
+ <filtersfile file="${build.dir}/version.properties"/>
+ <filtersfile file="${int.sunri50.dir}/version.properties"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jars" depends="compile,module-jars"
description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars" depends="init">
+
+ <!-- Build jbossws-sunri50.jar -->
+ <mkdir dir="${sunri50.output.lib.dir}"/>
+ <jar jarfile="${sunri50.output.lib.dir}/jbossws-sunri50.jar"
manifest="${sunri50.output.etc.dir}/default.mf">
+ <fileset dir="${sunri50.output.classes.dir}">
+ <include name="org/jboss/ws/integration/jboss50/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbosswsri-context.war -->
+ <war warfile="${sunri50.output.lib.dir}/jbossws-sunri50-context.war"
webxml="${sunri50.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
+ <fileset dir="${sunri50.resources.dir}/jbossws-context.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ </fileset>
+ <webinf
dir="${sunri50.resources.dir}/jbossws-context.war/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- Build jbosswsri.sar -->
+ <jar jarfile="${sunri50.output.lib.dir}/jbossws-sunri50.sar"
manifest="${sunri50.output.etc.dir}/default.mf">
+ <!-- [JBAS-4379] MC beans deployed twice because of jacc service
+ <fileset dir="${sunri50.output.lib.dir}">
+ <include name="jbossws-context.war"/>
+ </fileset>
+ -->
+ <fileset dir="${thirdparty.dir}">
+ <include name="FastInfoset.jar"/>
+ <include name="http.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jaxws-rt.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jsr173_api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="jsr250-api.jar"/>
+ <include name="resolver.jar"/>
+ <include name="saaj-api.jar"/>
+ <include name="saaj-impl.jar"/>
+ <include name="sjsxp.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ </fileset>
+ <metainf dir="${sunri50.resources.dir}/jbossws.sar/META-INF">
+ <include name="jbossws-beans.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- Build jbosswsri-deployer -->
+ <zip
zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-deployer.zip">
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${sunri50.output.lib.dir}">
+ <include name="jbossws-sunri50.jar"/>
+ </fileset>
+ <fileset dir="${sunri50.resources.dir}/jbossws.deployer">
+ <include name="META-INF/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </zip>
+
+ <!-- Build jbosswsri50-src.zip -->
+ <zip zipfile="${sunri50.output.lib.dir}/jbossws-sunri50-src.zip" >
+ <fileset dir="${sunri50.java.dir}"/>
+ </zip>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans
up most generated files.">
+ <delete dir="${sunri50.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans
up all generated files.">
+ <delete dir="${int.sunri50.dir}/output-tests"/>
+ <delete dir="${int.sunri50.dir}/thirdparty"/>
+ </target>
+
+ <target name="main" description="Executes the default target
(most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything."
depends="jars"/>
+
+ <target name="all" description="Create a distribution zip file"
depends="most,tests-main">
+ </target>
+
+</project>
Copied: branches/tdiesler/trunk/integration/sunri-jboss50/src (from rev 3093,
branches/tdiesler/trunk/integration/sunri/src)
Modified:
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
---
branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -5,7 +5,7 @@
<!--
A web service deployer that hooks in after the EJB deployers
-->
- <bean name="WebServiceDeployerEJB"
class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerEJB">
+ <bean name="WebServiceDeployerEJB"
class="org.jboss.ws.integration.jboss50.WebServiceDeployerEJB">
<property name="relOrderEJB2x"><inject
bean="EJB2xDeployer" property="relativeOrder"/></property>
<property name="relOrderEJB3"><inject
bean="EJBRegistrationDeployer"
property="relativeOrder"/></property>
<install bean="MainDeployer" method="addDeployer">
@@ -25,7 +25,7 @@
<!--
A web service deployer that hooks in before the WAR deployer
-->
- <bean name="WebServiceDeployerJSE"
class="org.jboss.ws.integration.jboss50.common.WebServiceDeployerJSE">
+ <bean name="WebServiceDeployerJSE"
class="org.jboss.ws.integration.jboss50.WebServiceDeployerJSE">
<property name="relOrderWar"><inject bean="WarDeployer"
property="relativeOrder"/></property>
<install bean="MainDeployer" method="addDeployer">
<parameter>
@@ -43,7 +43,7 @@
<!--
A web service deployer that hooks in after the web service WAR/EJB deployers
-->
- <bean name="WebServiceMainDeployer"
class="org.jboss.ws.integration.jboss50.common.WebServiceMainDeployer">
+ <bean name="WebServiceMainDeployer"
class="org.jboss.ws.integration.jboss50.WebServiceMainDeployer">
<property name="relOrderJSE"><inject
bean="WebServiceDeployerJSE"
property="relativeOrder"/></property>
<property name="relOrderEJB"><inject
bean="WebServiceDeployerEJB"
property="relativeOrder"/></property>
<install bean="MainDeployer" method="addDeployer">
Modified:
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml
===================================================================
---
branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-14
21:45:21 UTC (rev 3093)
+++
branches/tdiesler/trunk/integration/sunri-jboss50/src/main/resources/jbossws.sar/META-INF/jbossws-beans.xml 2007-05-15
05:13:16 UTC (rev 3095)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- An abstraction of server configuration aspects. -->
- <bean name="WSServerConfig"
class="org.jboss.ws.integration.jboss50.common.ManagedServerConfig">
+ <bean name="WSServerConfig"
class="org.jboss.ws.integration.jboss50.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.
@@ -133,12 +133,12 @@
<property
name="servletClass">org.jboss.ws.integration.jboss50.sunri.WSEndpointServlet</property>
</bean>
<bean name="WSSunJaxwsDeployer"
class="org.jboss.ws.integration.jboss50.sunri.SunJaxwsDeployer"/>
- <bean name="WSUnifiedDeploymentInfoDeployer"
class="org.jboss.ws.integration.jboss50.common.UnifiedDeploymentInfoDeployer"/>
+ <bean name="WSUnifiedDeploymentInfoDeployer"
class="org.jboss.ws.integration.jboss50.UnifiedDeploymentInfoDeployer"/>
<!--
Register DeployerHooks with JBoss deployers
-->
- <bean name="WSDeployerHook_JAXRPC_JSE"
class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookJSE">
+ <bean name="WSDeployerHook_JAXRPC_JSE"
class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookJSE">
<property name="deployerManager"><inject
bean="WSDeployerManagerJSE"/></property>
<install bean="WebServiceDeployerJSE"
method="addDeployerHook">
<parameter>
@@ -152,7 +152,7 @@
</uninstall>
<depends>WebServiceDeployerJSE</depends>
</bean>
- <bean name="WSDeployerHook_JAXRPC_EJB21"
class="org.jboss.ws.integration.jboss50.common.JAXRPCDeployerHookEJB21">
+ <bean name="WSDeployerHook_JAXRPC_EJB21"
class="org.jboss.ws.integration.jboss50.JAXRPCDeployerHookEJB21">
<property name="deployerManager"><inject
bean="WSDeployerManagerEJB"/></property>
<install bean="WebServiceDeployerEJB"
method="addDeployerHook">
<parameter>
@@ -166,7 +166,7 @@
</uninstall>
<depends>WebServiceDeployerEJB</depends>
</bean>
- <bean name="WSDeployerHook_JAXWS_JSE"
class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookJSE">
+ <bean name="WSDeployerHook_JAXWS_JSE"
class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookJSE">
<property name="deployerManager"><inject
bean="WSDeployerManagerJSE"/></property>
<install bean="WebServiceDeployerJSE"
method="addDeployerHook">
<parameter>
@@ -180,7 +180,7 @@
</uninstall>
<depends>WebServiceDeployerJSE</depends>
</bean>
- <bean name="WSDeployerHook_JAXWS_EJB3"
class="org.jboss.ws.integration.jboss50.common.JAXWSDeployerHookEJB3">
+ <bean name="WSDeployerHook_JAXWS_EJB3"
class="org.jboss.ws.integration.jboss50.JAXWSDeployerHookEJB3">
<property name="deployerManager"><inject
bean="WSDeployerManagerEJB"/></property>
<install bean="WebServiceDeployerEJB"
method="addDeployerHook">
<parameter>
@@ -194,7 +194,7 @@
</uninstall>
<depends>WebServiceDeployerEJB</depends>
</bean>
- <bean name="WSMainDeployerHook"
class="org.jboss.ws.integration.jboss50.common.MainDeployerHook">
+ <bean name="WSMainDeployerHook"
class="org.jboss.ws.integration.jboss50.MainDeployerHook">
<property name="deployerManager"><inject
bean="WSMainDeployerManager"/></property>
<install bean="WebServiceMainDeployer"
method="addDeployerHook">
<parameter>
Deleted: branches/tdiesler/trunk/integration/sunri-jboss50/version.properties
===================================================================
--- branches/tdiesler/trunk/integration/sunri/version.properties 2007-05-13 15:42:19 UTC
(rev 3086)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/version.properties 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,13 +0,0 @@
-
-# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
-
-sunri.implementation.title=JBoss Web Services - JBossWS/SunRI
-
-# Thirdparty library versions
-jboss-jaxr=1.2.0.GA
-jboss-jbossws-spi=SNAPSHOT
-jboss-security-spi=2.0.0.Beta
-sun-jaxb=2.1.3
-sun-jaxws=2.1.1
-sun-servlet=2.5
-
Copied: branches/tdiesler/trunk/integration/sunri-jboss50/version.properties (from rev
3093, branches/tdiesler/trunk/integration/sunri/version.properties)
===================================================================
--- branches/tdiesler/trunk/integration/sunri-jboss50/version.properties
(rev 0)
+++ branches/tdiesler/trunk/integration/sunri-jboss50/version.properties 2007-05-15
05:13:16 UTC (rev 3095)
@@ -0,0 +1,13 @@
+
+# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $
+
+sunri.implementation.title=JBoss Web Services - JBossWS/SunRI
+
+# Thirdparty library versions
+jboss-jaxr=1.2.0.GA
+jboss-jbossws-spi=SNAPSHOT
+jboss-security-spi=2.0.0.Beta
+sun-jaxb=2.1.3
+sun-jaxws=2.1.1
+sun-servlet=2.5
+
Modified: branches/tdiesler/trunk/testsuite/.classpath
===================================================================
--- branches/tdiesler/trunk/testsuite/.classpath 2007-05-15 05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/testsuite/.classpath 2007-05-15 05:13:16 UTC (rev 3095)
@@ -3,12 +3,11 @@
<classpathentry
excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java"
kind="src" path="src/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/jbossws-spi"/>
- <classpathentry kind="lib"
path="/sunri-jboss50/thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib"
path="/sunri-jboss50/thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib"
path="/sunri-jboss50/thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib"
path="/sunri-jboss50/thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib"
path="/sunri-jboss50/thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib"
path="/jbossws-spi/thirdparty/junit.jar"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/spi"/>
+ <classpathentry kind="lib" path="/spi/thirdparty/junit.jar"/>
+ <classpathentry kind="lib"
path="/spi/thirdparty/jaxws-api.jar"/>
+ <classpathentry kind="lib"
path="/spi/thirdparty/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib"
path="/spi/thirdparty/jsr181-api.jar"/>
+ <classpathentry kind="lib"
path="/spi/thirdparty/servlet-api.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml 2007-05-15 05:10:13
UTC (rev 3094)
+++ branches/tdiesler/trunk/testsuite/ant-import/build-testsuite.xml 2007-05-15 05:13:16
UTC (rev 3095)
@@ -1,9 +1,9 @@
<project>
<property name="tests.dir" value="${testsuite.dir}/src"/>
+ <property name="tests.output.dir"
value="${testsuite.dir}/output-tests"/>
<import file="${build.dir}/ant-import/build-testsuite.xml"/>
- <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<property name="excludesfile"
value="${testsuite.dir}/src/resources/dummy-excludes.txt"/>
Modified: branches/tdiesler/trunk/testsuite/build.xml
===================================================================
--- branches/tdiesler/trunk/testsuite/build.xml 2007-05-15 05:10:13 UTC (rev 3094)
+++ branches/tdiesler/trunk/testsuite/build.xml 2007-05-15 05:13:16 UTC (rev 3095)
@@ -8,19 +8,18 @@
<!-- $Id$ -->
-<project default="main" basedir="../jbossws-tests"
name="JBossWS-Tests">
+<project default="main" basedir=".."
name="JBossWS-Tests">
- <import file="${basedir}/../build/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-testsuite.xml"/>
- <import file="${spi.dir}/build.xml"/>
+ <import file="${basedir}/build/ant-import/build-setup.xml"/>
+ <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
<!-- Cleaning -->
<!-- ================================================================== -->
<target name="clean" description="Delete all generated test
files.">
- <delete dir="${tests.output.dir}"/>
+ <delete dir="${testsuite.dir}/output-tests"/>
</target>
<target name="main" description="Builds almost everything."
depends="tests-main"/>
Modified:
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java
===================================================================
---
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-15
05:10:13 UTC (rev 3094)
+++
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/JBossWSTestHelper.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -135,7 +135,7 @@
{
String username = System.getProperty("tomcat.manager.username");
String password = System.getProperty("tomcat.manager.password");
- return new TestDeployerTomcat(username, password);
+ return null; //new TestDeployerTomcat(username, password);
}
else
{
Deleted:
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java
===================================================================
---
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-05-15
05:10:13 UTC (rev 3094)
+++
branches/tdiesler/trunk/testsuite/src/java/org/jboss/test/ws/TestDeployerTomcat.java 2007-05-15
05:13:16 UTC (rev 3095)
@@ -1,129 +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.test.ws;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.util.Base64;
-
-/**
- * A deployer that deploys to Tomcat
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 16-May-2006
- */
-public class TestDeployerTomcat implements TestDeployer
-{
- private String username, password;
-
- // Map<String,String> of URL to context path
- private static Map pathMap = new HashMap();
-
- public TestDeployerTomcat(String username, String password)
- {
- this.username = username;
- this.password = password;
- }
-
- public void deploy(URL url) throws Exception
- {
- File destDir = new File(new File(url.getFile()).getParent() +
"/wspublish");
- destDir.mkdirs();
-
- // Use reflection to invoke wspublish.process() from the tomcat integration layer
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Class wspublishClass =
loader.loadClass("org.jboss.ws.integration.tomcat.wspublish");
- Method process = wspublishClass.getMethod("process", new
Class[]{URL.class, File.class, String.class});
- URL warURL = (URL)process.invoke(wspublishClass.newInstance(), new Object[]{url,
destDir, null});
-
- String path = warURL.toExternalForm();
- path = path.substring(path.lastIndexOf("/"));
- if (path.endsWith(".war"))
- path = path.substring(0, path.length() - 4);
-
- URL managerURL = new URL(getManagerPath() + "/deploy?path=" + path +
"&war=" + warURL.toExternalForm());
- HttpURLConnection con = getURLConnection(managerURL);
-
- con.connect();
-
- BufferedReader br = new BufferedReader(new
InputStreamReader(con.getInputStream()));
- String status = br.readLine();
-
- if (status == null)
- throw new IllegalStateException("Cannot obtain deploy status");
-
- if (status.startsWith("OK") == false)
- throw new IllegalStateException("Cannot deploy application: " +
status);
-
- path = status.substring(status.indexOf("/"));
- pathMap.put(url.toExternalForm(), path);
- }
-
- public void undeploy(URL url) throws Exception
- {
- String path = (String) pathMap.get(url.toExternalForm());
- if (path != null)
- {
- URL managerURL = new URL(getManagerPath() + "/undeploy?path=" +
path);
- HttpURLConnection con = getURLConnection(managerURL);
-
- con.connect();
-
- BufferedReader br = new BufferedReader(new
InputStreamReader(con.getInputStream()));
- String status = br.readLine();
-
- if (status == null)
- throw new IllegalStateException("Cannot obtain undeploy status");
-
- if (status.startsWith("OK") == false)
- throw new IllegalStateException("Cannot undeploy application: " +
status);
- }
- }
-
- private String getManagerPath() throws MalformedURLException
- {
- String hostName = System.getProperty("jbosstest.server.host",
"localhost");
- return "http://" + hostName + ":8080/manager";
- }
-
- private HttpURLConnection getURLConnection(URL managerURL) throws IOException,
ProtocolException
- {
- HttpURLConnection con = (HttpURLConnection)managerURL.openConnection();
- con.setRequestMethod("GET");
- con.setDoInput(true);
-
- String authorization = username + ":" + password;
- authorization = Base64.encodeBytes(authorization.getBytes());
- con.setRequestProperty("Authorization", "Basic " +
authorization);
- return con;
- }
-}