[jboss-svn-commits] JBL Code SVN: r33433 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/soa/esb/listeners/config and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2010-06-09 19:34:47 -0400 (Wed, 09 Jun 2010)
New Revision: 33433

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java
Log:
Change paths to normalized: JBESB-3281

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2010-06-09 22:48:29 UTC (rev 33432)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2010-06-09 23:34:47 UTC (rev 33433)
@@ -28,6 +28,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -725,10 +726,11 @@
     
     static Map<String, String> getSchemasFromDirectory(final File directory) throws DeploymentException
     {
-        return getSchemasFromDir(directory, directory);
+        final URI rootURI = directory.toURI() ;
+        return getSchemasFromDir(rootURI, directory);
     }
 
-    private static Map<String, String> getSchemasFromDir(final File root, final File directory) throws DeploymentException
+    private static Map<String, String> getSchemasFromDir(final URI root, final File directory) throws DeploymentException
     {
         if (directory != null)
         {
@@ -747,7 +749,8 @@
                     {
                         try
                         {
-                            final String filename = determineSchemaFilename(root, file);
+                            final URI relativeURI = root.relativize(file.toURI()) ;
+                            final String filename = relativeURI.getPath();
                             schemasMap.put(filename, FileUtil.readTextFile(file));
                         } 
                         catch (final IOException e)
@@ -768,19 +771,6 @@
         return Collections.emptyMap();
     }
     
-    private static String determineSchemaFilename(final File rootDir, final File file)
-    {
-        final String rootName = rootDir.getName();
-        final String path = file.getPath();
-        int idx = path.indexOf(rootName);
-        if (idx != -1)
-        {
-            return path.substring(idx + rootName.length() + 1);
-        }
-        
-        return file.getName();
-    }
-    
     private static boolean isXsd(final String fileName)
     {
         return fileName.endsWith(".xsd");

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java	2010-06-09 22:48:29 UTC (rev 33432)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java	2010-06-09 23:34:47 UTC (rev 33433)
@@ -25,7 +25,6 @@
 import java.io.File;
 import java.net.URL;
 import java.util.Map;
-import java.util.zip.ZipInputStream;
 
 import junit.framework.JUnit4TestAdapter;
 
@@ -83,9 +82,9 @@
     private void assertAddedSchemas(final Map<String, String> schemas)
     {
         assertTrue(schemas.containsKey("mock.xsd"));
-        assertTrue(schemas.containsKey("subdir" + File.separator + "type.xsd"));
-        assertTrue(schemas.containsKey("subdir" + File.separator + "subdir2" + File.separator + "type.xsd"));
-        assertTrue(schemas.containsKey("jarsubdir" + File.separator + "jarsubdir.xsd"));
+        assertTrue(schemas.containsKey("subdir/type.xsd"));
+        assertTrue(schemas.containsKey("subdir/subdir2/type.xsd"));
+        assertTrue(schemas.containsKey("jarsubdir/jarsubdir.xsd"));
         assertTrue(schemas.containsKey("mockFromjar.xsd"));
     }