accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1183501 - in /incubator/accumulo/trunk: ./ contrib/accumulo_sample/ src/server/ src/server/src/main/java/org/apache/accumulo/server/logger/ src/server/src/main/java/org/apache/accumulo/server/monitor/ src/server/src/main/java/org/apache/ac...
Date Fri, 14 Oct 2011 21:03:46 GMT
Author: ecn
Date: Fri Oct 14 21:03:46 2011
New Revision: 1183501

URL: http://svn.apache.org/viewvc?rev=1183501&view=rev
Log:
ACCUMULO-13 remove references to jfree; remove GraphServlet

Removed:
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/GraphServlet.java
Modified:
    incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml
    incubator/accumulo/trunk/pom.xml
    incubator/accumulo/trunk/src/server/pom.xml
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml?rev=1183501&r1=1183500&r2=1183501&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/pom.xml Fri Oct 14 21:03:46 2011
@@ -127,7 +127,7 @@
 						<configuration>
 							<outputDirectory>../../lib</outputDirectory>
 							<!-- just grab the non-provided runtime dependencies -->
-							<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,jfreechart,jcommon,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,cloudtrace</includeArtifactIds>
+							<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,cloudtrace</includeArtifactIds>
 							<excludeGroupIds>accumulo</excludeGroupIds>
 							<excludeTransitive>true</excludeTransitive>
 						</configuration>

Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1183501&r1=1183500&r2=1183501&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Fri Oct 14 21:03:46 2011
@@ -81,7 +81,7 @@
 						<configuration>
 							<outputDirectory>../../lib</outputDirectory>
 							<!-- just grab the non-provided runtime dependencies -->
-							<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,jfreechart,jcommon,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
+							<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
 							<excludeGroupIds>org.apache.accumulo</excludeGroupIds>
 							<excludeTransitive>true</excludeTransitive>
 						</configuration>
@@ -538,11 +538,6 @@
 			</dependency>
 			<dependency>
 				<groupId>jfree</groupId>
-				<artifactId>jfreechart</artifactId>
-				<version>1.0.9</version>
-			</dependency>
-			<dependency>
-				<groupId>jfree</groupId>
 				<artifactId>jcommon</artifactId>
 				<version>1.0.12</version>
 			</dependency>

Modified: incubator/accumulo/trunk/src/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/pom.xml?rev=1183501&r1=1183500&r2=1183501&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/pom.xml (original)
+++ incubator/accumulo/trunk/src/server/pom.xml Fri Oct 14 21:03:46 2011
@@ -84,14 +84,6 @@
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jfreechart</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jfree</groupId>
-			<artifactId>jcommon</artifactId>
-		</dependency>
 	</dependencies>
 
 </project>

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java?rev=1183501&r1=1183500&r2=1183501&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
Fri Oct 14 21:03:46 2011
@@ -58,7 +58,6 @@ import org.apache.zookeeper.WatchedEvent
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.jfree.util.Log;
 
 import cloudtrace.instrument.thrift.TraceWrap;
 import cloudtrace.thrift.TInfo;
@@ -380,7 +379,7 @@ public class LogService implements Mutat
             Halt.halt(0, new Runnable() {
                 @Override
                 public void run() {
-                    Log.info("Halting by request");
+                    LOG.info("Halting by request");
                 } 
             });
         } catch (ThriftSecurityException ex) {

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java?rev=1183501&r1=1183500&r2=1183501&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
Fri Oct 14 21:03:46 2011
@@ -36,7 +36,6 @@ import org.apache.accumulo.server.client
 import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.monitor.servlets.DefaultServlet;
 import org.apache.accumulo.server.monitor.servlets.GcStatusServlet;
-import org.apache.accumulo.server.monitor.servlets.GraphServlet;
 import org.apache.accumulo.server.monitor.servlets.LogServlet;
 import org.apache.accumulo.server.monitor.servlets.LoggersServlet;
 import org.apache.accumulo.server.monitor.servlets.MasterServlet;
@@ -438,7 +437,6 @@ public class Monitor {
 		server.addServlet(GcStatusServlet.class, "/gc");
 		server.addServlet(LogServlet.class, "/log");
 		server.addServlet(XMLServlet.class, "/xml");
-		server.addServlet(GraphServlet.class, "/graph");
 		server.addServlet(Summary.class, "/trace/summary");
 		server.addServlet(ListType.class, "/trace/listType");
 		server.addServlet(ShowTrace.class, "/trace/show");

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java?rev=1183501&r1=1183500&r2=1183501&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
Fri Oct 14 21:03:46 2011
@@ -132,6 +132,9 @@ public class DefaultServlet extends Basi
 		else
 			super.doGet(req, resp);
 	}
+	
+	public static final int GRAPH_WIDTH = 450;
+	public static final int GRAPH_HEIGHT = 150;
 
 	@SuppressWarnings("unchecked")
 	private static void plotData(StringBuilder sb, String title, @SuppressWarnings("rawtypes")
List data, boolean points){
@@ -140,7 +143,7 @@ public class DefaultServlet extends Basi
 		sb.append("</center>");
 		sb.append("</br>");
 		String id = "c"+title.hashCode();
-		sb.append("<div id=\""+id+"\" style=\"width:" + GraphServlet.GRAPH_WIDTH + "px;height:"
+ GraphServlet.GRAPH_HEIGHT + "px;\"></div>\n");
+		sb.append("<div id=\""+id+"\" style=\"width:" + GRAPH_WIDTH + "px;height:" + GRAPH_HEIGHT
+ "px;\"></div>\n");
 
 		sb.append("<script type=\"text/javascript\">\n");
 		sb.append("$(function () {\n");



Mime
View raw message