added more configuration options so folks can set things via blueprin…

…t.properties files
hawtio · Apr 19, 2013 · 6490fc2 · 6490fc2
1 parent 1e5e3a2
commit 6490fc2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 21 deletions.
diff --git a/hawtio-core/src/main/java/io/hawt/config/ConfigFacade.java b/hawtio-core/src/main/java/io/hawt/config/ConfigFacade.java
@@ -45,7 +45,6 @@ public void init() throws Exception {
             mBeanServer = ManagementFactory.getPlatformMBeanServer();
         }
         if (!registered && !mBeanServer.isRegistered(objectName)) {
-            System.out.println("Registering " + objectName + " as there is no bean registered yet with: " + this);
             mBeanServer.registerMBean(this, objectName);
             registered = true;
         }
@@ -113,7 +112,7 @@ public File getConfigDirectory() {
 
     @Override
     public String getConfigDir() {
-        if (configDir == null) {
+        if (Strings.isBlank(configDir)) {
             // lets default to the users home directory
             String home = System.getProperty("user.home", "~");
             configDir = home + "/.hawtio";

diff --git a/hawtio-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/hawtio-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -2,15 +2,15 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0">
 
-<!--
   <ext:property-placeholder>
     <ext:default-properties>
-      <ext:property name="hawtio.config.dir" value=""/>
+      <!-- no value will default to ~/.hawtio -->
+      <ext:property name="hawtio.home.dir" value=""/>
     </ext:default-properties>
   </ext:property-placeholder>
--->
 
   <bean id="configFacade" class="io.hawt.config.ConfigFacade" init-method="init" destroy-method="destroy">
+    <property name="configDir" value="${hawtio.home.dir}"/>
   </bean>
 
 </blueprint>

diff --git a/hawtio-default/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/hawtio-default/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -2,21 +2,14 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.2.0">
 
-<!--
-    TODO add property injection from context parameters / system properties / env vars
-
-    <ext:property-placeholder>
-        <ext:default-properties>
-            <ext:property name="name" value="value" />
-            <ext:property name="a" value="Hello " />
-            <ext:property name="b" value="FooBar" />
-        </ext:default-properties>
-        <ext:location>classpath:test.properties</ext:location>
-    </ext:property-placeholder>
--->
-
-	<bean id="logFacade" class="org.fusesource.insight.log.log4j.Log4jLogQuery" init-method="start" destroy-method="stop">
-    <!-- TODO configure size property from hawtio.log.size -->
-	</bean>
+  <ext:property-placeholder>
+    <ext:default-properties>
+      <ext:property name="hawtio.log.buffer.size" value="2000"/>
+    </ext:default-properties>
+  </ext:property-placeholder>
+
+  <bean id="logFacade" class="org.fusesource.insight.log.log4j.Log4jLogQuery" init-method="start" destroy-method="stop">
+    <property name="size" value="${hawtio.log.buffer.size}"/>
+  </bean>
 </blueprint>
 
diff --git a/hawtio-git/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/hawtio-git/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -8,6 +8,7 @@
       <ext:property name="hawtio.config.repo" value="https://github.com/hawtio/hawtio-config.git"/>
       <ext:property name="hawtio.config.pullOnStartup" value="true"/>
       <ext:property name="hawtio.config.cloneOnStartup" value="true"/>
+      <ext:property name="hawtio.config.remote" value="origin"/>
     </ext:default-properties>
   </ext:property-placeholder>
 
@@ -16,6 +17,7 @@
     <property name="remoteRepository" value="${hawtio.config.repo}"/>
     <property name="pullOnStartup" value="${hawtio.config.pullOnStartup}"/>
     <property name="cloneRemoteRepoOnStartup" value="${hawtio.config.cloneOnStartup}"/>
+    <property name="remote" value="${hawtio.config.remote}"/>
   </bean>
 
 </blueprint>

diff --git a/hawtio-maven-indexer/src/main/java/io/hawt/maven/indexer/AsyncMavenIndexerFacadeFactory.java b/hawtio-maven-indexer/src/main/java/io/hawt/maven/indexer/AsyncMavenIndexerFacadeFactory.java
@@ -26,6 +26,7 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -59,6 +60,9 @@ public void run() {
         };
         timer.schedule(task, 3000);
         LOG.info("Started the async timer to create the MavenIndexerFacade after the application starts up");
+        if (repositories != null) {
+            LOG.info("Using remote repositories: " + Arrays.asList(repositories));
+        }
     }
 
     public void destroy() throws InstanceNotFoundException, IOException, MBeanRegistrationException {

diff --git a/hawtio-maven-indexer/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/hawtio-maven-indexer/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -5,12 +5,23 @@
   <ext:property-placeholder>
     <ext:default-properties>
       <ext:property name="hawtio.maven.index.dir" value=""/>
+<!--
+      <ext:property name="hawtio.maven.index.repos">
+        <array>
+          <value>http://repo.fusesource.com/nexus/content/repositories/releases@id=fusesource.release.repo</value>
+          <value>http://repo1.maven.org/maven2@central</value>
+        </array>
+      </ext:property>
+-->
     </ext:default-properties>
   </ext:property-placeholder>
 
   <bean id="mavenIndexer" class="io.hawt.maven.indexer.AsyncMavenIndexerFacadeFactory" init-method="init"
         destroy-method="destroy">
     <property name="indexDirectory" value="${hawtio.maven.index.dir}"/>
+<!--
+    <property name="repositories" value="${hawtio.maven.index.repos}"/>
+-->
   </bean>
 </blueprint>