Author: mszefler
Date: Mon Aug 6 15:50:01 2007
New Revision: 563322
URL: http://svn.apache.org/viewvc?view=rev&rev=563322
Log:
Merged to [EMAIL PROTECTED]
Modified:
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/Messages.java
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
Modified:
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/Messages.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/Messages.java?view=diff&rev=563322&r1=563321&r2=563322
==============================================================================
---
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/Messages.java
(original)
+++
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/Messages.java
Mon Aug 6 15:50:01 2007
@@ -24,6 +24,7 @@
import javax.xml.namespace.QName;
+import org.apache.ode.bpel.compiler.api.CompilationException;
import org.apache.ode.utils.msg.MessageBundle;
/**
@@ -207,8 +208,12 @@
return format("Deploy failed; process \"{0}\" not found in deployment
unit \"{1}\".",pid,du);
}
- public String msgDeployFailCompileErrors() {
- return format("Deploy failed; BPEL compilation errors." );
+ public String msgDeployFailCompileErrors(CompilationException ce) {
+ if (ce != null) {
+ return format("Deploy failed; {0}", ce.getMessage());
+ } else {
+ return format("Deploy failed; BPEL compilation errors." );
+ }
}
}
Modified:
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java?view=diff&rev=563322&r1=563321&r2=563322
==============================================================================
---
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
(original)
+++
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
Mon Aug 6 15:50:01 2007
@@ -43,8 +43,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -78,6 +77,9 @@
private QName _pid;
private QName _type;
+ // cache the inMemory flag because XMLBeans objects are heavily
synchronized (guarded by a coarse-grained lock)
+ private volatile boolean _inMemory = false;
+
ProcessConfImpl(QName pid, QName type, long version, DeploymentUnitDir du,
TDeployment.Process pinfo, Date deployDate,
Map<QName, Node> props, ProcessState pstate) {
_pid = pid;
@@ -88,6 +90,7 @@
_props = Collections.unmodifiableMap(props);
_state = pstate;
_type = type;
+ _inMemory = _pinfo.isSetInMemory() && _pinfo.getInMemory();
initLinks();
initMexInterceptors();
@@ -181,7 +184,7 @@
if (cbpInfo == null)
throw new ContextException("CBP record not found for type " +
getType());
try {
- String relative = getRelativePath(_du.getDeployDir(), cbpInfo.cbp);
+ String relative = getRelativePath(_du.getDeployDir(),
cbpInfo.cbp).replaceAll("\\\\", "/");
if (!relative.endsWith(".cbp")) throw new ContextException("CBP
file must end with .cbp suffix: " + cbpInfo.cbp);
relative = relative.replace(".cbp", ".bpel");
File bpelFile = new File(_du.getDeployDir(), relative);
@@ -192,12 +195,8 @@
}
}
- public URL getBaseURL() {
- try {
- return _du.getDeployDir().toURL();
- } catch (MalformedURLException except) {
- throw new RuntimeException(except);
- }
+ public URI getBaseURI() {
+ return _du.getDeployDir().toURI();
}
public ProcessState getState() {
@@ -268,10 +267,11 @@
}
public boolean isTransient() {
- return _pinfo.isSetInMemory() && _pinfo.getInMemory();
+ return _inMemory;
}
public void setTransient(boolean t) {
_pinfo.setInMemory(t);
+ _inMemory = t;
}
public boolean isEventEnabled(List<String> scopeNames, BpelEvent.TYPE
type) {
Modified:
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?view=diff&rev=563322&r1=563321&r2=563322
==============================================================================
---
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
(original)
+++
ode/branches/bart/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
Mon Aug 6 15:50:01 2007
@@ -164,7 +164,7 @@
try {
du.compile();
} catch (CompilationException ce) {
- String errmsg = __msgs.msgDeployFailCompileErrors();
+ String errmsg = __msgs.msgDeployFailCompileErrors(ce);
__log.error(errmsg, ce);
throw new ContextException(errmsg, ce);
}
Modified:
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java?view=diff&rev=563322&r1=563321&r2=563322
==============================================================================
---
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
(original)
+++
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/DeploymentUnitTest.java
Mon Aug 6 15:50:01 2007
@@ -36,7 +36,7 @@
* Test some complicated xsd/wsdl loading.
*/
public void setUp() throws Exception {
- File dir = new
File(getClass().getResource("/complexImport/deploy.xml").getPath()).getParentFile();
+ File dir = new
File(getClass().getResource("/complexImport/deploy.xml").toURI().getPath()).getParentFile();
du = new DeploymentUnitDir(dir);
}
Modified:
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java?view=diff&rev=563322&r1=563321&r2=563322
==============================================================================
---
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
(original)
+++
ode/branches/bart/bpel-store/src/test/java/org/apache/ode/store/ProcessStoreTest.java
Mon Aug 6 15:50:01 2007
@@ -19,7 +19,7 @@
package org.apache.ode.store;
import java.io.File;
-import java.net.URL;
+import java.net.URI;
import java.util.Collection;
import java.util.List;
@@ -38,7 +38,7 @@
System.setProperty("openjpa.properties", "/openjpa.xml");
_ps = new ProcessStoreImpl();
_ps.loadAll();
- URL tdd= getClass().getResource("/testdd/deploy.xml");
+ URI tdd= getClass().getResource("/testdd/deploy.xml").toURI();
_testdd = new File(tdd.getPath()).getParentFile();
}
