svn commit: r483394 - /incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java

[mb...@apache.org]

Author: mbaessler
Date: Thu Dec  7 01:38:23 2006
New Revision: 483394

URL: http://svn.apache.org/viewvc?view=rev&rev=483394
Log:
JIRA ticket UIMA-76 (https://issues.apache.org/jira/browse/UIMA-76)

change install controller that for the pear verification the UIMA_HOME variable is used it
it is specified. If not java.class.path is used to build the UIMA classpath

Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java?view=diff&rev=483394&r1=483393&r2=483394
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java Thu Dec  7 01:38:23 2006
@@ -1167,6 +1167,7 @@
       try {
         status.retCode = process.waitFor();
       } catch (InterruptedException e) {
+        
       }
       status.message = msgBuffer.toString();
     } finally {
@@ -1218,13 +1219,22 @@
       String mainDescPath = mainInsD.getMainComponentDesc();
       if (mainDescPath == null)
         throw new RuntimeException("main descriptor path not specified");
-      //if (uimaHomePath == null)
-        //throw new RuntimeException(UIMA_HOME_ENV + " variable not specified");
+
+      String uimaClassPath = null;
+      if (uimaHomePath == null) {
+        // build UIMA classpath using application class path
+        uimaClassPath = System.getProperty("java.class.path", null);
+      } else {
+        // build UIMA classpath using UIMA_HOME env variable
+        uimaClassPath = buildUIMAClassPath(uimaHomePath);
+      }
+      if (uimaClassPath == null) {
+        throw new RuntimeException(UIMA_HOME_ENV + " variable not specified");
+      }
+
       // build component classpath, including dlg components
       String compClassPath = controller.buildComponentClassPath();
-      // build UIMA classpath
-      //String uimaClassPath = buildUIMAClassPath(uimaHomePath);
-      String uimaClassPath = System.getProperty("java.class.path", null);
+
       // set java.library.path, including dlg components
       String javaLibPath = controller.buildComponentPath();
       // set other required env vars