You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/15 16:00:38 UTC

[1/2] brooklyn-dist git commit: Add example catalog.bom file.

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 299c8cfad -> eb5a46e86


Add example catalog.bom file.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/c1ced23e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/c1ced23e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/c1ced23e

Branch: refs/heads/master
Commit: c1ced23e227232a944a2968c27141d5f9fb5bb81
Parents: d060959
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Wed Mar 23 16:16:22 2016 +0000
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Wed Apr 13 12:36:09 2016 +0100

----------------------------------------------------------------------
 .../src/main/resources/catalog.bom              | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/c1ced23e/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom b/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom
new file mode 100644
index 0000000..889e732
--- /dev/null
+++ b/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom
@@ -0,0 +1,23 @@
+# 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: 0.10.0-SNAPSHOT # BROOKLYN_VERSION
+    items:
+    - id: com.acme.sample.brooklyn.MySample
+      item:
+        type: com.acme.sample.brooklyn.MySample


[2/2] brooklyn-dist git commit: Closes #26

Posted by sv...@apache.org.
Closes #26

Populate catalog from bundle bom

The PR adds updates to the existing jars to add a catalog.bom file that includes the details of the various entities in each.

See https://github.com/apache/brooklyn-server/pull/80 for details; this PR depends on that one and should be merged after it.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/eb5a46e8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/eb5a46e8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/eb5a46e8

Branch: refs/heads/master
Commit: eb5a46e8614eed5fd1b0a3ad581c93692b55ac0a
Parents: 299c8cf c1ced23
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Apr 15 17:00:25 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Apr 15 17:00:25 2016 +0300

----------------------------------------------------------------------
 .../src/main/resources/catalog.bom              | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
----------------------------------------------------------------------