[jbossws-commits] JBossWS SVN: r3762 - in branches/jbossws-2.0: integration/jboss50/ant-import and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 29 08:57:03 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-29 08:57:03 -0400 (Fri, 29 Jun 2007)
New Revision: 3762
Modified:
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/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/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
Log:
Update to new deployer architecture
Modified: branches/jbossws-2.0/build/eclipse/jbossws.userlibraries
===================================================================
--- branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/build/eclipse/jbossws.userlibraries 2007-06-29 12:57:03 UTC (rev 3762)
@@ -13,24 +13,23 @@
<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.0.GA/lib/jboss-jmx.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/lib/jboss-system.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-ejb3x.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.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.0.GA/server/default/deploy/ejb3.deployer/jboss-ejb3.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.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.0.GA/lib/jboss-common.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jboss-j2ee.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.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.0.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.0.GA/lib/jboss-xml-binding.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/servlet-api.jar"/>
-<archive path="/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA/server/default/lib/jbosssx.jar"/>
+<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"/>
</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-deployers.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"/>
@@ -48,5 +47,10 @@
<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"/>
</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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/ant-import/build-thirdparty.xml 2007-06-29 12:57:03 UTC (rev 3762)
@@ -40,7 +40,11 @@
<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.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/>
+ <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/>
<pathelement location="${jboss50.lib}/jboss-j2se.jar"/>
<pathelement location="${jboss50.lib}/jboss-system.jar"/>
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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -21,9 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-//$Id$
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.DeployerManager;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -31,6 +29,9 @@
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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookJSE.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -21,7 +21,7 @@
*/
package org.jboss.wsf.container.jboss50;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,9 +24,10 @@
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.deployers.spi.deployer.helpers.AbstractComponentDeployer;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
//$Id$
@@ -37,13 +38,13 @@
* @author Thomas.Diesler at jboss.org
* @since 24-Apr-2007
*/
-public abstract class AbstractWebServiceDeployer extends AbstractSimpleDeployer
+public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer
{
// 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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -26,7 +26,8 @@
import java.net.URL;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -143,7 +144,7 @@
private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
{
- VirtualFile vf = unit.getMetaDataFile("webservices.xml");
+ VirtualFile vf = ((VFSDeploymentUnit)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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,7 +24,8 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
import org.jboss.metadata.ApplicationMetaData;
@@ -70,13 +71,13 @@
try
{
- if (unit.getDeploymentContext().getParent() != null)
+ if (unit.getParent() != null)
{
udi.parent = new UnifiedDeploymentInfo(null);
- buildDeploymentInfo(dep, udi.parent, unit.getDeploymentContext().getParent().getDeploymentUnit());
+ buildDeploymentInfo(dep, udi.parent, unit.getParent());
}
- udi.vfRoot = new VirtualFileAdaptor(unit.getDeploymentContext().getRoot());
+ udi.vfRoot = new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot());
udi.name = unit.getName();
udi.simpleName = unit.getSimpleName();
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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,8 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ApplicationMetaData;
import org.jboss.metadata.BeanMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -53,7 +54,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,8 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -28,7 +28,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.stateless.StatelessContainer;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -29,7 +29,8 @@
import javax.jws.WebService;
import javax.xml.ws.WebServiceProvider;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.web.Servlet;
import org.jboss.wsf.spi.deployment.Deployment;
@@ -56,7 +57,7 @@
public Deployment createDeployment(DeploymentUnit unit)
{
Deployment dep = createDeployment();
- dep.setRootFile(new VirtualFileAdaptor(unit.getDeploymentContext().getRoot()));
+ dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -24,7 +24,7 @@
//$Id$
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployerDeployer.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -27,18 +27,16 @@
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.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
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
@@ -51,11 +49,11 @@
// provide logging
private static Logger log = Logger.getLogger(WebAppDeployerDeployer.class);
- private MainDeployer mainDeployer;
+ private DeployerClient mainDeployer;
private WebXMLRewriter webXMLRewriter;
- private Map<String, DeploymentContext> contextMap = new HashMap<String, DeploymentContext>();
+ private Map<String, org.jboss.deployers.client.spi.Deployment> deploymentMap = new HashMap<String, org.jboss.deployers.client.spi.Deployment>();
- public void setMainDeployer(MainDeployer mainDeployer)
+ public void setMainDeployer(DeployerClient mainDeployer)
{
this.mainDeployer = mainDeployer;
}
@@ -77,12 +75,11 @@
try
{
webXMLRewriter.rewriteWebXml(dep);
- DeploymentContext context = createDeploymentContext(warURL);
+ org.jboss.deployers.client.spi.Deployment deployment = createDeploymentContext(warURL);
- mainDeployer.addDeploymentContext(context);
- mainDeployer.process();
+ mainDeployer.deploy(deployment);
- contextMap.put(warURL.toExternalForm(), context);
+ deploymentMap.put(warURL.toExternalForm(), deployment);
}
catch (Exception ex)
{
@@ -106,14 +103,11 @@
log.debug("destroyServiceEndpoint: " + warURL);
try
{
- DeploymentContext context = contextMap.get(warURL.toExternalForm());
- if (context != null)
+ org.jboss.deployers.client.spi.Deployment deployment = deploymentMap.get(warURL.toExternalForm());
+ if (deployment != null)
{
- context.setState(DeploymentState.UNDEPLOYING);
- mainDeployer.process();
- mainDeployer.removeDeploymentContext(context.getName());
-
- contextMap.remove(warURL.toExternalForm());
+ mainDeployer.undeploy(deployment);
+ deploymentMap.remove(warURL.toExternalForm());
}
}
catch (Exception ex)
@@ -122,9 +116,9 @@
}
}
- private DeploymentContext createDeploymentContext(URL warURL) throws Exception
+ private org.jboss.deployers.client.spi.Deployment createDeploymentContext(URL warURL) throws Exception
{
VirtualFile file = VFS.getRoot(warURL);
- return new AbstractDeploymentContext(file);
+ return VFSDeploymentFactory.getInstance().createVFSDeployment(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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -29,7 +29,7 @@
import java.util.List;
import java.util.Map;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
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-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.deployer/META-INF/jbossws-deployer-beans.xml 2007-06-29 12:57:03 UTC (rev 3762)
@@ -8,16 +8,6 @@
<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>
@@ -27,16 +17,6 @@
-->
<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>
@@ -46,16 +26,6 @@
<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/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestHelper.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -30,7 +30,6 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.jboss.logging.Logger;
@@ -68,21 +67,21 @@
}
/** True, if -Djbossws.integration.target=jboss50 */
- public static boolean isTargetJBoss50()
+ public boolean isTargetJBoss50()
{
String target = getIntegrationTarget();
return "jboss50".equals(target);
}
/** True, if -Djbossws.integration.target=jboss42 */
- public static boolean isTargetJBoss42()
+ public boolean isTargetJBoss42()
{
String target = getIntegrationTarget();
return "jboss42".equals(target);
}
/** True, if -Djbossws.integration.target=jboss40 */
- public static boolean isTargetJBoss40()
+ public boolean isTargetJBoss40()
{
String target = getIntegrationTarget();
return "jboss40".equals(target);
@@ -93,18 +92,18 @@
String vendor = Service.class.getPackage().getImplementationVendor();
return vendor.startsWith("JBoss");
}
-
+
public boolean isIntegrationSunRI()
{
String vendor = Service.class.getPackage().getImplementationVendor();
return vendor.startsWith("Sun Microsystems");
}
-
+
public boolean isIntegrationXFire()
{
throw new NotImplementedException();
}
-
+
/**
* Get the JBoss server host from system property "jboss.bind.address"
* This defaults to "localhost"
@@ -139,7 +138,7 @@
return new TestDeployerJBoss(getServer());
}
- private static String getIntegrationTarget()
+ public String getIntegrationTarget()
{
if (integrationTarget == null)
{
@@ -149,10 +148,11 @@
throw new IllegalStateException("Cannot obtain jbossws.integration.target");
// Read the JBoss SpecificationVersion
+ String jbossVersion = null;
try
{
ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- String jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
+ jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion");
if (jbossVersion.startsWith("5.0"))
jbossVersion = "jboss50";
else if (jbossVersion.startsWith("4.2"))
@@ -160,17 +160,14 @@
else if (jbossVersion.startsWith("4.0"))
jbossVersion = "jboss40";
else throw new RuntimeException("Unsupported jboss version: " + jbossVersion);
-
- if (jbossVersion.equals(integrationTarget) == false)
- {
- throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
- //integrationTarget = jbossVersion;
- }
}
catch (Throwable th)
{
// ignore, we are not running on jboss-4.2 or greater
}
+
+ if (jbossVersion != null && jbossVersion.equals(integrationTarget) == false)
+ throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion);
}
return integrationTarget;
}
Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/test/JBossWSTestSetup.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -30,6 +30,8 @@
import javax.management.MBeanServerConnection;
import javax.naming.NamingException;
+import org.jboss.logging.Logger;
+
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -42,6 +44,9 @@
*/
public class JBossWSTestSetup extends TestSetup
{
+ // provide logging
+ private static Logger log = Logger.getLogger(JBossWSTestSetup.class);
+
private JBossWSTestHelper delegate = new JBossWSTestHelper();
private String[] archives = new String[0];
@@ -76,6 +81,10 @@
protected void setUp() throws Exception
{
+ // verify integration target
+ String integrationTarget = delegate.getIntegrationTarget();
+ log.debug("Integration target: " + integrationTarget);
+
List clientJars = new ArrayList();
for (int i = 0; i < archives.length; i++)
{
Modified: branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-29 11:51:49 UTC (rev 3761)
+++ branches/jbossws-2.0/testsuite/src/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2007-06-29 12:57:03 UTC (rev 3762)
@@ -48,7 +48,7 @@
{
public static Test suite()
{
- String earName = (JBossWSTestHelper.isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
+ String earName = (new JBossWSTestHelper().isTargetJBoss50() ? "jaxws-samples-eardeployment.ear" : "jaxws-samples-eardeployment42.ear");
return new JBossWSTestSetup(EarTestCase.class, earName);
}
More information about the jbossws-commits
mailing list