[Jboss-cvs] JBossAS SVN: r56350 - in branches/MC_VDF_WORK/system/src/main/org/jboss/deployers: plugins plugins/classloading plugins/jar spi
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 28 13:22:20 EDT 2006
Author: scott.stark at jboss.org
Date: 2006-08-28 13:22:14 -0400 (Mon, 28 Aug 2006)
New Revision: 56350
Modified:
branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/AbstractAspectDeployer.java
branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/DeployerConstants.java
branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/classloading/ClassLoadingDeployer.java
branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/jar/JARDeployer.java
branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/spi/ContextDataKeys.java
Log:
Move common keys in org.jboss.deployers.plugins.DeployerConstants to org.jboss.deployers.spi.ContextDataKeys
Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/AbstractAspectDeployer.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/AbstractAspectDeployer.java 2006-08-28 16:20:51 UTC (rev 56349)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/AbstractAspectDeployer.java 2006-08-28 17:22:14 UTC (rev 56350)
@@ -24,6 +24,7 @@
import java.util.concurrent.atomic.AtomicLong;
import org.jboss.deployers.spi.AspectDeployer;
+import org.jboss.deployers.spi.ContextDataKeys;
import org.jboss.deployers.spi.DeploymentContext;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.kernel.plugins.event.AbstractEvent;
@@ -190,7 +191,7 @@
if( this.isAllowImplicitClasspath() )
{
ctx.putContextData(DeployerConstants.class,
- DeployerConstants.DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH, Boolean.TRUE);
+ ContextDataKeys.DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH, Boolean.TRUE);
}
return false;
}
Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/DeployerConstants.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/DeployerConstants.java 2006-08-28 16:20:51 UTC (rev 56349)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/DeployerConstants.java 2006-08-28 17:22:14 UTC (rev 56350)
@@ -65,19 +65,6 @@
public static final String ZIP_ENHANCED_SUFFIX = "270:.zip";
public static final String BSH_ENHANCED_SUFFIX = "280:.bsh";
public static final String LAST_ENHANCED_SUFFIX = "900:.last";
- /** The key into the DeploymentContext.contextData used like:
- * dc.putContextData(DeployerConstants.class, DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH, Boolean.TRUE|Boolean.FALSE)
- * if TRUE the JARDeployer will add non-deployment jars to the containing
- * deployment. If FALSE, only explicit classpath entries added by deployers
- * or ClassLoadingDeployer metadata will be added.
- */
- public static final String DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH = "implicitClasspath";
- /**
- * The key into the DeploymentContext.contextData for the deployment
- * class loader.
- */
- public static final String CLASSLOADER = "classloader";
-
public static final int DEFAULT_SUFFIX_ORDER = 500;
}
Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/classloading/ClassLoadingDeployer.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/classloading/ClassLoadingDeployer.java 2006-08-28 16:20:51 UTC (rev 56349)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/classloading/ClassLoadingDeployer.java 2006-08-28 17:22:14 UTC (rev 56350)
@@ -29,6 +29,7 @@
import org.jboss.deployers.plugins.AbstractAspectDeployer;
import org.jboss.deployers.plugins.DeployerConstants;
+import org.jboss.deployers.spi.ContextDataKeys;
import org.jboss.deployers.spi.DeploymentContext;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.vfs.classloading.VFSClassLoader;
@@ -36,7 +37,8 @@
import org.jboss.vfs.spi.VirtualFile;
/**
- * ClassLoadingDeployer
+ * ClassLoadingDeployer that sets the
+ * DeployerConstants.CLASSLOADING_DEPLOYER_ORDER
*
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
* @version $Revision$
@@ -107,7 +109,7 @@
public void deploy(DeploymentContext ctx) throws DeploymentException
{
VFSClassLoader loader = (VFSClassLoader) ctx.getContextData(DeployerConstants.class,
- DeployerConstants.CLASSLOADER);
+ ContextDataKeys.CLASSLOADER);
if( loader == null )
{
ReadOnlyVFS vfs = ctx.getVFS();
@@ -115,7 +117,7 @@
String[] paths = new String[classpath.size()];
loader = new VFSClassLoader(paths, vfs);
ctx.putContextData(DeployerConstants.class,
- DeployerConstants.CLASSLOADER, loader);
+ ContextDataKeys.CLASSLOADER, loader);
}
}
Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/jar/JARDeployer.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/jar/JARDeployer.java 2006-08-28 16:20:51 UTC (rev 56349)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/plugins/jar/JARDeployer.java 2006-08-28 17:22:14 UTC (rev 56350)
@@ -23,6 +23,7 @@
import org.jboss.deployers.plugins.AbstractAspectDeployer;
import org.jboss.deployers.plugins.DeployerConstants;
+import org.jboss.deployers.spi.ContextDataKeys;
import org.jboss.deployers.spi.DeploymentContext;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.vfs.spi.VirtualFile;
@@ -30,7 +31,7 @@
/**
* A structural only deployer that should be ordered last to pickup
* non-deployment jars in deployments marked with
- * {@value DeployerConstants#DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH}DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH
+ * {@value ContextDataKeys#DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH}DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH
* key with a value of Boolean.TRUE in the DeploymentContext.contextData map.
*
* @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
@@ -77,7 +78,7 @@
{
DeploymentContext parent = ctx.getParentContext();
Boolean implicitClasspath = (Boolean) parent.getContextData(DeployerConstants.class,
- DeployerConstants.DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH);
+ ContextDataKeys.DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH);
if( parent != null && Boolean.TRUE == implicitClasspath )
{
String path = vf.getPathName();
Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/spi/ContextDataKeys.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/spi/ContextDataKeys.java 2006-08-28 16:20:51 UTC (rev 56349)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/deployers/spi/ContextDataKeys.java 2006-08-28 17:22:14 UTC (rev 56350)
@@ -29,11 +29,20 @@
*/
public interface ContextDataKeys
{
- /** A key to the VFSClassLoader instance for the ctx
- */
- public static final String VFSClassLoader = "VFSClassLoader";
/**
* A key to the name of the VFSClassLoader bean instance for the ctx
*/
public static final String VFSClassLoaderName = "VFSClassLoaderName";
+ /**
+ * The key into the DeploymentContext.contextData for the deployment
+ * class loader.
+ */
+ public static final String CLASSLOADER = "classloader";
+ /** The key into the DeploymentContext.contextData used like:
+ * dc.putContextData(DeployerConstants.class, DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH, Boolean.TRUE|Boolean.FALSE)
+ * if TRUE the JARDeployer will add non-deployment jars to the containing
+ * deployment. If FALSE, only explicit classpath entries added by deployers
+ * or ClassLoadingDeployer metadata will be added.
+ */
+ public static final String DEPLOYER_ALLOWS_IMPLICIT_CLASSPATH = "implicitClasspath";
}
More information about the jboss-cvs-commits
mailing list