[jboss-cvs] JBossAS SVN: r81794 - in projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src: test/java/org/jboss/test/deployers/classloading/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 28 16:58:21 EST 2008
Author: alesj
Date: 2008-11-28 16:58:21 -0500 (Fri, 28 Nov 2008)
New Revision: 81794
Added:
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java
Modified:
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
Log:
Port jbdeploy-137.
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java 2008-11-28 21:47:56 UTC (rev 81793)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java 2008-11-28 21:58:21 UTC (rev 81794)
@@ -27,6 +27,7 @@
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.Controller;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -34,6 +35,7 @@
* AbstractDeploymentClassLoaderPolicyModule.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public abstract class AbstractDeploymentClassLoaderPolicyModule extends ClassLoaderPolicyModule
@@ -64,12 +66,14 @@
* Determine the classloading metadata for the deployment unit
*
* @param unit the deployment unit
+ * @param addAlias should we add alias or remove
* @return the classloading metadata
*/
- private static String determineContextName(DeploymentUnit unit)
+ private static String determineContextName(DeploymentUnit unit, boolean addAlias)
{
if (unit == null)
throw new IllegalArgumentException("Null unit");
+
ControllerContext context = unit.getTopLevel().getAttachment(ControllerContext.class);
if (context == null)
throw new IllegalStateException("Deployment has no controller context");
@@ -81,15 +85,23 @@
if (contextName.equals(context.getName()) == false)
{
Set<Object> aliases = context.getAliases();
- if (aliases != null && aliases.contains(contextName) == false)
+ if (aliases == null || (aliases != null && aliases.contains(contextName) == false))
{
- try
+ Controller controller = context.getController();
+ if (addAlias)
{
- context.getController().addAlias(contextName, context.getName());
+ try
+ {
+ controller.addAlias(contextName, context.getName());
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException("Error adding deployment alias " + contextName + " to " + context, t);
+ }
}
- catch (Throwable t)
+ else
{
- throw new RuntimeException("Error adding deployment alias " + contextName + " to " + context, t);
+ controller.removeAlias(contextName);
}
}
}
@@ -105,7 +117,7 @@
*/
public AbstractDeploymentClassLoaderPolicyModule(DeploymentUnit unit)
{
- super(determineClassLoadingMetaData(unit), determineContextName(unit));
+ super(determineClassLoadingMetaData(unit), determineContextName(unit, true));
this.unit = unit;
ControllerContext context = unit.getTopLevel().getAttachment(ControllerContext.class);
setControllerContext(context);
@@ -126,4 +138,11 @@
{
return CLASSLOADER_STATE;
}
+
+ @Override
+ public void reset()
+ {
+ super.reset();
+ determineContextName(unit, false);
+ }
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java (from rev 81793, projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ModuleRemoveUnitTestCase.java 2008-11-28 21:58:21 UTC (rev 81794)
@@ -0,0 +1,146 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.classloading.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.classloading.spi.version.Version;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.plugins.main.MainDeployerImpl;
+import org.jboss.deployers.structure.spi.DeploymentContext;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.helpers.AbstractDeploymentContext;
+import org.jboss.deployers.structure.spi.helpers.AbstractDeploymentUnit;
+import org.jboss.deployers.structure.spi.helpers.AbstractStructuralDeployers;
+import org.jboss.deployers.structure.spi.helpers.AbstractStructureBuilder;
+import org.jboss.test.deployers.classloading.support.a.A;
+
+/**
+ * ModuleRemoveUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ModuleRemoveUnitTestCase extends ClassLoaderDependenciesTest
+{
+ private Controller controller;
+
+ public static Test suite()
+ {
+ return new TestSuite(ModuleRemoveUnitTestCase.class);
+ }
+
+ public ModuleRemoveUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testAliasRemove() throws Exception
+ {
+ DeployerClient mainDeployer = getMainDeployer();
+ // change structure builder
+ MainDeployerImpl mdi = assertInstanceOf(mainDeployer, MainDeployerImpl.class);
+ AbstractStructuralDeployers ads = assertInstanceOf(mdi.getStructuralDeployers(), AbstractStructuralDeployers.class);
+ ads.setStructureBuilder(new RenamingStructureBuilder());
+
+ Version v1 = Version.parseVersion("1");
+ Deployment ad = createSimpleDeployment("A");
+ addClassLoadingMetaData(ad, ad.getName(), v1, true, A.class);
+
+ mainDeployer.addDeployment(ad);
+ mainDeployer.process();
+
+ try
+ {
+ mainDeployer.checkComplete();
+ assertAlias(true);
+ }
+ finally
+ {
+ mainDeployer.removeDeployment(ad);
+ mainDeployer.process();
+ assertAlias(false);
+ }
+ }
+
+ protected void assertAlias(boolean exists) throws Exception
+ {
+ // this is ugly impl detail
+ String controllerId = controller.getClass().getSimpleName() + "[" + System.identityHashCode(controller) + "]";
+ ControllerContext alias = controller.getContext("A_Alias_" + controllerId, null);
+ assertEquals(exists, alias != null);
+ }
+
+ private class RenamingStructureBuilder extends AbstractStructureBuilder
+ {
+ @Override
+ protected DeploymentContext createRootDeploymentContext(Deployment deployment) throws Exception
+ {
+ return new RenamingDeploymentContext("NotA", "");
+ }
+ }
+
+ private class RenamingDeploymentContext extends AbstractDeploymentContext
+ {
+ public RenamingDeploymentContext()
+ {
+ }
+
+ public RenamingDeploymentContext(String name, String relativePath)
+ {
+ super(name, relativePath);
+ }
+
+ @Override
+ protected DeploymentUnit createDeploymentUnit()
+ {
+ return new RenamingDeploymentUnit(this);
+ }
+ }
+
+ private class RenamingDeploymentUnit extends AbstractDeploymentUnit
+ {
+ public RenamingDeploymentUnit()
+ {
+ }
+
+ private RenamingDeploymentUnit(DeploymentContext deploymentContext)
+ {
+ super(deploymentContext);
+ }
+
+ @Override
+ public String getName()
+ {
+ return "A";
+ }
+ }
+
+ @Override
+ protected Controller getController()
+ {
+ controller = super.getController();
+ return controller;
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list