Skip to content

Commit f7f0657

Browse files
nezdanezda
committed
[#48] just swap $JAVA_OPTS @EXTRA_JVM_ARGUMENTS@ to env is last and has a chance for its values to take precedence
1 parent 974ee6c commit f7f0657

File tree

20 files changed

+36
-36
lines changed

20 files changed

+36
-36
lines changed

‎appassembler-maven-plugin/src/it/binFolderTest/verify.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );
3737
t.checkExistenceAndContentOfAFile(unixScriptFile, [
3838
'[ -f "$BASEDIR"/xbin/setup-env ] && . "$BASEDIR"/xbin/setup-env',
3939
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/envrionmentSetup-test/1.0-SNAPSHOT/envrionmentSetup-test-1.0-SNAPSHOT.jar',
40-
'exec "$JAVACMD" $JAVA_OPTS -Xms16m \\',
40+
'exec "$JAVACMD" -Xms16m $JAVA_OPTS \\',
4141
' -classpath "$CLASSPATH" \\',
4242
' -Dapp.name="basic-test" \\',
4343
' -Dapp.pid="$$" \\',
@@ -54,7 +54,7 @@ File windowsBatchFile = new File( fileBinFolder, "basic-test.bat" );
5454
t.checkExistenceAndContentOfAFile(windowsBatchFile, [
5555
/if exist "%BASEDIR%\xbin\setup-env.bat" call "%BASEDIR%\xbin\setup-env.bat"/,
5656
/set CLASSPATH="%BASEDIR%"\etc;"%REPO%"\org\codehaus\mojo\appassembler-maven-plugin\it\envrionmentSetup-test\1.0-SNAPSHOT\envrionmentSetup-test-1.0-SNAPSHOT.jar/,
57-
/%JAVACMD% %JAVA_OPTS% -Xms16m -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%/,
57+
/%JAVACMD% -Xms16m %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%/,
5858
])
5959

6060
//Check the existence of the generated repository.

‎appassembler-maven-plugin/src/it/booterLicenseHeaderTest/verify.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-unix/bin/boot
3636
'# ******************************************',
3737
'# --- This is my own license header file ---',
3838
'# ******************************************',
39-
'exec "$JAVACMD" $JAVA_OPTS \\',
39+
'exec "$JAVACMD" $JAVA_OPTS \\',
4040
' -classpath "$CLASSPATH" \\',
4141
' -Dapp.name="booterLicenseHeaderTest" \\',
4242
' -Dapp.pid="$$" \\',
@@ -58,7 +58,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/bin/b
5858
'@REM ******************************************',
5959
'@REM --- This is my own license header file ---',
6060
'@REM ******************************************',
61-
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="booterLicenseHeaderTest" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.booter.AppassemblerBooter %CMD_LINE_ARGS%',
61+
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="booterLicenseHeaderTest" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.booter.AppassemblerBooter %CMD_LINE_ARGS%',
6262
])
6363

6464
t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/etc/booterLicenseHeaderTest.xml" ), [
@@ -73,7 +73,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-unix/bin/boot
7373
'# ******************************************',
7474
'# --- This is LicenseHeader File 01 ---',
7575
'# ******************************************',
76-
'exec "$JAVACMD" $JAVA_OPTS \\',
76+
'exec "$JAVACMD" $JAVA_OPTS \\',
7777
' -classpath "$CLASSPATH" \\',
7878
' -Dapp.name="booterLicenseHeaderTest-01" \\',
7979
' -Dapp.pid="$$" \\',
@@ -95,7 +95,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/bin/b
9595
'@REM ******************************************',
9696
'@REM --- This is LicenseHeader File 01 ---',
9797
'@REM ******************************************',
98-
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="booterLicenseHeaderTest-01" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.booter.AppassemblerBooter %CMD_LINE_ARGS%',
98+
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="booterLicenseHeaderTest-01" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.booter.AppassemblerBooter %CMD_LINE_ARGS%',
9999
])
100100

101101
t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/etc/booterLicenseHeaderTest-01.xml" ), [

‎appassembler-maven-plugin/src/it/configurationSourceDirectoryTest/verify.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );
3636

3737
t.checkExistenceAndContentOfAFile(unixScriptFile, [
3838
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/configurationSourceDirectory-test/1.0-SNAPSHOT/configurationSourceDirectory-test-1.0-SNAPSHOT.jar',
39-
'exec "$JAVACMD" $JAVA_OPTS -Xms16m \\',
39+
'exec "$JAVACMD" -Xms16m $JAVA_OPTS \\',
4040
' -classpath "$CLASSPATH" \\',
4141
' -Dapp.name="basic-test" \\',
4242
' -Dapp.pid="$$" \\',
@@ -51,7 +51,7 @@ File windowsBatchFile = new File( fileBinFolder, "basic-test.bat" );
5151

5252
t.checkExistenceAndContentOfAFile(windowsBatchFile, [
5353
/set CLASSPATH="%BASEDIR%"\etc;"%REPO%"\org\codehaus\mojo\appassembler-maven-plugin\it\configurationSourceDirectory-test\1.0-SNAPSHOT\configurationSourceDirectory-test-1.0-SNAPSHOT.jar/,
54-
'%JAVACMD% %JAVA_OPTS% -Xms16m -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
54+
'%JAVACMD% -Xms16m %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
5555
])
5656

5757
//Check the existence of the generated repository.

‎appassembler-maven-plugin/src/it/environmentSetupTest/verify.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );
3737
t.checkExistenceAndContentOfAFile(unixScriptFile, [
3838
'[ -f "$BASEDIR"/bin/setup-env ] && . "$BASEDIR"/bin/setup-env',
3939
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/envrionmentSetup-test/1.0-SNAPSHOT/envrionmentSetup-test-1.0-SNAPSHOT.jar',
40-
'exec "$JAVACMD" $JAVA_OPTS -Xms16m \\',
40+
'exec "$JAVACMD" -Xms16m $JAVA_OPTS \\',
4141
' -classpath "$CLASSPATH" \\',
4242
' -Dapp.name="basic-test" \\',
4343
' -Dapp.pid="$$" \\',
@@ -54,7 +54,7 @@ File windowsBatchFile = new File( fileBinFolder, "basic-test.bat" );
5454
t.checkExistenceAndContentOfAFile(windowsBatchFile, [
5555
'if exist "%BASEDIR%\\bin\\setup-env.bat" call "%BASEDIR%\\bin\\setup-env.bat"',
5656
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\envrionmentSetup-test\\1.0-SNAPSHOT\\envrionmentSetup-test-1.0-SNAPSHOT.jar',
57-
'%JAVACMD% %JAVA_OPTS% -Xms16m -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
57+
'%JAVACMD% -Xms16m %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
5858
])
5959

6060
//Check the existence of the generated repository.

‎appassembler-maven-plugin/src/it/programCLIArgumentsTest/verify.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );
3636

3737
t.checkExistenceAndContentOfAFile(unixScriptFile, [
3838
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programCLIArguments-test/1.0-SNAPSHOT/programCLIArguments-test-1.0-SNAPSHOT.jar',
39-
'exec "$JAVACMD" $JAVA_OPTS -Xms16m \\',
39+
'exec "$JAVACMD" -Xms16m $JAVA_OPTS \\',
4040
' -classpath "$CLASSPATH" \\',
4141
' -Dapp.name="basic-test" \\',
4242
' -Dapp.pid="$$" \\',
@@ -53,7 +53,7 @@ File windowsBatchFile = new File( fileBinFolder, "basic-test.bat" );
5353

5454
t.checkExistenceAndContentOfAFile(windowsBatchFile, [
5555
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programCLIArguments-test\\1.0-SNAPSHOT\\programCLIArguments-test-1.0-SNAPSHOT.jar',
56-
'%JAVACMD% %JAVA_OPTS% -Xms16m -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
56+
'%JAVACMD% -Xms16m %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
5757
])
5858

5959
//Check the existence of the generated repository.

‎appassembler-maven-plugin/src/it/programCLIArgumentsWithExpandingTest/verify.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );
3636

3737
t.checkExistenceAndContentOfAFile(unixScriptFile, [
3838
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programCLIArgumentsWithExpanding-test/1.0-SNAPSHOT/programCLIArgumentsWithExpanding-test-1.0-SNAPSHOT.jar',
39-
'exec "$JAVACMD" $JAVA_OPTS -Dx.y.basedir="$BASEDIR" -Dx.y.repo="$REPO" \\',
39+
'exec "$JAVACMD" -Dx.y.basedir="$BASEDIR" -Dx.y.repo="$REPO" $JAVA_OPTS \\',
4040
' -classpath "$CLASSPATH" \\',
4141
' -Dapp.name="basic-test" \\',
4242
' -Dapp.pid="$$" \\',
@@ -53,7 +53,7 @@ def windowsScriptFile = new File( fileBinFolder, "basic-test.bat");
5353

5454
t.checkExistenceAndContentOfAFile(windowsScriptFile, [
5555
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programCLIArgumentsWithExpanding-test\\1.0-SNAPSHOT\\programCLIArgumentsWithExpanding-test-1.0-SNAPSHOT.jar',
56-
'%JAVACMD% %JAVA_OPTS% -Dx.y.basedir="%BASEDIR%" -Dx.y.repo="%REPO%" -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 "%BASEDIR%" "%REPO%" %CMD_LINE_ARGS%',
56+
'%JAVACMD% -Dx.y.basedir="%BASEDIR%" -Dx.y.repo="%REPO%" %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="basic-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 "%BASEDIR%" "%REPO%" %CMD_LINE_ARGS%',
5757
])
5858

5959
//Check the existence of the generated repository.

‎appassembler-maven-plugin/src/it/programJvmArgumentsTest/verify.groovy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def scriptfile_program_01_test = new File( fileBinFolder, 'program-01-test');
3535

3636
t.checkExistenceAndContentOfAFile(scriptfile_program_01_test, [
3737
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programJvmArguments-test/1.0-SNAPSHOT/programJvmArguments-test-1.0-SNAPSHOT.jar',
38-
'exec "$JAVACMD" $JAVA_OPTS "--port 1" "--option 2" \\',
38+
'exec "$JAVACMD" "--port 1" "--option 2" $JAVA_OPTS \\',
3939
' -classpath "$CLASSPATH" \\',
4040
' -Dapp.name="program-01-test" \\',
4141
' -Dapp.pid="$$" \\',
@@ -50,14 +50,14 @@ def scriptfile_program_01_test_bat = new File( fileBinFolder, 'program-01-test.b
5050

5151
t.checkExistenceAndContentOfAFile(scriptfile_program_01_test_bat, [
5252
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programJvmArguments-test\\1.0-SNAPSHOT\\programJvmArguments-test-1.0-SNAPSHOT.jar',
53-
'%JAVACMD% %JAVA_OPTS% "--port 1" "--option 2" -classpath %CLASSPATH% -Dapp.name="program-01-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
53+
'%JAVACMD% "--port 1" "--option 2" %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="program-01-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
5454
]);
5555

5656
def scriptfile_program_02_test = new File( fileBinFolder, 'program-02-test');
5757

5858
t.checkExistenceAndContentOfAFile(scriptfile_program_02_test, [
5959
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programJvmArguments-test/1.0-SNAPSHOT/programJvmArguments-test-1.0-SNAPSHOT.jar',
60-
'exec "$JAVACMD" $JAVA_OPTS -Xms20M -Xmx256G \\',
60+
'exec "$JAVACMD" -Xms20M -Xmx256G $JAVA_OPTS \\',
6161
' -classpath "$CLASSPATH" \\',
6262
' -Dapp.name="program-02-test" \\',
6363
' -Dapp.pid="$$" \\',
@@ -73,7 +73,7 @@ def scriptfile_program_02_test_bat = new File( fileBinFolder, 'program-02-test.b
7373

7474
t.checkExistenceAndContentOfAFile(scriptfile_program_02_test_bat, [
7575
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programJvmArguments-test\\1.0-SNAPSHOT\\programJvmArguments-test-1.0-SNAPSHOT.jar',
76-
'%JAVACMD% %JAVA_OPTS% -Xms20M -Xmx256G -classpath %CLASSPATH% -Dapp.name="program-02-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld test-environment %CMD_LINE_ARGS%',
76+
'%JAVACMD% -Xms20M -Xmx256G %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="program-02-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld test-environment %CMD_LINE_ARGS%',
7777
]);
7878

7979

@@ -82,7 +82,7 @@ def scriptfile_program_03_test = new File( fileBinFolder, 'program-03-test');
8282

8383
t.checkExistenceAndContentOfAFile(scriptfile_program_03_test, [
8484
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programJvmArguments-test/1.0-SNAPSHOT/programJvmArguments-test-1.0-SNAPSHOT.jar',
85-
'exec "$JAVACMD" $JAVA_OPTS -Xms20m -Xmx256m -Xss128m -Dtest=false -Dlog4j.properties=false -Danton=2345 -Dberta="xaz" \\',
85+
'exec "$JAVACMD" -Xms20m -Xmx256m -Xss128m -Dtest=false -Dlog4j.properties=false -Danton=2345 -Dberta="xaz" $JAVA_OPTS \\',
8686
' -classpath "$CLASSPATH" \\',
8787
' -Dapp.name="program-03-test" \\',
8888
' -Dapp.pid="$$" \\',
@@ -98,7 +98,7 @@ def scriptfile_program_03_test_bat = new File( fileBinFolder, 'program-03-test.b
9898

9999
t.checkExistenceAndContentOfAFile(scriptfile_program_03_test_bat, [
100100
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programJvmArguments-test\\1.0-SNAPSHOT\\programJvmArguments-test-1.0-SNAPSHOT.jar',
101-
'%JAVACMD% %JAVA_OPTS% -Xms20m -Xmx256m -Xss128m -Dtest=false -Dlog4j.properties=false -Danton=2345 -Dberta="xaz" -classpath %CLASSPATH% -Dapp.name="program-03-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld test-environment %CMD_LINE_ARGS%',
101+
'%JAVACMD% -Xms20m -Xmx256m -Xss128m -Dtest=false -Dlog4j.properties=false -Danton=2345 -Dberta="xaz" %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="program-03-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld test-environment %CMD_LINE_ARGS%',
102102
]);
103103

104104

‎appassembler-maven-plugin/src/it/programLicenseHeaderTest/verify.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader
3636
'# --- This is my own license header file ---',
3737
'# ******************************************',
3838
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programLicenseHeader-test/1.0-SNAPSHOT/programLicenseHeader-test-1.0-SNAPSHOT.jar',
39-
'exec "$JAVACMD" $JAVA_OPTS \\',
39+
'exec "$JAVACMD" $JAVA_OPTS \\',
4040
' -classpath "$CLASSPATH" \\',
4141
' -Dapp.name="programLicenseHeader-test" \\',
4242
' -Dapp.pid="$$" \\',
@@ -52,15 +52,15 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader
5252
'@REM --- This is my own license header file ---',
5353
'@REM ******************************************',
5454
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programLicenseHeader-test\\1.0-SNAPSHOT\\programLicenseHeader-test-1.0-SNAPSHOT.jar',
55-
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="programLicenseHeader-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
55+
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="programLicenseHeader-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld arg1 arg2 %CMD_LINE_ARGS%',
5656
])
5757

5858
t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader-01-test"), [
5959
'# ******************************************',
6060
'# --- This is LicenseHeader File 01 ---',
6161
'# ******************************************',
6262
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programLicenseHeader-test/1.0-SNAPSHOT/programLicenseHeader-test-1.0-SNAPSHOT.jar',
63-
'exec "$JAVACMD" $JAVA_OPTS \\',
63+
'exec "$JAVACMD" $JAVA_OPTS \\',
6464
' -classpath "$CLASSPATH" \\',
6565
' -Dapp.name="programLicenseHeader-01-test" \\',
6666
' -Dapp.pid="$$" \\',
@@ -76,7 +76,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader
7676
'@REM --- This is LicenseHeader File 01 ---',
7777
'@REM ******************************************',
7878
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programLicenseHeader-test\\1.0-SNAPSHOT\\programLicenseHeader-test-1.0-SNAPSHOT.jar',
79-
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="programLicenseHeader-01-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld %CMD_LINE_ARGS%',
79+
'%JAVACMD% %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="programLicenseHeader-01-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" org.codehaus.mojo.appassembler.example.helloworld.HelloWorld %CMD_LINE_ARGS%',
8080
])
8181

8282
//Check the existence of the generated repository.

‎appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if $cygwin; then
9999
[ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
100100
fi
101101

102-
exec "$JAVACMD" $JAVA_OPTS @EXTRA_JVM_ARGUMENTS@ \
102+
exec "$JAVACMD" @EXTRA_JVM_ARGUMENTS@ $JAVA_OPTS \
103103
-classpath "$CLASSPATH" \
104104
-Dapp.name="@APP_NAME@" \
105105
-Dapp.pid="$$" \

‎appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
6464
@REM Reaching here means variables are defined and arguments have been captured
6565
:endInit
6666

67-
%JAVACMD% %JAVA_OPTS% #EXTRA_JVM_ARGUMENTS# -classpath %CLASSPATH% -Dapp.name="#APP_NAME#" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" #MAINCLASS# #APP_ARGUMENTS#%CMD_LINE_ARGS%
67+
%JAVACMD% #EXTRA_JVM_ARGUMENTS# %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="#APP_NAME#" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" #MAINCLASS# #APP_ARGUMENTS#%CMD_LINE_ARGS%
6868
if %ERRORLEVEL% NEQ 0 goto error
6969
goto end
7070

0 commit comments

Comments
 (0)