[jbossws-commits] JBossWS SVN: r7217 - in spi/trunk: src/main/java/org/jboss/wsf/spi/tools/ant and 1 other directory.
Author: heiko.braun(a)jboss.com
Date: 2008-05-29 17:48:21 -0400 (Thu, 29 May 2008)
New Revision: 7217
Modified:
spi/trunk/spi.iml
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
Log:
Fix exception propagation
Modified: spi/trunk/spi.iml
===================================================================
--- spi/trunk/spi.iml 2008-05-29 20:37:44 UTC (rev 7216)
+++ spi/trunk/spi.iml 2008-05-29 21:48:21 UTC (rev 7217)
@@ -23,15 +23,6 @@
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
- <library name="M2 Dep: xml-apis:xml-apis:jar:1.0.b2:compile">
- <CLASSES>
- <root
url="jar://$MODULE_DIR$/../../../../../.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar!/"
/>
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
<library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile">
<CLASSES>
<root
url="jar://$MODULE_DIR$/../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/"
/>
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-05-29
20:37:44 UTC (rev 7216)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSConsumeTask.java 2008-05-29
21:48:21 UTC (rev 7217)
@@ -220,7 +220,7 @@
consumer.setAdditionalCompilerClassPath(getTaskClassPathStrings());
consumer.consume(wsdl);
}
- catch (MalformedURLException e)
+ catch (Throwable e)
{
throw new BuildException(e, getLocation());
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2008-05-29
20:37:44 UTC (rev 7216)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2008-05-29
21:48:21 UTC (rev 7217)
@@ -220,6 +220,10 @@
gen.provide(sei);
}
+ catch(Throwable t)
+ {
+ throw new BuildException(t, getLocation());
+ }
finally
{
Thread.currentThread().setContextClassLoader(prevCL);
@@ -292,6 +296,7 @@
ExecuteJava execute = new ExecuteJava();
execute.setClasspath(path);
execute.setJavaCommand(command.getJavaCommand());
+
if (execute.fork(this) != 0)
throw new BuildException("Could not invoke WSProvideTask",
getLocation());
}