svn commit: r890135 - in /hadoop/chukwa/trunk: conf/mdl.xml src/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java src/web/hicc/jsp/event_viewer_data.jsp src/web/hicc/jsp/event_viewer_helper.jsp

[ey...@apache.org]

Author: eyang
Date: Sun Dec 13 22:22:56 2009
New Revision: 890135

URL: http://svn.apache.org/viewvc?rev=890135&view=rev
Log:
CHUKWA-428. Revised location for Chukwa HDFS repository.

Modified:
    hadoop/chukwa/trunk/conf/mdl.xml
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java
    hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_data.jsp
    hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_helper.jsp

Modified: hadoop/chukwa/trunk/conf/mdl.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/mdl.xml?rev=890135&r1=890134&r2=890135&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/mdl.xml (original)
+++ hadoop/chukwa/trunk/conf/mdl.xml Sun Dec 13 22:22:56 2009
@@ -21,6 +21,13 @@
 <!-- Put site-specific property overrides in this file. -->
 
 <configuration>
+
+<property>
+  <name>chukwa.engine.dsDirectory.rootFolder</name>
+  <value>/chukwa/repos</value>
+  <description>Chukwa Data location on HDFS</description>
+</property>
+
 <!-- database tables -->
 
 <property>

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java?rev=890135&r1=890134&r2=890135&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java (original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/extraction/engine/datasource/DsDirectory.java Sun Dec 13 22:22:56 2009
@@ -42,7 +42,7 @@
 
   private DsDirectory() {
     dataConfig = new DataConfig();
-    conf = new ChukwaConfiguration();
+    conf = new Configuration();
     try {
       fs = FileSystem.get(conf);
     } catch (IOException e) {

Modified: hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_data.jsp
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_data.jsp?rev=890135&r1=890134&r2=890135&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_data.jsp (original)
+++ hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_data.jsp Sun Dec 13 22:22:56 2009
@@ -22,7 +22,7 @@
    XssFilter xf = new XssFilter(request);
    response.setHeader("boxId", xf.getParameter("boxId"));
 %>
-<% String filter=xf.getParameter("query"));
+<% String filter=xf.getParameter("query");
    if(filter==null) {
        filter="";
    }

Modified: hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_helper.jsp
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_helper.jsp?rev=890135&r1=890134&r2=890135&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_helper.jsp (original)
+++ hadoop/chukwa/trunk/src/web/hicc/jsp/event_viewer_helper.jsp Sun Dec 13 22:22:56 2009
@@ -52,7 +52,7 @@
 <script type="text/javascript">
 $('.flexme1').flexigrid(
 			{
-                        url: '/hicc/jsp/event_viewer_data.jsp?<% for(int i=0;i<database.length;i++) { out.print("database="+XssFilter.filter(database[i])+"&"); } %>',
+                        url: '/hicc/jsp/event_viewer_data.jsp?<% for(int i=0;i<database.length;i++) { out.print("database="+xf.filter(database[i])+"&"); } %>',
                         dataType: 'json',
 			searchitems : [
 				{display: 'Event', name : 'event', isdefault: true}