You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by lo...@apache.org on 2016/02/18 12:59:07 UTC
[1/4] storm git commit: port dev_zookeeper.clj to java
Repository: storm
Updated Branches:
refs/heads/master 8aff56fb0 -> bb60f11c0
port dev_zookeeper.clj to java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/930014bf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/930014bf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/930014bf
Branch: refs/heads/master
Commit: 930014bf66e841c503f70185aec56ab708af88a2
Parents: 12ceb09
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Tue Feb 16 19:32:51 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Tue Feb 16 19:32:51 2016 +0800
----------------------------------------------------------------------
bin/storm.cmd | 2 +-
bin/storm.py | 2 +-
.../org/apache/storm/command/dev_zookeeper.clj | 28 ----------------
storm-core/src/jvm/org/apache/storm/Config.java | 2 +-
.../org/apache/storm/command/devZookeeper.java | 35 ++++++++++++++++++++
5 files changed, 38 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/930014bf/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 6f4e934..8b89fd6 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -139,7 +139,7 @@
goto :eof
:dev-zookeeper
- set CLASS=org.apache.storm.command.dev_zookeeper
+ set CLASS=org.apache.storm.command.devZookeeper
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
goto :eof
http://git-wip-us.apache.org/repos/asf/storm/blob/930014bf/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index f2aca95..0dfed26 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -651,7 +651,7 @@ def dev_zookeeper():
"""
cppaths = [CLUSTER_CONF_DIR]
exec_storm_class(
- "org.apache.storm.command.dev_zookeeper",
+ "org.apache.storm.command.devZookeeper",
jvmtype="-server",
extrajars=[CLUSTER_CONF_DIR])
http://git-wip-us.apache.org/repos/asf/storm/blob/930014bf/storm-core/src/clj/org/apache/storm/command/dev_zookeeper.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/command/dev_zookeeper.clj b/storm-core/src/clj/org/apache/storm/command/dev_zookeeper.clj
deleted file mode 100644
index 657e242..0000000
--- a/storm-core/src/clj/org/apache/storm/command/dev_zookeeper.clj
+++ /dev/null
@@ -1,28 +0,0 @@
-;; 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.
-(ns org.apache.storm.command.dev-zookeeper
- (:import [org.apache.storm.utils Utils])
- (:use [org.apache.storm zookeeper util config])
- (:import [org.apache.storm.utils ConfigUtils])
- (:import [org.apache.storm.zookeeper Zookeeper])
- (:gen-class))
-
-(defn -main [& args]
- (let [conf (clojurify-structure (ConfigUtils/readStormConfig))
- port (conf STORM-ZOOKEEPER-PORT)
- localpath (conf DEV-ZOOKEEPER-PATH)]
- (Utils/forceDelete localpath)
- (Zookeeper/mkInprocessZookeeper localpath port)))
http://git-wip-us.apache.org/repos/asf/storm/blob/930014bf/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java
index 74231a0..951e524 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -2086,7 +2086,7 @@ public class Config extends HashMap<String, Object> {
/**
* The path to use as the zookeeper dir when running a zookeeper server via
- * "storm dev-zookeeper". This zookeeper instance is only intended for development;
+ * "storm devZookeeper". This zookeeper instance is only intended for development;
* it is not a production grade zookeeper setup.
*/
@isString
http://git-wip-us.apache.org/repos/asf/storm/blob/930014bf/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java b/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
new file mode 100644
index 0000000..e9ad554
--- /dev/null
+++ b/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
@@ -0,0 +1,35 @@
+/**
+ * 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.storm.command;
+
+import org.apache.storm.Config;
+import org.apache.storm.utils.ConfigUtils;
+import org.apache.storm.utils.Utils;
+import org.apache.storm.zookeeper.Zookeeper;
+
+import java.util.Map;
+
+public class devZookeeper {
+ public static void main(String[] args) throws Exception {
+ Map<String, Object> conf = ConfigUtils.readStormConfig();
+ Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
+ String localPath = (String) conf.get(Config.DEV_ZOOKEEPER_PATH);
+ Utils.forceDelete(localPath);
+ Zookeeper.mkInprocessZookeeper(localPath, Utils.getInt(port));
+ }
+}
[3/4] storm git commit: Rename devZookeeper.java to DevZookeeper.java
Posted by lo...@apache.org.
Rename devZookeeper.java to DevZookeeper.java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9f168d26
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9f168d26
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9f168d26
Branch: refs/heads/master
Commit: 9f168d267b685a65b69d8f778c96c05c7d5784c6
Parents: 99ecc4b
Author: John Fang <hu...@gmail.com>
Authored: Tue Feb 16 20:43:27 2016 +0800
Committer: John Fang <hu...@gmail.com>
Committed: Tue Feb 16 20:43:27 2016 +0800
----------------------------------------------------------------------
.../org/apache/storm/command/DevZookeeper.java | 35 ++++++++++++++++++++
.../org/apache/storm/command/devZookeeper.java | 35 --------------------
2 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9f168d26/storm-core/src/jvm/org/apache/storm/command/DevZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/DevZookeeper.java b/storm-core/src/jvm/org/apache/storm/command/DevZookeeper.java
new file mode 100644
index 0000000..846b0f1
--- /dev/null
+++ b/storm-core/src/jvm/org/apache/storm/command/DevZookeeper.java
@@ -0,0 +1,35 @@
+/**
+ * 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.storm.command;
+
+import org.apache.storm.Config;
+import org.apache.storm.utils.ConfigUtils;
+import org.apache.storm.utils.Utils;
+import org.apache.storm.zookeeper.Zookeeper;
+
+import java.util.Map;
+
+public class DevZookeeper {
+ public static void main(String[] args) throws Exception {
+ Map<String, Object> conf = ConfigUtils.readStormConfig();
+ Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
+ String localPath = (String) conf.get(Config.DEV_ZOOKEEPER_PATH);
+ Utils.forceDelete(localPath);
+ Zookeeper.mkInprocessZookeeper(localPath, Utils.getInt(port));
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/9f168d26/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java b/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
deleted file mode 100644
index 846b0f1..0000000
--- a/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * 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.storm.command;
-
-import org.apache.storm.Config;
-import org.apache.storm.utils.ConfigUtils;
-import org.apache.storm.utils.Utils;
-import org.apache.storm.zookeeper.Zookeeper;
-
-import java.util.Map;
-
-public class DevZookeeper {
- public static void main(String[] args) throws Exception {
- Map<String, Object> conf = ConfigUtils.readStormConfig();
- Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
- String localPath = (String) conf.get(Config.DEV_ZOOKEEPER_PATH);
- Utils.forceDelete(localPath);
- Zookeeper.mkInprocessZookeeper(localPath, Utils.getInt(port));
- }
-}
[2/4] storm git commit: capital DevZookeeper
Posted by lo...@apache.org.
capital DevZookeeper
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99ecc4b4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99ecc4b4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99ecc4b4
Branch: refs/heads/master
Commit: 99ecc4b42a14c607905441f9284f3716d7b350a7
Parents: 930014b
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Tue Feb 16 20:06:48 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Tue Feb 16 20:06:48 2016 +0800
----------------------------------------------------------------------
bin/storm.cmd | 2 +-
bin/storm.py | 2 +-
storm-core/src/jvm/org/apache/storm/Config.java | 2 +-
storm-core/src/jvm/org/apache/storm/command/devZookeeper.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 8b89fd6..42d1875 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -139,7 +139,7 @@
goto :eof
:dev-zookeeper
- set CLASS=org.apache.storm.command.devZookeeper
+ set CLASS=org.apache.storm.command.DevZookeeper
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
goto :eof
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 0dfed26..f02a72b 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -651,7 +651,7 @@ def dev_zookeeper():
"""
cppaths = [CLUSTER_CONF_DIR]
exec_storm_class(
- "org.apache.storm.command.devZookeeper",
+ "org.apache.storm.command.DevZookeeper",
jvmtype="-server",
extrajars=[CLUSTER_CONF_DIR])
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java
index 951e524..74231a0 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -2086,7 +2086,7 @@ public class Config extends HashMap<String, Object> {
/**
* The path to use as the zookeeper dir when running a zookeeper server via
- * "storm devZookeeper". This zookeeper instance is only intended for development;
+ * "storm dev-zookeeper". This zookeeper instance is only intended for development;
* it is not a production grade zookeeper setup.
*/
@isString
http://git-wip-us.apache.org/repos/asf/storm/blob/99ecc4b4/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java b/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
index e9ad554..846b0f1 100644
--- a/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
+++ b/storm-core/src/jvm/org/apache/storm/command/devZookeeper.java
@@ -24,7 +24,7 @@ import org.apache.storm.zookeeper.Zookeeper;
import java.util.Map;
-public class devZookeeper {
+public class DevZookeeper {
public static void main(String[] args) throws Exception {
Map<String, Object> conf = ConfigUtils.readStormConfig();
Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
[4/4] storm git commit: Merge branch 'dev-zookeeper' of
https://github.com/hustfxj/storm into STORM-1262
Posted by lo...@apache.org.
Merge branch 'dev-zookeeper' of https://github.com/hustfxj/storm into STORM-1262
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bb60f11c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bb60f11c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bb60f11c
Branch: refs/heads/master
Commit: bb60f11c0cee7698ec77be947b4e707c7ed34c44
Parents: 8aff56f 9f168d2
Author: zhongyan.feng <zh...@alipay.com>
Authored: Thu Feb 18 19:51:08 2016 +0800
Committer: zhongyan.feng <zh...@alipay.com>
Committed: Thu Feb 18 19:51:08 2016 +0800
----------------------------------------------------------------------
bin/storm.cmd | 2 +-
bin/storm.py | 2 +-
.../org/apache/storm/command/dev_zookeeper.clj | 28 ----------------
.../org/apache/storm/command/DevZookeeper.java | 35 ++++++++++++++++++++
4 files changed, 37 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bb60f11c/bin/storm.cmd
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bb60f11c/bin/storm.py
----------------------------------------------------------------------