[jboss-cvs] JBossAS SVN: r103961 - projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer.

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

Author: alesj
Date: 2010-04-14 08:38:03 -0400 (Wed, 14 Apr 2010)
New Revision: 103961

Added:
   projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Constants.java
Modified:
   projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Main.java
Log:
Fix alias support.

Added: projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Constants.java
===================================================================
--- projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Constants.java	                        (rev 0)
+++ projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Constants.java	2010-04-14 12:38:03 UTC (rev 103961)
@@ -0,0 +1,50 @@
+package org.jboss.scanning.indexer;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class Constants
+{
+   /** Alias to plugin (provider) shortcut */
+   private static final Map<String, String> aliases = new HashMap<String, String>();
+
+   static
+   {
+      aliases.put("@", "org.jboss.scanning.annotations.plugins.AnnotationsScanningPlugin");
+      aliases.put("ann", "org.jboss.scanning.annotations.plugins.AnnotationsScanningPlugin");
+      aliases.put("annotations", "org.jboss.scanning.annotations.plugins.AnnotationsScanningPlugin");
+      aliases.put("h", "org.jboss.scanning.hierarchy.plugins.HierarchyIndexScanningPlugin");
+      aliases.put("hierarchy", "org.jboss.scanning.hierarchy.plugins.HierarchyIndexScanningPlugin");
+   }
+
+   /**
+    * Apply alias.
+    *
+    * @param key the key
+    * @return return alias if found, else return key
+    */
+   public static String applyAlias(String key)
+   {
+      String value = aliases.get(key);
+      return value != null ? value : key;
+   }
+
+   /**
+    * Apply aliases.
+    *
+    * @param providers the providers
+    * @return set of providers with applied aliases
+    */
+   public static Set<String> applyAliases(String... providers)
+   {
+      Set<String> set = new HashSet<String>();
+      for (String provider : providers)
+         set.add(applyAlias(provider));
+      return set;
+   }
+}

Modified: projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Main.java
===================================================================
--- projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Main.java	2010-04-14 12:26:18 UTC (rev 103960)
+++ projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/Main.java	2010-04-14 12:38:03 UTC (rev 103961)
@@ -24,10 +24,6 @@
 
 import java.io.File;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -43,18 +39,6 @@
 {
    private static final Logger log = Logger.getLogger(Main.class.getName());
 
-   /** Alias to plugin (provider) shortcut */
-   private static final Map<String, String> aliases = new HashMap<String, String>();
-
-   static
-   {
-      aliases.put("@", "org.jboss.scanning.annotations.plugins.AnnotationsScanningPlugin");
-      aliases.put("ann", "org.jboss.scanning.annotations.plugins.AnnotationsScanningPlugin");
-      aliases.put("annotations", "org.jboss.scanning.annotations.plugins.AnnotationsScanningPlugin");
-      aliases.put("h", "org.jboss.scanning.hierarchy.plugins.HierarchyIndexScanningPlugin");
-      aliases.put("hierarchy", "org.jboss.scanning.hierarchy.plugins.HierarchyIndexScanningPlugin");
-   }
-
    /**
     * Usage
     */
@@ -78,20 +62,12 @@
          {
             File input = new File(args[0]);
             String[] providers = args[1].split(",");
-            // change aliases
-            for (int i = 0; i < providers.length; i++)
-            {
-               String alias = aliases.get(providers[i]);
-               if (alias != null)
-                  providers[i] = alias;
-            }
-
             URL[] urls = new URL[args.length - offset];
             // add the rest of classpath
             for (int i = 0; i < urls.length; i++)
                urls[i] = new File(args[i + offset]).toURI().toURL();
 
-            ScanUtils.scan(input, urls, new HashSet<String>(Arrays.asList(providers)));
+            ScanUtils.scan(input, urls, Constants.applyAliases(providers));
          }
          else
          {