[jboss-cvs] JBossAS SVN: r85159 - in projects/jboss-deployers/trunk: deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 3 06:40:10 EST 2009
Author: alesj
Date: 2009-03-03 06:40:09 -0500 (Tue, 03 Mar 2009)
New Revision: 85159
Modified:
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentContext.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnit.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java
projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java
projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java
projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
Log:
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentContext.java 2009-03-03 11:32:42 UTC (rev 85158)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentContext.java 2009-03-03 11:40:09 UTC (rev 85159)
@@ -39,6 +39,7 @@
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author Scott.Stark at jboss.org
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 59630 $
*/
public interface DeploymentContext extends ManagedObjectsWithTransientAttachments
@@ -339,6 +340,13 @@
ClassLoader getResourceClassLoader();
/**
+ * Get underlying controller context name.
+ *
+ * @return the controller context name
+ */
+ Object getControllerContextName();
+
+ /**
* Get the dependency info
*
* @return the dependency
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnit.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnit.java 2009-03-03 11:32:42 UTC (rev 85158)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnit.java 2009-03-03 11:40:09 UTC (rev 85159)
@@ -41,6 +41,7 @@
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author Scott.Stark at jboss.org
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public interface DeploymentUnit extends MutableAttachments
@@ -259,8 +260,15 @@
* @return the deployer or null if not associated with a main deployer
*/
MainDeployer getMainDeployer();
-
+
/**
+ * Get underlying controller context name.
+ *
+ * @return the controller context name
+ */
+ Object getControllerContextName();
+
+ /**
* Get the dependency info
*
* @return the dependency
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2009-03-03 11:32:42 UTC (rev 85158)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContext.java 2009-03-03 11:40:09 UTC (rev 85159)
@@ -72,6 +72,7 @@
*
* @author <a href="adrian at jboss.org">Adrian Brock</a>
* @author Scott.Stark at jboss.org
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class AbstractDeploymentContext extends ManagedObjectsWithTransientAttachmentsImpl implements DeploymentContext, AbstractDeploymentContextMBean, MBeanRegistration
@@ -752,16 +753,36 @@
return EmptyResourceLoader.INSTANCE;
}
+ public Object getControllerContextName()
+ {
+ ControllerContext controllerContext = getTransientAttachments().getAttachment(ControllerContext.class);
+ if (controllerContext != null)
+ {
+ return controllerContext.getName();
+ }
+ else
+ {
+ DeploymentContext parent = getParent();
+ if (parent == null)
+ throw new IllegalStateException("Deployment ControllerContext has not been set");
+
+ return parent.getControllerContextName();
+ }
+ }
+
public DependencyInfo getDependencyInfo()
{
ControllerContext controllerContext = getTransientAttachments().getAttachment(ControllerContext.class);
if (controllerContext != null)
+ {
return controllerContext.getDependencyInfo();
+ }
else
{
DeploymentContext parent = getParent();
if (parent == null)
throw new IllegalStateException("Deployment ControllerContext has not been set");
+
return parent.getDependencyInfo();
}
}
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java 2009-03-03 11:32:42 UTC (rev 85158)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentUnit.java 2009-03-03 11:40:09 UTC (rev 85159)
@@ -55,6 +55,7 @@
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author Scott.Stark at jboss.org
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class AbstractDeploymentUnit extends AbstractMutableAttachments implements DeploymentUnit
@@ -461,6 +462,11 @@
getDeploymentContext().visit(contextVisitor);
}
+ public Object getControllerContextName()
+ {
+ return getDeploymentContext().getControllerContextName();
+ }
+
public DependencyInfo getDependencyInfo()
{
return getDeploymentContext().getDependencyInfo();
Modified: projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java 2009-03-03 11:32:42 UTC (rev 85158)
+++ projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContext.java 2009-03-03 11:40:09 UTC (rev 85159)
@@ -60,6 +60,7 @@
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author Scott.Stark at jboss.org
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 59630 $
*/
public class ComponentDeploymentContext implements DeploymentContext, ComponentDeploymentContextMBean, MBeanRegistration
@@ -422,6 +423,11 @@
return parent.getResourceLoader();
}
+ public Object getControllerContextName()
+ {
+ return parent.getControllerContextName();
+ }
+
public DependencyInfo getDependencyInfo()
{
return parent.getDependencyInfo();
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java 2009-03-03 11:32:42 UTC (rev 85158)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java 2009-03-03 11:40:09 UTC (rev 85159)
@@ -21,7 +21,6 @@
*/
package org.jboss.deployers.vfs.plugins.dependency;
-import org.jboss.dependency.spi.ControllerContext;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
@@ -43,11 +42,7 @@
public void deploy(DeploymentUnit unit, DependenciesMetaData deployment) throws DeploymentException
{
- ControllerContext context = unit.getTopLevel().getAttachment(ControllerContext.class);
- if (context == null)
- throw new DeploymentException("Missing deployment controller context: " + unit.getName());
-
- Object contextName = context.getName();
+ Object contextName = unit.getControllerContextName();
unit.addAttachment(DeploymentDependencies.class, new DeploymentDependenciesImpl(contextName, deployment));
}
}
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java 2009-03-03 11:32:42 UTC (rev 85158)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java 2009-03-03 11:40:09 UTC (rev 85159)
@@ -27,7 +27,6 @@
import java.util.Set;
import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
@@ -57,11 +56,7 @@
@Override
protected DeploymentUnit addComponent(DeploymentUnit unit, Object attachment)
{
- ControllerContext context = unit.getAttachment(ControllerContext.class);
- if (context == null)
- throw new IllegalArgumentException("Missing deployment controller context: " + unit.getName());
-
- Object contextName = context.getName();
+ Object contextName = unit.getControllerContextName();
try
{
controller.addAlias(attachment, contextName);
More information about the jboss-cvs-commits
mailing list