[jboss-cvs] JBossAS SVN: r103963 - in projects/scanning/trunk: scanning-spi/src/main/java/org/jboss/scanning/spi and 1 other directories.

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

Author: alesj
Date: 2010-04-14 08:43:36 -0400 (Wed, 14 Apr 2010)
New Revision: 103963

Modified:
   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 prefix and suffix constants.

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-14 12:40:35 UTC (rev 103962)
+++ projects/scanning/trunk/indexer/src/main/java/org/jboss/scanning/indexer/core/ScanUtils.java	2010-04-14 12:43:36 UTC (rev 103963)
@@ -35,6 +35,7 @@
 import java.util.zip.GZIPOutputStream;
 
 import org.jboss.scanning.plugins.DefaultScanner;
+import org.jboss.scanning.spi.Scanner;
 import org.jboss.scanning.spi.ScanningHandle;
 import org.jboss.scanning.spi.ScanningPlugin;
 
@@ -63,7 +64,7 @@
 
       for (Map.Entry<ScanningPlugin, ScanningHandle> entry : handles.entrySet())
       {
-         File file = new File(directory, entry.getKey().getHandleKey() + ".mcs");
+         File file = new File(directory, entry.getKey().getHandleKey() + Scanner.SUFFIX);
          FileOutputStream fos = new FileOutputStream(file);
          BufferedOutputStream bos = new BufferedOutputStream(fos);
          GZIPOutputStream gos = new GZIPOutputStream(bos);
@@ -112,9 +113,9 @@
       Map<ScanningPlugin, ScanningHandle> handles = scaner.getHandles();
       File tmp = new File(System.getProperty("java.io.tmpdir"));
       File jar = FileUtil.extract(input, tmp);
-      File destination = new File(jar, "META-INF");
+      File destination = new File(jar, Scanner.PREFIX);
       store(destination, handles);
-      File output = new File(input.getName() + ".mcs");
+      File output = new File(input.getName() + Scanner.SUFFIX);
       FileUtil.compress(jar, output);
       FileUtil.recursiveDelete(jar);
    }

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-14 12:40:35 UTC (rev 103962)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/Scanner.java	2010-04-14 12:43:36 UTC (rev 103963)
@@ -7,6 +7,9 @@
  */
 public interface Scanner
 {
+   /** The pre-existing files prefix */
+   public static final String PREFIX = "META-INF/";
+
    /** The pre-existing files suffix */
    public static final String SUFFIX = ".mcs";
 

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-14 12:40:35 UTC (rev 103962)
+++ projects/scanning/trunk/scanning-spi/src/main/java/org/jboss/scanning/spi/helpers/UrlScanner.java	2010-04-14 12:43:36 UTC (rev 103963)
@@ -72,7 +72,7 @@
             String handleKey = plugin.getHandleKey();
             for (URL root : roots)
             {
-               InputStream is = getInputStream(root, handleKey + SUFFIX);
+               InputStream is = getInputStream(root, PREFIX + handleKey + SUFFIX);
                if (is != null)
                {
                   ScanningHandle pre = readHandle(is);