You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/09/04 12:25:36 UTC
svn commit: r440017 - in
/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo:
InstallerMojoSupport.java StartServerMojo.java
Author: jdillon
Date: Mon Sep 4 03:25:31 2006
New Revision: 440017
URL: http://svn.apache.org/viewvc?view=rev&rev=440017
Log:
Added comments about some future changes/cleanup
Modified:
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/InstallerMojoSupport.java
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/InstallerMojoSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/InstallerMojoSupport.java?view=diff&rev=440017&r1=440016&r2=440017
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/InstallerMojoSupport.java (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/InstallerMojoSupport.java Mon Sep 4 03:25:31 2006
@@ -81,6 +81,10 @@
*/
protected File assemblyArchive = null;
+ //
+ // TODO: change this to installDir, add geronimoHome which is the dir under the installDir
+ //
+
/**
* Directory to extract the assembly into.
*
@@ -152,7 +156,7 @@
installArchive = assemblyArchive;
//
- // FIXME: This probably will not work...
+ // TODO: This probably will not work... might use a scanner to search for bin/server.jar
//
installDir = new File(outputDirectory, "assembly-archive");
Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java?view=diff&rev=440017&r1=440016&r2=440017
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java Mon Sep 4 03:25:31 2006
@@ -113,6 +113,10 @@
protected void doExecute() throws Exception {
log.info("Starting Geronimo server...");
+ //
+ // TODO: Support existing install (no assembly install logic), which needs geronimoHome to be set and exist
+ //
+
doInstall();
// Setup the JVM to start the server with