You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ka...@apache.org on 2009/11/25 22:41:21 UTC
svn commit: r884284 - in /ode/branches/APACHE_ODE_1.X:
axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Author: karthick
Date: Wed Nov 25 21:41:21 2009
New Revision: 884284
URL: http://svn.apache.org/viewvc?rev=884284&view=rev
Log:
ODE-713 Configurable Process Deployment Folder
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=884284&r1=884283&r2=884284&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Wed Nov 25 21:41:21 2009
@@ -440,6 +440,10 @@
_store = createProcessStore(eprContext, _db.getDataSource());
_store.registerListener(new ProcessStoreListenerImpl());
_store.setDeployDir(new File(_workRoot, "processes"));
+ _store.setDeployDir(
+ _odeConfig.getDeployDir() != null ?
+ new File(_odeConfig.getDeployDir()) :
+ new File(_workRoot, "processes"));
_store.setConfigDir(_configRoot);
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java?rev=884284&r1=884283&r2=884284&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-epr/src/main/java/org/apache/ode/il/config/OdeConfigProperties.java Wed Nov 25 21:41:21 2009
@@ -71,6 +71,8 @@
public static final String PROP_WORKING_DIR = "working.dir";
+ public static final String PROP_DEPLOY_DIR = "deploy.dir";
+
public static final String PROP_EVENT_LISTENERS = "event.listeners";
public static final String PROP_MEX_INTERCEPTORS = "mex.interceptors";
@@ -239,6 +241,10 @@
return getProperty(OdeConfigProperties.PROP_WORKING_DIR);
}
+ public String getDeployDir() {
+ return getProperty(OdeConfigProperties.PROP_DEPLOY_DIR);
+ }
+
public String getTxFactoryClass() {
return getProperty(OdeConfigProperties.PROP_TX_FACTORY_CLASS, DEFAULT_TX_FACTORY_CLASS_NAME);
}
Modified: ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=884284&r1=884283&r2=884284&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Wed Nov 25 21:41:21 2009
@@ -690,8 +690,14 @@
if (f.exists())
return f;
f = new File(_deployDir, dudao.getName());
- if (f.exists())
+ if (f.exists()) {
+ try {
+ dudao.setDeploymentUnitDir(f.getCanonicalPath());
+ } catch (IOException e) {
+ __log.warn("Could not update deployment unit directory for " + dudao.getName(), e);
+ }
return f;
+ }
return null;
}