chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r766882 - in /hadoop/chukwa: branches/chukwa-0.1/ branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/ branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/inputtools/mdl/ trunk/ trunk/src/java/org/apache/hadoop/chukwa/database/...
Date Mon, 20 Apr 2009 21:30:38 GMT
Author: eyang
Date: Mon Apr 20 21:30:37 2009
New Revision: 766882

URL: http://svn.apache.org/viewvc?rev=766882&view=rev
Log:
CHUKWA-163. Updated reference to mdl.xml file. (Terence Kwan via Eric Yang)


Modified:
    hadoop/chukwa/branches/chukwa-0.1/CHANGES.txt
    hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
    hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
    hadoop/chukwa/trunk/CHANGES.txt
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java

Modified: hadoop/chukwa/branches/chukwa-0.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/CHANGES.txt?rev=766882&r1=766881&r2=766882&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/CHANGES.txt (original)
+++ hadoop/chukwa/branches/chukwa-0.1/CHANGES.txt Mon Apr 20 21:30:37 2009
@@ -36,6 +36,10 @@
 
   IMPROVEMENTS
 
+    CHUKWA-163. Updated reference to mdl.xml file. (Terence Kwan via Eric Yang)
+
+    CHUKWA-157. Added javadoc target, api-xml, api-report, and change log 2 html. (Eric Yang)
+
     CHUKWA-141. Updated Chukwa Docs overview page for 0.1.2. (Corinne Chandel via Eric Yang)
 
     CHUKWA-138. Updated Chukwa Admin Guide. (Corinne Chandel via Eric Yang)

Modified: hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java?rev=766882&r1=766881&r2=766882&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
(original)
+++ hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
Mon Apr 20 21:30:37 2009
@@ -22,6 +22,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import java.util.*;
+import java.io.File;
 
 public class DatabaseConfig {
   private Configuration config = null;
@@ -32,6 +33,7 @@
   public final static long MONTH = 30 * 24 * 60 * 60 * 1000L;
   public final static long WEEK = 7 * 24 * 60 * 60 * 1000L;
   public final static long DAY = 24 * 60 * 60 * 1000L;
+  public final static String MDL_XML = "mdl.xml";
 
   public DatabaseConfig(String path) {
     Path fileResource = new Path(path);
@@ -40,7 +42,13 @@
   }
 
   public DatabaseConfig() {
-    Path fileResource = new Path(System.getenv("DATACONFIG"));
+    String dataConfig = System.getenv("CHUKWA_CONF_DIR");
+    if (dataConfig == null) {
+      dataConfig = MDL_XML;
+    } else {
+      dataConfig += File.separator + MDL_XML;
+    }
+    Path fileResource = new Path(dataConfig);
     config = new Configuration();
     config.addResource(fileResource);
   }

Modified: hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java?rev=766882&r1=766881&r2=766882&view=diff
==============================================================================
--- hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
(original)
+++ hadoop/chukwa/branches/chukwa-0.1/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
Mon Apr 20 21:30:37 2009
@@ -26,10 +26,11 @@
 import java.util.Iterator;
 import java.util.HashMap;
 import java.util.Map;
+import java.io.File;
 
 public class DataConfig {
   private static Configuration config;
-  final static String DATACONFIG = "mdl.xml";
+  final static String MDL_XML = "mdl.xml";
   private Log log = LogFactory.getLog(DataConfig.class);
 
   public DataConfig(String path) {
@@ -39,9 +40,11 @@
   }
 
   public DataConfig() {
-    String dataConfig = System.getenv("DATACONFIG");
+    String dataConfig = System.getenv("CHUKWA_CONF_DIR");
     if (dataConfig == null) {
-      dataConfig = DATACONFIG;
+      dataConfig = MDL_XML;
+    } else {
+      dataConfig += File.separator + MDL_XML;
     }
     log.debug("DATACONFIG=" + dataConfig);
     if (config == null) {

Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=766882&r1=766881&r2=766882&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Mon Apr 20 21:30:37 2009
@@ -36,6 +36,10 @@
 
   IMPROVEMENTS
 
+    CHUKWA-163. Updated reference to mdl.xml file. (Terence Kwan via Eric Yang)
+
+    CHUKWA-157. Added javadoc target, api-xml, api-report, and change log 2 html. (Eric Yang)
+
     CHUKWA-141. Updated Chukwa Docs overview page for 0.1.2. (Corinne Chandel via Eric Yang)
 
     CHUKWA-138. Updated Chukwa Admin Guide. (Corinne Chandel via Eric Yang)

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java?rev=766882&r1=766881&r2=766882&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java (original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/database/DatabaseConfig.java Mon
Apr 20 21:30:37 2009
@@ -22,6 +22,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import java.util.*;
+import java.io.File;
 
 public class DatabaseConfig {
   private Configuration config = null;
@@ -32,6 +33,7 @@
   public final static long MONTH = 30 * 24 * 60 * 60 * 1000L;
   public final static long WEEK = 7 * 24 * 60 * 60 * 1000L;
   public final static long DAY = 24 * 60 * 60 * 1000L;
+  public final static String MDL_XML = "mdl.xml";
 
   public DatabaseConfig(String path) {
     Path fileResource = new Path(path);
@@ -40,7 +42,13 @@
   }
 
   public DatabaseConfig() {
-    Path fileResource = new Path(System.getenv("DATACONFIG"));
+    String dataConfig = System.getenv("CHUKWA_CONF_DIR");
+    if (dataConfig == null) {
+      dataConfig = MDL_XML;
+    } else {
+      dataConfig += File.separator + MDL_XML;
+    }
+    Path fileResource = new Path(dataConfig);
     config = new Configuration();
     config.addResource(fileResource);
   }

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java?rev=766882&r1=766881&r2=766882&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java (original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/mdl/DataConfig.java Mon
Apr 20 21:30:37 2009
@@ -26,10 +26,11 @@
 import java.util.Iterator;
 import java.util.HashMap;
 import java.util.Map;
+import java.io.File;
 
 public class DataConfig {
   private static Configuration config;
-  final static String DATACONFIG = "mdl.xml";
+  final static String MDL_XML = "mdl.xml";
   private Log log = LogFactory.getLog(DataConfig.class);
 
   public DataConfig(String path) {
@@ -39,9 +40,11 @@
   }
 
   public DataConfig() {
-    String dataConfig = System.getenv("DATACONFIG");
+    String dataConfig = System.getenv("CHUKWA_CONF_DIR");
     if (dataConfig == null) {
-      dataConfig = DATACONFIG;
+      dataConfig = MDL_XML;
+    } else {
+      dataConfig += File.separator + MDL_XML;
     }
     log.debug("DATACONFIG=" + dataConfig);
     if (config == null) {



Mime
View raw message