Author: mriou
Date: Mon Jul 31 11:59:19 2006
New Revision: 427209
URL: http://svn.apache.org/viewvc?rev=427209&view=rev
Log:
Deployment must be abandoned after a compilation failure (no retry possible).
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentUnit.java
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentUnit.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentUnit.java?rev=427209&r1=427208&r2=427209&view=diff
==============================================================================
---
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentUnit.java
(original)
+++
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/DeploymentUnit.java
Mon Jul 31 11:59:19 2006
@@ -19,19 +19,20 @@
package org.apache.ode.axis2;
-import org.apache.ode.bpel.dd2.DeployDocument;
-import org.apache.ode.bpel.dd2.TDeployment;
-import org.apache.ode.bpel.dd2.TProvide;
-import org.apache.ode.bpel.dd2.TInvoke;
+import org.apache.axis2.AxisFault;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ode.bom.wsdl.Definition4BPEL;
import org.apache.ode.bom.wsdl.WSDLFactory4BPEL;
import org.apache.ode.bom.wsdl.WSDLFactoryBPEL20;
+import org.apache.ode.bpel.capi.CompilationException;
+import org.apache.ode.bpel.compiler.BpelC;
+import org.apache.ode.bpel.dd2.DeployDocument;
+import org.apache.ode.bpel.dd2.TDeployment;
+import org.apache.ode.bpel.dd2.TInvoke;
+import org.apache.ode.bpel.dd2.TProvide;
import org.apache.ode.bpel.o.OProcess;
import org.apache.ode.bpel.o.Serializer;
-import org.apache.ode.bpel.compiler.BpelC;
-import org.apache.axis2.AxisFault;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.wsdl.WSDLException;
import javax.wsdl.xml.WSDLReader;
@@ -39,8 +40,8 @@
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
/**
@@ -108,8 +109,17 @@
public void deploy(boolean activateOnly) {
// (Re)compile all bpel files if it's a "real" re-deployment, a simple
// activation doesn't need recompile.
- if (!activateOnly) compileProcesses();
- else loadProcessDefinitions();
+ if (!activateOnly) {
+ try {
+ compileProcesses();
+ } catch (CompilationException e) {
+ // No retry on compilation error, we just forget about it
+ _lastModified = new File(_duDirectory, "deploy.xml").lastModified();
+ __log.error("Compilation errors have been reported.");
+ return;
+ }
+ }
+ loadProcessDefinitions();
// Going trough each process declared in the dd
for (TDeployment.Process processDD : _dd.getDeploy().getProcessList()) {
@@ -187,7 +197,6 @@
for (File bpel : bpels) {
compile(bpel);
}
- loadProcessDefinitions();
}
private void compile(File bpelFile) {
