You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/03/01 04:56:59 UTC
svn commit: r1295402 - in
/geronimo/server/branches/3.0-beta/framework/modules:
geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/
geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/
geronimo-system/src/main/java/o...
Author: xiaming
Date: Thu Mar 1 03:56:58 2012
New Revision: 1295402
URL: http://svn.apache.org/viewvc?rev=1295402&view=rev
Log:
GERONIMO-6286 some reasonable changes that reflect multiple instances scenario in mind, though those gogo commands not work now, provided by Russell, for 3.0-beta
Modified:
geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java
geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java
geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/BaseJavaCommand.java
geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartClientCommand.java
geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java
geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java?rev=1295402&r1=1295401&r2=1295402&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandUnlockKeystore.java Thu Mar 1 03:56:58 2012
@@ -46,7 +46,9 @@ public class CommandUnlockKeystore exten
private static final String GERONIMO_HOME = "org.apache.geronimo.home.dir";
- private static final String DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE = System.getProperty(GERONIMO_HOME) + "/var/config/config-substitutions.properties";
+ private static final String GERONIMO_SERVER = "org.apache.geronimo.server.dir";
+
+ private static final String DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE = System.getProperty(GERONIMO_SERVER) + "/var/config/config-substitutions.properties";
public void execute(ConsoleReader consoleReader, ServerConnection connection, CommandArgs commandArgs) throws DeploymentException {
String args[] = commandArgs.getArgs();
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java?rev=1295402&r1=1295401&r2=1295402&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployUtils.java Thu Mar 1 03:56:58 2012
@@ -55,8 +55,11 @@ public class DeployUtils extends ConfigI
private static final String GERONIMO_HOME =
"org.apache.geronimo.home.dir";
+ private static final String GERONIMO_SERVER =
+ "org.apache.geronimo.server.dir";
+
private static final String DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE =
- System.getProperty(GERONIMO_HOME) + "/var/config/config-substitutions.properties";
+ System.getProperty(GERONIMO_SERVER) + "/var/config/config-substitutions.properties";
/**
* Split up an output line so it indents at beginning and end (to fit in a
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/BaseJavaCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/BaseJavaCommand.java?rev=1295402&r1=1295401&r2=1295402&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/BaseJavaCommand.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/BaseJavaCommand.java Thu Mar 1 03:56:58 2012
@@ -38,6 +38,9 @@ public abstract class BaseJavaCommand ex
@Option(name = "-H", aliases = { "--home" }, description = "Use a specific Geronimo home directory")
String geronimoHome;
+ @Option(name = "-S", aliases = { "--serverdir" }, description = "Use a specific full path directory for a Geronimo instance")
+ String geronimoBase;
+
@Option(name = "-j", aliases = { "--jvm" }, description = "Use a specific Java Virtual Machine for server process")
String javaVirtualMachine;
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartClientCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartClientCommand.java?rev=1295402&r1=1295401&r2=1295402&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartClientCommand.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartClientCommand.java Thu Mar 1 03:56:58 2012
@@ -53,14 +53,19 @@ public class StartClientCommand extends
geronimoHome = this.bundleContext.getProperty("org.apache.geronimo.home.dir");
}
+ if (geronimoBase == null) {
+ geronimoBase = this.bundleContext.getProperty("org.apache.geronimo.server.dir");
+ }
+
log.debug("Geronimo home: " + geronimoHome);
// Set the properties which we pass to the JVM from the startup script
properties.put("org.apache.geronimo.home.dir", geronimoHome);
+ properties.put("org.apache.geronimo.server.dir", geronimoBase);
properties.put("karaf.home", geronimoHome);
- properties.put("karaf.base", geronimoHome);
+ properties.put("karaf.base", geronimoBase);
// Use relative path
- properties.put("java.io.tmpdir", "var/temp");// Use relative path
+ properties.put("java.io.tmpdir", geronimoBase + "/var/temp");// Don't use relative path
properties.put("java.endorsed.dirs", prefixSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/endorsed")));
properties.put("java.ext.dirs", prefixSystemPath("java.ext.dirs", new File(geronimoHome, "lib/ext")));
// set console properties
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java?rev=1295402&r1=1295401&r2=1295402&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/StartServerCommand.java Thu Mar 1 03:56:58 2012
@@ -72,14 +72,19 @@ public class StartServerCommand extends
geronimoHome = this.bundleContext.getProperty("org.apache.geronimo.home.dir");
}
+ if (geronimoBase == null) {
+ geronimoBase = this.bundleContext.getProperty("org.apache.geronimo.server.dir");
+ }
+
log.debug("Geronimo home: " + geronimoHome);
// Set the properties which we pass to the JVM from the startup script
properties.put("org.apache.geronimo.home.dir", geronimoHome);
+ properties.put("org.apache.geronimo.server.dir", geronimoBase);
properties.put("karaf.home", geronimoHome);
- properties.put("karaf.base", geronimoHome);
+ properties.put("karaf.base", geronimoBase);
// Use relative path
- properties.put("java.io.tmpdir", "var/temp");// Use relative path
+ properties.put("java.io.tmpdir", geronimoBase + "/var/temp");// Don't use relative path
properties.put("java.endorsed.dirs", prefixSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/endorsed")));
properties.put("java.ext.dirs", prefixSystemPath("java.ext.dirs", new File(geronimoHome, "lib/ext")));
// set console properties
Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?rev=1295402&r1=1295401&r2=1295402&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java (original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java Thu Mar 1 03:56:58 2012
@@ -62,7 +62,8 @@ public class EmbeddedDaemon implements M
static String KEYSTORE_TRUSTSTORE_PASSWORD_FILE = "org.apache.geronimo.keyStoreTrustStorePasswordFile";
static String DEFAULT_TRUSTSTORE_KEYSTORE_LOCATION = "/var/security/keystores/geronimo-default";
static String GERONIMO_HOME = "org.apache.geronimo.home.dir";
- static String DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE = System.getProperty(GERONIMO_HOME)
+ static String GERONIMO_SERVER = "org.apache.geronimo.server.dir";
+ static String DEFAULT_KEYSTORE_TRUSTSTORE_PASSWORD_FILE = System.getProperty(GERONIMO_SERVER)
+ "/var/config/config-substitutions.properties";
public EmbeddedDaemon(Kernel kernel, Bundle bundle) {