@@ -49,25 +49,27 @@ module.exports = class extends Generator {
49
49
writing ( ) {
50
50
app: {
51
51
var userProps = this . props ;
52
+ var platformDelimiter = ':' ;
53
+ if ( process . platform === 'win32' )
54
+ platformDelimiter = ';' ;
52
55
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 ) ;
60
62
var outPath = path . join ( process . cwd ( ) , userProps . outdirectory ) ;
61
63
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 ;
67
69
cmdString = cmdString + ' --wsdl ' + userProps . wsdl ;
68
70
cmdString = cmdString + ' --out ' + outPath ;
69
71
70
- this . log ( 'calling: ' + cmdString ) ;
72
+ console . log ( 'calling: ' + cmdString ) ;
71
73
const wsdl2rest = exec ( cmdString ) ;
72
74
73
75
wsdl2rest . stdout . on ( 'data' , function ( data ) {
@@ -77,7 +79,12 @@ module.exports = class extends Generator {
77
79
console . log ( `stderr: ${ data } ` ) ;
78
80
} ) ;
79
81
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
+ }
81
88
} ) ;
82
89
}
83
90
}
0 commit comments