You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by cj...@apache.org on 2013/07/12 03:26:54 UTC
svn commit: r1502407 - in /accumulo/trunk/minicluster/src:
main/java/org/apache/accumulo/minicluster/
test/java/org/apache/accumulo/minicluster/
Author: cjnolet
Date: Fri Jul 12 01:26:54 2013
New Revision: 1502407
URL: http://svn.apache.org/r1502407
Log:
ACCUMULO-1564 Fixing types (JWDP -> JDWP)
Modified:
accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
accumulo/trunk/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
Modified: accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java?rev=1502407&r1=1502406&r2=1502407&view=diff
==============================================================================
--- accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java (original)
+++ accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Fri Jul 12 01:26:54 2013
@@ -180,7 +180,7 @@ public class MiniAccumuloCluster {
List<String> jvmOpts = new ArrayList<String>();
jvmOpts.add("-Xmx" + config.getMemory(serverType));
- if (config.isJWDPEnabled()) {
+ if (config.isJDWPEnabled()) {
Integer port = PortUtils.getRandomFreePort();
jvmOpts.addAll(buildRemoteDebugParams(port));
debugPorts.add(new Pair<ServerType,Integer>(serverType, port));
Modified: accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java?rev=1502407&r1=1502406&r2=1502407&view=diff
==============================================================================
--- accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java (original)
+++ accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java Fri Jul 12 01:26:54 2013
@@ -41,7 +41,7 @@ public class MiniAccumuloConfig {
private int numTservers = 2;
private Map<ServerType,Long> memoryConfig = new HashMap<ServerType,Long>();
- private boolean jwdpEnabled = false;
+ private boolean jdwpEnabled = false;
private String instanceName = "miniInstance";
@@ -332,23 +332,23 @@ public class MiniAccumuloConfig {
}
/**
- * @return is the current configuration in jwdpEnabled mode?
+ * @return is the current configuration in jdwpEnabled mode?
*
* @since 1.6.0
*/
- public boolean isJWDPEnabled() {
- return jwdpEnabled;
+ public boolean isJDWPEnabled() {
+ return jdwpEnabled;
}
/**
- * @param jwdpEnabled
- * should the processes run remote jwdpEnabled servers?
+ * @param jdwpEnabled
+ * should the processes run remote jdwpEnabled servers?
* @return the current instance
*
* @since 1.6.0
*/
- public MiniAccumuloConfig setJWDPEnabled(boolean jwdpEnabled) {
- this.jwdpEnabled = jwdpEnabled;
+ public MiniAccumuloConfig setJDWPEnabled(boolean jdwpEnabled) {
+ this.jdwpEnabled = jdwpEnabled;
return this;
}
Modified: accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java?rev=1502407&r1=1502406&r2=1502407&view=diff
==============================================================================
--- accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java (original)
+++ accumulo/trunk/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloRunner.java Fri Jul 12 01:26:54 2013
@@ -44,7 +44,7 @@ import com.google.common.io.Files;
* instanceName=testInstance
* numTServers=1
* zooKeeperPort=3191
- * jwdpEnabled=true
+ * jdwpEnabled=true
* zooKeeperMemory=128M
* tserverMemory=256M
* masterMemory=128M
@@ -110,8 +110,8 @@ public class MiniAccumuloRunner {
config.setNumTservers(Integer.parseInt(opts.prop.getProperty("numTServers")));
if (opts.prop.containsKey("zooKeeperPort"))
config.setZooKeeperPort(Integer.parseInt(opts.prop.getProperty("zooKeeperPort")));
- if (opts.prop.containsKey("jwdpEnabled"))
- config.setJWDPEnabled(Boolean.parseBoolean(opts.prop.getProperty("jwdpEnabled")));
+ if (opts.prop.containsKey("jdwpEnabled"))
+ config.setJDWPEnabled(Boolean.parseBoolean(opts.prop.getProperty("jdwpEnabled")));
if (opts.prop.containsKey("zooKeeperMemory"))
setMemoryOnConfig(config, opts.prop.getProperty("zooKeeperMemory"), ServerType.ZOOKEEPER);
if (opts.prop.containsKey("tserverMemory"))
Modified: accumulo/trunk/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java?rev=1502407&r1=1502406&r2=1502407&view=diff
==============================================================================
--- accumulo/trunk/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java (original)
+++ accumulo/trunk/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java Fri Jul 12 01:26:54 2013
@@ -59,7 +59,7 @@ public class MiniAccumuloClusterTest {
Logger.getLogger("org.apache.zookeeper").setLevel(Level.ERROR);
folder.create();
- MiniAccumuloConfig config = new MiniAccumuloConfig(folder.getRoot(), "superSecret").setJWDPEnabled(true);
+ MiniAccumuloConfig config = new MiniAccumuloConfig(folder.getRoot(), "superSecret").setJDWPEnabled(true);
accumulo = new MiniAccumuloCluster(config);
accumulo.start();
}