[jboss-cvs] JBossAS SVN: r105421 - in projects/scanning/trunk: plugins/src/main/java/org/jboss/scanning/annotations/plugins and 7 other directories.

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

Author: alesj
Date: 2010-05-31 15:53:46 -0400 (Mon, 31 May 2010)
New Revision: 105421

Modified:
   projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/ScanningDeployer.java
   projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/annotations/plugins/AnnotationsScanningPluginFactory.java
   projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/HibernateScanningPluginFactory.java
   projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hierarchy/plugins/HierarchyIndexScanningPluginFactory.java
   projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/weld/WeldScanningPluginFactory.java
   projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentScanningPluginFactory.java
   projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/support/FilteredAnnotationScanningPluginFactory.java
   projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/support/TestScanningPluginFactory.java
   projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/smoke/support/TIFScanningPluginFactory.java
Log:
Add plugin output info to factory.

Modified: projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/ScanningDeployer.java
===================================================================
--- projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/ScanningDeployer.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/ScanningDeployer.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -110,6 +110,10 @@
          throw new IllegalArgumentException("Null factory");
 
       factories.add(factory);
+
+      String output = factory.getPluginOutput();
+      if (output != null)
+         addOutput(output);
    }
 
    /**

Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/annotations/plugins/AnnotationsScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/annotations/plugins/AnnotationsScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/annotations/plugins/AnnotationsScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -45,6 +45,11 @@
       return true;
    }
 
+   public String getPluginOutput()
+   {
+      return AnnotationIndex.class.getName();
+   }
+
    public ScanningPlugin<DefaultAnnotationRepository, AnnotationIndex> create(DeploymentUnit unit)
    {
       ReflectProvider provider = DeploymentUtilsFactory.getProvider(unit);

Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/HibernateScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/HibernateScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/HibernateScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -50,6 +50,11 @@
       return unit.isAttachmentPresent("org.jboss.metadata.jpa.spec.PersistenceMetaData");
    }
 
+   public String getPluginOutput()
+   {
+      return Scanner.class.getName();
+   }
+
    public ScanningPlugin<ScannerImpl, Scanner> create(DeploymentUnit unit)
    {
       return new HibernateScanningPlugin(unit, this);

Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hierarchy/plugins/HierarchyIndexScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hierarchy/plugins/HierarchyIndexScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hierarchy/plugins/HierarchyIndexScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -55,6 +55,11 @@
       return attachmentKey == null || unit.isAttachmentPresent(attachmentKey);
    }
 
+   public String getPluginOutput()
+   {
+      return HierarchyIndex.class.getName();
+   }
+
    public ScanningPlugin<HierarchyIndexImpl, HierarchyIndex> create(DeploymentUnit unit)
    {
       ReflectProvider provider = DeploymentUtilsFactory.getProvider(unit);

Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/weld/WeldScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/weld/WeldScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/weld/WeldScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -79,6 +79,11 @@
       return hasCp;
    }
 
+   public String getPluginOutput()
+   {
+      return null; // no such attachment / output
+   }
+
    public ScanningPlugin<VoidScanningHandle, Object> create(DeploymentUnit unit)
    {
       @SuppressWarnings("unchecked")

Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/DeploymentScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -31,6 +31,7 @@
  * Used for incallback automatching.
  *
  * @param <T> exact handle type
+ * @param <U> exact attachment type
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
 public interface DeploymentScanningPluginFactory<T extends ScanningHandle, U>
@@ -44,6 +45,16 @@
    boolean isRelevant(DeploymentUnit unit);
 
    /**
+    * Get plugin's output.
+    *
+    * Can be null, if it cannot be determined before actual plugin creation
+    * or the plugin actually doesn't create any attachment.
+    *
+    * @return plugin's output
+    */
+   String getPluginOutput();
+
+   /**
     * Create scanning plugin from deployment unit.
     *
     * @param unit the deployment unit

Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/support/FilteredAnnotationScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/support/FilteredAnnotationScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/support/FilteredAnnotationScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -55,6 +55,11 @@
       return true;
    }
 
+   public String getPluginOutput()
+   {
+      return AnnotationIndex.class.getName();
+   }
+
    public ScanningPlugin<DefaultAnnotationRepository, AnnotationIndex> create(DeploymentUnit unit)
    {
       ReflectProvider provider = DeploymentUtilsFactory.getProvider(unit);

Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/support/TestScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/support/TestScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/metadata/support/TestScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -36,6 +36,11 @@
       return true;
    }
 
+   public String getPluginOutput()
+   {
+      return null;
+   }
+
    public ScanningPlugin<DummyScanningHandle, DummyScanningHandle> create(DeploymentUnit unit)
    {
       return new TestScanningPlugin();

Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/smoke/support/TIFScanningPluginFactory.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/smoke/support/TIFScanningPluginFactory.java	2010-05-31 19:36:11 UTC (rev 105420)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/smoke/support/TIFScanningPluginFactory.java	2010-05-31 19:53:46 UTC (rev 105421)
@@ -38,6 +38,11 @@
       return true;
    }
 
+   public String getPluginOutput()
+   {
+      return TIFScanningPlugin.class.getName();
+   }
+
    public ScanningPlugin<TIFScanningPlugin, TIFScanningPlugin> create(DeploymentUnit unit)
    {
       ReflectProvider provider = DeploymentUtilsFactory.getProvider(unit);