Botched merge with ShardServer, methodCalls displaying in GUI and fixed pom for eclipse
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/c7d5011a Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/c7d5011a Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/c7d5011a Branch: refs/heads/master Commit: c7d5011a62c3ab4be2783d81defb82dfe02b1b4d Parents: 4503f31 Author: gbarton <[email protected]> Authored: Thu Aug 23 23:39:02 2012 -0400 Committer: gbarton <[email protected]> Committed: Thu Aug 23 23:39:02 2012 -0400 ---------------------------------------------------------------------- .../blur/thrift/ThriftBlurShardServer.java | 3 - .../src/main/webapps/controller/metrics.jsp | 10 +- src/blur-util/pom.xml | 101 ++++++++------- 3 files changed, 57 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c7d5011a/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java ---------------------------------------------------------------------- diff --git a/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java b/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java index 8e3d61a..5fb88d7 100644 --- a/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java +++ b/src/blur-core/src/main/java/com/nearinfinity/blur/thrift/ThriftBlurShardServer.java @@ -16,14 +16,11 @@ package com.nearinfinity.blur.thrift; -<<<<<<< HEAD import static com.nearinfinity.blur.utils.BlurConstants.*; -======= import static com.nearinfinity.blur.utils.BlurConstants.BLUR_CONTROLLER_BIND_PORT; import static com.nearinfinity.blur.utils.BlurConstants.BLUR_GUI_CONTROLLER_PORT; import static com.nearinfinity.blur.utils.BlurConstants.BLUR_GUI_SHARD_PORT; import static com.nearinfinity.blur.utils.BlurConstants.BLUR_INDEXMANAGER_SEARCH_THREAD_COUNT; ->>>>>>> gui import static com.nearinfinity.blur.utils.BlurConstants.BLUR_MAX_CLAUSE_COUNT; import static com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BIND_ADDRESS; import static com.nearinfinity.blur.utils.BlurConstants.BLUR_SHARD_BIND_PORT; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c7d5011a/src/blur-gui/src/main/webapps/controller/metrics.jsp ---------------------------------------------------------------------- diff --git a/src/blur-gui/src/main/webapps/controller/metrics.jsp b/src/blur-gui/src/main/webapps/controller/metrics.jsp index 28ccdcf..f8731ac 100644 --- a/src/blur-gui/src/main/webapps/controller/metrics.jsp +++ b/src/blur-gui/src/main/webapps/controller/metrics.jsp @@ -72,12 +72,12 @@ arr[0] = json; //select obj and bind data d3.select("#rightTD").selectAll("ul") - .data(arr) + .data(d3.keys(methodCalls)) .enter().append("ul") - .text("Metrics") + .text(function(d) { return d;}) .selectAll("li") .data(function(d) { - return d3.entries(d);}) + return d3.entries(methodCalls[d]);}) .enter() .append("li") .text(function(d) { return d.key + " " + d.value }) @@ -91,8 +91,8 @@ <br /> <table> <tr> - <td width="400" id="leftTD"></td> - <td width="400" id="rightTD"></td> + <td width="400" id="leftTD" valign="top"></td> + <td width="400" id="rightTD" valign="top"></td> </tr> </table> <div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/c7d5011a/src/blur-util/pom.xml ---------------------------------------------------------------------- diff --git a/src/blur-util/pom.xml b/src/blur-util/pom.xml index b2b5341..4e41a83 100644 --- a/src/blur-util/pom.xml +++ b/src/blur-util/pom.xml @@ -80,56 +80,59 @@ </repositories> <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> + <pluginManagement> + <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/../../../lib - </outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <excludeTransitive>true</excludeTransitive> - <excludeArtifactIds>junit,commons-cli,commons-logging,hadoop-core,slf4j-api,slf4j-log4j12</excludeArtifactIds> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - </configuration> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/../../../lib + </outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <excludeTransitive>true</excludeTransitive> + <excludeArtifactIds>junit,commons-cli,commons-logging,hadoop-core,slf4j-api,slf4j-log4j12</excludeArtifactIds> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> </project>
