[jboss-cvs] JBossAS SVN: r108030 - trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 7 23:07:59 EDT 2010
Author: marius.bogoevici
Date: 2010-09-07 23:07:59 -0400 (Tue, 07 Sep 2010)
New Revision: 108030
Modified:
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
Log:
JBAS-8345: Weld EJB interceptors enabled for deployments that have a beans.xml file in one of the JARs, but not in the metadata location of the deployment
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java 2010-09-08 03:04:03 UTC (rev 108029)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java 2010-09-08 03:07:59 UTC (rev 108030)
@@ -27,6 +27,8 @@
import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
+import java.util.Collection;
+
/**
* Post jboss-app.xml weld deployer.
*
@@ -39,7 +41,6 @@
public PostJBossAppMetadataDeployer()
{
super(JBossAppMetaData.class);
- addInput(DeployersUtils.WELD_FILES);
setOptionalWeldXml(true);
}
@@ -49,7 +50,7 @@
}
@Override
- protected boolean isIsolated(VFSDeploymentUnit unit, VirtualFile wbXml)
+ protected boolean isIsolated(VFSDeploymentUnit unit, Collection<VirtualFile> wbXml)
{
return (super.isIsolated(unit, wbXml) && (wbXml != null || DeployersUtils.checkForWeldFiles(unit)));
}
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java 2010-09-08 03:04:03 UTC (rev 108029)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java 2010-09-08 03:07:59 UTC (rev 108030)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import org.jboss.deployers.spi.DeploymentException;
@@ -51,7 +52,6 @@
public PostWebMetadataDeployer()
{
super(JBossWebMetaData.class, true);
- addInput(DeployersUtils.WELD_FILES);
addInput("merged." + JBossWebMetaData.class.getName());
setStage(DeploymentStages.POST_CLASSLOADER);
setOptionalWeldXml(true);
@@ -68,7 +68,7 @@
CPFM.setUrlPatterns(Arrays.asList("/*"));
}
- protected void internalDeploy(VFSDeploymentUnit unit, JBossWebMetaData deployment, VirtualFile wbXml) throws DeploymentException
+ protected void internalDeploy(VFSDeploymentUnit unit, JBossWebMetaData deployment, Collection<VirtualFile> wbXml) throws DeploymentException
{
if (wbXml != null || DeployersUtils.checkForWeldFiles(unit))
{
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java 2010-09-08 03:04:03 UTC (rev 108029)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java 2010-09-08 03:07:59 UTC (rev 108030)
@@ -26,7 +26,10 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.vfs.VirtualFile;
+import org.jboss.weld.integration.deployer.DeployersUtils;
+import java.util.Collection;
+
/**
* Weld aware metadata deployer.
* It looks for weld.xml in metadata.
@@ -43,13 +46,14 @@
{
super(input);
setStage(DeploymentStages.POST_PARSE);
+ addInput(DeployersUtils.WELD_FILES);
if (isInputModified)
addOutput(input); // we also modify input
}
public void deploy(VFSDeploymentUnit unit, T deployment) throws DeploymentException
{
- VirtualFile wbXml = unit.getMetaDataFile("beans.xml");
+ Collection<VirtualFile> wbXml = unit.getAttachment(DeployersUtils.WELD_FILES, Collection.class);
if (wbXml != null || optionalWeldXml)
internalDeploy(unit, deployment, wbXml);
}
@@ -62,7 +66,7 @@
* @param wbXml web beans xml
* @throws org.jboss.deployers.spi.DeploymentException for any deployment error
*/
- protected abstract void internalDeploy(VFSDeploymentUnit unit, T deployment, VirtualFile wbXml) throws DeploymentException;
+ protected abstract void internalDeploy(VFSDeploymentUnit unit, T deployment, Collection<VirtualFile> wbXml) throws DeploymentException;
/**
* Set optional wb xml file.
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java 2010-09-08 03:04:03 UTC (rev 108029)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java 2010-09-08 03:07:59 UTC (rev 108030)
@@ -29,6 +29,8 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.vfs.VirtualFile;
+import java.util.Collection;
+
/**
* Handle classloading metadata creation.
*
@@ -47,7 +49,7 @@
addOutput(ClassLoadingMetaData.class);
}
- protected void internalDeploy(VFSDeploymentUnit unit, T deployment, VirtualFile wbXml) throws DeploymentException
+ protected void internalDeploy(VFSDeploymentUnit unit, T deployment, Collection<VirtualFile> wbXml) throws DeploymentException
{
ClassLoadingMetaData classLoadingMetaData = unit.getAttachment(ClassLoadingMetaData.class);
if (classLoadingMetaData != null)
@@ -86,9 +88,9 @@
* @param wbXml weld xml
* @return true is deployment shouold be isolated, false otherwise
*/
- protected boolean isIsolated(VFSDeploymentUnit unit, VirtualFile wbXml)
+ protected boolean isIsolated(VFSDeploymentUnit unit, Collection<VirtualFile> wbXml)
{
- return isIsolated();
+ return isolated;
}
/**
@@ -101,14 +103,6 @@
protected abstract String getJMXName(T metaData, DeploymentUnit unit);
/**
- * @return whether ear deployments should be isolated
- */
- public boolean isIsolated()
- {
- return isolated;
- }
-
- /**
* @param isolated whether ear deployments should be isolated
*/
public void setIsolated(boolean isolated)
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-09-08 03:04:03 UTC (rev 108029)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-09-08 03:07:59 UTC (rev 108030)
@@ -21,6 +21,7 @@
*/
package org.jboss.weld.integration.deployer.metadata;
+import java.util.Collection;
import java.util.Iterator;
import org.jboss.deployers.spi.DeploymentException;
@@ -63,7 +64,6 @@
{
super(JBossMetaData.class, true);
- addInput(DeployersUtils.WELD_FILES);
addInput("merged." + JBossMetaData.class.getName());
setStage(DeploymentStages.POST_CLASSLOADER);
@@ -105,7 +105,7 @@
}
@Override
- protected void internalDeploy(VFSDeploymentUnit unit, JBossMetaData jbmd, VirtualFile wbXml) throws DeploymentException
+ protected void internalDeploy(VFSDeploymentUnit unit, JBossMetaData jbmd, Collection<VirtualFile> wbXml) throws DeploymentException
{
if (jbmd.getInterceptors() == null)
{
More information about the jboss-cvs-commits
mailing list