Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-22 18:30:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

change naming to common config

Browse Source
This commit is contained in:
fjy 2014-11-21 15:36:42 -08:00
parent 6f778d608d
commit 9da66291e1
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bin/run_example_server.sh
View File

@ -58,7 +58,7 @@ DRUID_CP=${EXAMPLE_LOC}
DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/../config/realtime
#For the kit
DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/lib/*
DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/config/_global
DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/config/_common
DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/config/realtime
echo "Running command:"

0
examples/config/_global/global.runtime.properties → examples/config/_common/common.runtime.properties
View File

4
processing/src/main/java/io/druid/guice/GuiceInjectors.java
View File

@ -38,7 +38,7 @@ public class GuiceInjectors
return Guice.createInjector(
new DruidGuiceExtensions(),
new JacksonModule(),
new PropertiesModule(Arrays.asList("global.runtime.properties", "runtime.properties")),
new PropertiesModule(Arrays.asList("common.runtime.properties", "runtime.properties")),
new ConfigModule(),
new Module()
{
@ -57,7 +57,7 @@ public class GuiceInjectors
List<Module> theModules = Lists.newArrayList();
theModules.add(new DruidGuiceExtensions());
theModules.add(new JacksonModule());
theModules.add(new PropertiesModule(Arrays.asList("global.runtime.properties", "runtime.properties")));
theModules.add(new PropertiesModule(Arrays.asList("common.runtime.properties", "runtime.properties")));
theModules.add(new ConfigModule());
theModules.add(
new Module()

4
services/src/assembly/assembly.xml
View File

@ -15,11 +15,11 @@
<outputDirectory>config</outputDirectory>
</fileSet>
<fileSet>
<directory>../examples/config/_global</directory>
<directory>../examples/config/_common</directory>
<includes>
<include>*</include>
</includes>
<outputDirectory>config/_global</outputDirectory>
<outputDirectory>config/_common</outputDirectory>
</fileSet>
<fileSet>
<directory>../examples/config/broker</directory>