[jboss-svn-commits] JBL Code SVN: r24007 - in labs/jbossesb/workspace/skeagh: routing/file/src/test/java/org/jboss/esb/file and 1 other directory.

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

Author: beve
Date: 2008-11-20 15:58:25 -0500 (Thu, 20 Nov 2008)
New Revision: 24007

Modified:
   labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java
   labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileOutboundRouterTest.java
   labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router_01.xml
   labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-outbound-router.xml
Log:
Update to fix path separator issue.


Modified: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java	2008-11-20 20:39:29 UTC (rev 24006)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java	2008-11-20 20:58:25 UTC (rev 24007)
@@ -303,7 +303,8 @@
      */
     public static String removePath(final String from)
     {
-        String newName = from;
+        String newName = from.replace('\\', '/');
+        //String newName = from;
         final int indexOfFileSeparator = newName.lastIndexOf(File.separatorChar);
         if (indexOfFileSeparator != -1)
         {

Modified: labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileOutboundRouterTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileOutboundRouterTest.java	2008-11-20 20:39:29 UTC (rev 24006)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileOutboundRouterTest.java	2008-11-20 20:58:25 UTC (rev 24007)
@@ -62,7 +62,7 @@
 
         final String expectedNamePattern = "target/test-classes/${name}.out";
         final String actualNamePattern = router.getFileNamePattern();
-        assertEquals(expectedNamePattern, actualNamePattern);
+        assertEquals(expectedNamePattern, actualNamePattern.replace('\\', '/'));
     }
 
     @Test

Modified: labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router_01.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router_01.xml	2008-11-20 20:39:29 UTC (rev 24006)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-inbound-router_01.xml	2008-11-20 20:58:25 UTC (rev 24007)
@@ -11,7 +11,7 @@
         <service serviceCategory="service-cat" serviceName="service-a" serviceDescription="TestService" class="org.jboss.esb.file.MyTestService">
             <inRouter name="fileRouter" class="org.jboss.esb.file.FileInboundRouter">
                 <property name="scheduleResourceId">schedule1</property>
-                <property name="fileSelectorPattern">target/test-classes/*.txt</property>
+                <property name="fileSelectorPattern">target\test-classes\*.txt</property>
                 <property name="workingRenamePattern">${name}-${timestamp}.${suffix}</property>
                 <property name="processedRenamePattern">${name}-${timestamp}-processed</property>
             </inRouter>
@@ -20,8 +20,8 @@
         <service serviceCategory="service-cat" serviceName="service-b" serviceDescription="TestService" class="org.jboss.esb.file.MyTestService">
             <inRouter name="fileRouter2" class="org.jboss.esb.file.FileInboundRouter">
                 <property name="scheduleResourceId">schedule1</property>
-                <property name="fileSelectorPattern">target/test-classes/*.txt</property>
-                <property name="workingRenamePattern">target/test/classes/${name}-${timestamp}.${suffix}</property>
+                <property name="fileSelectorPattern">target\test-classes\*.txt</property>
+                <property name="workingRenamePattern">target/test/classes\${name}-${timestamp}.${suffix}</property>
                 <property name="processedRenamePattern">target/test-classes/processedDir/${name}.processed</property>
             </inRouter>
         </service>

Modified: labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-outbound-router.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-outbound-router.xml	2008-11-20 20:39:29 UTC (rev 24006)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/file-outbound-router.xml	2008-11-20 20:58:25 UTC (rev 24007)
@@ -10,7 +10,7 @@
     <services>
         <service serviceCategory="serviceCat" serviceName="serviceName" serviceDescription="TestService" class="org.jboss.esb.file.MyTestService">
             <outRouter name="fileOutboundRouter" class="org.jboss.esb.file.FileOutboundRouter">
-                <property name="fileNamePattern">target/test-classes/${name}.out</property>
+                <property name="fileNamePattern">target\test-classes/${name}.out</property>
             </outRouter>
         </service>
     </services>