From c772063d596f5aa2d5496ce19614b4d9f5cad64f Mon Sep 17 00:00:00 2001
From: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Date: Tue, 14 Nov 2017 10:34:59 +0000
Subject: [PATCH 1/3] Add missing /v1/catalog/bundles REST endpoint for karaf
 distribution

---
 .../src/main/resources/OSGI-INF/blueprint/service.xml           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
index af55572277..d03ac87186 100644
--- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
+++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
@@ -75,6 +75,7 @@ limitations under the License.
     <bean id="apidocResourceBean" class="org.apache.brooklyn.rest.resources.ApidocResource"/>
     <bean id="applicationResourceBean" class="org.apache.brooklyn.rest.resources.ApplicationResource"/>
     <bean id="catalogResourceBean" class="org.apache.brooklyn.rest.resources.CatalogResource"/>
+    <bean id="bundlesResourceBean" class="org.apache.brooklyn.rest.resources.BundleResource"/>
     <bean id="effectorResourceBean" class="org.apache.brooklyn.rest.resources.EffectorResource"/>
     <bean id="entityConfigResourceBean" class="org.apache.brooklyn.rest.resources.EntityConfigResource"/>
     <bean id="entityResourceBean" class="org.apache.brooklyn.rest.resources.EntityResource"/>
@@ -95,6 +96,7 @@ limitations under the License.
             <ref component-id="apidocResourceBean"/>
             <ref component-id="applicationResourceBean"/>
             <ref component-id="catalogResourceBean"/>
+            <ref component-id="bundlesResourceBean"/>
             <ref component-id="effectorResourceBean"/>
             <ref component-id="entityConfigResourceBean"/>
             <ref component-id="entityResourceBean"/>

From 9efbc4d8e36162d47f66c36769c00c44b2524c93 Mon Sep 17 00:00:00 2001
From: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Date: Tue, 14 Nov 2017 10:41:03 +0000
Subject: [PATCH 2/3] Add more missing REST endpoints

---
 .../src/main/resources/OSGI-INF/blueprint/service.xml  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
index d03ac87186..db2701553e 100644
--- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
+++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
@@ -74,19 +74,20 @@ limitations under the License.
     <bean id="adjunctResourceBean" class="org.apache.brooklyn.rest.resources.AdjunctResource"/>
     <bean id="apidocResourceBean" class="org.apache.brooklyn.rest.resources.ApidocResource"/>
     <bean id="applicationResourceBean" class="org.apache.brooklyn.rest.resources.ApplicationResource"/>
-    <bean id="catalogResourceBean" class="org.apache.brooklyn.rest.resources.CatalogResource"/>
     <bean id="bundlesResourceBean" class="org.apache.brooklyn.rest.resources.BundleResource"/>
+    <bean id="catalogResourceBean" class="org.apache.brooklyn.rest.resources.CatalogResource"/>
     <bean id="effectorResourceBean" class="org.apache.brooklyn.rest.resources.EffectorResource"/>
     <bean id="entityConfigResourceBean" class="org.apache.brooklyn.rest.resources.EntityConfigResource"/>
     <bean id="entityResourceBean" class="org.apache.brooklyn.rest.resources.EntityResource"/>
     <bean id="locationResourceBean" class="org.apache.brooklyn.rest.resources.LocationResource"/>
+    <bean id="logoutResourceBean" class="org.apache.brooklyn.rest.resources.LogoutResource"/>
     <bean id="policyConfigResourceBean" class="org.apache.brooklyn.rest.resources.PolicyConfigResource"/>
     <bean id="policyResourceBean" class="org.apache.brooklyn.rest.resources.PolicyResource"/>
     <bean id="scriptResourceBean" class="org.apache.brooklyn.rest.resources.ScriptResource"/>
     <bean id="sensorResourceBean" class="org.apache.brooklyn.rest.resources.SensorResource"/>
     <bean id="serverResourceBean" class="org.apache.brooklyn.rest.resources.ServerResource"/>
+    <bean id="typeResourceBean" class="org.apache.brooklyn.rest.resources.TypeResource"/>
     <bean id="usageResourceBean" class="org.apache.brooklyn.rest.resources.UsageResource"/>
-    <bean id="logoutResourceBean" class="org.apache.brooklyn.rest.resources.LogoutResource"/>
 
     <jaxrs:server id="brooklynRestApiV1" address="/">
         <jaxrs:serviceBeans>
@@ -95,19 +96,20 @@ limitations under the License.
             <ref component-id="adjunctResourceBean"/>
             <ref component-id="apidocResourceBean"/>
             <ref component-id="applicationResourceBean"/>
-            <ref component-id="catalogResourceBean"/>
             <ref component-id="bundlesResourceBean"/>
+            <ref component-id="catalogResourceBean"/>
             <ref component-id="effectorResourceBean"/>
             <ref component-id="entityConfigResourceBean"/>
             <ref component-id="entityResourceBean"/>
             <ref component-id="locationResourceBean"/>
+            <ref component-id="logoutResourceBean"/>
             <ref component-id="policyConfigResourceBean"/>
             <ref component-id="policyResourceBean"/>
             <ref component-id="scriptResourceBean"/>
             <ref component-id="sensorResourceBean"/>
             <ref component-id="serverResourceBean"/>
+            <ref component-id="typeResourceBean"/>
             <ref component-id="usageResourceBean"/>
-            <ref component-id="logoutResourceBean"/>
         </jaxrs:serviceBeans>
 
         <jaxrs:providers>

From f57e28ea3789986b43d10437a539bb3b2eb1ffda Mon Sep 17 00:00:00 2001
From: Thomas Bouron <thomas.bouron@cloudsoftcorp.com>
Date: Tue, 14 Nov 2017 10:44:39 +0000
Subject: [PATCH 3/3] Update bean name for bundles resources

---
 .../src/main/resources/OSGI-INF/blueprint/service.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
index db2701553e..9d7e5e702b 100644
--- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
+++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml
@@ -74,7 +74,7 @@ limitations under the License.
     <bean id="adjunctResourceBean" class="org.apache.brooklyn.rest.resources.AdjunctResource"/>
     <bean id="apidocResourceBean" class="org.apache.brooklyn.rest.resources.ApidocResource"/>
     <bean id="applicationResourceBean" class="org.apache.brooklyn.rest.resources.ApplicationResource"/>
-    <bean id="bundlesResourceBean" class="org.apache.brooklyn.rest.resources.BundleResource"/>
+    <bean id="bundleResourceBean" class="org.apache.brooklyn.rest.resources.BundleResource"/>
     <bean id="catalogResourceBean" class="org.apache.brooklyn.rest.resources.CatalogResource"/>
     <bean id="effectorResourceBean" class="org.apache.brooklyn.rest.resources.EffectorResource"/>
     <bean id="entityConfigResourceBean" class="org.apache.brooklyn.rest.resources.EntityConfigResource"/>
@@ -96,7 +96,7 @@ limitations under the License.
             <ref component-id="adjunctResourceBean"/>
             <ref component-id="apidocResourceBean"/>
             <ref component-id="applicationResourceBean"/>
-            <ref component-id="bundlesResourceBean"/>
+            <ref component-id="bundleResourceBean"/>
             <ref component-id="catalogResourceBean"/>
             <ref component-id="effectorResourceBean"/>
             <ref component-id="entityConfigResourceBean"/>