[EMAIL PROTECTED] wrote:
Revision
3973 <http://fisheye.codehaus.org/changelog/mojo/?cs=3973>
Author
dantran
Date
2007-04-23 18:30:14 -0500 (Mon, 23 Apr 2007)
Log Message
MOJO-729 <http://jira.codehaus.org/secure/ViewIssue.jspa?key=MOJO-729>: Add ability to source an optional environment setup script.
MOJO-626 <http://jira.codehaus.org/secure/ViewIssue.jspa?key=MOJO-626>: Add
"flat" repository layout type support
Modified Paths
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/AssembleMojo.java
<#trunkmojoappassemblerappassemblermavenpluginsrcmainjavaorgcodehausmojoappassemblerAssembleMojojava>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/DefaultScriptGenerator.java
<#trunkmojoappassemblerappassemblermavenpluginsrcmainjavaorgcodehausmojoappassemblerdaemonscriptDefaultScriptGeneratorjava>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/Platform.java
<#trunkmojoappassemblerappassemblermavenpluginsrcmainjavaorgcodehausmojoappassemblerdaemonscriptPlatformjava>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate
<#trunkmojoappassemblerappassemblermavenpluginsrcmainresourcesorgcodehausmojoappassemblerdaemonscriptunixBinTemplate>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate
<#trunkmojoappassemblerappassemblermavenpluginsrcmainresourcesorgcodehausmojoappassemblerdaemonscriptwindowsBinTemplate>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/java/org/codehaus/mojo/appassembler/daemon/script/ScriptGeneratorTest.java
<#trunkmojoappassemblerappassemblermavenpluginsrctestjavaorgcodehausmojoappassemblerdaemonscriptScriptGeneratorTestjava>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app.bat
<#trunkmojoappassemblerappassemblermavenpluginsrctestresourcesorgcodehausmojoappassemblerdaemonbooterappbat>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test
<#trunkmojoappassemblerappassemblermavenpluginsrctestresourcesorgcodehausmojoappassemblerdaemonscriptexpectedtest>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat
<#trunkmojoappassemblerappassemblermavenpluginsrctestresourcesorgcodehausmojoappassemblerdaemonscriptexpectedtestbat>
*
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/project-1/descriptor.xml
<#trunkmojoappassemblerappassemblermavenpluginsrctestresourcesproject1descriptorxml>
*
trunk/mojo/appassembler/appassembler-model/src/main/java/org/codehaus/mojo/appassembler/model/io/DaemonModelUtil.java
<#trunkmojoappassemblerappassemblermodelsrcmainjavaorgcodehausmojoappassemblermodelioDaemonModelUtiljava>
* trunk/mojo/appassembler/appassembler-model/src/main/modello/model.xml
<#trunkmojoappassemblerappassemblermodelsrcmainmodellomodelxml>
* trunk/mojo/appassembler/pom.xml <#trunkmojoappassemblerpomxml>
Diff
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/AssembleMojo.java
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/AssembleMojo.java
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/AssembleMojo.java
2007-04-23 23:30:14 UTC (rev 3973)
@@ -40,6 +40,7 @@
import org.codehaus.mojo.appassembler.daemon.script.ScriptGenerator;
import org.codehaus.mojo.appassembler.model.*;
import org.codehaus.mojo.appassembler.model.JvmSettings;
+import org.codehaus.mojo.appassembler.repository.FlatRepositoryLayout;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -129,9 +130,10 @@
*/
private boolean includeConfigurationDirectoryInClasspath;
+
/**
- * The layout of the generated Maven repository.
- * Supported types - "default" (Maven2) | "legacy" (Maven1)
+ * The layout of the generated Maven repository. Supported types - "default" (Maven2) |
"legacy" (Maven1) | "flat"
+ * (flat lib/ style)
*
* @parameter default-value="default"
*/
@@ -151,6 +153,13 @@
* @parameter
*/
private Set platforms;
+
+ /**
+ * Setup file in $BASEDIR/bin to be called prior to execution.
+ *
+ * @parameter
+ */
+ private String environmentSetupFileName;
// -----------------------------------------------------------------------
// Components
@@ -217,6 +226,10 @@
{
artifactRepositoryLayout = new LegacyRepositoryLayout();
}
+ else if ( repositoryLayout.equals( "flat" ) )
+ {
+ artifactRepositoryLayout = new FlatRepositoryLayout();
+ }
else
{
throw new MojoFailureException( "Unknown repository layout '" +
repositoryLayout + "'." );
@@ -351,7 +364,9 @@
jvmSettings.setExtraArguments( parseTokens( this.extraJvmArguments ) );
daemon.setJvmSettings( jvmSettings );
-
+
+ daemon.setEnvironmentSetupFileName( this.environmentSetupFileName );
+
return daemon;
}
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/DefaultScriptGenerator.java
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/DefaultScriptGenerator.java
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/DefaultScriptGenerator.java
2007-04-23 23:30:14 UTC (rev 3973)
@@ -57,6 +57,7 @@
context.put( "CLASSPATH", platform.getClassPath( daemon ) );
context.put( "EXTRA_JVM_ARGUMENTS", platform.getExtraJvmArguments(
daemon.getJvmSettings() ) );
context.put( "APP_NAME", daemon.getId() );
+ context.put( "ENV_SETUP", platform.getEnvSetup( daemon ) );
String appArguments = platform.getAppArguments( daemon );
if ( appArguments != null )
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/Platform.java
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/Platform.java
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/java/org/codehaus/mojo/appassembler/daemon/script/Platform.java
2007-04-23 23:30:14 UTC (rev 3973)
@@ -294,6 +294,30 @@
return vmArgs + " " + argType + extraJvmArgument;
}
+ public String getEnvSetup( Daemon daemon )
+ {
+ String envSetup = "";
+
+ String envSetupFileName = daemon.getEnvironmentSetupFileName();
+
+ if ( envSetupFileName != null )
+ {
+ if ( isWindows )
+ {
+ String envScriptPath = "%BASEDIR%\\bin\\" + envSetupFileName +
".bat" ;
+
+ envSetup = "if exist " + envScriptPath + " call " + envScriptPath ;
+ }
+ else
+ {
+ String envScriptPath = "$BASEDIR/bin/" +
envSetupFileName;
+ envSetup = "if [ -f " + envScriptPath + " ]; then . " +
envScriptPath + " fi" ;
The BASEDIR variable should be in quotes here.
+ }
+ }
+
+ return envSetup;
+ }
+
// -----------------------------------------------------------------------
// Object overrides
// -----------------------------------------------------------------------
@@ -324,4 +348,5 @@
{
return name;
}
+
}
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/unixBinTemplate
2007-04-23 23:30:14 UTC (rev 3973)
@@ -18,6 +18,11 @@
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
# reserved.
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
+
[EMAIL PROTECTED]@
+
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
@@ -67,9 +72,6 @@
exit 1
fi
-BASEDIR=`dirname $0`/..
-BASEDIR=`(cd "$BASEDIR"; pwd)`
-
if [ -z "$REPO" ]
then
REPO="$BASEDIR"/repo
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate
2007-04-23 23:30:14 UTC (rev 3973)
@@ -57,12 +57,14 @@
set BASEDIR=%CD%
cd %SAVEDIR%
set SAVE_DIR=
-goto setRepo
+goto repoSetup
:WinNTGetScriptDir
set BASEDIR=%~dp0\..
-:setRepo
+:repoSetup
+#ENV_SETUP#
+
if "%REPO%"=="" set REPO="%BASEDIR%\repo"
set CLASSPATH=#CLASSPATH#
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/java/org/codehaus/mojo/appassembler/daemon/script/ScriptGeneratorTest.java
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/java/org/codehaus/mojo/appassembler/daemon/script/ScriptGeneratorTest.java
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/java/org/codehaus/mojo/appassembler/daemon/script/ScriptGeneratorTest.java
2007-04-23 23:30:14 UTC (rev 3973)
@@ -49,10 +49,12 @@
Daemon daemon = new Daemon();
+
daemon.setId( "test" );
daemon.setMainClass( "foo.Bar" );
daemon.setJvmSettings( new JvmSettings() );
daemon.getJvmSettings().setExtraArguments( Arrays.asList( new String[] { "Yo",
"dude"} ));
+ daemon.setEnvironmentSetupFileName( "setup" );
File outputDirectory = getTestFile( "target/test-output/normal-shell/" + platform.getName() );
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app.bat
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app.bat
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/booter/app.bat
2007-04-23 23:30:14 UTC (rev 3973)
@@ -57,12 +57,14 @@
set BASEDIR=%CD%
cd %SAVEDIR%
set SAVE_DIR=
-goto setRepo
+goto repoSetup
:WinNTGetScriptDir
set BASEDIR=%~dp0\..
-:setRepo
+:repoSetup
+if exist %BASEDIR%\bin\app-env.bat call %BASEDIR%\bin\app-env.bat
+
if "%REPO%"=="" set REPO="%BASEDIR%\repo"
set CLASSPATH="%BASEDIR%"\etc;"%REPO%"\org/codehaus/mojo/appassembler-booter/1.0-SNAPSHOT/appassembler-booter-1.0-SNAPSHOT.jar;"%REPO%"\org/codehaus/mojo/appassembler-booter/1.0-SNAPSHOT/appassembler-booter-1.0-SNAPSHOT.jar
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test
2007-04-23 23:30:14 UTC (rev 3973)
@@ -18,6 +18,11 @@
# Copyright (c) 2001-2002 The Apache Software Foundation. All rights
# reserved.
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
+
+if [ -f $BASEDIR/bin/setup ]; then . $BASEDIR/bin/setup fi
+
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
@@ -67,9 +72,6 @@
exit 1
fi
-BASEDIR=`dirname $0`/..
-BASEDIR=`(cd "$BASEDIR"; pwd)`
-
if [ -z "$REPO" ]
then
REPO="$BASEDIR"/repo
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat
2007-04-23 23:30:14 UTC (rev 3973)
@@ -57,12 +57,14 @@
set BASEDIR=%CD%
cd %SAVEDIR%
set SAVE_DIR=
-goto setRepo
+goto repoSetup
:WinNTGetScriptDir
set BASEDIR=%~dp0\..
-:setRepo
+:repoSetup
+if exist %BASEDIR%\bin\setup.bat call %BASEDIR%\bin\setup.bat
+
if "%REPO%"=="" set REPO="%BASEDIR%\repo"
set CLASSPATH=
Modified:
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/project-1/descriptor.xml
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/project-1/descriptor.xml
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-maven-plugin/src/test/resources/project-1/descriptor.xml
2007-04-23 23:30:14 UTC (rev 3973)
@@ -8,5 +8,6 @@
<systemProperty>foo=bar</systemProperty>
<systemProperty>bar=foo</systemProperty>
</systemProperties>
- </jvmSettings>
+ </jvmSettings>
+ <setupName>app-env</setupName>
</daemon>
Modified:
trunk/mojo/appassembler/appassembler-model/src/main/java/org/codehaus/mojo/appassembler/model/io/DaemonModelUtil.java
(3972 => 3973)
---
trunk/mojo/appassembler/appassembler-model/src/main/java/org/codehaus/mojo/appassembler/model/io/DaemonModelUtil.java
2007-04-22 19:54:59 UTC (rev 3972)
+++
trunk/mojo/appassembler/appassembler-model/src/main/java/org/codehaus/mojo/appassembler/model/io/DaemonModelUtil.java
2007-04-23 23:30:14 UTC (rev 3973)
@@ -271,6 +271,10 @@
{
daemon.setMainClass( text );
}
+ else if ( qName.equals( "setupName" ) )
+ {
+ daemon.setEnvironmentSetupFileName( text );
+ }
IMO the tag name should be "environmentSetupFileName" as well.
--
Trygve
---------------------------------------------------------------------
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
