[jboss-cvs] JBossAS SVN: r67429 - in trunk: ejb3/src/main/org/jboss/ejb3/deployers and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2007-11-24 12:20:29 -0500 (Sat, 24 Nov 2007)
New Revision: 67429

Modified:
   trunk/build/build-thirdparty.xml
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/AbstractOptionalVFSRealDeployer.java
   trunk/server/src/main/org/jboss/deployment/JaccCommitDeployer.java
   trunk/server/src/main/org/jboss/deployment/JaccInitializationDeployer.java
   trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
   trunk/system-jmx/src/main/org/jboss/system/deployers/HackClassloaderMetaDataDeployer.java
   trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
Log:
Update to microcontainer 2.0.0.Beta7

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-11-24 17:18:13 UTC (rev 67428)
+++ trunk/build/build-thirdparty.xml	2007-11-24 17:20:29 UTC (rev 67429)
@@ -106,7 +106,7 @@
     <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
     <componentref name="jboss/messaging" version="1.4.0.SP1-brew"/>
     <componentref name="jboss/metadata" version="1.0.0.snapshot"/>
-    <componentref name="jboss/microcontainer" version="2.0.0.Beta6"/>
+    <componentref name="jboss/microcontainer" version="2.0.0.Beta7"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
     <componentref name="jboss/remoting" version="2.2.2.SP2"/>
     <componentref name="jboss/serialization" version="1.0.3.GA"/>

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/AbstractOptionalVFSRealDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/AbstractOptionalVFSRealDeployer.java	2007-11-24 17:18:13 UTC (rev 67428)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/AbstractOptionalVFSRealDeployer.java	2007-11-24 17:20:29 UTC (rev 67429)
@@ -31,7 +31,7 @@
  * is optional instead of mandatory.
  * 
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
  */
 public abstract class AbstractOptionalVFSRealDeployer<T> extends AbstractRealDeployer
 {
@@ -45,7 +45,7 @@
       setInputs(optionalInput);
    }
    
-   public void deploy(DeploymentUnit unit) throws DeploymentException
+   public void internalDeploy(DeploymentUnit unit) throws DeploymentException
    {
       deploy(unit, unit.getAttachment(optionalInput));
    }
@@ -69,7 +69,7 @@
    public abstract void deploy(VFSDeploymentUnit unit, T deployment) throws DeploymentException;
 
    @Override
-   public void undeploy(DeploymentUnit unit)
+   public void internalUndeploy(DeploymentUnit unit)
    {
       undeploy(unit, unit.getAttachment(optionalInput));
    }

Modified: trunk/server/src/main/org/jboss/deployment/JaccCommitDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JaccCommitDeployer.java	2007-11-24 17:18:13 UTC (rev 67428)
+++ trunk/server/src/main/org/jboss/deployment/JaccCommitDeployer.java	2007-11-24 17:20:29 UTC (rev 67429)
@@ -45,7 +45,7 @@
       setInput(PolicyConfiguration.class);
    }
    
-   public void deploy(DeploymentUnit unit) throws org.jboss.deployers.spi.DeploymentException
+   public void internalDeploy(DeploymentUnit unit) throws org.jboss.deployers.spi.DeploymentException
    {
       PolicyConfiguration pc = unit.getAttachment(PolicyConfiguration.class);
       if (pc == null)

Modified: trunk/server/src/main/org/jboss/deployment/JaccInitializationDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JaccInitializationDeployer.java	2007-11-24 17:18:13 UTC (rev 67428)
+++ trunk/server/src/main/org/jboss/deployment/JaccInitializationDeployer.java	2007-11-24 17:20:29 UTC (rev 67429)
@@ -59,7 +59,7 @@
       this.acceptedAttachments = acceptedAttachments;
    }
 
-   public void deploy(DeploymentUnit unit) throws org.jboss.deployers.spi.DeploymentException
+   public void internalDeploy(DeploymentUnit unit) throws org.jboss.deployers.spi.DeploymentException
    {
       boolean accepted = false;
       for (String accept : acceptedAttachments)

Modified: trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2007-11-24 17:18:13 UTC (rev 67428)
+++ trunk/server/src/main/org/jboss/deployment/ReferenceMetaDataResolverDeployer.java	2007-11-24 17:20:29 UTC (rev 67429)
@@ -85,7 +85,7 @@
     * Look for ejb, web or client metadata to resolve references without
     * mapped names.
     */
-   public void deploy(DeploymentUnit unit) throws DeploymentException
+   public void internalDeploy(DeploymentUnit unit) throws DeploymentException
    {
       JBossMetaData ejbMetaData = unit.getAttachment(JBossMetaData.class);
       JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
@@ -118,7 +118,7 @@
       }
    }
 
-   public void undeploy(DeploymentUnit unit)
+   public void internalUndeploy(DeploymentUnit unit)
    {
    }
 

Modified: trunk/system-jmx/src/main/org/jboss/system/deployers/HackClassloaderMetaDataDeployer.java
===================================================================
--- trunk/system-jmx/src/main/org/jboss/system/deployers/HackClassloaderMetaDataDeployer.java	2007-11-24 17:18:13 UTC (rev 67428)
+++ trunk/system-jmx/src/main/org/jboss/system/deployers/HackClassloaderMetaDataDeployer.java	2007-11-24 17:20:29 UTC (rev 67429)
@@ -65,7 +65,7 @@
       setStage(DeploymentStages.DESCRIBE);
    }
 
-   public void deploy(DeploymentUnit unit) throws DeploymentException
+   public void internalDeploy(DeploymentUnit unit) throws DeploymentException
    {
       // Check the loader repository config
       LoaderRepositoryConfig loaderConfig = unit.getAttachment(LoaderRepositoryConfig.class);
@@ -116,7 +116,7 @@
       classLoading.addDeploymentUnit(unit);
    }
 
-   public void undeploy(DeploymentUnit unit)
+   public void internalUndeploy(DeploymentUnit unit)
    {
       classLoading.removeDeploymentUnit(unit);
    }

Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java	2007-11-24 17:18:13 UTC (rev 67428)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/AbstractWebServiceDeployer.java	2007-11-24 17:20:29 UTC (rev 67429)
@@ -57,14 +57,14 @@
    }
 
    @Override
-   public void deploy(DeploymentUnit unit) throws DeploymentException
+   public void internalDeploy(DeploymentUnit unit) throws DeploymentException
    {
       for (DeployerHook deployer : deployerHooks)
          deployer.deploy(unit);
    }
 
    @Override
-   public void undeploy(DeploymentUnit unit)
+   public void internalUndeploy(DeploymentUnit unit)
    {
       for (DeployerHook deployer : deployerHooks)
          deployer.undeploy(unit);