You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by mb...@apache.org on 2008/04/23 13:43:15 UTC

svn commit: r650833 - /incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java

Author: mbaessler
Date: Wed Apr 23 04:43:14 2008
New Revision: 650833

URL: http://svn.apache.org/viewvc?rev=650833&view=rev
Log:
UIMA-880

use as default PEAR install location the servlet context working directory

https://issues.apache.org/jira/browse/UIMA-880

Modified:
    incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java

Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java?rev=650833&r1=650832&r2=650833&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/servlet/SimpleServerServlet.java Wed Apr 23 04:43:14 2008
@@ -257,18 +257,19 @@
         this.server.configureAnalysisEngine(descriptor, resultSpec);
       } else if (descriptorPath == null) {
         File pear = new File(this.baseWebappDirectory.getAbsoluteFile(), pearPath);
-        // set default pear install directory
-        File pearInstallDir = pear.getParentFile();
+        // get default servlet working directory
+        File pearInstallDir = (File) this.getServletContext().getAttribute(
+                "javax.servlet.context.tempdir");
         // check if a special install directory is specified
         if (pearInstallPath != null) {
+          pearInstallDir = new File(pearInstallPath);
           // check if a relative path is set, relative path names are
-          // evaluated relative to the PEAR file.
-          if (pearInstallPath.startsWith(".")) {
+          // evaluated relative to the PEAR file location.
+          if (!pearInstallDir.isAbsolute()) {
             pearInstallDir = new File(pear.getParentFile(), pearInstallPath);
-          } else {
-            pearInstallDir = new File(pearInstallPath);
           }
         }
+        getLogger().log(Level.INFO, "Install PEAR file to: " + pearInstallDir.getAbsolutePath());
         this.server.configurePear(pear, pearInstallDir, resultSpec);
       }
     } catch (Exception e) {