Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortle2012-07-13 00:22:50 +0000
committertle2012-07-13 00:22:50 +0000
commit2110afedf1e96d8c1020703338c16fe135b80214 (patch)
treeb58c900d236644ccc00f5790a92514593373a2d1 /jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen
parent387de26fce49153df720e9f14e3e6c38f8c41f7b (diff)
downloadwebtools.dali-2110afedf1e96d8c1020703338c16fe135b80214.tar.gz
webtools.dali-2110afedf1e96d8c1020703338c16fe135b80214.tar.xz
webtools.dali-2110afedf1e96d8c1020703338c16fe135b80214.zip
352865 - SQL script generation does not open the generated script
Diffstat (limited to 'jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen')
-rw-r--r--jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java
index 4f6f4451a6..797c931eb6 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.core.gen/src/org/eclipse/jpt/dbws/eclipselink/core/gen/Main.java
@@ -72,14 +72,14 @@ public class Main
DBWSBuilderModel model = this.buildBuilderModel(this.builderFile);
if(model == null) {
this.logMessage(INFO, JptDbwsCoreMessages.NO_GENERATION_PERFORMED);
- return;
+ this.generationFailed();
}
builder.setProperties(model.properties);
builder.setOperations(model.operations);
if( ! this.jdbcDriverIsOnClasspath(builder.getDriver())) {
- return;
+ this.generationFailed();
}
DBWSPackager packager = this.buildEclipsePackager();
@@ -92,13 +92,13 @@ public class Main
}
catch(WSDLException e) {
this.logMessage(SEVERE, JptDbwsCoreMessages.WSDL_EXCEPTION, e.getMessage());
- return;
+ this.generationFailed();
}
catch(Exception e) {
//TODO Clean-up Stage dir. ?
this.logMessage(SEVERE, JptDbwsCoreMessages.GENERATION_FAILED, e.getMessage());
e.printStackTrace();
- return;
+ this.generationFailed();
}
this.logMessage(INFO, JptDbwsCoreMessages.GENERATION_COMPLETED);
return;
@@ -192,7 +192,11 @@ public class Main
private void logMessage(Level level, String key) {
Tools.logMessage(level, Tools.getString(key));
}
-
+
+ private void generationFailed() {
+ System.exit(1);
+ }
+
// ********** argument queries **********
private String getArgumentBuilderFile(String[] args) {

Back to the top