chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1665125 - in /chukwa/trunk: ./ src/main/java/org/apache/hadoop/chukwa/datacollection/test/ src/main/java/org/apache/hadoop/chukwa/datacollection/writer/ src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/ src/main/java/or...
Date Mon, 09 Mar 2015 04:18:13 GMT
Author: eyang
Date: Mon Mar  9 04:18:13 2015
New Revision: 1665125

URL: http://svn.apache.org/r1665125
Log:
CHUKWA-741. Updated to Hadoop 2.6.0 and HBase 1.0.0.  (Eric Yang)

Removed:
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/demux/processor/mapper/JobLog.java
    chukwa/trunk/src/main/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java
Modified:
    chukwa/trunk/CHANGES.txt
    chukwa/trunk/pom.xml
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java
    chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
    chukwa/trunk/src/main/web/hicc/index.jsp
    chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java

Modified: chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/chukwa/trunk/CHANGES.txt?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/CHANGES.txt (original)
+++ chukwa/trunk/CHANGES.txt Mon Mar  9 04:18:13 2015
@@ -10,17 +10,19 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
 
-  CHUKWA-740. Updated README file to be more current.  (Lewis John McGibbney via Eric Yang)
+    CHUKWA-741. Updated to Hadoop 2.6.0 and HBase 1.0.0.  (Eric Yang)
 
-  CHUKWA-739. Update XSS Filter to use ESAPI and Jsoup.  (Eric Yang)
+    CHUKWA-740. Updated README file to be more current.  (Lewis John McGibbney via Eric Yang)
 
-  CHUKWA-723. Update Chukwa code to use new HBase HConnection API.  (Sreepathi Prasanna via
Eric Yang)
+    CHUKWA-739. Update XSS Filter to use ESAPI and Jsoup.  (Eric Yang)
 
-  CHUKWA-738. Updated dragging event handling over iframe.  (Eric Yang)
+    CHUKWA-723. Update Chukwa code to use new HBase HConnection API.  (Sreepathi Prasanna
via Eric Yang)
+
+    CHUKWA-738. Updated dragging event handling over iframe.  (Eric Yang)
 
   BUGS
 
-  CHUKWA-735. Updated Nagios support to support basic encryption.  (Eric Yang)
+    CHUKWA-735. Updated Nagios support to support basic encryption.  (Eric Yang)
 
 Release 0.6 - 09/28/2014
 

Modified: chukwa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chukwa/trunk/pom.xml?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/pom.xml (original)
+++ chukwa/trunk/pom.xml Mon Mar  9 04:18:13 2015
@@ -20,7 +20,7 @@
     <properties>
         <buildtype>test</buildtype>
         <BUILD_NUMBER>${env.BUILD_NUMBER}</BUILD_NUMBER>
-        <VERSION>0.6.0-SNAPSHOT</VERSION>
+        <VERSION>0.7.0-SNAPSHOT</VERSION>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <package.prefix>/usr</package.prefix>
         <package.conf.dir>/etc/chukwa</package.conf.dir>
@@ -129,6 +129,12 @@
 	    <groupId>de.viaboxx</groupId>
 	    <artifactId>log4j-nagios-appender</artifactId>
 	    <version>1.1</version>
+            <exclusions>
+              <exclusion>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+              </exclusion>
+            </exclusions>
           </dependency>
           <dependency>
             <groupId>org.fusesource</groupId>
@@ -176,11 +182,6 @@
             <version>1.1</version>
           </dependency>
           <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-          </dependency>
-          <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.3</version>
@@ -221,6 +222,11 @@
             <version>4.10</version>
           </dependency>
           <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.6.1</version>
+          </dependency>
+          <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.16</version>
@@ -251,11 +257,6 @@
             <version>2.10.0</version>
           </dependency>
           <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>libthrift</artifactId>
-            <version>0.5.0</version>
-          </dependency>
-          <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
             <version>3.4.5</version>
@@ -282,31 +283,6 @@
             <version>1.1</version>
           </dependency>
           <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-core</artifactId>
-            <version>1.2.1</version>
-            <exclusions>
-              <exclusion>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-compiler</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
-              </exclusion>
-              <exclusion>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-test</artifactId>
-            <version>1.2.1</version>
-            <scope>test</scope>
-          </dependency>
-          <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
             <version>4.7.2</version>
@@ -333,6 +309,16 @@
               </exclusion>
             </exclusions>
           </dependency>
+          <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jsp-2.1</artifactId>
+            <version>6.1.14</version>
+          </dependency>
+          <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jsp-api-2.1</artifactId>
+            <version>6.1.14</version>
+          </dependency>
     </dependencies>
 
     <developers>
@@ -460,13 +446,12 @@
                       <goals>
                         <goal>compile</goal>
                       </goals>
-                      <!--<compilerArgument>-Xlint:unchecked</compilerArgument>
-                      <compilerArgument>-Xlint:deprecation</compilerArgument>-->
                       <compilerVersion>1.6</compilerVersion>
                       <source>1.6</source>
                       <target>1.6</target>
                       <excludes>
                         <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
+                        <exclude>**/JobLog.java</exclude>
                       </excludes>
                     </configuration>
                   </execution>
@@ -477,13 +462,14 @@
                       <goals>
                         <goal>testCompile</goal>
                       </goals>
-                      <!--<compilerArgument>-Xlint:unchecked</compilerArgument>
-                      <compilerArgument>-Xlint:deprecation</compilerArgument>-->
                       <compilerVersion>1.6</compilerVersion>
                       <source>1.6</source>
                       <target>1.6</target>
                       <testExcludes>
                         <exclude>**/ChukwaJobTrackerInstrumentation.java</exclude>
+                        <exclude>**/JobLog.java</exclude>
+                        <exclude>**/TestJobLogEntry.java</exclude>
+                        <exclude>**/TestDemuxManager.java</exclude>
                       </testExcludes>
                     </configuration>
                   </execution>
@@ -906,14 +892,15 @@
             </build>
         </profile>
         <profile>
-            <id>hbase-0.96</id>
+            <id>hbase-1</id>
             <activation>
                 <property>
                     <name>!hbase.profile</name>
                 </property>
             </activation>
             <properties>
-                <hbase.version>0.96.2-hadoop1</hbase.version>
+                <hbase.version>1.0.0</hbase.version>
+                <hadoop.version>2.6.0</hadoop.version>
             </properties>
             <dependencies>
                 <dependency>
@@ -941,6 +928,26 @@
                             <groupId>tomcat</groupId>
                             <artifactId>jasper-runtime</artifactId>
                         </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-hdfs</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-auth</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-client</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-mapreduce-client-core</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-yarn-common</artifactId>
+                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -968,6 +975,10 @@
                             <groupId>tomcat</groupId>
                             <artifactId>jasper-runtime</artifactId>
                         </exclusion>
+                        <exclusion>
+                            <groupId>org.apache.hadoop</groupId>
+                            <artifactId>hadoop-hdfs</artifactId>
+                        </exclusion>
                     </exclusions>
                 </dependency>
                 <dependency>
@@ -1015,37 +1026,17 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-hadoop1-compat</artifactId>
+                    <artifactId>hbase-hadoop2-compat</artifactId>
                     <classifier>tests</classifier>
                     <version>${hbase.version}</version>
                     <scope>test</scope>
                 </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>hbase-0.94</id>
-            <properties>
-                <hbase.version>0.94.9</hbase.version>
-            </properties>
-            <dependencies>
                 <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase</artifactId>
-                    <version>${hbase.version}</version>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-common</artifactId>
+                    <version>${hadoop.version}</version>
                     <exclusions>
                         <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-server</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>com.sun.jersey</groupId>
-                            <artifactId>jersey-json</artifactId>
-                        </exclusion>
-                        <exclusion>
                             <groupId>tomcat</groupId>
                             <artifactId>jasper-compiler</artifactId>
                         </exclusion>
@@ -1053,25 +1044,48 @@
                             <groupId>tomcat</groupId>
                             <artifactId>jasper-runtime</artifactId>
                         </exclusion>
-                    </exclusions>   
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase</artifactId>
-                    <classifier>tests</classifier>
-                    <version>${hbase.version}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-compiler</artifactId>
-                        </exclusion>
                         <exclusion>
-                            <groupId>tomcat</groupId>
-                            <artifactId>jasper-runtime</artifactId>
+                            <groupId>org.codehaus.jackson</groupId>
+                            <artifactId>jackson-mapper-asl</artifactId>
                         </exclusion>
                     </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-auth</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-client</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-mapreduce-client-core</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-yarn-common</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-hdfs</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+                    <artifactId>hadoop-yarn-server-tests</artifactId>
+                    <version>${hadoop.version}</version>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.hadoop</groupId>
+	            <artifactId>hadoop-minicluster</artifactId>
+                    <version>${hadoop.version}</version>
+                </dependency>
             </dependencies>
         </profile>
         <profile>
@@ -1136,6 +1150,7 @@
               <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.1</version>
                 <executions>
                   <execution>
                     <id>agent-public-api</id>
@@ -1149,7 +1164,7 @@
                       <show>public</show>
                       <subpackages>org.apache.hadoop.chukwa.datacollection.agent.rest</subpackages>
                       <doclet>com.sun.jersey.wadl.resourcedoc.ResourceDocletJSON</doclet>
-                      <!-- <docletPath>${path.separator}${project.build.outputDirectory}</docletPath>
-->
+                      <docletPath>${path.separator}${project.build.outputDirectory}</docletPath>
                       <docletArtifacts>
                         <docletArtifact>
                           <groupId>com.atlassian.plugins.rest</groupId>
@@ -1354,34 +1369,6 @@
                 <report>javadoc</report>
               </reports>
             </reportSet>
-<!--            <reportSet>
-              <id>restdoc</id>
-              <configuration>
-                <encoding>UTF-8</encoding>
-                <verbose>false</verbose>
-                <show>public</show>
-                <subpackages>org.apache.hadoop.chukwa.datacollection.agent.rest</subpackages>
-                <doclet>com.sun.jersey.wadl.resourcedoc.ResourceDoclet</doclet>
-                <docletPath>${path.separator}${project.build.outputDirectory}</docletPath>
-                <docletArtifacts>
-                  <docletArtifact>
-                    <groupId>com.sun.jersey.contribs</groupId>
-                    <artifactId>wadl-resourcedoc-doclet</artifactId>
-                    <version>1.8</version>
-                  </docletArtifact>
-                  <docletArtifact>
-                    <groupId>xerces</groupId>
-                    <artifactId>xercesImpl</artifactId>
-                    <version>2.6.1</version>
-                  </docletArtifact>
-                </docletArtifacts>
-                <useStandardDocletOptions>false</useStandardDocletOptions>
-                <additionalparam>-output ${project.build.outputDirectory}/agent-rest.xml</additionalparam>
-              </configuration>
-              <reports>
-                <report>javadoc</report>
-              </reports>
-            </reportSet> -->
           </reportSets>
         </plugin>
       </plugins>

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java
(original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/test/FilePerPostWriter.java
Mon Mar  9 04:18:13 2015
@@ -114,7 +114,7 @@ public class FilePerPostWriter extends S
       String fsname = conf.get("writer.hdfs.filesystem");
       if (fsname == null || fsname.equals("")) {
         // otherwise try to get the filesystem from hadoop
-        fsname = conf.get("fs.default.name");
+        fsname = conf.get("fs.defaultFS");
       }
 
       fs = FileSystem.get(new URI(fsname), conf);

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java
(original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/SeqFileWriter.java
Mon Mar  9 04:18:13 2015
@@ -115,7 +115,7 @@ public class SeqFileWriter extends Pipel
     String fsname = conf.get("writer.hdfs.filesystem");
     if (fsname == null || fsname.equals("")) {
       // otherwise try to get the filesystem from hadoop
-      fsname = conf.get("fs.default.name");
+      fsname = conf.get("fs.defaultFS");
     }
 
     log.info("rotateInterval is " + rotateInterval);

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java
(original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/writer/localfs/LocalToRemoteHdfsMover.java
Mon Mar  9 04:18:13 2015
@@ -72,7 +72,7 @@ public class LocalToRemoteHdfsMover exte
     fsname = conf.get("writer.hdfs.filesystem");
     if (fsname == null || fsname.equals("")) {
       // otherwise try to get the filesystem from hadoop
-      fsname = conf.get("fs.default.name");
+      fsname = conf.get("fs.defaultFS");
     }
 
     if (fsname == null) {

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java (original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/UserStore.java Mon Mar 
9 04:18:13 2015
@@ -44,7 +44,7 @@ public class UserStore {
   private static Log log = LogFactory.getLog(UserStore.class);
   private static Configuration config = new Configuration();
   private static ChukwaConfiguration chukwaConf = new ChukwaConfiguration();
-  private static String hiccPath = config.get("fs.default.name")+File.separator+chukwaConf.get("chukwa.data.dir")+File.separator+"hicc"+File.separator+"users";
+  private static String hiccPath = config.get("fs.defaultFS")+File.separator+chukwaConf.get("chukwa.data.dir")+File.separator+"hicc"+File.separator+"users";
   
   public UserStore() throws IllegalAccessException {
     UserStore.config = HiccWebServer.getConfig();
@@ -152,4 +152,4 @@ public class UserStore {
     return list;    
   }
 }
-           
\ No newline at end of file
+           

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java (original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/ViewStore.java Mon Mar 
9 04:18:13 2015
@@ -46,7 +46,7 @@ public class ViewStore {
   private static Log log = LogFactory.getLog(ViewStore.class);
   private static Configuration config = new Configuration();
   private static ChukwaConfiguration chukwaConf = new ChukwaConfiguration();
-  private static String viewPath = config.get("fs.default.name")+File.separator+chukwaConf.get("chukwa.data.dir")+File.separator+"hicc"+File.separator+"views";
+  private static String viewPath = config.get("fs.defaultFS")+File.separator+chukwaConf.get("chukwa.data.dir")+File.separator+"hicc"+File.separator+"views";
   private static String publicViewPath = viewPath+File.separator+"public";
   private static String usersViewPath = viewPath+File.separator+"users";
   private static String PUBLIC = "public".intern();

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java (original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datastore/WidgetStore.java Mon Mar
 9 04:18:13 2015
@@ -43,7 +43,7 @@ public class WidgetStore {
   private static Log log = LogFactory.getLog(WidgetStore.class);
   private static Configuration config = new Configuration();
   private static ChukwaConfiguration chukwaConf = new ChukwaConfiguration();
-  private static String hiccPath = config.get("fs.default.name")+File.separator+chukwaConf.get("chukwa.data.dir")+File.separator+"hicc"+File.separator+"widgets";
+  private static String hiccPath = config.get("fs.defaultFS")+File.separator+chukwaConf.get("chukwa.data.dir")+File.separator+"hicc"+File.separator+"widgets";
   private static CatalogBean catalog = null;
   private static HashMap<String, WidgetBean> list = new HashMap<String, WidgetBean>();
   

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java (original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/CHUKWA_CONSTANT.java Mon
Mar  9 04:18:13 2015
@@ -19,7 +19,7 @@
 package org.apache.hadoop.chukwa.extraction;
 
 public interface CHUKWA_CONSTANT {
-  public static final String HDFS_DEFAULT_NAME_FIELD = "fs.default.name";
+  public static final String HDFS_DEFAULT_NAME_FIELD = "fs.defaultFS";
   public static final String WRITER_HDFS_FILESYSTEM_FIELD = "writer.hdfs.filesystem";
   public static final String CHUKWA_ROOT_DIR_FIELD = "chukwaRootDir";
   public static final String CHUKWA_ROOT_REPOS_DIR_FIELD = "chukwaRootReposDir";

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java (original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/extraction/demux/Demux.java Mon Mar
 9 04:18:13 2015
@@ -183,7 +183,7 @@ public class Demux extends Configured im
       FileSystem fs = FileSystem.get(new Configuration());
       FileStatus[] fstatus = fs.listStatus(new Path(parserPath));
       if (fstatus != null) {
-        String hdfsUrlPrefix = conf.get("fs.default.name");
+        String hdfsUrlPrefix = conf.get("fs.defaultFS");
 
         for (FileStatus parser : fstatus) {
           Path jarPath = new Path(parser.getPath().toString().replace(hdfsUrlPrefix, ""));

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java (original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/hicc/HiccWebServer.java Mon Mar  9
04:18:13 2015
@@ -68,7 +68,7 @@ public class HiccWebServer {
 
   public void start() {
     try {
-      chukwaHdfs = config.get("fs.default.name")+File.separator+chukwaConf.get("chukwa.data.dir");
+      chukwaHdfs = config.get("fs.defaultFS")+File.separator+chukwaConf.get("chukwa.data.dir");
       hiccData = chukwaHdfs+File.separator+"hicc";
       DaemonWatcher.createInstance("hicc");
       setupDefaultData();

Modified: chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
(original)
+++ chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4jMetricsSink.java
Mon Mar  9 04:18:13 2015
@@ -22,7 +22,7 @@ import org.json.simple.JSONObject;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.apache.commons.configuration.SubsetConfiguration;
-import org.apache.hadoop.metrics2.Metric;
+import org.apache.hadoop.metrics2.AbstractMetric;
 import org.apache.hadoop.metrics2.MetricsRecord;
 import org.apache.hadoop.metrics2.MetricsSink;
 import org.apache.hadoop.metrics2.MetricsTag;
@@ -79,7 +79,7 @@ public class Log4jMetricsSink implements
       for (MetricsTag tag : record.tags()) {
         json.put(tag.name(), tag.value());
       }
-      for (Metric metric : record.metrics()) {
+      for (AbstractMetric metric : record.metrics()) {
         json.put(metric.name(), metric.value());
       }
       out.info(json);

Modified: chukwa/trunk/src/main/web/hicc/index.jsp
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/main/web/hicc/index.jsp?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/main/web/hicc/index.jsp (original)
+++ chukwa/trunk/src/main/web/hicc/index.jsp Mon Mar  9 04:18:13 2015
@@ -83,7 +83,6 @@
 </div>
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/treeview/assets/skins/sam/treeview.css"
/>
 <link href="css/default.css" rel="stylesheet" type="text/css">
-<style type="text/css">@import url('css/calendar.css');</style>
 <link href="css/menu.css" rel="stylesheet" type="text/css">
 <link href="css/tab.css" rel="stylesheet" type="text/css">
 <link href="css/timeframe.css" rel="stylesheet" type="text/css">
@@ -93,18 +92,13 @@
 <script type="text/javascript" src="./js/treeview-min.js"></script>
 <script type="text/javascript" src="/hicc/js/jquery-1.3.2.min.js"></script>
 <script type="text/javascript" src="/hicc/js/workspace/prototype.js"></script>
-<script type="text/javascript" src="/hicc/js/calendar.js"></script>
 <script type="text/javascript" src="/hicc/js/timeframe.js"></script>
-<script type="text/javascript" src="/hicc/js/lang/calendar-en.js"></script>
-<script type="text/javascript" src="/hicc/js/calendar-setup.js"></script>
 <script type="text/javascript" src="/hicc/js/workspace/scriptaculous.js"></script>
 <script type="text/javascript" src="/hicc/js/workspace/effects.js"></script>
 <script type="text/javascript" src="/hicc/js/workspace/dragdrop.js"></script>
 <script type="text/javascript" src="/hicc/js/workspace/prototype.js"></script>
 <script type="text/javascript" src="/hicc/js/workspace/custom_edits.js"></script>
 <script type="text/javascript" src="/hicc/js/workspace/workspace.js"></script>
-<script type="text/javascript" src="/hicc/js/slider.js"></script>
-<script type="text/javascript" src="/hicc/js/swfobject.js"></script>
 <script type="text/javascript" src="/hicc/js/time.js"></script>
 <script type="text/javascript" src="/hicc/js/jquery.formalize.js"></script>
 
@@ -229,7 +223,8 @@ Select the widget from the widget tree t
 </div>
 
 <!-- page configuration UI -->
-<div id="page_config_menu" style="display:none;">
+<!--
+<div id="page_config_menu" style="display:block;">
 <table width="160" cellpadding=0 cellspacing=0><tr><td width="80" class="ppsPopupHead">&nbsp;</td><td
class="ppsPopupTail"><img src="/hicc/css/images/popup_tail.gif"></td><td
class="ppsPopupHead">&nbsp;</td><td width="5"></td></tr></table>
 <table width="160" style="border-style:solid; border-top:0; border-left:0; border-width:5px;
border-color:#CCCCCC; " cellpadding=0 cellspacing=0>
 <tr><td>
@@ -243,7 +238,7 @@ Select the widget from the widget tree t
 </table>
 </td></tr>
 </table>
-</div>
+</div>-->
 <!-- end of page configuration UI -->
 
 <script>

Modified: chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java
URL: http://svn.apache.org/viewvc/chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java?rev=1665125&r1=1665124&r2=1665125&view=diff
==============================================================================
--- chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java
(original)
+++ chukwa/trunk/src/test/java/org/apache/hadoop/chukwa/extraction/archive/TestArchive.java
Mon Mar  9 04:18:13 2015
@@ -88,7 +88,7 @@ public class TestArchive extends TestCas
     MiniDFSCluster dfs = new MiniDFSCluster(conf, NUM_HADOOP_SLAVES, true,
         null);
     fileSys = dfs.getFileSystem();
-    conf.set("fs.default.name", fileSys.getUri().toString());
+    conf.set("fs.defaultFS", fileSys.getUri().toString());
     
     System.out.println("filesystem is " + fileSys.getUri());
 



Mime
View raw message