[jboss-cvs] JBossAS SVN: r82669 - in projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer: metadata and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 7 12:59:58 EST 2009
Author: alesj
Date: 2009-01-07 12:59:58 -0500 (Wed, 07 Jan 2009)
New Revision: 82669
Modified:
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java
Log:
Refactor util method.
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java 2009-01-07 17:50:01 UTC (rev 82668)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java 2009-01-07 17:59:58 UTC (rev 82669)
@@ -23,8 +23,11 @@
import java.io.Serializable;
import java.net.URL;
+import java.util.Collection;
+import java.util.List;
import org.jboss.virtual.VirtualFile;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
/**
* JBoss WebBeans custom meta data
@@ -52,4 +55,50 @@
{
return file.toURL();
}
+
+ /**
+ * Check deployment hierarchy for web-beans.xml files.
+ * It check the 'cached' flag.
+ *
+ * @param unit the deployment unit
+ * @return true if web-beans.xml files exist, false otherwise
+ */
+ public static boolean checkForWebBeansFiles(DeploymentUnit unit)
+ {
+ DeploymentUnit top = unit.getTopLevel();
+
+ Boolean flag = top.getAttachment(WEB_BEANS_DEPLOYMENT_FLAG, Boolean.class);
+ if (flag != null)
+ return flag;
+
+ flag = searchForWebBeans(top);
+ top.addAttachment(WEB_BEANS_DEPLOYMENT_FLAG, flag, Boolean.class);
+
+ return flag;
+ }
+
+ /**
+ * Search deployment hierarchy for web-beans.xml files.
+ *
+ * @param unit the deployment unit
+ * @return true if web-beans.xml files exist, false otherwise
+ */
+ private static boolean searchForWebBeans(DeploymentUnit unit)
+ {
+ Collection files = unit.getAttachment(WEB_BEANS_FILES, Collection.class);
+ if (files != null && files.isEmpty() == false)
+ return true;
+
+ List<DeploymentUnit> children = unit.getChildren();
+ if (children != null && children.isEmpty() == false)
+ {
+ for (DeploymentUnit child : children)
+ {
+ boolean result = searchForWebBeans(child);
+ if (result)
+ return true;
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java 2009-01-07 17:50:01 UTC (rev 82668)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java 2009-01-07 17:59:58 UTC (rev 82669)
@@ -51,7 +51,7 @@
@Override
protected boolean isIsolated(VFSDeploymentUnit unit, VirtualFile wbXml)
{
- return (super.isIsolated(unit, wbXml) && (wbXml != null || checkForWebBeansFiles(unit)));
+ return (super.isIsolated(unit, wbXml) && (wbXml != null || JBossWebBeansMetaData.checkForWebBeansFiles(unit)));
}
protected String getJMXName(JBossAppMetaData metaData, DeploymentUnit unit)
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java 2009-01-07 17:50:01 UTC (rev 82668)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java 2009-01-07 17:59:58 UTC (rev 82669)
@@ -55,7 +55,7 @@
protected void internalDeploy(VFSDeploymentUnit unit, JBossWebMetaData deployment, VirtualFile wbXml) throws DeploymentException
{
- if (wbXml != null || checkForWebBeansFiles(unit))
+ if (wbXml != null || JBossWebBeansMetaData.checkForWebBeansFiles(unit))
{
List<ListenerMetaData> listeners = deployment.getListeners();
if (listeners == null)
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java 2009-01-07 17:50:01 UTC (rev 82668)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java 2009-01-07 17:59:58 UTC (rev 82669)
@@ -21,16 +21,11 @@
*/
package org.jboss.webbeans.integration.microcontainer.deployer.metadata;
-import java.util.Collection;
-import java.util.List;
-
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaData;
/**
* WebBeans aware metadata deployer.
@@ -58,54 +53,7 @@
internalDeploy(unit, deployment, wbXml);
}
-
/**
- * Check deployment hierarchy for web-beans.xml files.
- * It check the 'cached' flag.
- *
- * @param unit the deployment unit
- * @return true if web-beans.xml files exist, false otherwise
- */
- static boolean checkForWebBeansFiles(DeploymentUnit unit)
- {
- DeploymentUnit top = unit.getTopLevel();
-
- Boolean flag = top.getAttachment(JBossWebBeansMetaData.WEB_BEANS_DEPLOYMENT_FLAG, Boolean.class);
- if (flag != null)
- return flag;
-
- flag = searchForWebBeans(top);
- top.addAttachment(JBossWebBeansMetaData.WEB_BEANS_DEPLOYMENT_FLAG, flag, Boolean.class);
-
- return flag;
- }
-
- /**
- * Search deployment hierarchy for web-beans.xml files.
- *
- * @param unit the deployment unit
- * @return true if web-beans.xml files exist, false otherwise
- */
- private static boolean searchForWebBeans(DeploymentUnit unit)
- {
- Collection files = unit.getAttachment(JBossWebBeansMetaData.WEB_BEANS_FILES, Collection.class);
- if (files != null && files.isEmpty() == false)
- return true;
-
- List<DeploymentUnit> children = unit.getChildren();
- if (children != null && children.isEmpty() == false)
- {
- for (DeploymentUnit child : children)
- {
- boolean result = searchForWebBeans(child);
- if (result)
- return true;
- }
- }
- return false;
- }
-
- /**
* Deploy.
*
* @param unit the deployment unit
More information about the jboss-cvs-commits
mailing list