allow the maven indexer to be configured via config admin

hawtio · Oct 11, 2013 · 93838da · 93838da
1 parent 052a209
commit 93838da
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/hawtio-maven-indexer/pom.xml b/hawtio-maven-indexer/pom.xml
@@ -116,6 +116,7 @@
             <Embed-Transitive>true</Embed-Transitive>
             <Bundle-ClassPath>.</Bundle-ClassPath>
             <Bundle-Name>${project.description}</Bundle-Name>
+            <Bundle-Blueprint>OSGI-INF/blueprint/osgi.xml</Bundle-Blueprint>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
             <Import-Package>${fuse.osgi.import}</Import-Package>
             <Export-Package>${fuse.osgi.export}</Export-Package>

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
@@ -2,6 +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">
 
+  <bean id="mavenIndexer" class="io.hawt.maven.indexer.AsyncMavenIndexerFacadeFactory" init-method="init"
+        destroy-method="destroy" scope="singleton">
+    <property name="indexDirectory" value="${hawtio.maven.index.dir}"/>
+<!--
+    <property name="repositories" value="${hawtio.maven.index.repos}"/>
+-->
+  </bean>
+
+  <!-- non OSGi configuration -->
   <ext:property-placeholder>
     <ext:default-properties>
       <ext:property name="hawtio.maven.index.dir" value=""/>
@@ -16,12 +25,5 @@
     </ext:default-properties>
   </ext:property-placeholder>
 
-  <bean id="mavenIndexer" class="io.hawt.maven.indexer.AsyncMavenIndexerFacadeFactory" init-method="init"
-        destroy-method="destroy" scope="singleton">
-    <property name="indexDirectory" value="${hawtio.maven.index.dir}"/>
-<!--
-    <property name="repositories" value="${hawtio.maven.index.repos}"/>
--->
-  </bean>
 </blueprint>
 
diff --git a/hawtio-maven-indexer/src/main/resources/OSGI-INF/blueprint/osgi.xml b/hawtio-maven-indexer/src/main/resources/OSGI-INF/blueprint/osgi.xml
@@ -0,0 +1,23 @@
+<?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"
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
+
+  <bean id="mavenIndexer" class="io.hawt.maven.indexer.AsyncMavenIndexerFacadeFactory" init-method="init"
+        destroy-method="destroy" scope="singleton">
+    <property name="indexDirectory" value="${indexDir}"/>
+<!--
+    <property name="repositories" value="${hawtio.maven.index.repos}"/>
+-->
+  </bean>
+
+  <!-- OSGi specific Config Admin -->
+  <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]" />
+
+  <cm:property-placeholder persistent-id="io.hawt.hawtio-maven-indexer" update-strategy="reload">
+    <cm:default-properties>
+      <cm:property name="indexDir" value="$[karaf.data]/mavenIndexer"/>
+    </cm:default-properties>
+  </cm:property-placeholder>
+
+</blueprint>