[jboss-cvs] JBossAS SVN: r104001 - in projects/scanning/trunk: indexer/src/main/java/org/jboss/scanning/indexer/core and 2 other directories.

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

Author: alesj
Date: 2010-04-15 09:58:10 -0400 (Thu, 15 Apr 2010)
New Revision: 104001

Modified:
   projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/ScanningDeployer.java
   projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java
   projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/Scanner.java
   projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java
Log:
Use consts.

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-04-15 13:47:17 UTC (rev 104000)
+++ projects/scanning/trunk/deployers/src/main/java/org/jboss/scanning/deployers/ScanningDeployer.java	2010-04-15 13:58:10 UTC (rev 104001)
@@ -82,8 +82,8 @@
             UrlScanner scanner = (vdu != null) ? new VFSDeploymentUnitScanner(vdu) : new DeploymentUnitScanner(unit);
             scanner.setPlugins(plugins);
             // check ignore flags
-            scanner.setIgnoreIndexedHandles(unit.isAttachmentPresent("jboss.scanning.ignoreIndexedHandles"));
-            scanner.setIgnoreRuntimeScanning(unit.isAttachmentPresent("jboss.scanning.ignoreRuntimeScanning"));
+            scanner.setIgnoreIndexedHandles(unit.isAttachmentPresent(UrlScanner.IGNORE_PRE_INDEXED));
+            scanner.setIgnoreRuntimeScanning(unit.isAttachmentPresent(UrlScanner.IGNORE_RUNTIME_SCAN));
             // the scan
             scanner.scan();
             // add used plugins as attachment

Modified: projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java
===================================================================
--- projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java	2010-04-15 13:47:17 UTC (rev 104000)
+++ projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java	2010-04-15 13:58:10 UTC (rev 104001)
@@ -101,7 +101,7 @@
       File jar = FileUtil.extract(input, tmp);
       try
       {
-         File destination = new File(jar, Scanner.PREFIX);
+         File destination = new File(jar, Scanner.META_INF);
          store(destination, handles);
          File output = new File(input.getParent(), input.getName() + Scanner.SUFFIX);
          FileUtil.compress(jar, output);

Modified: projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/Scanner.java
===================================================================
--- projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/Scanner.java	2010-04-15 13:47:17 UTC (rev 104000)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/Scanner.java	2010-04-15 13:58:10 UTC (rev 104001)
@@ -7,12 +7,16 @@
  */
 public interface Scanner
 {
-   /** The pre-existing files prefix */
-   public static final String PREFIX = "META-INF/";
+   /** The meta-inf prefix */
+   public static final String META_INF = "META-INF/";
 
    /** The pre-existing files suffix */
    public static final String SUFFIX = ".mcs";
 
+   /** Ignore flags */
+   public static final String IGNORE_PRE_INDEXED = "jboss.scanning.ignoreIndexedHandles";
+   public static final String IGNORE_RUNTIME_SCAN = "jboss.scanning.ignoreRuntimeScanning";
+
    /**
     * Scan handle method.
     *

Modified: projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java
===================================================================
--- projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java	2010-04-15 13:47:17 UTC (rev 104000)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java	2010-04-15 13:58:10 UTC (rev 104001)
@@ -74,7 +74,7 @@
             String fileName = plugin.getFileName();
             for (URL root : roots)
             {
-               InputStream is = getInputStream(root, Scanner.PREFIX + fileName);
+               InputStream is = getInputStream(root, Scanner.META_INF + fileName);
                if (is != null)
                {
                   ScanningHandle pre = readHandle(is);