diff --git a/common/src/main/java/org/apache/rocketmq/common/flowcontrol/FlowControlConfig.java b/common/src/main/java/org/apache/rocketmq/common/flowcontrol/FlowControlConfig.java index 57e9aa8661..f4839454ec 100644 --- a/common/src/main/java/org/apache/rocketmq/common/flowcontrol/FlowControlConfig.java +++ b/common/src/main/java/org/apache/rocketmq/common/flowcontrol/FlowControlConfig.java @@ -38,7 +38,7 @@ public class FlowControlConfig { private String flowControlFileHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); - private static final String DEFAULT_FLOW_CONTROL_FILE = "conf/flowControl.yml"; + private static final String DEFAULT_FLOW_CONTROL_FILE = "conf/flow_control.yml"; private String flowControlFileName = System.getProperty("rocketmq.flow.control.file", DEFAULT_FLOW_CONTROL_FILE); diff --git a/distribution/conf/flowControl.yml b/distribution/conf/flow_control.yml similarity index 100% rename from distribution/conf/flowControl.yml rename to distribution/conf/flow_control.yml diff --git a/distribution/pom.xml b/distribution/pom.xml index c4d3b955c6..c3823daa97 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -46,6 +46,10 @@ org.apache.rocketmq rocketmq-example + + org.apache.rocketmq + rocketmq-snode + diff --git a/distribution/release.xml b/distribution/release.xml index 76bf5fbb87..df746d97ee 100644 --- a/distribution/release.xml +++ b/distribution/release.xml @@ -67,6 +67,7 @@ org.apache.rocketmq:rocketmq-namesrv org.apache.rocketmq:rocketmq-example org.apache.rocketmq:rocketmq-openmessaging + org.apache.rocketmq:rocketmq-snode lib/ diff --git a/pom.xml b/pom.xml index 89c222a024..6cd00956a8 100644 --- a/pom.xml +++ b/pom.xml @@ -530,6 +530,11 @@ rocketmq-acl ${project.version} + + ${project.groupId} + rocketmq-snode + ${project.version} + org.slf4j slf4j-api diff --git a/snode/src/test/java/org/apache/rocketmq/snode/SnodeControllerTest.java b/snode/src/test/java/org/apache/rocketmq/snode/SnodeControllerTest.java index 67d53f60a0..ff5235b2df 100644 --- a/snode/src/test/java/org/apache/rocketmq/snode/SnodeControllerTest.java +++ b/snode/src/test/java/org/apache/rocketmq/snode/SnodeControllerTest.java @@ -41,7 +41,7 @@ public class SnodeControllerTest { @Test public void testSnodeRestartWithAclEnable() { System.setProperty("rocketmq.home.dir", "src/test/resources"); - System.setProperty("rocketmq.flow.control.file", "/conf/flowControl.yml"); + System.setProperty("rocketmq.acl.plain.file", "/conf/plain_acl.yml"); SnodeConfig snodeConfig = new SnodeConfig(); snodeConfig.setAclEnable(true); SnodeController snodeController = new SnodeController(