Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue [#48] #58

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+36 −36
Open

Issue [#48] #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7f0657
[#48] just swap $JAVA_OPTS @EXTRA_JVM_ARGUMENTS@ to env is last and h…
nezda Mar 27, 2017
b8058f7
remove confusing space changes
nezda Apr 25, 2020
1480697
Revert "remove confusing space changes"
nezda Apr 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appassembler-maven-plugin/src/it/binFolderTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );
t.checkExistenceAndContentOfAFile(unixScriptFile, [
'[ -f "$BASEDIR"/xbin/setup-env ] && . "$BASEDIR"/xbin/setup-env',
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/envrionmentSetup-test/1.0-SNAPSHOT/envrionmentSetup-test-1.0-SNAPSHOT.jar',
'exec "$JAVACMD" $JAVA_OPTS -Xms16m \\',
'exec "$JAVACMD" -Xms16m $JAVA_OPTS \\',
' -classpath "$CLASSPATH" \\',
' -Dapp.name="basic-test" \\',
' -Dapp.pid="$$" \\',
Expand All @@ -54,7 +54,7 @@ File windowsBatchFile = new File( fileBinFolder, "basic-test.bat" );
t.checkExistenceAndContentOfAFile(windowsBatchFile, [
/if exist "%BASEDIR%\xbin\setup-env.bat" call "%BASEDIR%\xbin\setup-env.bat"/,
/set CLASSPATH="%BASEDIR%"\etc;"%REPO%"\org\codehaus\mojo\appassembler-maven-plugin\it\envrionmentSetup-test\1.0-SNAPSHOT\envrionmentSetup-test-1.0-SNAPSHOT.jar/,
/%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%/,
/%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%/,
])

//Check the existence of the generated repository.
Expand Down
8 changes: 4 additions & 4 deletions appassembler-maven-plugin/src/it/booterLicenseHeaderTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-unix/bin/boot
'# ******************************************',
'# --- This is my own license header file ---',
'# ******************************************',
'exec "$JAVACMD" $JAVA_OPTS \\',
'exec "$JAVACMD" $JAVA_OPTS \\',
' -classpath "$CLASSPATH" \\',
' -Dapp.name="booterLicenseHeaderTest" \\',
' -Dapp.pid="$$" \\',
Expand All @@ -58,7 +58,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/bin/b
'@REM ******************************************',
'@REM --- This is my own license header file ---',
'@REM ******************************************',
'%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%',
'%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%',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Special reason why this has been changed? also Line 39 ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i must've been confused - removed those changes.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops - de ja vu :) #58 (comment) - some of these mvn --show-version --errors --batch-mode -Prun-its clean verify tests failed

[INFO] Building: booterLicenseHeaderTest/pom.xml
[INFO] run script verify.groovy
[INFO] ..FAILED (2.3 s)
[INFO]   The post-build script did not succeed. The expected content 'exec "$JAVACMD" $JAVA_OPTS  \' in the file '/Users/nezda/code/appassembler.git/appassembler-maven-plugin/target/it/booterLicenseHeaderTest/target/generated-resources/appassembler/booter-unix/bin/booterLicenseHeaderTest' couldn't be found.

[INFO] Building: programLicenseHeaderTest/pom.xml
[INFO] run script verify.groovy
[INFO] ..FAILED (2.2 s)
[INFO]   The post-build script did not succeed. The expected content 'exec "$JAVACMD" $JAVA_OPTS  \' in the file '/Users/nezda/code/appassembler.git/appassembler-maven-plugin/target/it/programLicenseHeaderTest/target/appassembler/bin/programLicenseHeader-test' couldn't be found.

reverting that last change

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The travis test failure appears to be because they no longer support Java 7

https://travis-ci.org/github/mojohaus/appassembler/jobs/679529347

image

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What can I do to get this merged?

])

t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/etc/booterLicenseHeaderTest.xml" ), [
Expand All @@ -73,7 +73,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-unix/bin/boot
'# ******************************************',
'# --- This is LicenseHeader File 01 ---',
'# ******************************************',
'exec "$JAVACMD" $JAVA_OPTS \\',
'exec "$JAVACMD" $JAVA_OPTS \\',
' -classpath "$CLASSPATH" \\',
' -Dapp.name="booterLicenseHeaderTest-01" \\',
' -Dapp.pid="$$" \\',
Expand All @@ -95,7 +95,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/bin/b
'@REM ******************************************',
'@REM --- This is LicenseHeader File 01 ---',
'@REM ******************************************',
'%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%',
'%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%',
])

t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "booter-windows/etc/booterLicenseHeaderTest-01.xml" ), [
Expand Down
4 changes: 2 additions & 2 deletions appassembler-maven-plugin/src/it/configurationSourceDirectoryTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );

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

t.checkExistenceAndContentOfAFile(windowsBatchFile, [
/set CLASSPATH="%BASEDIR%"\etc;"%REPO%"\org\codehaus\mojo\appassembler-maven-plugin\it\configurationSourceDirectory-test\1.0-SNAPSHOT\configurationSourceDirectory-test-1.0-SNAPSHOT.jar/,
'%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%',
'%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%',
])

//Check the existence of the generated repository.
Expand Down
4 changes: 2 additions & 2 deletions appassembler-maven-plugin/src/it/environmentSetupTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );
t.checkExistenceAndContentOfAFile(unixScriptFile, [
'[ -f "$BASEDIR"/bin/setup-env ] && . "$BASEDIR"/bin/setup-env',
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/envrionmentSetup-test/1.0-SNAPSHOT/envrionmentSetup-test-1.0-SNAPSHOT.jar',
'exec "$JAVACMD" $JAVA_OPTS -Xms16m \\',
'exec "$JAVACMD" -Xms16m $JAVA_OPTS \\',
' -classpath "$CLASSPATH" \\',
' -Dapp.name="basic-test" \\',
' -Dapp.pid="$$" \\',
Expand All @@ -54,7 +54,7 @@ File windowsBatchFile = new File( fileBinFolder, "basic-test.bat" );
t.checkExistenceAndContentOfAFile(windowsBatchFile, [
'if exist "%BASEDIR%\\bin\\setup-env.bat" call "%BASEDIR%\\bin\\setup-env.bat"',
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\envrionmentSetup-test\\1.0-SNAPSHOT\\envrionmentSetup-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
])

//Check the existence of the generated repository.
Expand Down
4 changes: 2 additions & 2 deletions appassembler-maven-plugin/src/it/programCLIArgumentsTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );

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

t.checkExistenceAndContentOfAFile(windowsBatchFile, [
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programCLIArguments-test\\1.0-SNAPSHOT\\programCLIArguments-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
])

//Check the existence of the generated repository.
Expand Down
4 changes: 2 additions & 2 deletions appassembler-maven-plugin/src/it/programCLIArgumentsWithExpandingTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def unixScriptFile = new File( fileBinFolder, "basic-test" );

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

t.checkExistenceAndContentOfAFile(windowsScriptFile, [
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programCLIArgumentsWithExpanding-test\\1.0-SNAPSHOT\\programCLIArgumentsWithExpanding-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
])

//Check the existence of the generated repository.
Expand Down
12 changes: 6 additions & 6 deletions appassembler-maven-plugin/src/it/programJvmArgumentsTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def scriptfile_program_01_test = new File( fileBinFolder, 'program-01-test');

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

t.checkExistenceAndContentOfAFile(scriptfile_program_01_test_bat, [
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programJvmArguments-test\\1.0-SNAPSHOT\\programJvmArguments-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
]);

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

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

t.checkExistenceAndContentOfAFile(scriptfile_program_02_test_bat, [
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programJvmArguments-test\\1.0-SNAPSHOT\\programJvmArguments-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
]);


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

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

t.checkExistenceAndContentOfAFile(scriptfile_program_03_test_bat, [
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programJvmArguments-test\\1.0-SNAPSHOT\\programJvmArguments-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
]);


Expand Down
8 changes: 4 additions & 4 deletions appassembler-maven-plugin/src/it/programLicenseHeaderTest/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader
'# --- This is my own license header file ---',
'# ******************************************',
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programLicenseHeader-test/1.0-SNAPSHOT/programLicenseHeader-test-1.0-SNAPSHOT.jar',
'exec "$JAVACMD" $JAVA_OPTS \\',
'exec "$JAVACMD" $JAVA_OPTS \\',
' -classpath "$CLASSPATH" \\',
' -Dapp.name="programLicenseHeader-test" \\',
' -Dapp.pid="$$" \\',
Expand All @@ -52,15 +52,15 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader
'@REM --- This is my own license header file ---',
'@REM ******************************************',
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programLicenseHeader-test\\1.0-SNAPSHOT\\programLicenseHeader-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
])

t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader-01-test"), [
'# ******************************************',
'# --- This is LicenseHeader File 01 ---',
'# ******************************************',
'CLASSPATH="$BASEDIR"/etc:"$REPO"/org/codehaus/mojo/appassembler-maven-plugin/it/programLicenseHeader-test/1.0-SNAPSHOT/programLicenseHeader-test-1.0-SNAPSHOT.jar',
'exec "$JAVACMD" $JAVA_OPTS \\',
'exec "$JAVACMD" $JAVA_OPTS \\',
' -classpath "$CLASSPATH" \\',
' -Dapp.name="programLicenseHeader-01-test" \\',
' -Dapp.pid="$$" \\',
Expand All @@ -76,7 +76,7 @@ t.checkExistenceAndContentOfAFile(new File( fileBinFolder, "programLicenseHeader
'@REM --- This is LicenseHeader File 01 ---',
'@REM ******************************************',
'set CLASSPATH="%BASEDIR%"\\etc;"%REPO%"\\org\\codehaus\\mojo\\appassembler-maven-plugin\\it\\programLicenseHeader-test\\1.0-SNAPSHOT\\programLicenseHeader-test-1.0-SNAPSHOT.jar',
'%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%',
'%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%',
])

//Check the existence of the generated repository.
Expand Down
2 changes: 1 addition & 1 deletion ...en-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if $cygwin; then
[ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
fi

exec "$JAVACMD" $JAVA_OPTS @EXTRA_JVM_ARGUMENTS@ \
exec "$JAVACMD" @EXTRA_JVM_ARGUMENTS@ $JAVA_OPTS \
-classpath "$CLASSPATH" \
-Dapp.name="@APP_NAME@" \
-Dapp.pid="$$" \
Expand Down
2 changes: 1 addition & 1 deletion ...plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
@REM Reaching here means variables are defined and arguments have been captured
:endInit

%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%
%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%
if %ERRORLEVEL% NEQ 0 goto error
goto end

Expand Down
2 changes: 1 addition & 1 deletion ...resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if $cygwin; then
[ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
fi

exec "$JAVACMD" $JAVA_OPTS Yo dude xyz="$BASEDIR" \
exec "$JAVACMD" Yo dude xyz="$BASEDIR" $JAVA_OPTS \
-classpath "$CLASSPATH" \
-Dapp.name="basedir-test" \
-Dapp.pid="$$" \
Expand Down
2 changes: 1 addition & 1 deletion ...urces/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
@REM Reaching here means variables are defined and arguments have been captured
:endInit

%JAVACMD% %JAVA_OPTS% Yo dude xyz="%BASEDIR%" -classpath %CLASSPATH% -Dapp.name="basedir-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
%JAVACMD% Yo dude xyz="%BASEDIR%" %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="basedir-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
if %ERRORLEVEL% NEQ 0 goto error
goto end

Expand Down
2 changes: 1 addition & 1 deletion ...st/resources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if $cygwin; then
[ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
fi

exec "$JAVACMD" $JAVA_OPTS Yo dude xyz="$REPO" \
exec "$JAVACMD" Yo dude xyz="$REPO" $JAVA_OPTS \
-classpath "$CLASSPATH" \
-Dapp.name="repo-test" \
-Dapp.pid="$$" \
Expand Down
2 changes: 1 addition & 1 deletion ...esources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ if NOT "%CLASSPATH_PREFIX%" == "" set CLASSPATH=%CLASSPATH_PREFIX%;%CLASSPATH%
@REM Reaching here means variables are defined and arguments have been captured
:endInit

%JAVACMD% %JAVA_OPTS% Yo dude xyz="%REPO%" -classpath %CLASSPATH% -Dapp.name="repo-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
%JAVACMD% Yo dude xyz="%REPO%" %JAVA_OPTS% -classpath %CLASSPATH% -Dapp.name="repo-test" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" foo.Bar %CMD_LINE_ARGS%
if %ERRORLEVEL% NEQ 0 goto error
goto end

Expand Down
2 changes: 1 addition & 1 deletion ...codehaus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if $cygwin; then
[ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
fi

exec "$JAVACMD" $JAVA_OPTS Yo dude \
exec "$JAVACMD" Yo dude $JAVA_OPTS \
-classpath "$CLASSPATH" \
-Dapp.name="test" \
-Dapp.pid="$$" \
Expand Down
Loading