renamed some configuration parameters and made sure log level is set properly for builds
diff --git a/asterix-app/src/main/resources/asterix-build-configuration.xml b/asterix-app/src/main/resources/asterix-build-configuration.xml
index bd984f0..20ffb37 100644
--- a/asterix-app/src/main/resources/asterix-build-configuration.xml
+++ b/asterix-app/src/main/resources/asterix-build-configuration.xml
@@ -9,7 +9,7 @@
<storeDirs>nc2data</storeDirs>
</store>
<property>
- <name>log_level</name>
+ <name>log.level</name>
<value>WARNING</value>
<description></description>
</property>
diff --git a/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixExternalProperties.java b/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixExternalProperties.java
index d82eb03..cf38932 100644
--- a/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixExternalProperties.java
+++ b/asterix-common/src/main/java/edu/uci/ics/asterix/common/config/AsterixExternalProperties.java
@@ -4,13 +4,13 @@
public class AsterixExternalProperties extends AbstractAsterixProperties {
- private static final String EXTERNAL_WEBPORT_KEY = "external.webport";
+ private static final String EXTERNAL_WEBPORT_KEY = "web.port";
private static int EXTERNAL_WEBPORT_DEFAULT = 19001;
- private static final String EXTERNAL_LOGLEVEL_KEY = "external.loglevel";
+ private static final String EXTERNAL_LOGLEVEL_KEY = "log.level";
private static Level EXTERNAL_LOGLEVEL_DEFAULT = Level.INFO;
- private static final String EXTERNAL_APISERVER_KEY = "external.apiserver";
+ private static final String EXTERNAL_APISERVER_KEY = "api.port";
private static int EXTERNAL_APISERVER_DEFAULT = 19101;
public AsterixExternalProperties(AsterixPropertiesAccessor accessor) {
diff --git a/asterix-installer/src/main/resources/conf/asterix-configuration.xml b/asterix-installer/src/main/resources/conf/asterix-configuration.xml
index acc8f39..b6958c5 100644
--- a/asterix-installer/src/main/resources/conf/asterix-configuration.xml
+++ b/asterix-installer/src/main/resources/conf/asterix-configuration.xml
@@ -168,21 +168,21 @@
</property>
<property>
- <name>external.webport</name>
+ <name>web.port</name>
<value>19001</value>
<description>The port for the ASTERIX web interface. (Default = 19001)
</description>
</property>
<property>
- <name>external.apiserver</name>
+ <name>api.port</name>
<value>19101</value>
<description>The port for the ASTERIX API server. (Default = 19101)
</description>
</property>
<property>
- <name>external.loglevel</name>
+ <name>log.level</name>
<value>INFO</value>
<description>The minimum log level to be displayed. (Default = INFO)
</description>