You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2022/09/09 20:27:04 UTC
[brooklyn-dist] 02/02: restructure catalog definitions
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit bbf9222f861d6a0fcc2b200fd641a7661774c2f8
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Fri Sep 9 21:25:58 2022 +0100
restructure catalog definitions
so things are easier to include/exclude
in line with brooklyn-server 12a22b9d7c2da4b1673724ef640dc605c9b019a3
---
.../{catalog.bom => catalog-brooklyn-default.bom} | 15 +++-
.../catalog/catalog-brooklyn-software-base.bom | 82 ++++++++++++++++++++++
.../resources/catalog/catalog-core.bom | 14 +++-
...talog-core.bom => catalog-library-software.bom} | 6 +-
....bom => catalog-templates-brooklyn-samples.bom} | 0
.../resources/catalog/catalog.bom | 3 +-
6 files changed, 114 insertions(+), 6 deletions(-)
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom
similarity index 65%
copy from karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom
copy to karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom
index 7c79198..529be3a 100644
--- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom
@@ -18,6 +18,19 @@
brooklyn.catalog:
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ # this is the set of items included by default with Apache Brooklyn,
+ # if referenced by catalog.bom. or the catalog.bom can be replaced entirely.
+
items:
+ # the most useful stuff
- 'file:catalog/catalog-core.bom'
- - 'file:catalog/catalog-templates.bom'
+
+ # occasionally useful server-related entities
+ - 'file:catalog/catalog-brooklyn-software-base.bom'
+
+ # occasionally useful blueprints for common software
+ - 'file:catalog/catalog-library-software.bom'
+
+ # brooklyn standard examples
+ - 'file:catalog/catalog-templates-brooklyn-samples.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
new file mode 100644
index 0000000..611f9af
--- /dev/null
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom
@@ -0,0 +1,82 @@
+# 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.machine.MachineEntity
+ item:
+ type: org.apache.brooklyn.entity.machine.MachineEntity
+ name: Machine Entity
+ description: Represents a machine, providing metrics about it (e.g. obtained from ssh)
+ - id: org.apache.brooklyn.entity.software.base.SameServerEntity
+ item:
+ type: org.apache.brooklyn.entity.software.base.SameServerEntity
+ name: Same Server Entity
+ description: |
+ An entity that, on start, will obtain a machine and pass that to each of its children
+ by calling their start effectors.
+ - id: org.apache.brooklyn.entity.brooklynnode.BrooklynEntityMirror
+ item:
+ type: org.apache.brooklyn.entity.brooklynnode.BrooklynEntityMirror
+ name: Brooklyn Entity Mirror
+ description: |
+ Provides an entity which can sit in one brooklyn
+ domain and reflect the status of an entity via the REST API of another domain.
+ - id: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
+ item:
+ type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess
+ name: Empty Software Process
+ - id: org.apache.brooklyn.entity.software.base.EmptyWindowsProcess
+ item:
+ type: org.apache.brooklyn.entity.software.base.EmptyWindowsProcess
+ name: Empty Windows Process
+ - id: org.apache.brooklyn.entity.software.base.VanillaWindowsProcess
+ item:
+ type: org.apache.brooklyn.entity.software.base.VanillaWindowsProcess
+ name: Vanilla Windows Process
+ description: A basic Windows entity configured with scripts, e.g. for launch, check-running and stop
+ - id: org.apache.brooklyn.entity.java.VanillaJavaApp
+ 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
+ name: Vanilla Software Process
+ description: A software process configured with scripts, e.g. for launch, check-running and stop
+ - id: org.apache.brooklyn.entity.machine.pool.ServerPool
+ item:
+ type: org.apache.brooklyn.entity.machine.pool.ServerPool
+ name: Server Pool
+ description: Creates a pre-allocated server pool, which other applications can deploy to
+
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom
index feb01b8..675d769 100644
--- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom
@@ -19,5 +19,17 @@ brooklyn.catalog:
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
brooklyn.libraries:
+
+ # very common building blocks
+ - mvn:org.apache.brooklyn/brooklyn-core/1.1.0-SNAPSHOT # BROOKLYN_VERSION
+ - mvn:org.apache.brooklyn/brooklyn-policy/1.1.0-SNAPSHOT # BROOKLYN_VERSION
+
+ # often useful server-related entities
+ - mvn:org.apache.brooklyn/brooklyn-software-base/1.1.0-SNAPSHOT # BROOKLYN_VERSION
+
+ # possibly useful test entities
+ - mvn:org.apache.brooklyn/brooklyn-test-framework/1.1.0-SNAPSHOT # BROOKLYN_VERSION
+
+ # convenient aliases for common things
- mvn:org.apache.brooklyn/brooklyn-karaf-init/1.1.0-SNAPSHOT # BROOKLYN_VERSION
- - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.1.0-SNAPSHOT # BROOKLYN_VERSION
\ No newline at end of file
+
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom
similarity index 89%
copy from karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom
copy to karaf/features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom
index feb01b8..8932e61 100644
--- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-core.bom
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom
@@ -19,5 +19,7 @@ brooklyn.catalog:
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
brooklyn.libraries:
- - mvn:org.apache.brooklyn/brooklyn-karaf-init/1.1.0-SNAPSHOT # BROOKLYN_VERSION
- - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.1.0-SNAPSHOT # BROOKLYN_VERSION
\ No newline at end of file
+
+ # possibly useful blueprints for common software (but often users will want to replace)
+ - mvn:org.apache.brooklyn/brooklyn-library-catalog/1.1.0-SNAPSHOT # BROOKLYN_VERSION
+
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates-brooklyn-samples.bom
similarity index 100%
rename from karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates.bom
rename to karaf/features/src/main/filtered-resources/resources/catalog/catalog-templates-brooklyn-samples.bom
diff --git a/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom b/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom
index 7c79198..851a7ba 100644
--- a/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom
+++ b/karaf/features/src/main/filtered-resources/resources/catalog/catalog.bom
@@ -19,5 +19,4 @@ brooklyn.catalog:
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
items:
- - 'file:catalog/catalog-core.bom'
- - 'file:catalog/catalog-templates.bom'
+ - 'file:catalog/catalog-brooklyn-default.bom'