You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/04 22:36:02 UTC
[1/3] git commit: Remove binaries in sandbox simple-open-loop-policy
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 0e7cc9c0f -> 00b5a872b
Remove binaries in sandbox simple-open-loop-policy
Embedded a Maven repository for a JAR file not available in an online
Maven repository. Replaced this with instructions on how to download and
install the artifact by hand.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dfc66b60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dfc66b60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dfc66b60
Branch: refs/heads/master
Commit: dfc66b605afbc09cae9267fd3abcbffbc178a11c
Parents: 7cfeacc
Author: Richard Downer <ri...@apache.org>
Authored: Tue Nov 4 20:41:21 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Nov 4 20:41:21 2014 +0000
----------------------------------------------------------------------
.../examples/simple-open-loop-policy/README.md | 63 ++++++++++++++++
.../examples/simple-open-loop-policy/README.txt | 72 -------------------
.../org.marre.smsj-1.0.0-20051126.jar | Bin 134604 -> 0 bytes
.../org.marre.smsj-1.0.0-20051126.pom | 9 ---
.../org.marre.smsj/maven-metadata-local.xml | 30 --------
.../examples/simple-open-loop-policy/pom.xml | 7 --
6 files changed, 63 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfc66b60/sandbox/examples/simple-open-loop-policy/README.md
----------------------------------------------------------------------
diff --git a/sandbox/examples/simple-open-loop-policy/README.md b/sandbox/examples/simple-open-loop-policy/README.md
new file mode 100644
index 0000000..de28c21
--- /dev/null
+++ b/sandbox/examples/simple-open-loop-policy/README.md
@@ -0,0 +1,63 @@
+Instructions for Running Examples
+=================================
+
+The commands below assume that the `brooklyn` script is on your $PATH, this project has been built,
+and you are in this directory. Adjust to taste for other configurations.
+
+ export BROOKLYN_CLASSPATH=$(pwd)/target/classes
+
+ # Three-tier: auto-scaling app-server cluster fronted by nginx, MySql backend wired up, on localhost
+ brooklyn launch --app brooklyn.demo.WebClusterDatabaseOpenLoopExample --location localhost
+
+The above requires passwordless `ssh localhost` and requires `gcc` to build `nginx`.
+You could instead target your favourite cloud, where this has been tried and tested:
+
+
+Redistributable embedded example:
+
+ # To build a redistributable tar.gz with a start.sh script
+ # which invokes the `main` method in the example class to start
+ # (the redistributable will be at: target/brooklyn-?-bin.tar.gz )
+ mvn clean assembly:assembly
+
+For more information, please visit:
+
+ http://brooklyncentral.github.com/use/examples/webcluster/
+
+
+Developer Notes
+===============
+
+This example sends an SMS message when the cluster has reached its max size (and where the auto-scaler policy
+would continue to increase the size if it were not capped). The message is sent using clickatell.com,
+using http://smsj.sourceforge.net.
+
+Because smsj is not available on maven central, you must obtain this library yourself and install it into
+your local Maven repository:
+
+ wget -Osmsj-20051126.jar http://sourceforge.net/projects/smsj/files/smsj/smsj-snapshot-20051126/smsj-20051126.jar/download
+
+ mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file \
+ -Dfile=smsj-20051126.jar \
+ -DgroupId=io.brooklyn \
+ -DartifactId=org.marre.smsj \
+ -Dversion=1.0.0-20051126 \
+ -Dpackaging=jar
+
+----
+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.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfc66b60/sandbox/examples/simple-open-loop-policy/README.txt
----------------------------------------------------------------------
diff --git a/sandbox/examples/simple-open-loop-policy/README.txt b/sandbox/examples/simple-open-loop-policy/README.txt
deleted file mode 100644
index 85c9336..0000000
--- a/sandbox/examples/simple-open-loop-policy/README.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Instructions for Running Examples
-=================================
-
-The commands below assume that the `brooklyn` script is on your $PATH, this project has been built,
-and you are in this directory. Adjust to taste for other configurations.
-
- export BROOKLYN_CLASSPATH=$(pwd)/target/classes
-
- # Three-tier: auto-scaling app-server cluster fronted by nginx, MySql backend wired up, on localhost
- brooklyn launch --app brooklyn.demo.WebClusterDatabaseOpenLoopExample --location localhost
-
-The above requires passwordless `ssh localhost` and requires `gcc` to build `nginx`.
-You could instead target your favourite cloud, where this has been tried and tested:
-
-
-Redistributable embedded example:
-
- # To build a redistributable tar.gz with a start.sh script
- # which invokes the `main` method in the example class to start
- # (the redistributable will be at: target/brooklyn-*-bin.tar.gz )
- mvn clean assembly:assembly
-
-For more information, please visit:
-
- http://brooklyncentral.github.com/use/examples/webcluster/
-
-
-Developer Notes
-===============
-
-This example sends an SMS message when the cluster has reached its max size (and where the auto-scaler policy
-would continue to increase the size if it were not capped). The message is sent using clickatell.com,
-using http://smsj.sourceforge.net.
-
-Because smsj is not available on maven central, a custom local maven repo has been built (and checked in to git):
-
- wget http://sourceforge.net/projects/smsj/files/smsj/smsj-snapshot-20051126/smsj-20051126.jar/download
-
- mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file \
- -Dfile=smsj-20051126.jar \
- -DgroupId=io.brooklyn \
- -DartifactId=org.marre.smsj \
- -Dversion=1.0.0-20051126 \
- -Dpackaging=jar \
- -DlocalRepositoryPath=localrepo
-
-And in the pom, this local repo is referenced:
-
- <repositories>
- <repository>
- <id>brooklyn-examples-localrepo</id>
- <url>file://${basedir}/localrepo</url>
- </repository>
- </repositories>
-
-----
-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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfc66b60/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.jar
----------------------------------------------------------------------
diff --git a/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.jar b/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.jar
deleted file mode 100644
index a076a47..0000000
Binary files a/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfc66b60/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom
----------------------------------------------------------------------
diff --git a/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom b/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom
deleted file mode 100644
index 7361303..0000000
--- a/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <groupId>io.brooklyn</groupId>
- <artifactId>org.marre.smsj</artifactId>
- <version>1.0.0-20051126</version>
- <description>POM was created from install:install-file</description>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfc66b60/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/maven-metadata-local.xml b/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/maven-metadata-local.xml
deleted file mode 100644
index c0018bb..0000000
--- a/sandbox/examples/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/maven-metadata-local.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<metadata>
- <groupId>io.brooklyn</groupId>
- <artifactId>org.marre.smsj</artifactId>
- <versioning>
- <release>1.0.0-20051126</release>
- <versions>
- <version>1.0.0-20051126</version>
- </versions>
- <lastUpdated>20130206095028</lastUpdated>
- </versioning>
-</metadata>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dfc66b60/sandbox/examples/simple-open-loop-policy/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/examples/simple-open-loop-policy/pom.xml b/sandbox/examples/simple-open-loop-policy/pom.xml
index 040630b..bbeaa2a 100644
--- a/sandbox/examples/simple-open-loop-policy/pom.xml
+++ b/sandbox/examples/simple-open-loop-policy/pom.xml
@@ -33,13 +33,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <repositories>
- <repository>
- <id>brooklyn-examples-localrepo</id>
- <url>file://${basedir}/localrepo</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
[3/3] git commit: This closes #299
Posted by al...@apache.org.
This closes #299
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/00b5a872
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/00b5a872
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/00b5a872
Branch: refs/heads/master
Commit: 00b5a872b5c38eb379762f81a73feda3c063d719
Parents: 0e7cc9c 3d17c1a
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 4 21:35:47 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 4 21:35:47 2014 +0000
----------------------------------------------------------------------
.../brooklyn-test-osgi-more-entities_0.1.0.txt | 21 ++++++
.../brooklyn-test-osgi-more-entities_0.2.0.txt | 21 ++++++
.../examples/simple-open-loop-policy/README.md | 63 ++++++++++++++++
.../examples/simple-open-loop-policy/README.txt | 72 -------------------
.../org.marre.smsj-1.0.0-20051126.jar | Bin 134604 -> 0 bytes
.../org.marre.smsj-1.0.0-20051126.pom | 9 ---
.../org.marre.smsj/maven-metadata-local.xml | 30 --------
.../examples/simple-open-loop-policy/pom.xml | 7 --
8 files changed, 105 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Add explanatory text for OSGi test binaries
Posted by al...@apache.org.
Add explanatory text for OSGi test binaries
Links to the actual source code in this repository.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3d17c1a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3d17c1a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3d17c1a5
Branch: refs/heads/master
Commit: 3d17c1a5aecf75cac72da8dcd65403eac05a262b
Parents: dfc66b6
Author: Richard Downer <ri...@apache.org>
Authored: Tue Nov 4 20:45:07 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Nov 4 20:45:07 2014 +0000
----------------------------------------------------------------------
.../brooklyn-test-osgi-more-entities_0.1.0.txt | 21 ++++++++++++++++++++
.../brooklyn-test-osgi-more-entities_0.2.0.txt | 21 ++++++++++++++++++++
2 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d17c1a5/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.txt b/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.txt
new file mode 100644
index 0000000..b1879d7
--- /dev/null
+++ b/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.1.0.txt
@@ -0,0 +1,21 @@
+# 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.
+
+The file brooklyn-test-osgi-entities.jar is for testing a deployment of
+an OSGi bundle containing entities.
+
+The source is in core/src/test/dependencies/osgi/more-entities-v1
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3d17c1a5/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.txt b/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.txt
new file mode 100644
index 0000000..bd307eb
--- /dev/null
+++ b/core/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-more-entities_0.2.0.txt
@@ -0,0 +1,21 @@
+# 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.
+
+The file brooklyn-test-osgi-entities.jar is for testing a deployment of
+an OSGi bundle containing entities.
+
+The source is in core/src/test/dependencies/osgi/more-entities-v2