cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r1063948 - in /cassandra/trunk: bin/ conf/ contrib/circuit/bin/ contrib/circuit/src/org/apache/cassandra/contrib/circuit/ src/java/org/apache/cassandra/cli/ src/java/org/apache/cassandra/tools/ test/distributed/org/apache/cassandra/
Date Thu, 27 Jan 2011 01:29:24 GMT
Author: eevans
Date: Thu Jan 27 01:29:23 2011
New Revision: 1063948

URL: http://svn.apache.org/viewvc?rev=1063948&view=rev
Log:
CASSANDRA-1855 new default jmx port

Patch by eevans for CASSANDRA-1855

Modified:
    cassandra/trunk/bin/cassandra.bat
    cassandra/trunk/conf/cassandra-env.sh
    cassandra/trunk/contrib/circuit/bin/circuit
    cassandra/trunk/contrib/circuit/src/org/apache/cassandra/contrib/circuit/RingModel.java
    cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java
    cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java
    cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
    cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
    cassandra/trunk/test/distributed/org/apache/cassandra/CassandraServiceController.java

Modified: cassandra/trunk/bin/cassandra.bat
URL: http://svn.apache.org/viewvc/cassandra/trunk/bin/cassandra.bat?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/bin/cassandra.bat (original)
+++ cassandra/trunk/bin/cassandra.bat Thu Jan 27 01:29:23 2011
@@ -34,7 +34,7 @@ set JAVA_OPTS=^
  -XX:MaxTenuringThreshold=1^
  -XX:CMSInitiatingOccupancyFraction=75^
  -XX:+UseCMSInitiatingOccupancyOnly^
- -Dcom.sun.management.jmxremote.port=8080^
+ -Dcom.sun.management.jmxremote.port=7199^
  -Dcom.sun.management.jmxremote.ssl=false^
  -Dcom.sun.management.jmxremote.authenticate=false^
  -Dlog4j.configuration=log4j-server.properties^

Modified: cassandra/trunk/conf/cassandra-env.sh
URL: http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra-env.sh?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/conf/cassandra-env.sh (original)
+++ cassandra/trunk/conf/cassandra-env.sh Thu Jan 27 01:29:23 2011
@@ -81,7 +81,7 @@ fi
 
 # Specifies the default port over which Cassandra will be available for
 # JMX connections.
-JMX_PORT="8080"
+JMX_PORT="7199"
 
 
 # Here we create the arguments that will get passed to the jvm when

Modified: cassandra/trunk/contrib/circuit/bin/circuit
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/circuit/bin/circuit?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/contrib/circuit/bin/circuit (original)
+++ cassandra/trunk/contrib/circuit/bin/circuit Thu Jan 27 01:29:23 2011
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DEFAULT_PORT=8080
+DEFAULT_PORT=7199
 
 if [ "x$CLASSPATH" = "x" ]; then
     # Cassandra class files.

Modified: cassandra/trunk/contrib/circuit/src/org/apache/cassandra/contrib/circuit/RingModel.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/circuit/src/org/apache/cassandra/contrib/circuit/RingModel.java?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/contrib/circuit/src/org/apache/cassandra/contrib/circuit/RingModel.java
(original)
+++ cassandra/trunk/contrib/circuit/src/org/apache/cassandra/contrib/circuit/RingModel.java
Thu Jan 27 01:29:23 2011
@@ -41,7 +41,7 @@ import org.apache.cassandra.service.Stor
  */
 public class RingModel
 {
-    public static final int defaultPort = 8080;
+    public static final int defaultPort = 7199;
     private static final String fmtUrl = "service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi";
     private static final String ssObjName = "org.apache.cassandra.service:type=StorageService";
 

Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java Thu Jan 27 01:29:23
2011
@@ -38,7 +38,7 @@ public class CliSessionState
     public String  keyspace;      // cassandra keyspace user is authenticating
     public boolean batch = false; // enable/disable batch processing mode
     public String  filename = ""; // file to read commands from
-    public int     jmxPort = 8080;// JMX service port
+    public int     jmxPort = 7199;// JMX service port
     public boolean verbose = false; // verbose output
     public int     schema_mwt;    // Schema migration wait time (secs.)
     /*

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/ClusterCmd.java Thu Jan 27 01:29:23
2011
@@ -31,7 +31,7 @@ public class ClusterCmd {
     private static final String HOST_OPT_SHORT = "h";
     private static final String PORT_OPT_LONG = "port";
     private static final String PORT_OPT_SHORT = "p";
-    private static final int defaultPort = 8080;
+    private static final int defaultPort = 7199;
     private static Options options = null;
     private CommandLine cmd = null;
     private NodeProbe probe;

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java Thu Jan 27 01:29:23 2011
@@ -49,7 +49,7 @@ public class NodeCmd {
     private static final String USERNAME_OPT_SHORT = "u";
     private static final String PASSWORD_OPT_LONG = "password";
     private static final String PASSWORD_OPT_SHORT = "pw";
-    private static final int defaultPort = 8080;
+    private static final int defaultPort = 7199;
     private static Options options = null;
     
     private NodeProbe probe;

Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java Thu Jan 27 01:29:23
2011
@@ -62,7 +62,7 @@ public class NodeProbe
 {
     private static final String fmtUrl = "service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi";
     private static final String ssObjName = "org.apache.cassandra.db:type=StorageService";
-    private static final int defaultPort = 8080;
+    private static final int defaultPort = 7199;
     final String host;
     final int port;
     private String username;

Modified: cassandra/trunk/test/distributed/org/apache/cassandra/CassandraServiceController.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/distributed/org/apache/cassandra/CassandraServiceController.java?rev=1063948&r1=1063947&r2=1063948&view=diff
==============================================================================
--- cassandra/trunk/test/distributed/org/apache/cassandra/CassandraServiceController.java
(original)
+++ cassandra/trunk/test/distributed/org/apache/cassandra/CassandraServiceController.java
Thu Jan 27 01:29:23 2011
@@ -71,7 +71,7 @@ public class CassandraServiceController
         LoggerFactory.getLogger(CassandraServiceController.class);
 
     protected static int CLIENT_PORT    = 9160;
-    protected static int JMX_PORT       = 8080;
+    protected static int JMX_PORT       = 7199;
 
     private static final CassandraServiceController INSTANCE =
         new CassandraServiceController();



Mime
View raw message