[5/5] brooklyn-server git commit: This closes #81
This closes #81 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fafff2da Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fafff2da Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fafff2da Branch: refs/heads/master Commit: fafff2dad5333ae620136e80dd01e9e4e35f2065 Parents: 3c051ad a0418bf Author: Aled Sage Authored: Fri Mar 25 00:44:12 2016 + Committer: Aled Sage Committed: Fri Mar 25 00:44:12 2016 + -- .../apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java | 2 +- .../mgmt/persist/deserializingClassRenames.properties | 9 + .../brooklyn/core/entity/hello/LocalEntitiesTest.java | 3 +-- .../apache/brooklyn/core/test/entity/TestEntity.java| 12 ++-- .../util/core/task/CompoundTaskExecutionTest.java | 2 +- .../jclouds/provider/AbstractJcloudsLocationTest.java | 2 +- pom.xml | 2 +- .../SoftwareProcessDriverLifecycleEffectorTasks.java| 9 ++--- .../java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java | 2 +- .../org/apache/brooklyn/feed/jmx/JmxHelperTest.java | 2 +- 10 files changed, 28 insertions(+), 17 deletions(-) --
[2/5] brooklyn-server git commit: Upgrade winrm4j to 0.3.3
Upgrade winrm4j to 0.3.3 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4cad1009 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4cad1009 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4cad1009 Branch: refs/heads/master Commit: 4cad1009ec3d3ca89cc51b656f3613556bdfb1c1 Parents: da26fb2 Author: Aled Sage Authored: Fri Mar 25 00:26:49 2016 + Committer: Aled Sage Committed: Fri Mar 25 00:26:49 2016 + -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4cad1009/pom.xml -- diff --git a/pom.xml b/pom.xml index d1dac8a..f45e19b 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ 2.0.1 0.8.1 4.0.0 -0.3.2 +0.3.3 1.4.0 3.3.4
[4/5] brooklyn-server git commit: softwareProcess.restart: even on error, set expected=running
softwareProcess.restart: even on error, set expected=running
Previously if the restart failed in some way (e.g. an error in the
launch script or a timeout waiting for serviceUp), we would leave the
expectedState as âstartingâ. This meant that serviceUp=false was not
rendered as an error.
Always setting expected=running is better, but is not great. For
example, if a script fails in restart then we wonât mark the
entity as onFire if the basic service-up checks still pass. This is
different from the start() behaviour. But then we are doing less than
in start (e.g. in start a script failure could mean that a WAR was not
installed so the simple serviceUp reachability check would not be
sufficient if customize() had failed).
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a0418bfb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a0418bfb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a0418bfb
Branch: refs/heads/master
Commit: a0418bfb4805c2f1443e2077d9362127e644ff1f
Parents: d08cda6
Author: Aled Sage
Authored: Fri Mar 25 00:29:51 2016 +
Committer: Aled Sage
Committed: Fri Mar 25 00:29:51 2016 +
--
.../base/SoftwareProcessDriverLifecycleEffectorTasks.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a0418bfb/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java
--
diff --git
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java
index cb4149a..1e174c0 100644
---
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java
+++
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessDriverLifecycleEffectorTasks.java
@@ -82,9 +82,12 @@ public class SoftwareProcessDriverLifecycleEffectorTasks
extends MachineLifecycl
private class PostRestartTask implements Runnable {
@Override
public void run() {
-postStartCustom();
-postRestartCustom();
-ServiceStateLogic.setExpectedState(entity(), Lifecycle.RUNNING);
+try {
+postStartCustom();
+postRestartCustom();
+} finally {
+ServiceStateLogic.setExpectedState(entity(),
Lifecycle.RUNNING);
+}
}
}
[3/5] brooklyn-server git commit: deserializingClassRenames: include TestEntity etc
deserializingClassRenames: include TestEntity etc Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d08cda63 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d08cda63 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d08cda63 Branch: refs/heads/master Commit: d08cda63f0d217a89937e7612988c46ab455d0c1 Parents: 4cad100 Author: Aled Sage Authored: Fri Mar 25 00:27:08 2016 + Committer: Aled Sage Committed: Fri Mar 25 00:27:08 2016 + -- .../core/mgmt/persist/deserializingClassRenames.properties | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d08cda63/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties -- diff --git a/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties b/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties index a5801c9..a86bea0 100644 --- a/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties +++ b/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties @@ -1421,3 +1421,12 @@ brooklyn.util.crypto.TrustingSslSocketFactory org.apache.brooklyn.test.TrustingSslSocketFactory : org.apache.brooklyn.util.http.TrustingSslSocketFactory org.apache.brooklyn.util.core.http.HttpTool : org.apache.brooklyn.util.http.HttpTool org.apache.brooklyn.util.core.http.HttpToolResponse : org.apache.brooklyn.util.http.HttpToolResponse + +brooklyn.test.entity.TestEntity : org.apache.brooklyn.core.test.entity.TestEntity +brooklyn.test.entity.TestEntityImpl : org.apache.brooklyn.core.test.entity.TestEntityImpl +brooklyn.test.entity.TestCluster : org.apache.brooklyn.core.test.entity.TestCluster +brooklyn.test.entity.TestClusterImpl : org.apache.brooklyn.core.test.entity.TestClusterImpl +brooklyn.test.entity.TestApplication : org.apache.brooklyn.core.test.entity.TestApplication +brooklyn.test.entity.TestApplicationImpl : org.apache.brooklyn.core.test.entity.TestApplicationImpl +brooklyn.test.entity.BlockingEntity : org.apache.brooklyn.core.test.entity.BlockingEntity +brooklyn.test.entity.BlockingEntityImpl : org.apache.brooklyn.core.test.entity.BlockingEntityImpl \ No newline at end of file
[1/5] brooklyn-server git commit: Tidy test imports
Repository: brooklyn-server
Updated Branches:
refs/heads/master 3c051adc7 -> fafff2dad
Tidy test imports
Use com.google.common.collect instead of org.testng.collections
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/da26fb2a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/da26fb2a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/da26fb2a
Branch: refs/heads/master
Commit: da26fb2a99b334dc8a9b8dc10d9bd960477c0c3e
Parents: ae57587
Author: Aled Sage
Authored: Fri Mar 25 00:26:30 2016 +
Committer: Aled Sage
Committed: Fri Mar 25 00:26:30 2016 +
--
.../apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java | 2 +-
.../brooklyn/core/entity/hello/LocalEntitiesTest.java | 3 +--
.../apache/brooklyn/core/test/entity/TestEntity.java| 12 ++--
.../util/core/task/CompoundTaskExecutionTest.java | 2 +-
.../jclouds/provider/AbstractJcloudsLocationTest.java | 2 +-
.../java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java | 2 +-
.../org/apache/brooklyn/feed/jmx/JmxHelperTest.java | 2 +-
7 files changed, 12 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
--
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
index 337c302..70c60ad 100644
---
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/EntitiesYamlTest.java
@@ -68,7 +68,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import org.testng.collections.Lists;
import com.google.common.base.Joiner;
import com.google.common.base.Suppliers;
@@ -76,6 +75,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
@Test
public class EntitiesYamlTest extends AbstractYamlTest {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
index 320d7a3..9729068 100644
---
a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
@@ -39,7 +39,6 @@ import org.apache.brooklyn.api.mgmt.EntityManager;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.sensor.SensorEvent;
import org.apache.brooklyn.api.sensor.SensorEventListener;
-import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.entity.EntityInternal;
import org.apache.brooklyn.core.location.SimulatedLocation;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
@@ -47,7 +46,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import org.testng.collections.Lists;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.time.Time;
@@ -58,6 +56,7 @@ import com.google.common.base.Stopwatch;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
/** tests effector invocation and a variety of sensor accessors and
subscribers */
public class LocalEntitiesTest extends BrooklynAppUnitTestSupport {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/da26fb2a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
index be8ad3d..733b912 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java
@@ -43,11 +43,11 @@ import org.apache.brooklyn.core.entity.lifecycle.
[1/2] brooklyn-library git commit: Fix KafkaZooKeeper archive directory name format
Repository: brooklyn-library
Updated Branches:
refs/heads/master 51f715b52 -> 3216b7a42
Fix KafkaZooKeeper archive directory name format
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/e34382e6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/e34382e6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/e34382e6
Branch: refs/heads/master
Commit: e34382e6a660b82e66490e73ccc63327cf17d5a8
Parents: 8a23940
Author: Sam Corbett
Authored: Tue Mar 22 11:55:16 2016 +
Committer: Sam Corbett
Committed: Tue Mar 22 11:55:16 2016 +
--
.../brooklyn/entity/messaging/kafka/KafkaZooKeeper.java | 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/e34382e6/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
--
diff --git
a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
index 5aee6d2..aef59eb 100644
---
a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
+++
b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/KafkaZooKeeper.java
@@ -23,6 +23,7 @@ import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.annotation.Effector;
import org.apache.brooklyn.core.annotation.EffectorParam;
import org.apache.brooklyn.core.config.BasicConfigKey;
+import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey;
import org.apache.brooklyn.entity.software.base.SoftwareProcess;
import org.apache.brooklyn.entity.zookeeper.ZooKeeperNode;
@@ -52,6 +53,13 @@ public interface KafkaZooKeeper extends ZooKeeperNode, Kafka
{
"kafka.zookeeper.configTemplate", "Kafka zookeeper configuration
template (in freemarker format)",
"classpath://org/apache/brooklyn/entity/messaging/kafka/zookeeper.properties");
+// This is defined by both ZooKeeperNode ("zookeeper-%s") and Kafka
("kafka_%s").
+// The latter is correct.
+@SetFromFlag("archiveNameFormat")
+ConfigKey ARCHIVE_DIRECTORY_NAME_FORMAT =
ConfigKeys.newConfigKeyWithDefault(
+SoftwareProcess.ARCHIVE_DIRECTORY_NAME_FORMAT,
+"kafka_%s");
+
@Effector(description = "Create a topic with a single partition and only
one replica")
void createTopic(@EffectorParam(name = "topic") String topic);
}
[2/2] brooklyn-library git commit: This closes #20
This closes #20 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/3216b7a4 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/3216b7a4 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/3216b7a4 Branch: refs/heads/master Commit: 3216b7a4231c2fbcc2e7362a0c83ed7dfa259291 Parents: 51f715b e34382e Author: Aled Sage Authored: Fri Mar 25 00:39:25 2016 + Committer: Aled Sage Committed: Fri Mar 25 00:39:25 2016 + -- .../brooklyn/entity/messaging/kafka/KafkaZooKeeper.java | 8 1 file changed, 8 insertions(+) --
[1/3] brooklyn-library git commit: Tidy ElasticSearch integration tests
Repository: brooklyn-library
Updated Branches:
refs/heads/master 0a50c1356 -> 51f715b52
Tidy ElasticSearch integration tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/3299958a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/3299958a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/3299958a
Branch: refs/heads/master
Commit: 3299958a18b5754ac969f9ac38433a436452fd5f
Parents: 47bdecf
Author: Aled Sage
Authored: Wed Mar 23 20:52:07 2016 +
Committer: Aled Sage
Committed: Fri Mar 25 00:37:18 2016 +
--
.../ElasticSearchClusterIntegrationTest.java| 9 ++---
.../ElasticSearchNodeIntegrationTest.java | 37 +++-
2 files changed, 18 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3299958a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
--
diff --git
a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
index eacc57f..86860b4 100644
---
a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
+++
b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchClusterIntegrationTest.java
@@ -28,12 +28,12 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.core.entity.Attributes;
+import org.apache.brooklyn.core.entity.EntityAsserts;
import org.apache.brooklyn.core.entity.trait.Startable;
import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport;
import org.apache.brooklyn.entity.group.DynamicCluster;
import org.apache.brooklyn.feed.http.HttpValueFunctions;
import org.apache.brooklyn.test.Asserts;
-import org.apache.brooklyn.test.EntityTestUtils;
import org.apache.brooklyn.util.http.HttpTool;
import org.apache.brooklyn.util.http.HttpToolResponse;
import org.apache.http.client.methods.HttpGet;
@@ -49,6 +49,7 @@ import com.google.common.collect.ImmutableMap;
public class ElasticSearchClusterIntegrationTest extends
BrooklynAppLiveTestSupport {
// FIXME Exception in thread "main"
java.lang.UnsupportedClassVersionError:
org/elasticsearch/bootstrap/Elasticsearch : Unsupported major.minor version 51.0
+// Happens if PATH points at a java that is older than Java 1.7.
private static final Logger LOG =
LoggerFactory.getLogger(ElasticSearchClusterIntegrationTest.class);
@@ -68,11 +69,11 @@ public class ElasticSearchClusterIntegrationTest extends
BrooklynAppLiveTestSupp
.configure(DynamicCluster.INITIAL_SIZE, 3));
app.start(ImmutableList.of(testLocation));
-EntityTestUtils.assertAttributeEqualsEventually(elasticSearchCluster,
Startable.SERVICE_UP, true);
+EntityAsserts.assertAttributeEqualsEventually(elasticSearchCluster,
Startable.SERVICE_UP, true);
elasticSearchCluster.stop();
-EntityTestUtils.assertAttributeEqualsEventually(elasticSearchCluster,
Startable.SERVICE_UP, false);
+EntityAsserts.assertAttributeEqualsEventually(elasticSearchCluster,
Startable.SERVICE_UP, false);
}
@Test(groups = {"Integration"})
@@ -81,7 +82,7 @@ public class ElasticSearchClusterIntegrationTest extends
BrooklynAppLiveTestSupp
.configure(DynamicCluster.INITIAL_SIZE, 3));
app.start(ImmutableList.of(testLocation));
-EntityTestUtils.assertAttributeEqualsEventually(elasticSearchCluster,
Startable.SERVICE_UP, true);
+EntityAsserts.assertAttributeEqualsEventually(elasticSearchCluster,
Startable.SERVICE_UP, true);
assertEquals(elasticSearchCluster.getMembers().size(), 3);
assertEquals(clusterDocumentCount(), 0);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/3299958a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
--
diff --git
a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
index a37d430..6254cf1 100644
---
a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeInte
[2/3] brooklyn-library git commit: Set ElasticSearch.DATASTORE_URL
Set ElasticSearch.DATASTORE_URL
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/47bdecfe
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/47bdecfe
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/47bdecfe
Branch: refs/heads/master
Commit: 47bdecfebe7333ce84af0cd568e1e9742c7ccfcf
Parents: 0a50c13
Author: Aled Sage
Authored: Wed Mar 23 20:47:59 2016 +
Committer: Aled Sage
Committed: Fri Mar 25 00:37:18 2016 +
--
.../entity/nosql/elasticsearch/ElasticSearchNodeImpl.java | 6 +-
.../elasticsearch/ElasticSearchNodeIntegrationTest.java | 9 +
2 files changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/47bdecfe/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
--
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
index a2a4652..ccb09e8 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
@@ -70,7 +70,11 @@ public class ElasticSearchNodeImpl extends
SoftwareProcessImpl implements Elasti
protected void connectSensors() {
super.connectSensors();
Integer rawPort = getAttribute(HTTP_PORT);
+String hostname = getAttribute(HOSTNAME);
checkNotNull(rawPort, "HTTP_PORT sensors not set for %s; is an
acceptable port available?", this);
+
+sensors().set(DATASTORE_URL, String.format("http://%s:%s";, hostname,
rawPort));
+
HostAndPort hp =
BrooklynAccessUtils.getBrooklynAccessibleAddress(this, rawPort);
Function, String> getNodeId = new
Function, String>() {
@Override public String apply(Maybe input) {
@@ -80,7 +84,7 @@ public class ElasticSearchNodeImpl extends
SoftwareProcessImpl implements Elasti
return
input.get().getAsJsonObject().entrySet().iterator().next().getKey();
}
};
-
+
if (isHttpMonitoringEnabled()) {
boolean retrieveUsageMetrics = getConfig(RETRIEVE_USAGE_METRICS);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/47bdecfe/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
--
diff --git
a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
index e6412f8..a37d430 100644
---
a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
+++
b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java
@@ -19,6 +19,8 @@
package org.apache.brooklyn.entity.nosql.elasticsearch;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
import java.net.URI;
import java.net.URISyntaxException;
@@ -31,9 +33,12 @@ import
org.apache.brooklyn.core.entity.factory.ApplicationBuilder;
import org.apache.brooklyn.core.entity.trait.Startable;
import org.apache.brooklyn.core.test.entity.TestApplication;
import org.apache.brooklyn.feed.http.HttpValueFunctions;
+import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.test.EntityTestUtils;
+import org.apache.brooklyn.util.http.HttpAsserts;
import org.apache.brooklyn.util.http.HttpTool;
import org.apache.brooklyn.util.http.HttpToolResponse;
+import org.apache.brooklyn.util.net.Networking;
import org.apache.http.client.methods.HttpGet;
import org.bouncycastle.util.Strings;
import org.testng.annotations.AfterMethod;
@@ -43,6 +48,7 @@ import
org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocati
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.net.HostAndPort;
public class ElasticSearchNodeIntegrationTest {
@@ -65,8 +71,11 @@ public class ElasticSearchNodeIntegrationTest {
public void testStartupAndShutdown() {
elasticSearchNode =
app.createAndManageChild(EntitySpec.create(ElasticSearchNode.class));
app.start(ImmutableList.of(testLocation));
+Strin
[3/3] brooklyn-library git commit: This closes #23
This closes #23 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/51f715b5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/51f715b5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/51f715b5 Branch: refs/heads/master Commit: 51f715b52dac450e53d5bf106b5a3261e14058cc Parents: 0a50c13 3299958 Author: Aled Sage Authored: Fri Mar 25 00:38:06 2016 + Committer: Aled Sage Committed: Fri Mar 25 00:38:06 2016 + -- .../elasticsearch/ElasticSearchNodeImpl.java| 6 ++- .../ElasticSearchClusterIntegrationTest.java| 9 +++-- .../ElasticSearchNodeIntegrationTest.java | 40 ++-- 3 files changed, 29 insertions(+), 26 deletions(-) --
[2/3] brooklyn-library git commit: Improve MySql auto-generated password
Improve MySql auto-generated password
(Not using makeRandomPassword utility, because need to think more
about quoting it when the password is subsequently used - otherwise
could fail if contains special chars)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/28c396b9
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/28c396b9
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/28c396b9
Branch: refs/heads/master
Commit: 28c396b95062c0422e916a2134a688f8c1bbaa53
Parents: 0744b0d
Author: Aled Sage
Authored: Thu Mar 24 00:09:37 2016 +
Committer: Aled Sage
Committed: Thu Mar 24 00:09:37 2016 +
--
.../org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/28c396b9/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
--
diff --git
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
index e2b0c2e..fd19fac 100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlNodeImpl.java
@@ -148,7 +148,7 @@ public class MySqlNodeImpl extends SoftwareProcessImpl
implements MySqlNode {
public String getPassword() {
String result = getAttribute(MySqlNode.PASSWORD);
if (Strings.isBlank(result)) {
-result = Identifiers.makeRandomId(6);
+result = Identifiers.makeRandomId(12);
sensors().set(MySqlNode.PASSWORD, result);
}
return result;
[3/3] brooklyn-library git commit: This closes #24
This closes #24 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/0a50c135 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/0a50c135 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/0a50c135 Branch: refs/heads/master Commit: 0a50c1356bffbb1f28e950698b4a1013dde2 Parents: 3fa4e75 28c396b Author: Aled Sage Authored: Fri Mar 25 00:32:16 2016 + Committer: Aled Sage Committed: Fri Mar 25 00:32:16 2016 + -- .../entity/database/mysql/MySqlNodeImpl.java| 2 +- software/nosql/pom.xml | 9 +++ .../nosql/elasticsearch/ElasticSearchNode.java | 3 + .../elasticsearch/ElasticSearchNodeImpl.java| 59 +--- .../brooklyn/entity/nosql/solr/SolrServer.java | 9 ++- .../entity/nosql/solr/SolrServerImpl.java | 32 +++ .../nosql/solr/SolrServerEc2LiveTest.java | 36 +++- .../webapp/nodejs/NodeJsWebAppService.java | 3 + .../webapp/nodejs/NodeJsWebAppServiceImpl.java | 35 .../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 37 +++- 10 files changed, 172 insertions(+), 53 deletions(-) --
[1/3] brooklyn-library git commit: Support disabling http-based sensors
Repository: brooklyn-library
Updated Branches:
refs/heads/master 3fa4e751e -> 0a50c1356
Support disabling http-based sensors
For Solr, ElasticSearch and NodeJS
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/0744b0d6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/0744b0d6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/0744b0d6
Branch: refs/heads/master
Commit: 0744b0d639ecebf2565b25183c936585cc05adcc
Parents: be0d232
Author: Aled Sage
Authored: Thu Mar 24 00:08:40 2016 +
Committer: Aled Sage
Committed: Thu Mar 24 00:08:40 2016 +
--
software/nosql/pom.xml | 9 +++
.../nosql/elasticsearch/ElasticSearchNode.java | 3 +
.../elasticsearch/ElasticSearchNodeImpl.java| 59 +---
.../brooklyn/entity/nosql/solr/SolrServer.java | 9 ++-
.../entity/nosql/solr/SolrServerImpl.java | 32 +++
.../nosql/solr/SolrServerEc2LiveTest.java | 36 +++-
.../webapp/nodejs/NodeJsWebAppService.java | 3 +
.../webapp/nodejs/NodeJsWebAppServiceImpl.java | 35
.../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 37 +++-
9 files changed, 171 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/0744b0d6/software/nosql/pom.xml
--
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 8866243..122742a 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -228,6 +228,15 @@
${project.version}
test
+
+
+javax.ws.rs
+javax.ws.rs-api
+test
+
+
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/0744b0d6/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
--
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
index 9e5f8ba..4a3e908 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNode.java
@@ -86,6 +86,9 @@ public interface ElasticSearchNode extends SoftwareProcess,
DatastoreMixins.HasD
StringAttributeSensorAndConfigKey CLUSTER_NAME = new
StringAttributeSensorAndConfigKey("elasticsearch.node.cluster.name",
"Cluster name (or elasticsearch selected if not set", null);
+@SetFromFlag("useHttpMonitoring")
+ConfigKey USE_HTTP_MONITORING =
ConfigKeys.newConfigKey("httpMonitoring.enabled", "HTTP(S) monitoring enabled",
Boolean.TRUE);
+
AttributeSensor NODE_ID =
Sensors.newStringSensor("elasticsearch.node.id");
AttributeSensor DOCUMENT_COUNT =
Sensors.newIntegerSensor("elasticsearch.node.docs.count");
AttributeSensor STORE_BYTES =
Sensors.newIntegerSensor("elasticsearch.node.store.bytes");
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/0744b0d6/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
--
diff --git
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
index c707ee6..a2a4652 100644
---
a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
+++
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeImpl.java
@@ -80,26 +80,39 @@ public class ElasticSearchNodeImpl extends
SoftwareProcessImpl implements Elasti
return
input.get().getAsJsonObject().entrySet().iterator().next().getKey();
}
};
-httpFeed = HttpFeed.builder()
-.entity(this)
-.period(1000)
-.baseUri(String.format("http://%s:%s/_nodes/_local/stats";,
hp.getHostText(), hp.getPort()))
-.poll(new HttpPollConfig(SERVICE_UP)
-.onSuccess(HttpValueFunctions.responseCodeEquals(200))
-.onFailureOrException(Functions.constant(false)))
-.poll(new HttpPollConfig(NODE_ID)
-
.onSuccess(Functionals.chain(HttpValueFunctions.jsonContents(),
MaybeFunctions.wrap(), JsonFunctions.walkM("nodes"), getNodeId))
-.onFailureOrException(Fu
[1/2] brooklyn-library git commit: Move custom-enable-credssp.ps1 to brooklyn-server
Repository: brooklyn-library
Updated Branches:
refs/heads/master be0d23240 -> 3fa4e751e
Move custom-enable-credssp.ps1 to brooklyn-server
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/b30d7c2f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/b30d7c2f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/b30d7c2f
Branch: refs/heads/master
Commit: b30d7c2f589bdb81eca58d1efa57b73eaa7aed96
Parents: be0d232
Author: Valentin Aitken
Authored: Tue Mar 22 23:13:06 2016 +0200
Committer: Valentin Aitken
Committed: Tue Mar 22 23:13:19 2016 +0200
--
.../database/mssql/Custom-Enable-CredSSP.ps1| 131 ---
.../brooklyn/entity/database/mssql/mssql.yaml | 4 +-
2 files changed, 2 insertions(+), 133 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/b30d7c2f/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/Custom-Enable-CredSSP.ps1
--
diff --git
a/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/Custom-Enable-CredSSP.ps1
b/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/Custom-Enable-CredSSP.ps1
deleted file mode 100644
index ef2ee5c..000
---
a/software/database/src/main/resources/org/apache/brooklyn/entity/database/mssql/Custom-Enable-CredSSP.ps1
+++ /dev/null
@@ -1,131 +0,0 @@
-#!ps1
-#
-# 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.
-#
-# Resources:
-# https://github.com/mwrock/boxstarter/blob/master/LICENSE.txt
-#
https://github.com/mwrock/boxstarter/blob/master/Boxstarter.Chocolatey/Enable-BoxstarterCredSSP.ps1
-
-function Custom-Enable-CredSSP {
-<#
-.SYNOPSIS
-Enables and configures CredSSP Authentication to be used in PowerShell
remoting sessions
-
-.DESCRIPTION
-Enabling CredSSP allows a caller from one remote session to authenticate on
other remote
-resources. This is known as credential delegation. By default, PowerShell
sessions do not
-use credSSP and therefore cannot bake a "second hop" to use other remote
resources that
-require their authentication token.
-
-This command will enable CredSSP and add all RemoteHostsToTrust to the CredSSP
trusted
-hosts list. It will also edit the users group policy to allow Fresh Credential
Delegation.
-
-.PARAMETER RemoteHostsToTrust
-A list of ComputerNames to add to the CredSSP Trusted hosts list.
-
-.OUTPUTS
-A list of the original trusted hosts on the local machine.
-
-.EXAMPLE
-Custom-Enable-CredSSP box1,box2
-
-
-#>
-param(
-[string[]] $RemoteHostsToTrust
-)
-
-# Required to be running for using CredSSP
-winrm quickconfig -transport:http -quiet
-
-& winrm set winrm/config/service/auth '@{CredSSP="true"}'
-If ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
-& winrm set winrm/config/client/auth '@{CredSSP="true"}'
-If ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
-
-$Result=@{
-Success=$False;
-PreviousCSSPTrustedHosts=$null;
-PreviousFreshCredDelegationHostCount=0
-}
-
-Write-Host "Configuring CredSSP settings..."
-$credssp = Get-WSManCredSSP
-
-$ComputersToAdd = @()
-$idxHosts=$credssp[0].IndexOf(": ")
-if($idxHosts -gt -1){
-$credsspEnabled=$True
-$Result.PreviousCSSPTrustedHosts=$credssp[0].substring($idxHosts+2)
-$hostArray=$Result.PreviousCSSPTrustedHosts.Split(",")
-$RemoteHostsToTrust | ? { $hostArray -notcontains "wsman/$_" } | % {
$ComputersToAdd += $_ }
-}
-else {
-$ComputersToAdd = $RemoteHostsToTrust
-}
-
-if($ComputersToAdd.Count -gt 0){
-try {
-Enable-WSManCredSSP -DelegateComputer $ComputersToAdd -Role Client
-Force -ErrorAction Stop | Out-Null
-}
-catch {
-Write-BoxstarterMessage "Enable-WSManCredSSP failed with: $_"
-Verbose
-return $result
-}
-}
-
-$key = "HKLM:\SOFTWARE\Policies\Microsoft\Windows"
-if (!
[2/2] brooklyn-library git commit: This closes #22
This closes #22 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/3fa4e751 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/3fa4e751 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/3fa4e751 Branch: refs/heads/master Commit: 3fa4e751e289433be63ee3cf88a125f38b2e43a6 Parents: be0d232 b30d7c2 Author: Aled Sage Authored: Thu Mar 24 16:30:38 2016 + Committer: Aled Sage Committed: Thu Mar 24 16:30:38 2016 + -- .../database/mssql/Custom-Enable-CredSSP.ps1| 131 --- .../brooklyn/entity/database/mssql/mssql.yaml | 4 +- 2 files changed, 2 insertions(+), 133 deletions(-) --
[2/2] brooklyn-server git commit: This closes #75
This closes #75 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3c051adc Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3c051adc Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3c051adc Branch: refs/heads/master Commit: 3c051adc720c6921c6dc5bd032786254b8c0d734 Parents: a4976ed 25aeb0b Author: Aled Sage Authored: Thu Mar 24 16:28:33 2016 + Committer: Aled Sage Committed: Thu Mar 24 16:28:33 2016 + -- .../brooklyn/logback-logger-excludes.xml| 2 +- .../software/base/custom-enable-credssp.ps1 | 131 +++ 2 files changed, 132 insertions(+), 1 deletion(-) --
[1/2] brooklyn-server git commit: Add Windows script for enabling CredSSP
Repository: brooklyn-server
Updated Branches:
refs/heads/master a4976ed19 -> 3c051adc7
Add Windows script for enabling CredSSP
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/25aeb0bb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/25aeb0bb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/25aeb0bb
Branch: refs/heads/master
Commit: 25aeb0bbaea82fe91332b28ac5c6da5b8885bf02
Parents: b8211ed
Author: Valentin Aitken
Authored: Tue Mar 22 23:16:51 2016 +0200
Committer: Valentin Aitken
Committed: Thu Mar 24 15:50:09 2016 +0200
--
.../brooklyn/logback-logger-excludes.xml| 2 +-
.../software/base/custom-enable-credssp.ps1 | 131 +++
2 files changed, 132 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25aeb0bb/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
--
diff --git
a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
index 93e6138..0b3824c 100644
---
a/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
+++
b/logging/logback-includes/src/main/resources/brooklyn/logback-logger-excludes.xml
@@ -62,5 +62,5 @@
-
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/25aeb0bb/software/base/src/main/resources/org/apache/brooklyn/software/base/custom-enable-credssp.ps1
--
diff --git
a/software/base/src/main/resources/org/apache/brooklyn/software/base/custom-enable-credssp.ps1
b/software/base/src/main/resources/org/apache/brooklyn/software/base/custom-enable-credssp.ps1
new file mode 100644
index 000..ef2ee5c
--- /dev/null
+++
b/software/base/src/main/resources/org/apache/brooklyn/software/base/custom-enable-credssp.ps1
@@ -0,0 +1,131 @@
+#!ps1
+#
+# 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.
+#
+# Resources:
+# https://github.com/mwrock/boxstarter/blob/master/LICENSE.txt
+#
https://github.com/mwrock/boxstarter/blob/master/Boxstarter.Chocolatey/Enable-BoxstarterCredSSP.ps1
+
+function Custom-Enable-CredSSP {
+<#
+.SYNOPSIS
+Enables and configures CredSSP Authentication to be used in PowerShell
remoting sessions
+
+.DESCRIPTION
+Enabling CredSSP allows a caller from one remote session to authenticate on
other remote
+resources. This is known as credential delegation. By default, PowerShell
sessions do not
+use credSSP and therefore cannot bake a "second hop" to use other remote
resources that
+require their authentication token.
+
+This command will enable CredSSP and add all RemoteHostsToTrust to the CredSSP
trusted
+hosts list. It will also edit the users group policy to allow Fresh Credential
Delegation.
+
+.PARAMETER RemoteHostsToTrust
+A list of ComputerNames to add to the CredSSP Trusted hosts list.
+
+.OUTPUTS
+A list of the original trusted hosts on the local machine.
+
+.EXAMPLE
+Custom-Enable-CredSSP box1,box2
+
+
+#>
+param(
+[string[]] $RemoteHostsToTrust
+)
+
+# Required to be running for using CredSSP
+winrm quickconfig -transport:http -quiet
+
+& winrm set winrm/config/service/auth '@{CredSSP="true"}'
+If ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+& winrm set winrm/config/client/auth '@{CredSSP="true"}'
+If ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+$Result=@{
+Success=$False;
+PreviousCSSPTrustedHosts=$null;
+PreviousFreshCredDelegationHostCount=0
+}
+
+Write-Host "Configuring CredSSP settings..."
+$credssp = Get-WSManCredSSP
+
+$ComputersToAdd = @()
+$idxHosts=$credssp[0].IndexOf(": ")
+if($idxHosts -gt -1){
+$credsspEnabled=$True
+$Result.PreviousCSSPTrustedHosts=$credssp[0].substring($idxHosts+2)
+$hostArray=$Result.PreviousCSSPTrustedHosts.S
[1/2] brooklyn-docs git commit: Minor wording changes around option of installing binaries in own environment
Repository: brooklyn-docs
Updated Branches:
refs/heads/master 0f14d7ef4 -> 2d5193051
Minor wording changes around option of installing binaries in own environment
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/ba6e888c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/ba6e888c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/ba6e888c
Branch: refs/heads/master
Commit: ba6e888cdb2ab5c8c79c89f61489c653074af89a
Parents: df024e3
Author: Murdo Aird
Authored: Thu Mar 24 11:35:04 2016 +
Committer: Murdo Aird
Committed: Thu Mar 24 11:35:04 2016 +
--
guide/start/running.md | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ba6e888c/guide/start/running.md
--
diff --git a/guide/start/running.md b/guide/start/running.md
index 380fe96..4cb508a 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -9,7 +9,7 @@ This guide will walk you through deploying an example 3-tier
web application to
An overview of core [Brooklyn
concepts](./concept-quickstart.html){:target="_blank"} is available for
reference.
-Two methods of deployment are detailed in this tutorial, using virtualisation
with Vagrant and a local install. Both assume that you are using Linux or Mac
OS X.
+Two methods of deployment are detailed in this tutorial, using virtualisation
with Vagrant and an install in your own environment (such as your local machine
or in your private/public cloud). Both assume that you are using Linux or Mac
OS X. To get you up-and-running quickly, the Vagrant option will provision four
compute nodes for you to deploy applications to.
## Install Apache Brooklyn
@@ -45,7 +45,7 @@ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
-b) Local Install
+b) Install
Download the Apache Brooklyn binary distribution as described on [the download
page]({{site.path.website}}/download/){:target="_blank"}.
@@ -85,7 +85,7 @@ you may wish to set up other configuration options first:
Vagrant
-Local Install
+Install
@@ -108,7 +108,7 @@ $ vagrant ssh brooklyn --command 'sudo journalctl -n15 -f
-u brooklyn'
-b) Local Install
+b) Install
Now start Apache Brooklyn with the following command:
[1/2] brooklyn-docs git commit: Update running.md
Repository: brooklyn-docs
Updated Branches:
refs/heads/master df024e3fa -> 0f14d7ef4
Update running.md
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/6bdb1b96
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/6bdb1b96
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/6bdb1b96
Branch: refs/heads/master
Commit: 6bdb1b96c65786ad9d2d0b1bd38de35cef9e9897
Parents: df024e3
Author: Aleksandr Vasilev
Authored: Thu Mar 24 04:32:06 2016 +0300
Committer: alrick87
Committed: Thu Mar 24 04:50:09 2016 +0300
--
guide/start/running.md | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/6bdb1b96/guide/start/running.md
--
diff --git a/guide/start/running.md b/guide/start/running.md
index 380fe96..8af578e 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -47,8 +47,17 @@ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
b) Local Install
-Download the Apache Brooklyn binary distribution as described on [the download
page]({{site.path.website}}/download/){:target="_blank"}.
+Download the Apache Brooklyn RPM distribution (CentOS 7, RHEL 7.x only) from:
+https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm
+Other binary distributions are also available at [the download
page]({{site.path.website}}/download/){:target="_blank"}.
+
+### Install the RPM package:
+{% highlight bash %}
+$ sudo yum install apache-brooklyn-{{site.brooklyn-version}}-1.rpm
+{% endhighlight %}
+
+### Install from other distributions:
{% if brooklyn_version contains 'SNAPSHOT' %}
Extract the `tar.gz` archive (note: as this is a -SNAPSHOT version, your
filename will be slightly different):
{% else %}
[2/2] brooklyn-docs git commit: This closes #34
This closes #34
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2d519305
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2d519305
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2d519305
Branch: refs/heads/master
Commit: 2d5193051ced7ced254219cf3e7f51c68afc18f5
Parents: 0f14d7e ba6e888
Author: Aled Sage
Authored: Thu Mar 24 14:51:43 2016 +
Committer: Aled Sage
Committed: Thu Mar 24 14:51:43 2016 +
--
guide/start/running.md | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2d519305/guide/start/running.md
--
diff --cc guide/start/running.md
index 8af578e,4cb508a..1566b6f
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@@ -45,19 -45,10 +45,19 @@@ $ cd apache-brooklyn-{{site.brooklyn-ve
- b) Local Install
+ b) Install
-Download the Apache Brooklyn binary distribution as described on [the
download page]({{site.path.website}}/download/){:target="_blank"}.
+Download the Apache Brooklyn RPM distribution (CentOS 7, RHEL 7.x only) from:
+https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm
+Other binary distributions are also available at [the download
page]({{site.path.website}}/download/){:target="_blank"}.
+
+### Install the RPM package:
+{% highlight bash %}
+$ sudo yum install apache-brooklyn-{{site.brooklyn-version}}-1.rpm
+{% endhighlight %}
+
+### Install from other distributions:
{% if brooklyn_version contains 'SNAPSHOT' %}
Extract the `tar.gz` archive (note: as this is a -SNAPSHOT version, your
filename will be slightly different):
{% else %}
[2/2] brooklyn-docs git commit: This closes #33
This closes #33 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/0f14d7ef Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/0f14d7ef Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/0f14d7ef Branch: refs/heads/master Commit: 0f14d7ef466ae3804e5648dfcccb53a508bf9410 Parents: df024e3 6bdb1b9 Author: Aled Sage Authored: Thu Mar 24 13:50:59 2016 + Committer: Aled Sage Committed: Thu Mar 24 13:50:59 2016 + -- guide/start/running.md | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) --
[2/2] brooklyn-server git commit: This closes #77
This closes #77 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a4976ed1 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a4976ed1 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a4976ed1 Branch: refs/heads/master Commit: a4976ed192e78e566cdb9e2e49ff1a698939888a Parents: ae57587 d1abb9a Author: Alex Heneveld Authored: Thu Mar 24 11:55:47 2016 + Committer: Alex Heneveld Committed: Thu Mar 24 11:55:47 2016 + -- parent/pom.xml | 52 1 file changed, 52 deletions(-) --
[1/2] brooklyn-server git commit: Don't skip tests jar generation during tests
Repository: brooklyn-server Updated Branches: refs/heads/master ae57587eb -> a4976ed19 Don't skip tests jar generation during tests Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d1abb9a0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d1abb9a0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d1abb9a0 Branch: refs/heads/master Commit: d1abb9a0d278fd97ee29d20b98de45b21536a79a Parents: 43a8816 Author: Svetoslav Neykov Authored: Wed Mar 23 15:54:05 2016 +0200 Committer: Svetoslav Neykov Committed: Wed Mar 23 18:47:06 2016 +0200 -- parent/pom.xml | 52 1 file changed, 52 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1abb9a0/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 5e721a3..06d10db 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1408,17 +1408,6 @@ - -maven-jar-plugin - - -test-jar-creation - -true - - - - @@ -1443,17 +1432,6 @@ - -maven-jar-plugin - - -test-jar-creation - -true - - - - @@ -1463,21 +1441,6 @@ Live Acceptance,WIP,Broken - - - -maven-jar-plugin - - -test-jar-creation - -true - - - - - - @@ -1486,21 +1449,6 @@ Live-sanity Acceptance,WIP,Broken - - - -maven-jar-plugin - - -test-jar-creation - -true - - - - - -
