[jboss-cvs] JBossAS SVN: r69940 - in projects/microcontainer/trunk: deployers-impl/src/tests/org/jboss/test/deployers/deployer/support and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 19 11:47:35 EST 2008
Author: adrian at jboss.org
Date: 2008-02-19 11:47:35 -0500 (Tue, 19 Feb 2008)
New Revision: 69940
Modified:
projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/classloading/AbstractTopLevelClassLoaderSystemDeployer.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestClassLoaderDeployer.java
projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractClassLoaderDeployer.java
projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractTopLevelClassLoaderDeployer.java
projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/ClassLoaderFactory.java
projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestClassLoaderDeployer.java
Log:
[JBMICROCONT-189] - Remove the DeploymentContext from the ClassLoader deployers and factory
Modified: projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/classloading/AbstractTopLevelClassLoaderSystemDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/classloading/AbstractTopLevelClassLoaderSystemDeployer.java 2008-02-19 16:37:55 UTC (rev 69939)
+++ projects/microcontainer/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/classloading/AbstractTopLevelClassLoaderSystemDeployer.java 2008-02-19 16:47:35 UTC (rev 69940)
@@ -30,7 +30,7 @@
import org.jboss.classloading.spi.dependency.Module;
import org.jboss.classloading.spi.dependency.policy.ClassLoaderPolicyModule;
import org.jboss.deployers.spi.deployer.helpers.AbstractTopLevelClassLoaderDeployer;
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* AbstractTopLevelClassLoaderSystemDeployer.
@@ -110,7 +110,7 @@
}
@Override
- protected ClassLoader createTopLevelClassLoader(DeploymentContext context) throws Exception
+ protected ClassLoader createTopLevelClassLoader(DeploymentUnit unit) throws Exception
{
if (classLoading == null)
throw new IllegalStateException("The classLoading has not been set");
@@ -118,7 +118,7 @@
throw new IllegalStateException("The system has not been set");
// No module means no classloader for the deployment, use the deployer's classloader
- Module module = context.getTransientAttachments().getAttachment(Module.class);
+ Module module = unit.getAttachment(Module.class);
if (module == null)
return null;
@@ -139,14 +139,14 @@
}
@Override
- protected void removeTopLevelClassLoader(DeploymentContext context) throws Exception
+ protected void removeTopLevelClassLoader(DeploymentUnit unit) throws Exception
{
// No module means no for the deployment classloader
- Module module = context.getTransientAttachments().getAttachment(Module.class);
+ Module module = unit.getAttachment(Module.class);
if (module == null)
return;
- ClassLoader classLoader = context.getClassLoader();
+ ClassLoader classLoader = unit.getClassLoader();
try
{
unregisterClassLoaderFromMBeanServer(classLoader);
@@ -163,7 +163,7 @@
}
finally
{
- cleanup(context, module);
+ cleanup(unit, module);
module.reset();
}
}
@@ -214,11 +214,11 @@
/**
* Hook to perform cleanup on destruction of classloaader
*
- * @param context the deployment context
+ * @param unit the deployment unit
* @param module the module
* @throws Exception for any error
*/
- protected void cleanup(DeploymentContext context, Module module) throws Exception
+ protected void cleanup(DeploymentUnit unit, Module module) throws Exception
{
}
}
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestClassLoaderDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestClassLoaderDeployer.java 2008-02-19 16:37:55 UTC (rev 69939)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/TestClassLoaderDeployer.java 2008-02-19 16:47:35 UTC (rev 69940)
@@ -27,7 +27,7 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractTopLevelClassLoaderDeployer;
import org.jboss.deployers.structure.spi.ClassLoaderFactory;
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* TestDeployerOrdering.
@@ -39,14 +39,14 @@
{
public ClassLoader cl = new URLClassLoader(new URL[0]);
- public ClassLoader createTopLevelClassLoader(DeploymentContext context) throws DeploymentException
+ public ClassLoader createTopLevelClassLoader(DeploymentUnit unit) throws DeploymentException
{
- log.debug("Created classloader: " + context.getName());
+ log.debug("Created classloader: " + unit.getName());
return cl;
}
- public void removeTopLevelClassLoader(DeploymentContext context) throws Exception
+ public void removeTopLevelClassLoader(DeploymentUnit unit) throws Exception
{
- log.debug("Removed classloader: " + context.getName());
+ log.debug("Removed classloader: " + unit.getName());
}
}
Modified: projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractClassLoaderDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractClassLoaderDeployer.java 2008-02-19 16:37:55 UTC (rev 69939)
+++ projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractClassLoaderDeployer.java 2008-02-19 16:47:35 UTC (rev 69940)
@@ -24,7 +24,6 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.ClassLoaderFactory;
-import org.jboss.deployers.structure.spi.DeploymentContext;
import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
@@ -61,7 +60,7 @@
unit.removeClassLoader(factory);
}
- public void removeClassLoader(DeploymentContext context) throws Exception
+ public void removeClassLoader(DeploymentUnit unit) throws Exception
{
}
}
Modified: projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractTopLevelClassLoaderDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractTopLevelClassLoaderDeployer.java 2008-02-19 16:37:55 UTC (rev 69939)
+++ projects/microcontainer/trunk/deployers-spi/src/main/org/jboss/deployers/spi/deployer/helpers/AbstractTopLevelClassLoaderDeployer.java 2008-02-19 16:47:35 UTC (rev 69940)
@@ -21,7 +21,7 @@
*/
package org.jboss.deployers.spi.deployer.helpers;
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* AbstractTopLevelClassLoaderDeployer.
@@ -31,37 +31,37 @@
*/
public abstract class AbstractTopLevelClassLoaderDeployer extends AbstractClassLoaderDeployer
{
- public ClassLoader createClassLoader(DeploymentContext context) throws Exception
+ public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
{
- if (context.isTopLevel())
- return createTopLevelClassLoader(context);
+ if (unit.isTopLevel())
+ return createTopLevelClassLoader(unit);
- return context.getTopLevel().getClassLoader();
+ return unit.getTopLevel().getClassLoader();
}
@Override
- public void removeClassLoader(DeploymentContext context) throws Exception
+ public void removeClassLoader(DeploymentUnit unit) throws Exception
{
- if (context.isTopLevel())
- removeTopLevelClassLoader(context);
+ if (unit.isTopLevel())
+ removeTopLevelClassLoader(unit);
}
/**
* Create a top level classloader
*
- * @param context the context
+ * @param unit the deployment unit
* @return the classloader
* @throws Exception for any error
*/
- protected abstract ClassLoader createTopLevelClassLoader(DeploymentContext context) throws Exception;
+ protected abstract ClassLoader createTopLevelClassLoader(DeploymentUnit unit) throws Exception;
/**
* Remove a top level classloader
*
- * @param context the context
+ * @param unit the deployment unit
* @throws Exception for any error
*/
- protected void removeTopLevelClassLoader(DeploymentContext context) throws Exception
+ protected void removeTopLevelClassLoader(DeploymentUnit unit) throws Exception
{
}
}
Modified: projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/ClassLoaderFactory.java
===================================================================
--- projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/ClassLoaderFactory.java 2008-02-19 16:37:55 UTC (rev 69939)
+++ projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/ClassLoaderFactory.java 2008-02-19 16:47:35 UTC (rev 69940)
@@ -32,17 +32,17 @@
/**
* Create a classloader for this deployment
*
- * @param context the deployment context
+ * @param unit the deployment unit
* @return classloader or null if not created
* @throws Exception for any error
*/
- ClassLoader createClassLoader(DeploymentContext context) throws Exception;
+ ClassLoader createClassLoader(DeploymentUnit unit) throws Exception;
/**
* Remove a classloader for this deployment
*
- * @param context the deployment context
+ * @param unit the deployment unit
* @throws Exception for any error
*/
- void removeClassLoader(DeploymentContext context) throws Exception;
+ void removeClassLoader(DeploymentUnit unit) throws Exception;
}
Modified: projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
===================================================================
--- projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2008-02-19 16:37:55 UTC (rev 69939)
+++ projects/microcontainer/trunk/deployers-structure-spi/src/main/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2008-02-19 16:47:35 UTC (rev 69940)
@@ -507,7 +507,7 @@
try
{
- cl = factory.createClassLoader(this);
+ cl = factory.createClassLoader(getDeploymentUnit());
if (cl != null)
{
setClassLoader(cl);
@@ -532,7 +532,7 @@
return;
try
{
- classLoaderFactory.removeClassLoader(this);
+ classLoaderFactory.removeClassLoader(getDeploymentUnit());
}
catch (Throwable t)
{
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestClassLoaderDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestClassLoaderDeployer.java 2008-02-19 16:37:55 UTC (rev 69939)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/TestClassLoaderDeployer.java 2008-02-19 16:47:35 UTC (rev 69940)
@@ -22,7 +22,7 @@
package org.jboss.test.deployers.vfs.deployer.bean.support;
import org.jboss.deployers.spi.deployer.helpers.AbstractTopLevelClassLoaderDeployer;
-import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* TestClassLoaderDeployer.
@@ -32,7 +32,7 @@
*/
public class TestClassLoaderDeployer extends AbstractTopLevelClassLoaderDeployer
{
- protected ClassLoader createTopLevelClassLoader(DeploymentContext context) throws Exception
+ protected ClassLoader createTopLevelClassLoader(DeploymentUnit unit) throws Exception
{
return new TestClassLoader();
}
More information about the jboss-cvs-commits
mailing list