Skip to content

Commit 2fee1fa

Browse files
committed
fixed by running with classpath -cp option at command line
1 parent 2ea3705 commit 2fee1fa

File tree

13 files changed

+21
-704
lines changed

13 files changed

+21
-704
lines changed

generators/wsdl2rest/bin/wsdl2rest.bat

Lines changed: 0 additions & 20 deletions
This file was deleted.

generators/wsdl2rest/bin/wsdl2rest.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

generators/wsdl2rest/index.js

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,27 @@ module.exports = class extends Generator {
4949
writing() {
5050
app: {
5151
var userProps = this.props;
52+
var platformDelimiter = ':';
53+
if (process.platform === 'win32')
54+
platformDelimiter = ';';
5255

53-
this.log('wsdl url', userProps.wsdl);
54-
55-
// var libDir = path.join(__dirname, 'lib', 'wsdl2rest-impl.jar');
56-
// var libDir = path.join(__dirname, 'target', 'wsdl2rest.jar');
57-
// var log4jDir = path.join(__dirname, 'config', 'logging.properties');
58-
// var log4jDirStr = String(log4jDir);
59-
// var log4jDirUrl = fileUrl(log4jDirStr);
56+
var mainClass = 'org.jboss.fuse.wsdl2rest.impl.Main';
57+
var libDir = path.join(__dirname, 'lib');
58+
var jarDir = path.join(libDir, 'wsdl2rest-impl.jar');
59+
var log4jDir = path.join(__dirname, 'config', 'logging.properties');
60+
var log4jDirStr = String(log4jDir);
61+
var log4jDirUrl = fileUrl(log4jDirStr);
6062
var outPath = path.join(process.cwd(), userProps.outdirectory);
6163

62-
// var cmdString = 'java';
63-
// cmdString = cmdString + ' -Dlog4j.configuration=' + log4jDirUrl;
64-
// cmdString = cmdString + ' -jar ' + libDir;
65-
var scriptPath = path.join(__dirname, 'bin', 'wsdl2rest.sh');
66-
var cmdString = 'sh ' + scriptPath;
64+
// build the java command with classpath, class name, and the passed parameters
65+
var cmdString = 'java';
66+
cmdString = cmdString + ' -Dlog4j.configuration=' + log4jDirUrl;
67+
cmdString = cmdString + ' -cp ' + jarDir + platformDelimiter +
68+
libDir + '\\*' + platformDelimiter + '. ' + mainClass;
6769
cmdString = cmdString + ' --wsdl ' + userProps.wsdl;
6870
cmdString = cmdString + ' --out ' + outPath;
6971

70-
this.log('calling: ' + cmdString);
72+
console.log('calling: ' + cmdString);
7173
const wsdl2rest = exec(cmdString);
7274

7375
wsdl2rest.stdout.on('data', function (data) {
@@ -77,7 +79,12 @@ module.exports = class extends Generator {
7779
console.log(`stderr: ${data}`);
7880
});
7981
wsdl2rest.on('close', (code) => {
80-
console.log(`child process exited with code ${code}`);
82+
if (code === 0) {
83+
console.log(`wsdl2rest generated artifacts successfully`);
84+
} else {
85+
console.log('code came back as ${code}');
86+
console.log(`wsdl2rest did not generate artifacts successfully - please check the log file for details`);
87+
}
8188
});
8289
}
8390
}

generators/wsdl2rest/pom.xml.individual-jars

Lines changed: 0 additions & 168 deletions
This file was deleted.

0 commit comments

Comments
 (0)