geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1291784 - in /geronimo/server/trunk/plugins/monitoring: agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java
Date Tue, 21 Feb 2012 13:47:37 GMT
Author: xiaming
Date: Tue Feb 21 13:47:37 2012
New Revision: 1291784

URL: http://svn.apache.org/viewvc?rev=1291784&view=rev
Log:
GERONIMO-6281 Fix wrong use of geronimo property about GERONIMO_HOME and GERONIMO_SERVER,
provided by Russell, for 3.0 trunk

Modified:
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java
    geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java

Modified: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java?rev=1291784&r1=1291783&r2=1291784&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java
Tue Feb 21 13:47:37 2012
@@ -137,12 +137,12 @@ public class SnapshotProcessor {
     }
     
     /**
-     * Checks to see if the GERONIMO_HOME/var/monitoring/ directory was made.
+     * Checks to see if the GERONIMO_SERVER/var/monitoring/ directory was made.
      * If not, the method creates it.
      */
     public static void ensureMonitorDir() {
         final String pathToDir = 
-            System.getProperty("org.apache.geronimo.home.dir") + "/var/monitoring/";
+            System.getProperty("org.apache.geronimo.server.dir") + "/var/monitoring/";
         File dir = new File(pathToDir);
         if(dir.exists() && dir.isDirectory()) {
             // all good

Modified: geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java?rev=1291784&r1=1291783&r2=1291784&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jar/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotConfigXMLBuilder.java
Tue Feb 21 13:47:37 2012
@@ -35,7 +35,7 @@ public class SnapshotConfigXMLBuilder {
     private static final Logger log = LoggerFactory.getLogger(SnapshotConfigXMLBuilder.class);
     
     private static final String pathToXML = 
-        System.getProperty("org.apache.geronimo.home.dir") + "/var/monitoring/snapshot-config.xml";
+        System.getProperty("org.apache.geronimo.server.dir") + "/var/monitoring/snapshot-config.xml";
 
     private static JAXBContext jc = null;
 
@@ -196,12 +196,12 @@ public class SnapshotConfigXMLBuilder {
 
     
     /**
-     * Checks to see if the GERONIMO_HOME/var/monitoring/ directory was made.
+     * Checks to see if the GERONIMO_SERVER/var/monitoring/ directory was made.
      * If not, the method creates it.
      */
     public static void ensureMonitorDir() {
         final String pathToDir = 
-            System.getProperty("org.apache.geronimo.home.dir") + "/var/monitoring/";
+            System.getProperty("org.apache.geronimo.server.dir") + "/var/monitoring/";
         File dir = new File(pathToDir);
         if(dir.exists() && dir.isDirectory()) {
             // all good



Mime
View raw message