[jboss-cvs] JBossAS SVN: r91584 - projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-07-22 17:24:00 -0400 (Wed, 22 Jul 2009)
New Revision: 91584

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostWebMetadataDeployer.java
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansAwareMetadataDeployer.java
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansClassloadingDeployer.java
Log:
[WBINT-20]; exclude input output in WebBeansClassloadingDeployer.

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostWebMetadataDeployer.java	2009-07-22 21:22:25 UTC (rev 91583)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/PostWebMetadataDeployer.java	2009-07-22 21:24:00 UTC (rev 91584)
@@ -49,7 +49,7 @@
 
    public PostWebMetadataDeployer()
    {
-      super(JBossWebMetaData.class);
+      super(JBossWebMetaData.class, true);
       addInput(DeployersUtils.WEB_BEANS_FILES);
       addInput("merged." + JBossWebMetaData.class.getName());
       setStage(DeploymentStages.POST_CLASSLOADER);

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-07-22 21:22:25 UTC (rev 91583)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WBEjbInterceptorMetadataDeployer.java	2009-07-22 21:24:00 UTC (rev 91584)
@@ -51,7 +51,7 @@
 
    public WBEjbInterceptorMetadataDeployer()
    {
-      super(JBossMetaData.class);
+      super(JBossMetaData.class, true);
       
       addInput(DeployersUtils.WEB_BEANS_FILES);
       addInput("merged." + JBossMetaData.class.getName());

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansAwareMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansAwareMetadataDeployer.java	2009-07-22 21:22:25 UTC (rev 91583)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansAwareMetadataDeployer.java	2009-07-22 21:24:00 UTC (rev 91584)
@@ -39,11 +39,12 @@
    /** Do we allow null wb xml file */
    private boolean optionalWebBeansXml;
 
-   public WebBeansAwareMetadataDeployer(Class<T> input)
+   protected WebBeansAwareMetadataDeployer(Class<T> input, boolean isInputModified)
    {
       super(input);
       setStage(DeploymentStages.POST_PARSE);
-      addOutput(input); // we just modify this
+      if (isInputModified)
+         addOutput(input); // we also modify input
    }
 
    public void deploy(VFSDeploymentUnit unit, T deployment) throws DeploymentException

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansClassloadingDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansClassloadingDeployer.java	2009-07-22 21:22:25 UTC (rev 91583)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/metadata/WebBeansClassloadingDeployer.java	2009-07-22 21:24:00 UTC (rev 91584)
@@ -40,9 +40,9 @@
    /** Whether to isolated deployments */
    private boolean isolated = true;
 
-   public WebBeansClassloadingDeployer(Class<T> input)
+   protected WebBeansClassloadingDeployer(Class<T> input)
    {
-      super(input);
+      super(input, false);
       addInput(ClassLoadingMetaData.class);
       addOutput(ClassLoadingMetaData.class);
    }