svn commit: r722671 - in /ode/trunk: axis2/src/main/java/org/apache/ode/axis2/ODEServer.java bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java

[mi...@apache.org]

Author: midon
Date: Tue Dec  2 15:29:10 2008
New Revision: 722671

URL: http://svn.apache.org/viewvc?rev=722671&view=rev
Log:
ODE-445: test existence of work/app/config directories

Modified:
    ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
    ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
    ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=722671&r1=722670&r2=722671&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Tue Dec  2 15:29:10 2008
@@ -122,11 +122,15 @@
             String rootDir = System.getProperty("org.apache.ode.rootDir");
             if (rootDir != null) _appRoot = new File(rootDir);
             else _appRoot = new File(contextPath);
+
+            if(!_appRoot.isDirectory()) throw new IllegalArgumentException(_appRoot+" does not exist or is not a directory");
             TempFileManager.setWorkingDirectory(_appRoot);
 
             __log.debug("Loading properties");
             String confDir = System.getProperty("org.apache.ode.configDir");
             _configRoot = confDir == null ? new File(_appRoot, "conf") : new File(confDir);
+            if(!_configRoot.isDirectory()) throw new IllegalArgumentException(_configRoot+" does not exist or is not a directory");
+
             _odeConfig = new ODEConfigProperties(_configRoot);
 
             try {
@@ -144,6 +148,7 @@
             String wdir = _odeConfig.getWorkingDir();
             if (wdir == null) _workRoot = _appRoot;
             else _workRoot = new File(wdir.trim());
+            if(!_workRoot.isDirectory()) throw new IllegalArgumentException(_workRoot+" does not exist or is not a directory");
 
             __log.debug("Initializing transaction manager");
             initTxMgr();

Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?rev=722671&r1=722670&r2=722671&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java Tue Dec  2 15:29:10 2008
@@ -126,17 +126,23 @@
         List<File> propFiles = new ArrayList<File>();
 
         propFiles.addAll(_du.getEndpointConfigFiles());
-        if (_configDir != null) {
+        if (_configDir == null) {
+            if (__log.isDebugEnabled()) __log.debug("No config directory set up.");
+        } else if (_configDir.isDirectory()) {
             // list and sort endpoint config files
             File[] files = _configDir.listFiles(new FileFilter() {
                 public boolean accept(File path) {
                     return path.getName().endsWith(".endpoint") && path.isFile();
                 }
             });
-            if( files != null ) {
-	            Arrays.sort(files);
-	            propFiles.addAll(Arrays.asList(files));
+            if (files != null) {
+                Arrays.sort(files);
+                propFiles.addAll(Arrays.asList(files));
+            } else {
+                if (__log.isErrorEnabled()) __log.error(_configDir + " does not exist or is not a directory");
             }
+        } else {
+            if (__log.isErrorEnabled()) __log.error(_configDir + " does not exist or is not a directory");
         }
         return propFiles;
     }    

Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=722671&r1=722670&r2=722671&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Tue Dec  2 15:29:10 2008
@@ -740,6 +740,8 @@
     }
 
     public void setDeployDir(File depDir) {
+        if (depDir != null && !depDir.isDirectory())
+            throw new IllegalArgumentException("Deploy directory is not a directory or does not exist:  " + depDir);
         _deployDir = depDir;
     }
 
@@ -752,6 +754,8 @@
     }
 
     public void setConfigDir(File configDir) {
+        if (configDir != null && !configDir.isDirectory())
+            throw new IllegalArgumentException("Config directory is not a directory or does not exist: " + configDir);
         this._configDir = configDir;
     }