You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/05/15 03:14:14 UTC
svn commit: r406493 - in /geronimo/branches/1.1:
applications/console-core/src/java/org/apache/geronimo/console/core/keystore/
assemblies/j2ee-jetty-server/src/var/log/
assemblies/j2ee-tomcat-server/src/var/log/
assemblies/minimal-jetty-server/src/var/...
Author: djencks
Date: Sun May 14 18:14:11 2006
New Revision: 406493
URL: http://svn.apache.org/viewcvs?rev=406493&view=rev
Log:
GERONIMO-1638 backport from trunk. revisions r378827, r379430, r382366. Still need to tweak the scripts.
Modified:
geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties
geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties
geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties
geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties
geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/client-log4j.properties
geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/deployer-log4j.properties
geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/server-log4j.properties
geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/client-log4j.properties
geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties
geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/server-log4j.properties
geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/client-log4j.properties
geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/deployer-log4j.properties
geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/server-log4j.properties
geronimo/branches/1.1/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
geronimo/branches/1.1/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/properties/SystemProperties.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java
geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
geronimo/branches/1.1/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java (original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java Sun May 14 18:14:11 2006
@@ -19,6 +19,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
@@ -40,6 +41,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -89,10 +91,9 @@
InputStream is = null;
try {
- log.debug("loading keystore from "
- + serverInfo.resolvePath(this.keyStoreLocation));
- is = new java.io.FileInputStream(serverInfo
- .resolvePath(this.keyStoreLocation));
+ File keyStore = serverInfo.resolveServer(this.keyStoreLocation);
+ log.debug("loading keystore from " + keyStore);
+ is = new java.io.FileInputStream(keyStore);
this.keystore.load(is, this.keyStorePassword.toCharArray());
} catch (java.io.FileNotFoundException e) {
keystoreExistsFlag = false;
@@ -298,8 +299,8 @@
FileOutputStream os = null;
try {
- os = new FileOutputStream(serverInfo
- .resolvePath(this.keyStoreLocation));
+ File keyStore = serverInfo.resolveServer(this.keyStoreLocation);
+ os = new FileOutputStream(keyStore);
keystore.store(os, keyStorePassword.toCharArray());
} finally {
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/deployer.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/geronimo.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/deployer.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/geronimo.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/client-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/client-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/client-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/client-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/deployer-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/deployer-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/deployer-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/deployer.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/server-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/log/server-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/geronimo.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/client-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/client-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/client-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/client-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/deployer-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/deployer.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/server-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/log/server-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/geronimo.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/client-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/client-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/client-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/client-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/client.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/deployer-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/deployer-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/deployer-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/deployer-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/deployer.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/server-log4j.properties?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.1/assemblies/zzzzj2ee-installer/src/var/log/server-log4j.properties Sun May 14 18:14:11 2006
@@ -34,7 +34,7 @@
# overwritten without archiving the previous version of the log.
#
log4j.appender.FILE.append=true
-log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log
+log4j.appender.FILE.file=${org.apache.geronimo.server.dir}/var/log/geronimo.log
log4j.appender.FILE.bufferedIO=false
log4j.appender.FILE.maxBackupIndex=3
log4j.appender.FILE.maxFileSize=10MB
Modified: geronimo/branches/1.1/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java (original)
+++ geronimo/branches/1.1/modules/derby/src/java/org/apache/geronimo/derby/DerbySystemGBean.java Sun May 14 18:14:11 2006
@@ -55,7 +55,7 @@
// set up the system property for the database home
actualHome = System.getProperty(SYSTEM_HOME);
if (actualHome == null) {
- actualHome = serverInfo.resolvePath(systemHome);
+ actualHome = serverInfo.resolveServerPath(systemHome);
}
System.setProperty(SYSTEM_HOME, actualHome);
Modified: geronimo/branches/1.1/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java (original)
+++ geronimo/branches/1.1/modules/directory/src/java/org/apache/geronimo/directory/DirectoryGBean.java Sun May 14 18:14:11 2006
@@ -186,7 +186,7 @@
MutableServerStartupConfiguration startup = new MutableServerStartupConfiguration();
// put some mandatory JNDI properties here
- startup.setWorkingDirectory(serverInfo.resolve(workingDir));
+ startup.setWorkingDirectory(serverInfo.resolveServer(workingDir));
startup.setAllowAnonymousAccess(anonymousAccess);
startup.setLdapPort(port);
startup.setEnableNetworking(enableNetworking);
Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java Sun May 14 18:14:11 2006
@@ -36,6 +36,7 @@
import org.apache.geronimo.jetty.requestlog.JettyLogManager;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
import org.apache.geronimo.kernel.config.EditableConfigurationManager;
import org.apache.geronimo.kernel.config.InvalidConfigException;
Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/requestlog/NCSARequestLog.java Sun May 14 18:14:11 2006
@@ -109,7 +109,7 @@
}
public void doStart() throws Exception {
- requestLog.setFilename(serverInfo.resolvePath(filename));
+ requestLog.setFilename(serverInfo.resolveServerPath(filename));
container.setRequestLog(requestLog);
requestLog.start();
}
Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java Sun May 14 18:14:11 2006
@@ -84,10 +84,10 @@
currentThread.setContextClassLoader(oldClassLoader);
}
}
- if (keyStore != null) sysOverRide(serverInfo.resolvePath(keyStore), KEYSTORE);
+ if (keyStore != null) sysOverRide(serverInfo.resolveServerPath(keyStore), KEYSTORE);
if (keyStorePassword != null) sysOverRide(keyStorePassword, KEYSTORE_PASSWORD);
- if (trustStore != null) sysOverRide(serverInfo.resolvePath(trustStore), TRUSTSTORE);
+ if (trustStore != null) sysOverRide(serverInfo.resolveServerPath(trustStore), TRUSTSTORE);
if (trustStorePassword != null) sysOverRide(trustStorePassword, TRUSTSTORE_PASSWORD);
log.debug(KEYSTORE + ": " + System.getProperty(KEYSTORE));
Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java Sun May 14 18:14:11 2006
@@ -108,7 +108,7 @@
}
public void doStart() throws Exception {
- keystoreFile = new File(serverInfo.resolve(keystorePath));
+ keystoreFile = new File(serverInfo.resolveServer(keystorePath));
if(!keystoreFile.exists() || !keystoreFile.canRead()) {
throw new IllegalArgumentException("Invalid keystore file ("+keystorePath+" = "+keystoreFile.getAbsolutePath()+")");
}
Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/providers/PropertiesFileLoginModule.java Sun May 14 18:14:11 2006
@@ -84,8 +84,8 @@
public void loadProperties(ServerInfo serverInfo, URI userURI, URI groupURI) throws GeronimoSecurityException {
try {
- URI userFile = serverInfo.resolve(userURI);
- URI groupFile = serverInfo.resolve(groupURI);
+ URI userFile = serverInfo.resolveServer(userURI);
+ URI groupFile = serverInfo.resolveServer(groupURI);
InputStream stream = userFile.toURL().openStream();
users.load(stream);
stream.close();
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Sun May 14 18:14:11 2006
@@ -500,7 +500,7 @@
private synchronized void ensureParentDirectory() throws IOException {
if (attributeFile == null) {
- attributeFile = serverInfo.resolve(configFile);
+ attributeFile = serverInfo.resolveServer(configFile);
tempFile = new File(attributeFile.getAbsolutePath() + TEMP_EXTENSION);
backupFile = new File(attributeFile.getAbsolutePath() + BACKUP_EXTENSION);
}
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java Sun May 14 18:14:11 2006
@@ -598,7 +598,7 @@
private synchronized File resolveConfigurationFile() {
try {
- return serverInfo.resolve(configurationFile);
+ return serverInfo.resolveServer(configurationFile);
} catch (Exception e) {
return null;
}
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/properties/SystemProperties.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/properties/SystemProperties.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/properties/SystemProperties.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/properties/SystemProperties.java Sun May 14 18:14:11 2006
@@ -46,7 +46,7 @@
Map.Entry entry = (Map.Entry) iterator.next();
String propertyName = (String) entry.getKey();
String propertyValue = (String) entry.getValue();
- propertyValue = serverInfo.resolvePath(propertyValue);
+ propertyValue = serverInfo.resolveServerPath(propertyValue);
if (System.getProperty(propertyName) == null) {
System.setProperty(propertyName, propertyValue);
}
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java Sun May 14 18:14:11 2006
@@ -30,26 +30,32 @@
* @version $Rev$ $Date$
*/
public class BasicServerInfo implements ServerInfo {
+ public static final String SERVER_NAME_SYS_PROP = "org.apache.geronimo.server.name";
+ public static final String SERVER_DIR_SYS_PROP = "org.apache.geronimo.server.dir";
+ public static final String HOME_DIR_SYS_PROP = "org.apache.geronimo.home.dir";
+
private final String baseDirectory;
private final File base;
+ private final File baseServer;
private final URI baseURI;
+ private final URI baseServerURI;
public BasicServerInfo() {
baseDirectory = null;
base = null;
+ baseServer = null;
baseURI = null;
+ baseServerURI = null;
}
-
- public BasicServerInfo(String baseDirectory) throws Exception {
- this.baseDirectory = baseDirectory;
+ public BasicServerInfo(String defaultBaseDirectory) throws Exception {
+ // Before we try the persistent value, we always check the
+ // system properties first. This lets an admin override this
+ // on the command line.
+ this.baseDirectory = System.getProperty(HOME_DIR_SYS_PROP, defaultBaseDirectory);
// force load of server constants
ServerConstants.getVersion();
- // Before we try the persistent value, we always check the
- // system properties first. This lets an admin override this
- // on the command line.
- baseDirectory = System.getProperty("org.apache.geronimo.base.dir", baseDirectory);
if (baseDirectory == null || baseDirectory.length() == 0) {
base = DirectoryUtils.getGeronimoInstallDirectory();
if (base == null) {
@@ -64,7 +70,11 @@
}
baseURI = base.toURI();
- System.setProperty("org.apache.geronimo.base.dir", base.getAbsolutePath());
+ System.setProperty(HOME_DIR_SYS_PROP, base.getAbsolutePath());
+
+ baseServer = deriveBaseServer();
+ baseServerURI = baseServer.toURI();
+ System.setProperty(SERVER_DIR_SYS_PROP, baseServer.getAbsolutePath());
}
/**
@@ -84,6 +94,10 @@
return resolve(filename).getAbsolutePath();
}
+ public String resolveServerPath(String filename) {
+ return resolveServer(filename).getAbsolutePath();
+ }
+
/**
* Resolves an abstract pathname to a File.
*
@@ -93,17 +107,21 @@
* @return a <code>File</code> value
*/
public File resolve(final String filename) {
- File file = new File(filename);
- if (file.isAbsolute()) {
- return file;
- }
- return new File(base, filename);
+ return resolveWithBase(base, filename);
+ }
+
+ public File resolveServer(String filename) {
+ return resolveWithBase(baseServer, filename);
}
public URI resolve(final URI uri) {
return baseURI.resolve(uri);
}
+ public URI resolveServer(URI uri) {
+ return baseServerURI.resolve(uri);
+ }
+
public String getBaseDirectory() {
return baseDirectory;
}
@@ -128,20 +146,49 @@
return ServerConstants.getCopyright();
}
+ private File resolveWithBase(File baseDir, String filename) {
+ File file = new File(filename);
+ if (file.isAbsolute()) {
+ return file;
+ }
+ return new File(baseDir, filename);
+ }
+
+ private File deriveBaseServer() {
+ File baseServerDir;
+
+ // first check if the base server directory has been provided via
+ // system property override.
+ String baseServerDirPath = System.getProperty(SERVER_DIR_SYS_PROP);
+ if (null == baseServerDirPath) {
+ // then check if a server name has been provided
+ String serverName = System.getProperty(SERVER_NAME_SYS_PROP);
+ if (null == serverName) {
+ // default base server directory.
+ baseServerDir = base;
+ } else {
+ baseServerDir = new File(base, serverName);
+ }
+ } else {
+ baseServerDir = new File(baseServerDirPath);
+ if (false == baseServerDir.isAbsolute()) {
+ baseServerDir = new File(base, baseServerDirPath);
+ }
+ }
+
+ if (!baseServerDir.isDirectory()) {
+ throw new IllegalArgumentException("Server directory is not a directory: " + baseServerDir);
+ }
+
+ return baseServerDir;
+ }
+
public static final GBeanInfo GBEAN_INFO;
static {
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(BasicServerInfo.class);
infoFactory.addAttribute("baseDirectory", String.class, true);
- infoFactory.addAttribute("version", String.class, false);
- infoFactory.addAttribute("buildDate", String.class, false);
- infoFactory.addAttribute("buildTime", String.class, false);
- infoFactory.addAttribute("copyright", String.class, false);
-
- infoFactory.addOperation("resolvePath", new Class[]{String.class});
- infoFactory.addOperation("resolve", new Class[]{String.class});
- infoFactory.addOperation("resolve", new Class[]{URI.class});
infoFactory.addInterface(ServerInfo.class);
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java Sun May 14 18:14:11 2006
@@ -29,6 +29,8 @@
public interface ServerInfo {
public String resolvePath(final String filename);
+ public String resolveServerPath(final String filename);
+
/**
* Resolves an abstract pathname to a File.
*
@@ -39,7 +41,11 @@
*/
public File resolve(final String filename);
+ public File resolveServer(final String filename);
+
public URI resolve(final URI uri);
+
+ public URI resolveServer(final URI uri);
/**
* A config.xml setting for the base directory. This is normally
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java Sun May 14 18:14:11 2006
@@ -59,7 +59,7 @@
if (entry.getName().startsWith(sourceEntry.getName())) {
String entryName = entry.getName();
String entryPath = entryName.substring(prefixLength);
- File targetPath = serverInfo.resolve(entryPath);
+ File targetPath = serverInfo.resolveServer(entryPath);
if (!targetPath.exists()) {
if (entry.isDirectory()) {
targetPath.mkdirs();
Modified: geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java (original)
+++ geronimo/branches/1.1/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java Sun May 14 18:14:11 2006
@@ -18,6 +18,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Properties;
import junit.framework.TestCase;
@@ -25,6 +26,7 @@
* @version $Rev$ $Date$
*/
public class ServerInfoTest extends TestCase {
+ private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
public final void testResolvePath() {
ServerInfo si = null;
@@ -76,7 +78,7 @@
try {
file = File.createTempFile("geronimo", null);
// a workaround - ServerInfo sets system-wide property
- System.setProperty("org.apache.geronimo.base.dir", file.getName());
+ System.setProperty(BasicServerInfo.HOME_DIR_SYS_PROP, file.getName());
new BasicServerInfo(file.getName());
fail("ServerInfo should throw exception when given non-directory path");
} catch (IOException ioe) {
@@ -86,12 +88,60 @@
String basedir = ".";
// a workaround - ServerInfo sets system-wide property
- System.setProperty("org.apache.geronimo.base.dir", basedir);
+ System.setProperty(BasicServerInfo.HOME_DIR_SYS_PROP, basedir);
ServerInfo si = new BasicServerInfo(basedir);
- assertNotNull(System.getProperty("org.apache.geronimo.base.dir"));
+ assertNotNull(System.getProperty(BasicServerInfo.HOME_DIR_SYS_PROP));
assertEquals("base directory is incorrect", basedir, si.getBaseDirectory());
} finally {
- System.getProperties().remove("org.apache.geronimo.base.dir");
+ resetSysProperties();
}
+ }
+
+ public void testWithServerName() throws Exception {
+ String serverName = "target/serverName";
+ File serverDir = new File(basedir, serverName);
+ serverDir.mkdirs();
+ try {
+ System.setProperty(BasicServerInfo.SERVER_NAME_SYS_PROP, serverName);
+ new BasicServerInfo(basedir.getAbsolutePath());
+ assertEquals(serverDir.getAbsolutePath(), System.getProperty(BasicServerInfo.SERVER_DIR_SYS_PROP));
+ } finally {
+ resetSysProperties();
+ serverDir.delete();
+ }
+ }
+
+ public void testWithServerDirAbsolute() throws Exception {
+ String serverDirName = "./target/serverDir";
+ File serverDir = new File(basedir, serverDirName);
+ serverDir.mkdirs();
+ try {
+ System.setProperty(BasicServerInfo.SERVER_DIR_SYS_PROP, serverDir.getAbsolutePath());
+ new BasicServerInfo(basedir.getAbsolutePath());
+ assertEquals(serverDir.getAbsolutePath(), System.getProperty(BasicServerInfo.SERVER_DIR_SYS_PROP));
+ } finally {
+ resetSysProperties();
+ serverDir.delete();
+ }
+ }
+
+ public void testWithServerDirRelative() throws Exception {
+ String serverDirName = "./target/serverDir";
+ File serverDir = new File(basedir, serverDirName);
+ serverDir.mkdirs();
+ try {
+ System.setProperty(BasicServerInfo.SERVER_DIR_SYS_PROP, serverDirName);
+ new BasicServerInfo(basedir.getAbsolutePath());
+ assertEquals(serverDir.getAbsolutePath(), System.getProperty(BasicServerInfo.SERVER_DIR_SYS_PROP));
+ } finally {
+ resetSysProperties();
+ }
+ }
+
+ private void resetSysProperties() {
+ Properties sysProps = System.getProperties();
+ sysProps.remove(BasicServerInfo.HOME_DIR_SYS_PROP);
+ sysProps.remove(BasicServerInfo.SERVER_DIR_SYS_PROP);
+ sysProps.remove(BasicServerInfo.SERVER_NAME_SYS_PROP);
}
}
Modified: geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java (original)
+++ geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java Sun May 14 18:14:11 2006
@@ -71,7 +71,7 @@
*/
public void setKeystoreFileName(String name) {
keystoreFileName = name;
- connector.setAttribute("keystoreFile", serverInfo.resolvePath(keystoreFileName));
+ connector.setAttribute("keystoreFile", serverInfo.resolveServerPath(keystoreFileName));
}
public String getTruststoreFileName() {
@@ -80,7 +80,7 @@
public void setTruststoreFileName(String name) {
truststoreFileName = name;
- connector.setAttribute("truststoreFile", serverInfo.resolvePath(truststoreFileName));
+ connector.setAttribute("truststoreFile", serverInfo.resolveServerPath(truststoreFileName));
}
/**
Modified: geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java Sun May 14 18:14:11 2006
@@ -113,7 +113,7 @@
if (catalinaHome == null)
catalinaHome = DEFAULT_CATALINA_HOME;
- setCatalinaHome(serverInfo.resolvePath(catalinaHome));
+ setCatalinaHome(serverInfo.resolveServerPath(catalinaHome));
if (classLoader == null) {
throw new IllegalArgumentException("classLoader cannot be null.");
Modified: geronimo/branches/1.1/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java?rev=406493&r1=406492&r2=406493&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java (original)
+++ geronimo/branches/1.1/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java Sun May 14 18:14:11 2006
@@ -112,7 +112,7 @@
public void setLogFileDir(String logDir) {
this.logFileDir = logDir;
if (started) {
- configuration.setLogFileDir(serverInfo.resolvePath(logDir));
+ configuration.setLogFileDir(serverInfo.resolveServerPath(logDir));
}
}