further improvements for #216 to reduce hand-wired DI with a single b…

…lueprint ServletContextListener
hawtio · Mar 25, 2013 · 0b98e0b · 0b98e0b
1 parent 87e8b9b
commit 0b98e0b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 58 deletions.
diff --git a/hawtio-default/src/main/java/io/hawt/insight/log4j/InsightContextListener.java b/hawtio-default/src/main/java/io/hawt/insight/log4j/InsightContextListener.java
diff --git a/hawtio-default/src/main/resources/META-INF/blueprint.xml b/hawtio-default/src/main/resources/META-INF/blueprint.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
+</blueprint>
+
diff --git a/hawtio-default/src/main/webapp/WEB-INF/web.xml b/hawtio-default/src/main/webapp/WEB-INF/web.xml
@@ -41,11 +41,6 @@
     <listener-class>org.apache.aries.blueprint.web.BlueprintContextListener</listener-class>
   </listener>
 
-  <!-- TODO replace these other listeners with META-INF/blueprint.xml files... -->
-  <listener>
-    <listener-class>io.hawt.insight.log4j.InsightContextListener</listener-class>
-  </listener>
-
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>
   </welcome-file-list>

diff --git a/sample/src/main/webapp/WEB-INF/web.xml b/sample/src/main/webapp/WEB-INF/web.xml
@@ -30,9 +30,6 @@
   <listener>
     <listener-class>org.apache.aries.blueprint.web.BlueprintContextListener</listener-class>
   </listener>
-  <listener>
-    <listener-class>io.hawt.insight.log4j.InsightContextListener</listener-class>
-  </listener>
 
   <!-- lets specify the configuration directory to use for hawtio's configuration -->
 <!--