Move blueprint XML files to where blueprint finds them by default and…

… configure blueprint-web to find them
hawtio · Apr 10, 2013 · 30d1726 · 30d1726
1 parent 9616a88
commit 30d1726
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git a/hawtio-default/src/main/webapp/WEB-INF/web.xml b/hawtio-default/src/main/webapp/WEB-INF/web.xml
@@ -44,6 +44,8 @@
   <context-param>
       <param-name>blueprintProperties</param-name>
       <param-value>blueprint.properties</param-value>
+      <param-name>blueprintLocation</param-name>
+      <param-value>OSGI-INF/blueprint/blueprint.xml</param-value>
   </context-param>
 
   <welcome-file-list>

diff --git a/...src/main/resources/META-INF/blueprint.xml → ...esources/OSGI-INF/blueprint/blueprint.xml b/...src/main/resources/META-INF/blueprint.xml → ...esources/OSGI-INF/blueprint/blueprint.xml
diff --git a/hawtio-json-schema-mbean/pom.xml b/hawtio-json-schema-mbean/pom.xml
@@ -19,6 +19,13 @@
     <jackson-module-jsonSchema-version>2.1.2</jackson-module-jsonSchema-version>
     <jackson-module-jaxb-annotations-version>2.1.3</jackson-module-jaxb-annotations-version>
     <reflections-version>0.9.9-RC1</reflections-version>
+    <fuse.osgi.export>
+      io.hawt.jsonschema
+    </fuse.osgi.export>
+    <fuse.osgi.import>
+      io.hawt.jsonschema,
+      *;resolution:=optional
+    </fuse.osgi.import>
   </properties>
 
   <dependencies>
@@ -124,11 +131,19 @@
             <supportedProjectType>war</supportedProjectType>
           </supportedProjectTypes>
           <instructions>
+
+            <Export-Package>${fuse.osgi.export}</Export-Package>
+            <Import-Package>${fuse.osgi.import}</Import-Package>
+
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
+
             <Bundle-Name>${project.description}</Bundle-Name>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-            <Export-Package />
+
+            <Implementation-Title>HawtIO</Implementation-Title>
+            <Implementation-Version>${project.version}</Implementation-Version>
+
             <DynamicImport-Package>*</DynamicImport-Package>
           </instructions>
         </configuration>

diff --git a/...src/main/resources/META-INF/blueprint.xml → ...esources/OSGI-INF/blueprint/blueprint.xml b/...src/main/resources/META-INF/blueprint.xml → ...esources/OSGI-INF/blueprint/blueprint.xml
@@ -2,8 +2,7 @@
 <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="schemaLookup" class="io.hawt.jsonschema.SchemaLookup" init-method="init" destroy-method="destroy">
-  </bean>
+  <bean id="schemaLookup" class="io.hawt.jsonschema.SchemaLookup" init-method="init" destroy-method="destroy"/>
 
 </blueprint>
 
diff --git a/...src/main/resources/META-INF/blueprint.xml → ...esources/OSGI-INF/blueprint/blueprint.xml b/...src/main/resources/META-INF/blueprint.xml → ...esources/OSGI-INF/blueprint/blueprint.xml
diff --git a/...n/resources/OSGI-INF/blueprint/plugin.xml → ...esources/OSGI-INF/blueprint/blueprint.xml b/...n/resources/OSGI-INF/blueprint/plugin.xml → ...esources/OSGI-INF/blueprint/blueprint.xml
diff --git a/...-INF/blueprint/hawtio-plugin-registry.xml → ...esources/OSGI-INF/blueprint/blueprint.xml b/...-INF/blueprint/hawtio-plugin-registry.xml → ...esources/OSGI-INF/blueprint/blueprint.xml