svn commit: r648900 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java

[ea...@apache.org]

Author: eae
Date: Wed Apr 16 16:54:32 2008
New Revision: 648900

URL: http://svn.apache.org/viewvc?rev=648900&view=rev
Log:
UIMA-912 strip / from in front of driver letters other than c: as well

Modified:
    incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java?rev=648900&r1=648899&r2=648900&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/UimacppServiceController.java Wed Apr 16 16:54:32 2008
@@ -31,6 +31,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
@@ -367,12 +369,17 @@
 
     // arguments
     // UIMA AE descriptor
-    if (this.aeDesc.startsWith("file:") || this.aeDesc.startsWith("File:")) {
+    // eclipse likes URL formats starting with file:, but C++ doesn't
+    if (this.aeDesc.regionMatches(true, 0, "file:", 0, 5)) {
       this.aeDesc = this.aeDesc.substring(5);
     }
-    if (this.aeDesc.startsWith("/C:") || this.aeDesc.startsWith("/c:")) {
+    Pattern mSlashDosDrive = Pattern.compile("/[a-zA-Z]:");
+    Matcher matcher = mSlashDosDrive.matcher(this.aeDesc);
+    if (matcher.find(0)) {
+      // "/c:" doesn't work either
       this.aeDesc = this.aeDesc.substring(1);
     }
+
     commandArgs.add(aeDesc);
     if (!(new File(aeDesc)).exists()) {
       throw new ResourceInitializationException(new IOException(