[jbossws-commits] JBossWS SVN: r3778 - in branches/jbossws-2.0: build/ant-import and 6 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sun Jul 1 17:50:16 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-07-01 17:50:16 -0400 (Sun, 01 Jul 2007)
New Revision: 3778
Added:
branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java
Modified:
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/build/ant.properties.example
branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
Log:
Rollback to deployer architecture in JBoss_5_0_0_Beta2
Use target branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -105,13 +105,17 @@
<pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.client}/jboss-common-core.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
+ <pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
<pathelement location="${jboss.client}/jboss-logging-spi.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}/jboss-javaee.jar"/>
+ <pathelement location="${jboss.client}/wsdl4j.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/>
<pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
+ <pathelement location="${jboss.server.lib}/javax.servlet.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
+ <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
</path>
<path id="tests.client.classpath">
<pathelement location="${jboss.client}/javassist.jar"/>
@@ -128,9 +132,6 @@
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.lib}/hibernate3.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
- <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="tests.javac.classpath"/>
</path>
</target>
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-07-01 21:50:16 UTC (rev 3778)
@@ -4,9 +4,9 @@
# $Id$
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
+#jboss50.home=/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
+#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA_CP05/build/output/jboss-4.0.5.GA_CP05-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
jbossws.integration.target=jboss50
@@ -32,16 +32,16 @@
hudson.admin.port=8150
hudson.http.port=8180
-hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss50.build=jboss-5.0.0.Beta3
+hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/branches/JBossWS_2_0_0_GA
+hudson.jboss50.build=jboss-5.0.0.Beta2
hudson.jboss50.rev=HEAD
-hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss42.build=jboss-4.2.1.GA
+hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_0_GA
+hudson.jboss42.build=jboss-4.2.0.GA
hudson.jboss42.rev=HEAD
-hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0
-hudson.jboss40.build=jboss-4.0.5.SP1
+hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_5_GA_CP05
+hudson.jboss40.build=jboss-4.0.5.GA_CP05
hudson.jboss40.rev=HEAD
hudson.mail.recipients=thomas.diesler at jboss.com, heiko.braun at jboss.com
Modified: branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
===================================================================
--- branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-07-01 21:50:16 UTC (rev 3778)
@@ -13,44 +13,40 @@
<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
</library>
<library name="jboss-4.2.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-jmx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-common.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jboss-j2ee.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-xml-binding.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/servlet-api.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/server/default/lib/jbosssx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-jmx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jboss.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jboss-ejb3x.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-common.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jboss-j2ee.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-dependency.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/deploy/jboss-bean.deployer/jboss-microcontainer.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/lib/jboss-xml-binding.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/servlet-api.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA/server/default/lib/jbosssx.jar"/>
</library>
<library name="jboss-5.0.x" systemlibrary="false">
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-j2se.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-javaee.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system-jmx.jar" source="/home/tdiesler/svn/jbossas/trunk/system-jmx/src/main"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-vfs.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss.jar" source="/home/tdiesler/svn/jbossas/trunk/server/src/main"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jnpserver.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-logging-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-xml-binding.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/client/jboss-ejb3-client.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-common-core.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jbosssx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/antlr.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/server/default/lib/jboss-security-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-structure-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-core-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-aop-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-deployers.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-j2se.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jboss-javaee.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-system.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-system-jmx.jar" source="/home/tdiesler/svn/jbossas/trunk/system-jmx/src/main"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-vfs.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jboss.jar" source="/home/tdiesler/svn/jbossas/trunk/server/src/main"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jnpserver.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-logging-spi.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-xml-binding.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/client/jboss-ejb3-client.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/lib/jboss-common-core.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jbosssx.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/deployers/ejb3.deployer/jboss-ejb3.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/antlr.jar"/>
+<archive path="/home/tdiesler/svn/jbossas/branches/JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2/server/default/lib/jboss-security-spi.jar"/>
</library>
</eclipse-userlibraries>
Modified: branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -40,22 +40,20 @@
<pathelement location="${jboss50.lib}/dom4j.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/>
- <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers.jar"/>
<pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
<pathelement location="${jboss50.lib}/jboss-system.jar"/>
<pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/>
<pathelement location="${jboss50.lib}/jboss-vfs.jar"/>
<pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/>
+ <pathelement location="${jboss50.server.lib}/javax.servlet.jar"/>
<pathelement location="${jboss50.server.lib}/jboss.jar"/>
- <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/>
+ <pathelement location="${jboss50.server.lib}/jboss-j2ee.jar"/>
<pathelement location="${jboss50.server.lib}/jbosssx.jar"/>
<pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/>
<pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
</path>
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -21,7 +21,9 @@
*/
package org.jboss.wsf.container.jboss50;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+//$Id$
+
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.DeployerManager;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -29,9 +31,6 @@
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
-//$Id$
-
-
/**
* An abstract web service deployer.
*
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
//$Id$
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,10 +24,9 @@
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.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
//$Id$
@@ -38,13 +37,13 @@
* @author Thomas.Diesler at jboss.org
* @since 24-Apr-2007
*/
-public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer
+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);
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -26,8 +26,7 @@
import java.net.URL;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.virtual.VirtualFile;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -144,7 +143,7 @@
private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
{
- VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml");
+ VirtualFile vf = unit.getMetaDataFile("webservices.xml");
return (vf != null ? new VirtualFileAdaptor(vf) : null);
}
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
/**
* An interface for all web service deployer hooks
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,8 +24,7 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
@@ -71,13 +70,13 @@
try
{
- if (unit.getParent() != null)
+ if (unit.getDeploymentContext().getParent() != null)
{
udi.parent = new UnifiedDeploymentInfo(null);
- buildDeploymentInfo(dep, udi.parent, unit.getParent());
+ buildDeploymentInfo(dep, udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit());
}
- udi.vfRoot = new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot());
+ udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
udi.name = unit.getName();
udi.simpleName = unit.getSimpleName();
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -40,15 +40,12 @@
import org.jboss.invocation.PayloadKey;
import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.plugins.SecurityContextAssociation;
+import org.jboss.security.SecurityAssociation;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.invocation.AbstractInvocationHandler;
import org.jboss.wsf.spi.invocation.HandlerCallback;
import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.SecurityAdaptor;
-import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.wsf.spi.utils.ObjectNameFactory;
@@ -148,16 +145,9 @@
if (msgContext == null)
throw new IllegalStateException("Cannot obtain MessageContext");
- SecurityAdaptor securityAdaptor = SecurityAdaptorFactory.getSecurityAdaptor();
- SecurityContext sc = SecurityContextAssociation.getSecurityContext();
- Principal principal = securityAdaptor.getPrincipal();
- Object credential = securityAdaptor.getCredential();
-
- if (principal == null && sc != null)
- principal = sc.getUtil().getUserPrincipal();
-
- if (credential == null && sc != null)
- credential = sc.getUtil().getCredential();
+ // these are provided by the ServerLoginHandler
+ Principal principal = SecurityAssociation.getPrincipal();
+ Object credential = SecurityAssociation.getCredential();
Method method = inv.getJavaMethod();
Object[] args = inv.getArgs();
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,8 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -54,7 +53,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,8 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -57,7 +56,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -28,8 +28,7 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.stateless.StatelessContainer;
@@ -57,7 +56,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -29,8 +29,7 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -57,7 +56,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
dep.setClassLoader(unit.getClassLoader());
dep.setType(getDeploymentType());
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.wsf.container.jboss50.AbstractDeployerHook;
import org.jboss.wsf.spi.deployment.Deployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.JAXRPCDeployment;
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -27,16 +27,18 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+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.wsf.spi.deployment.AbstractDeployer;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.WebXMLRewriter;
import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
import org.jboss.wsf.spi.deployment.WSDeploymentException;
-import org.jboss.wsf.spi.deployment.WebXMLRewriter;
/**
* Publish the HTTP service endpoint to Tomcat
@@ -49,11 +51,11 @@
// provide logging
private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class);
- private DeployerClient mainDeployer;
+ private MainDeployer mainDeployer;
private WebXMLRewriter webXMLRewriter;
- private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>();
+ private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
- public void setMainDeployer(DeployerClient mainDeployer)
+ public void setMainDeployer(MainDeployer mainDeployer)
{
this.mainDeployer = mainDeployer;
}
@@ -75,11 +77,12 @@
try
{
webXMLRewriter.rewriteWebXml(dep);
- org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(warURL);
+ DeploymentContext context = createDeploymentContext(warURL);
- mainDeployer.deploy(deployment);
+ mainDeployer.addDeploymentContext(context);
+ mainDeployer.process();
- deploymentMap.put(warURL.toExternalForm(), deployment);
+ contextMap.put(warURL.toExternalForm(), context);
}
catch (Exception ex)
{
@@ -103,11 +106,14 @@
log.debug("destroyServiceEndpoint: " + warURL);
try
{
- org.jboss.deployers.client.spi.Deployment deployment = deploymentMap.get(warURL.toExternalForm());
- if (deployment != null)
+ DeploymentContext context = contextMap.get(warURL.toExternalForm());
+ if (context != null)
{
- mainDeployer.undeploy(deployment);
- deploymentMap.remove(warURL.toExternalForm());
+ context.setState(DeploymentState.UNDEPLOYING);
+ mainDeployer.process();
+ mainDeployer.removeDeploymentContext(context.getName());
+
+ contextMap.remove(warURL.toExternalForm());
}
}
catch (Exception ex)
@@ -116,9 +122,9 @@
}
}
- private org.jboss.deployers.client.spi.Deployment createDeploymentContext(URL warURL) throws Exception
+ private DeploymentContext createDeploymentContext(URL warURL) throws Exception
{
VirtualFile file = VFS.getRoot(warURL);
- return VFSDeploymentFactory.getInstance().createVFSDeployment(file);
+ return new AbstractDeploymentContext(file);
}
}
Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java
===================================================================
--- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -29,7 +29,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.deployment.J2eeApplicationMetaData;
import org.jboss.deployment.J2eeModuleMetaData;
import org.jboss.metadata.WebMetaData;
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -8,6 +8,16 @@
<bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB">
<property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property>
<property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property>
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
<depends>EJB2xDeployer</depends>
<depends>EJBRegistrationDeployer</depends>
</bean>
@@ -17,6 +27,16 @@
-->
<bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE">
<property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property>
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
<depends>WebAppParsingDeployer</depends>
</bean>
@@ -26,6 +46,16 @@
<bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer">
<property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property>
<property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property>
+ <install bean="MainDeployer" method="addDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </install>
+ <uninstall bean="MainDeployer" method="removeDeployer">
+ <parameter>
+ <this/>
+ </parameter>
+ </uninstall>
<depends>WarDeployer</depends>
<depends>WebServiceDeployerEJB</depends>
<depends>WebServiceDeployerJSE</depends>
Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-01 21:43:07 UTC (rev 3777)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-01 21:50:16 UTC (rev 3778)
@@ -34,7 +34,7 @@
</bean>
<!-- Bind Service objects in client environment context -->
- <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
+ <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
<!-- Locate the single instance of the kernel -->
<bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">
Added: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/soap/FactoryLoader.java 2007-07-01 21:50:16 UTC (rev 3778)
@@ -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 javax.xml.soap;
+
+import org.jboss.wsf.spi.utils.ServiceLoader;
+
+// $Id: FactoryLoader.java 2649 2007-03-20 22:23:25Z thomas.diesler at jboss.com $
+
+/**
+ * @deprecated
+ * @see ServiceLoader
+ */
+public abstract class FactoryLoader
+{
+ public static Object loadFactory(String propertyName, String defaultFactory)
+ {
+ return ServiceLoader.loadService(propertyName, defaultFactory);
+ }
+}
More information about the jbossws-commits
mailing list