chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r885291 [2/7] - in /hadoop/chukwa/trunk: ./ conf/ contrib/chukwa-pig/ ivy/ src/java/org/apache/hadoop/chukwa/conf/ src/java/org/apache/hadoop/chukwa/datastore/ src/java/org/apache/hadoop/chukwa/hicc/ src/java/org/apache/hadoop/chukwa/rest/b...
Date Sun, 29 Nov 2009 23:16:17 GMT
Added: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java?rev=885291&view=auto
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java (added)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetContextResolver.java Sun Nov 29 23:16:13 2009
@@ -0,0 +1,43 @@
+package org.apache.hadoop.chukwa.rest.resource;
+
+import com.sun.jersey.api.json.JSONJAXBContext;
+
+import org.apache.hadoop.chukwa.rest.bean.CatalogBean;
+import org.apache.hadoop.chukwa.rest.bean.CategoryBean;
+import org.apache.hadoop.chukwa.rest.bean.ViewBean;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+import javax.xml.bind.JAXBContext;
+
+  @Provider
+  public class WidgetContextResolver implements ContextResolver<JAXBContext> {
+      private JAXBContext context;
+      private Set<Class<?>> types;
+      protected Class<?>[] classTypes = new Class[] {CatalogBean.class, CategoryBean.class};
+      protected Set<String> jsonArray = new HashSet<String>(1) {
+        {
+            add("children");
+        }
+      };
+
+      public WidgetContextResolver() throws Exception {
+          Map props = new HashMap<String, Object>();
+          props.put(JSONJAXBContext.JSON_NOTATION, JSONJAXBContext.JSONNotation.MAPPED);
+          props.put(JSONJAXBContext.JSON_ROOT_UNWRAPPING, Boolean.TRUE);
+          props.put(JSONJAXBContext.JSON_ARRAYS, jsonArray);
+          this.types = new HashSet<Class<?>>(Arrays.asList(classTypes));
+          this.context = new JSONJAXBContext(classTypes, props);
+      }
+
+      public JAXBContext getContext(Class<?> objectType) {
+          return (types.contains(objectType)) ? context : null;
+      }
+  }
+

Added: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java?rev=885291&view=auto
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java (added)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java Sun Nov 29 23:16:13 2009
@@ -0,0 +1,64 @@
+package org.apache.hadoop.chukwa.rest.resource;
+
+import java.util.HashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.chukwa.rest.bean.CatalogBean;
+
+import org.apache.hadoop.chukwa.rest.bean.ReturnCodeBean;
+import org.apache.hadoop.chukwa.rest.bean.WidgetBean;
+import org.apache.hadoop.chukwa.datastore.WidgetStore;
+
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+@Path ("/widget")
+public class WidgetResource {
+  private static Log log = LogFactory.getLog(WidgetResource.class);
+  
+  @GET
+  @Path("wid/{wid}")
+  public WidgetBean getProfile(@PathParam("wid") String wid) {
+    HashMap<String, WidgetBean> list;
+    try {
+      list = WidgetStore.list();
+    } catch (IllegalAccessException e) {
+      throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND)
+          .entity("Widget does not exist.").build());
+    }
+    return list.get(wid);
+  }
+  
+  @PUT
+  @Consumes("application/json")
+  public ReturnCodeBean saveWidget(WidgetBean widget) {
+    try {
+      WidgetStore ws = new WidgetStore();
+      ws.set(widget);
+    } catch(Exception e) {
+      throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND)
+          .entity("Widget save failed.").build());
+    }
+    return new ReturnCodeBean(ReturnCodeBean.SUCCESS,"Saved");
+  }
+  
+  @GET
+  @Path("catalog")
+  public CatalogBean getWidgetCatalog() {
+    CatalogBean result;
+    try {
+      result = WidgetStore.getCatalog();
+    } catch (IllegalAccessException e) {
+      throw new WebApplicationException(Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+          .entity("No catalog exists.").build());
+    }
+    return result;
+  }
+}

Propchange: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/rest/resource/WidgetResource.java
------------------------------------------------------------------------------
    svn:executable = *

Added: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java?rev=885291&view=auto
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java (added)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/SetupTestEnv.java Sun Nov 29 23:16:13 2009
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.chukwa.rest.resource;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+
+import org.apache.hadoop.chukwa.hicc.HiccWebServer;
+import org.apache.hadoop.chukwa.util.ExceptionUtil;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.ServletHolder;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.spi.container.servlet.ServletContainer;
+
+import junit.framework.TestCase;
+
+public class SetupTestEnv extends TestCase {
+  public WebResource resource;
+  public URI baseURL;
+  public Client client;
+  public static int restPort = 8080;
+  public static Configuration conf = null;
+  public static HiccWebServer hicc = null;
+  public static String user = "admin";
+  public static String authorization = "Basic YWRtaW46YWRtaW4=";
+  public static MiniDFSCluster dfs;
+  
+  public SetupTestEnv() {
+    if(hicc==null) {
+      hicc = HiccWebServer.getInstance();
+      conf = HiccWebServer.getConfig();
+    }
+  }
+  
+  public void setUp() {
+    hicc.start();
+  }
+  
+  public void tearDown() {
+  }
+}

Added: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestUserResource.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestUserResource.java?rev=885291&view=auto
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestUserResource.java (added)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestUserResource.java Sun Nov 29 23:16:13 2009
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.chukwa.rest.resource;
+
+import org.apache.hadoop.chukwa.rest.bean.ReturnCodeBean;
+import org.apache.hadoop.chukwa.rest.bean.UserBean;
+import org.apache.hadoop.chukwa.rest.bean.ViewBean;
+import org.apache.hadoop.chukwa.util.ExceptionUtil;
+import org.json.JSONArray;
+
+import com.sun.jersey.api.client.Client;
+
+public class TestUserResource extends SetupTestEnv {
+  public void testUserSave() {
+    try {
+    UserBean user = new UserBean();
+    user.setId("admin");
+    user.setProperty("testKey", "testValue");
+    JSONArray ja = new JSONArray();
+    user.setViews(ja);
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    ReturnCodeBean result = resource.path("/hicc/v1/user").
+    header("Content-Type","application/json").
+    header("Authorization", authorization).
+    put(ReturnCodeBean.class, user);
+    assertEquals(1, result.getCode());
+    } catch (Exception e) {
+      fail(ExceptionUtil.getStackTrace(e));
+    }
+  }
+  
+  public void testUserLoad() {
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    UserBean user = resource.path("/hicc/v1/user/uid/admin").header("Authorization", authorization).get(UserBean.class);
+    try {
+      assertEquals("admin", user.getId());
+      assertEquals("testValue", user.getPropertyValue("testKey"));
+    } catch (Exception e) {
+      fail(ExceptionUtil.getStackTrace(e));
+    }
+  }
+}

Added: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestViewResource.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestViewResource.java?rev=885291&view=auto
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestViewResource.java (added)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestViewResource.java Sun Nov 29 23:16:13 2009
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.chukwa.rest.resource;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.apache.hadoop.chukwa.hicc.HiccWebServer;
+import org.apache.hadoop.chukwa.rest.bean.ColumnBean;
+import org.apache.hadoop.chukwa.rest.bean.PagesBean;
+import org.apache.hadoop.chukwa.rest.bean.ReturnCodeBean;
+import org.apache.hadoop.chukwa.rest.bean.ViewBean;
+import org.apache.hadoop.chukwa.rest.bean.WidgetBean;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+
+public class TestViewResource extends SetupTestEnv{
+  public void testViewClone() {
+    MultivaluedMap form = new MultivaluedMapImpl();
+    form.add("owner", "system");
+    form.add("view_name","test");
+    form.add("view_vid","default");
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    ReturnCodeBean result = resource.path("/hicc/v1/view").
+    header("Authorization", authorization).
+    post(ReturnCodeBean.class,form);
+    assertEquals(1,result.getCode());
+  }
+  
+  public void testViewSave() {
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    ViewBean view = resource.path("/hicc/v1/view/vid/test").header("Authorization", authorization).get(ViewBean.class);
+    view.setPermissionType("private");
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    ReturnCodeBean result = (ReturnCodeBean) resource.path("/hicc/v1/view").
+    header("Content-Type","application/json").
+    header("Authorization", authorization).
+    put(ReturnCodeBean.class, view);
+    assertEquals(1, result.getCode());
+  }
+  
+  public void testViewLoad() {
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    ViewBean view = resource.path("/hicc/v1/view/vid/test").header("Authorization", authorization).get(ViewBean.class);
+    assertEquals("test", view.getName());
+    assertEquals("admin", view.getOwner());
+    assertEquals("private", view.getPermissionType());
+  }
+  
+  public void testViewDelete() {
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    ReturnCodeBean result = resource.path("/hicc/v1/view/delete/admin/vid/test").
+    header("Authorization", authorization).
+    delete(ReturnCodeBean.class);
+    assertEquals(1,result.getCode());
+  }
+}

Added: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestWidgetResource.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestWidgetResource.java?rev=885291&view=auto
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestWidgetResource.java (added)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/rest/resource/TestWidgetResource.java Sun Nov 29 23:16:13 2009
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.chukwa.rest.resource;
+
+import org.apache.hadoop.chukwa.rest.bean.UserBean;
+import org.apache.hadoop.chukwa.rest.bean.WidgetBean;
+import org.apache.hadoop.chukwa.util.ExceptionUtil;
+
+import com.sun.jersey.api.client.Client;
+
+public class TestWidgetResource extends SetupTestEnv {
+  public void testWidgetSave() {
+    
+  }
+  
+  public void testWidgetLoad() {
+    client = Client.create();
+    resource = client.resource("http://localhost:"+restPort);
+    WidgetBean widget = resource.path("/hicc/v1/widget/wid/disk").header("Authorization", authorization).get(WidgetBean.class);
+    try {
+      assertEquals("disk", widget.getId());
+    } catch (Exception e) {
+      fail(ExceptionUtil.getStackTrace(e));
+    }    
+  }
+}

Modified: hadoop/chukwa/trunk/src/web/hicc/WEB-INF/jetty.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/WEB-INF/jetty.xml?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/WEB-INF/jetty.xml (original)
+++ hadoop/chukwa/trunk/src/web/hicc/WEB-INF/jetty.xml Sun Nov 29 23:16:13 2009
@@ -81,6 +81,18 @@
     </Set>
     -->
 
+    <Set name="UserRealms">
+    <Array type="org.mortbay.jetty.security.UserRealm">
+    <Item>
+    <New class="org.mortbay.jetty.security.HashUserRealm">
+    <Set name="name">Auth</Set>
+    <Set name="config"><SystemProperty name="CHUKWA_DATA_DIR" default="."/>/auth.conf</Set>
+    <Set name="refreshInterval">0</Set>
+    </New>
+    </Item>
+    </Array>
+    </Set>
+
     <!-- =========================================================== -->
     <!-- Set handler Collection Structure                            --> 
     <!-- =========================================================== -->

Modified: hadoop/chukwa/trunk/src/web/hicc/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/WEB-INF/web.xml?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/WEB-INF/web.xml (original)
+++ hadoop/chukwa/trunk/src/web/hicc/WEB-INF/web.xml Sun Nov 29 23:16:13 2009
@@ -33,7 +33,7 @@
       </servlet-class>
       <init-param>
 	<param-name>com.sun.jersey.config.property.packages</param-name>
-	<param-value>org.apache.hadoop.chukwa.rest.actions</param-value>
+	<param-value>org.apache.hadoop.chukwa.rest.resource</param-value>
       </init-param>
       <load-on-startup>1</load-on-startup>
     </servlet>
@@ -41,4 +41,24 @@
       <servlet-name>REST_API</servlet-name>
       <url-pattern>/v1/*</url-pattern>
     </servlet-mapping>    
+
+    <security-role>
+    <role-name>user</role-name>
+    </security-role>
+
+    <login-config>
+    <realm-name>Auth</realm-name>
+    </login-config>
+
+    <security-constraint>
+    <web-resource-collection>
+    <web-resource-name>File Upload</web-resource-name>
+    <url-pattern>/*</url-pattern>
+    </web-resource-collection>
+
+    <auth-constraint>
+    <role-name>user</role-name>
+    </auth-constraint>
+    </security-constraint>
+
 </web-app>

Modified: hadoop/chukwa/trunk/src/web/hicc/css/default.css
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/css/default.css?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/css/default.css (original)
+++ hadoop/chukwa/trunk/src/web/hicc/css/default.css Sun Nov 29 23:16:13 2009
@@ -228,10 +228,6 @@
 	display:inline;
 }
 
-body#main_body, div#workspaceContainer {
-	height: 100%;
-}
-
 .tabcontent{
 	display:none;
 	background-color: #ffffff;

Added: hadoop/chukwa/trunk/src/web/hicc/css/images/titlebar.png
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/css/images/titlebar.png?rev=885291&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/chukwa/trunk/src/web/hicc/css/images/titlebar.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/client_trace.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/client_trace.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/client_trace.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/client_trace.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Client Trace",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display Hadoop data transfer statistics",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Cluster Disk Statistics",
 "version":"0.1",
 "categories":"System Metrics,Cluster,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display cluster disk related statistics",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk_pcnt.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk_pcnt.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk_pcnt.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_disk_pcnt.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Cluster Disk Statistics By Percentage",
 "version":"0.1",
 "categories":"System Metrics,Cluster,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display cluster disk related statistics",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Cluster Metrics",
 "version":"0.1",
 "categories":"System Metrics,Cluster,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display cluster related stats",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics_pcnt.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics_pcnt.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics_pcnt.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_metrics_pcnt.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Cluster Metrics By Percentage",
 "version":"0.1",
 "categories":"System Metrics,Cluster,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display cluster related stats by percentage",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_selector.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_selector.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_selector.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/cluster_selector.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Cluster Selector",
 "version":"0.1",
 "categories":"Global,Utility",
-"module":"jsp\/cluster_selector.jsp",
+"url":"jsp\/cluster_selector.jsp",
 "description":"Global control to manipulate cluster selection across widgets",
 "screendump":"",
 "refresh":"0",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/debug.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/debug.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/debug.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/debug.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Session Debugger",
 "version":"0.1",
 "categories":"Developer,Utilities",
-"module":"jsp\/debug.jsp",
+"url":"jsp\/debug.jsp",
 "description":"Display session stats",
 "refresh":"15",
 "parameters":[

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_counter.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_counter.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_counter.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_counter.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Data Node Metrics By Counter",
 "version":"0.1",
 "categories":"Hadoop,Data Node,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display HDFS data node stats by accumulated values",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_rate.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_rate.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_rate.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_datanode_rate.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Data Node Metrics By Rate",
 "version":"0.1",
 "categories":"Hadoop,Data Node,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display HDFS data node stats",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_fsnamesystem.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_fsnamesystem.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_fsnamesystem.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_fsnamesystem.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"HDFS FS Name System Metrics",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display File System Name System related stats",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_counter.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_counter.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_counter.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_counter.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Name Node Metrics By Counter",
 "version":"0.1",
 "categories":"Hadoop,Name Node,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display hadoop name node stats by accumulated values",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_rate.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_rate.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_rate.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_namenode_rate.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Name Node Metrics By Rate",
 "version":"0.1",
 "categories":"Hadoop,Name Node,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display hadoop name node related stats",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_throughput.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_throughput.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_throughput.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/dfs_throughput.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"HDFS Throughput Metrics",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display HDFS cluster throughput stats by rate values",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/disk.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/disk.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/disk.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/disk.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Disk Statistics",
 "version":"0.1",
 "categories":"System Metrics,Server,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display disk related statistics",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/disk_pcnt.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/disk_pcnt.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/disk_pcnt.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/disk_pcnt.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Disk Statistics By Percentage",
 "version":"0.1",
 "categories":"System Metrics,Server,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display disk related statistics",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/event_viewer.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/event_viewer.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/event_viewer.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/event_viewer.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Event Viewer",
 "version":"0.1",
 "categories":"Global,Utilities",
-"module":"jsp\/event_viewer.jsp",
+"url":"jsp\/event_viewer.jsp",
 "description":"Display Time sorted events",
 "screendump":"",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_counter.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_counter.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_counter.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_counter.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"JVM Metrics By Counter",
 "version":"0.1",
 "categories":"Hadoop,Java Virtual Machine,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display Java virtual machine metrics for Hadoop",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_rate.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_rate.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_rate.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_jvm_rate.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"JVM Metrics By Rate",
 "version":"0.1",
 "categories":"Hadoop,Java Virtual Machine,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display Java virtual machine metrics for Hadoop",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_mapred.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_mapred.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_mapred.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/hadoop_mapred.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Hadoop Map/Reduce Metrics",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display map/reduce metrics from Hadoop",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap-static.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap-static.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap-static.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap-static.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"HDFS Heatmap (Static)",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/heatmap-static.jsp",
+"url":"iframe/jsp/heatmap-static.jsp",
 "description":"Display time-aggregated HDFS events",
 "screendump":"\/images\/start.png",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap_datanode.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap_datanode.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap_datanode.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/heatmap_datanode.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"HDFS Heatmap",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/heatmap_datanode.jsp",
+"url":"iframe/jsp/heatmap_datanode.jsp",
 "description":"Display Time sorted events",
 "screendump":"\/images\/start.png",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/host_selector.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/host_selector.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/host_selector.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/host_selector.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Host Selector",
 "version":"0.1",
 "categories":"Global,Utility",
-"module":"jsp\/host_selector.jsp",
+"url":"jsp\/host_selector.jsp",
 "description":"Global control to manipulate host selection across widgets",
 "refresh":"15",
 "parameters":[

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/node_activity_chart.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/node_activity_chart.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/node_activity_chart.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/node_activity_chart.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Node Activity Graph",
 "version":"0.1",
 "categories":"Global,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display Node Activity Graph",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/rpc_metrics.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/rpc_metrics.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/rpc_metrics.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/rpc_metrics.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"RPC Metrics",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display RPC metrics from Hadoop",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/sql_client.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/sql_client.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/sql_client.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/sql_client.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"SQL Client",
 "version":"0.1",
 "categories":"Developer,Utility",
-"module":"iframe/jsp/sql_client.jsp",
+"url":"iframe/jsp/sql_client.jsp",
 "description":"Display table or chart from SQL queries",
 "refresh":"0",
 "parameters":[

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes-static.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes-static.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes-static.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes-static.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Swimlanes (Static)",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/swimlanes-static.jsp",
+"url":"iframe/jsp/swimlanes-static.jsp",
 "description":"Display Time sorted events",
 "screendump":"\/images\/start.png",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/swimlanes.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Swimlanes",
 "version":"0.1",
 "categories":"Hadoop,Status",
-"module":"iframe/jsp/swimlanes_viewer.jsp",
+"url":"iframe/jsp/swimlanes_viewer.jsp",
 "description":"Display Time sorted events",
 "screendump":"\/images\/start.png",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"System Metrics",
 "version":"0.1",
 "categories":"System Metrics,Server,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display system related stats",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics_pcnt.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics_pcnt.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics_pcnt.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/system_metrics_pcnt.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"System Metrics By Percentage",
 "version":"0.1",
 "categories":"System Metrics,Server,Status",
-"module":"iframe/jsp/single-series-chart-javascript.jsp",
+"url":"iframe/jsp/single-series-chart-javascript.jsp",
 "description":"Display system related stats by utilization percentage",
 "screendump":"\/images\/server_load.gif",
 "refresh":"15",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/time.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/time.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/time.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/time.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Time",
 "version":"0.1",
 "categories":"Global,Utility",
-"module":"jsp\/time.jsp",
+"url":"jsp\/time.jsp",
 "javascripts":"time.js",
 "description":"Global control to manipulate time across widgets",
 "refresh":"0",

Modified: hadoop/chukwa/trunk/src/web/hicc/descriptors/utilization.descriptor
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/descriptors/utilization.descriptor?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/descriptors/utilization.descriptor (original)
+++ hadoop/chukwa/trunk/src/web/hicc/descriptors/utilization.descriptor Sun Nov 29 23:16:13 2009
@@ -3,7 +3,7 @@
 "title":"Utilization",
 "version":"0.1",
 "categories":"Accounting,Utilities",
-"module":"iframe\/jsp\/table_viewer.jsp",
+"url":"iframe\/jsp\/table_viewer.jsp",
 "description":"Display Queue/User utilization of the hadoop cluter",
 "screendump":"",
 "refresh":"0",

Added: hadoop/chukwa/trunk/src/web/hicc/images/application_edit.png
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/images/application_edit.png?rev=885291&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/application_edit.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/application_edit.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: hadoop/chukwa/trunk/src/web/hicc/images/bullet_arrow_top.png
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/images/bullet_arrow_top.png?rev=885291&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/bullet_arrow_top.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/bullet_arrow_top.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: hadoop/chukwa/trunk/src/web/hicc/images/bullet_white.png
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/images/bullet_white.png?rev=885291&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/bullet_white.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/bullet_white.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: hadoop/chukwa/trunk/src/web/hicc/images/clone.png
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/images/clone.png?rev=885291&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/clone.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: hadoop/chukwa/trunk/src/web/hicc/images/clone.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: hadoop/chukwa/trunk/src/web/hicc/index.jsp
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/web/hicc/index.jsp?rev=885291&r1=885290&r2=885291&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/web/hicc/index.jsp (original)
+++ hadoop/chukwa/trunk/src/web/hicc/index.jsp Sun Nov 29 23:16:13 2009
@@ -17,7 +17,16 @@
  * limitations under the License.
  */
 %>
-<%@ page import = "java.sql.*,java.io.*, java.util.Calendar, java.util.Date, java.text.SimpleDateFormat, java.util.regex.Pattern, java.util.regex.Matcher, java.util.*, org.apache.hadoop.chukwa.hicc.ClusterConfig, org.apache.hadoop.chukwa.hicc.TimeHandler, org.apache.hadoop.chukwa.util.XssFilter"  %>
+<%@ page import = "java.sql.*,java.io.*" %>
+<%@ page import = "java.util.Calendar" %>
+<%@ page import = "java.util.Date" %>
+<%@ page import = "java.text.SimpleDateFormat" %>
+<%@ page import = "java.util.regex.Pattern" %>
+<%@ page import = "java.util.regex.Matcher" %>
+<%@ page import = "java.util.*" %>
+<%@ page import = "org.apache.hadoop.chukwa.hicc.ClusterConfig" %>
+<%@ page import = "org.apache.hadoop.chukwa.hicc.TimeHandler" %>
+<%@ page import = "org.apache.hadoop.chukwa.util.XssFilter"  %>
 <%
     XssFilter xf = new XssFilter(request);
     for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) {
@@ -74,6 +83,7 @@
 <!-- all the necessary js files -->
 <script type="text/javascript" src="./js/yahoo-dom-event.js"></script>
 <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>
@@ -152,22 +162,19 @@
 <div id="manage_view" style="display:none;overflow:hidden;width:100%;">
 <table cellspacing="10" cellpadding="0" width="100%" class="ppsmenu">
 <tr><td>
-<table width="100%" class="titlebar"><tr><td>Dashboard</td><td align="right"><span class="glossy_icon"><a href="#" onClick="manage_content('close');"><img src="images/close.png" align="absmiddle"></a></span></td></tr></table>
-<div id="views_list_div">
-</div>
-</td></tr>
-<tr><td colspan="2">
-<input class="formButton" type="button" name="new_workspace" value="Create New Dashboard" onClick="createNewView();"/>
-</td></tr>
+<table width="100%" class="titlebar"><tr><td width="16"><span class="glossy_icon"><a href="#" onClick="javascript:manage_content('close'); return false;" class='glossy_icon'><img src="images/bullet_arrow_top.png" alig
+n="absmiddle"></a></span></td><td>Dashboard</td></tr></table>
+<table id="views_list" class="portal_table" cellspacing="0" cellpadding="2" width="100%">
+<tr><th width="32"></th><th width="15%" align="center">Permission</th><th>View Name</th><th>Owner</th></tr>
+</table></td></tr>
 </table>
 </div>
 <!-- end of manage view -->
-
-<!-- panel 3 for creation widgets -->
+<!-- widget catalog -->
 <div id="widget_view" style="display:none;overflow:hidden;width:100%;">
 <table cellspacing="10" cellpadding="0" width="100%" class="ppsmenu">
 <tr><td>
-<table width=100% class="titlebar"><tr><td>Widget Menu</td><td width="18"><span class="glossy_icon"><a href="#" onClick="add_widget_menu('close');"><img src="images/close.png"></span></a></td></tr></table>
+<table width=100% class="titlebar"><tr><td>Widget Menu</td><td width="18"><span class="glossy_icon"><a href="#" onClick="javascript:add_widget_menu('close'); return false;"><img src="images/close.png"></span></a></td></tr></table>
 <table width="100%" cellpadding="1" cellspacing="1" class="mailListBorder">
 <tr><td class="table-subhead" align="center">Widgets Catalog</td><td class="table-subhead" align="center">Widget Details</td></tr>
 <tr><td valign="top" width="250" class="white">
@@ -193,9 +200,7 @@
 </td></tr>
 </table>
 </div>
-<DIV ID="popup-div" class="ppsPopup" STYLE="max-width:300px;position:absolute;visibility:hidden;z-index:100;">
-</DIV>
-<!-- end of panel 3 -->
+<!-- end of widget catalog -->
 <!-- page selector -->
 <table class="page_selector_table" width="100%" cellspacing=0 cellpadding=0>
 <tr><td>
@@ -237,7 +242,6 @@
 // initialize the script
 update_views_list();
 initScript('<% if(request.getParameter("view") != null) { out.print(request.getParameter("view")); } else { out.print("default"); } %>',<% if (request.getParameter("_page")!=null) { out.print(request.getParameter("_page")); } else { out.print("0"); } %>);
-set_current_view('<% if(request.getParameter("view") != null) { out.print(request.getParameter("view")); } else { out.print("default"); } %>');
 $('shadow').style.display='none';
 
 function debugMode() {



Mime
View raw message