geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r382366 - in /geronimo/trunk/modules/system/src: java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
Date Thu, 02 Mar 2006 12:51:33 GMT
Author: gdamour
Date: Thu Mar  2 04:51:31 2006
New Revision: 382366

URL: http://svn.apache.org/viewcvs?rev=382366&view=rev
Log:
rename org.apache.geronimo.base.dir to org.apache.geronimo.home.dir as
suggested by John.

Modified:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
    geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?rev=382366&r1=382365&r2=382366&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java
Thu Mar  2 04:51:31 2006
@@ -32,7 +32,7 @@
 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 BASE_DIR_SYS_PROP = "org.apache.geronimo.base.dir";
+    public static final String HOME_DIR_SYS_PROP = "org.apache.geronimo.home.dir";
     
     private final String baseDirectory;
     private final File base;
@@ -51,7 +51,7 @@
         // 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(BASE_DIR_SYS_PROP, defaultBaseDirectory);
+        this.baseDirectory = System.getProperty(HOME_DIR_SYS_PROP, defaultBaseDirectory);
 
         // force load of server constants
         ServerConstants.getVersion();
@@ -70,7 +70,7 @@
         }
 
         baseURI = base.toURI();
-        System.setProperty(BASE_DIR_SYS_PROP, base.getAbsolutePath());
+        System.setProperty(HOME_DIR_SYS_PROP, base.getAbsolutePath());
 
         baseServer = deriveBaseServer();
         baseServerURI = baseServer.toURI();

Modified: geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java?rev=382366&r1=382365&r2=382366&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
(original)
+++ geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java
Thu Mar  2 04:51:31 2006
@@ -78,7 +78,7 @@
 			try {
 				file = File.createTempFile("geronimo", null);
 				// a workaround - ServerInfo sets system-wide property
-				System.setProperty(BasicServerInfo.BASE_DIR_SYS_PROP, 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) {
@@ -88,9 +88,9 @@
 
 			String basedir = ".";
 			// a workaround - ServerInfo sets system-wide property
-			System.setProperty(BasicServerInfo.BASE_DIR_SYS_PROP, basedir);
+			System.setProperty(BasicServerInfo.HOME_DIR_SYS_PROP, basedir);
 			ServerInfo si = new BasicServerInfo(basedir);
-			assertNotNull(System.getProperty(BasicServerInfo.BASE_DIR_SYS_PROP));
+			assertNotNull(System.getProperty(BasicServerInfo.HOME_DIR_SYS_PROP));
 			assertEquals("base directory is incorrect", basedir, si.getBaseDirectory());
 		} finally {
             resetSysProperties();
@@ -140,7 +140,7 @@
     
     private void resetSysProperties() {
         Properties sysProps = System.getProperties();
-        sysProps.remove(BasicServerInfo.BASE_DIR_SYS_PROP);
+        sysProps.remove(BasicServerInfo.HOME_DIR_SYS_PROP);
         sysProps.remove(BasicServerInfo.SERVER_DIR_SYS_PROP);
         sysProps.remove(BasicServerInfo.SERVER_NAME_SYS_PROP);
     }



Mime
View raw message