refactor the brooklyn node entities in the catalog init
so people can include them or not easily
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom
index 529be3a..741eeee 100644
--- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom
@@ -25,9 +25,12 @@
# the most useful stuff
- 'file:catalog/catalog-core.bom'
- # occasionally useful server-related entities
+ # useful server-related entities
- 'file:catalog/catalog-brooklyn-software-base.bom'
+ # brooklyn nodes
+ - 'file:catalog/catalog-brooklyn-software-brooklyn.bom'
+
# occasionally useful blueprints for common software
- 'file:catalog/catalog-library-software.bom'
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom
index 7c0af09..7289cb6 100644
--- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom
@@ -60,20 +60,6 @@
item:
type: org.apache.brooklyn.entity.java.VanillaJavaApp
name: Vanilla Java App
- - id: org.apache.brooklyn.entity.brooklynnode.BrooklynNode
- item:
- type: org.apache.brooklyn.entity.brooklynnode.BrooklynNode
- name: Brooklyn Node
- description: Deploys a Brooklyn management server
- - id: org.apache.brooklyn.entity.brooklynnode.BrooklynCluster
- item:
- type: org.apache.brooklyn.entity.brooklynnode.BrooklynCluster
- name: Brooklyn Cluster
- - id: org.apache.brooklyn.entity.brooklynnode.LocalBrooklynNode
- item:
- type: org.apache.brooklyn.entity.brooklynnode.LocalBrooklynNode
- name: Local Brooklyn Node
- description: An entity that represents the local Brooklyn server.
- id: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
item:
type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-brooklyn.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-brooklyn.bom
new file mode 100644
index 0000000..4ee7073
--- /dev/null
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-brooklyn.bom
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+ version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ itemType: entity
+ items:
+ - id: org.apache.brooklyn.entity.brooklynnode.BrooklynNode
+ item:
+ type: org.apache.brooklyn.entity.brooklynnode.BrooklynNode
+ name: Brooklyn Node
+ description: Deploys a Brooklyn management server
+ - id: org.apache.brooklyn.entity.brooklynnode.BrooklynCluster
+ item:
+ type: org.apache.brooklyn.entity.brooklynnode.BrooklynCluster
+ name: Brooklyn Cluster
+ - id: org.apache.brooklyn.entity.brooklynnode.LocalBrooklynNode
+ item:
+ type: org.apache.brooklyn.entity.brooklynnode.LocalBrooklynNode
+ name: Local Brooklyn Node
+ description: An entity that represents the local Brooklyn server.
