This closes #829
Conflicts: (all simple package renames in imports)
core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogXmlSerializer.java
software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/storm/StormDeploymentImpl.java
software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/StormAbstractCloudLiveTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b290fdd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b290fdd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b290fdd9
Branch: refs/heads/master
Commit: b290fdd93e902d136be1273a21986dd10c528f16
Parents: bdd8ef9 54f5c36
Author: Alex Heneveld <[email protected]>
Authored: Tue Aug 18 11:52:27 2015 +0100
Committer: Alex Heneveld <[email protected]>
Committed: Tue Aug 18 11:52:27 2015 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java | 2 ++
.../org/apache/brooklyn/entity/database/mysql/MySqlDriver.java | 2 ++
.../brooklyn/entity/database/postgresql/PostgreSqlDriver.java | 2 ++
.../java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java | 2 ++
4 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b290fdd9/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java
----------------------------------------------------------------------
diff --cc
software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java
index 5c841a7,0000000..8ff7905
mode 100644,000000..100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbDriver.java
@@@ -1,31 -1,0 +1,33 @@@
+/*
+ * 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.
+ */
+package org.apache.brooklyn.entity.database.mariadb;
+
+import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
+
++import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
++
+import brooklyn.entity.basic.SoftwareProcessDriver;
+
+/**
+ * The {@link SoftwareProcessDriver} for MariaDB.
+ */
+public interface MariaDbDriver extends SoftwareProcessDriver {
+ public String getStatusCmd();
+ public ProcessTaskWrapper<Integer> executeScriptAsync(String commands);
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b290fdd9/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java
----------------------------------------------------------------------
diff --cc
software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java
index dd63ae1,0000000..0fc89ef
mode 100644,000000..100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlDriver.java
@@@ -1,31 -1,0 +1,33 @@@
+/*
+ * 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.
+ */
+package org.apache.brooklyn.entity.database.mysql;
+
+import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
+
++import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
++
+import brooklyn.entity.basic.SoftwareProcessDriver;
+
+/**
+ * The {@link SoftwareProcessDriver} for MySQL.
+ */
+public interface MySqlDriver extends SoftwareProcessDriver {
+ public String getStatusCmd();
+ public ProcessTaskWrapper<Integer> executeScriptAsync(String commands);
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b290fdd9/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java
----------------------------------------------------------------------
diff --cc
software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java
index c1df992,0000000..f7e331d
mode 100644,000000..100644
---
a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java
+++
b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlDriver.java
@@@ -1,33 -1,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.
+ */
+package org.apache.brooklyn.entity.database.postgresql;
+
+import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
+
++import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
++
+import brooklyn.entity.basic.SoftwareProcessDriver;
+
+/**
+ * The {@link brooklyn.entity.basic.SoftwareProcessDriver} for PostgreSQL.
+ */
+public interface PostgreSqlDriver extends SoftwareProcessDriver {
+
+ String getStatusCmd();
+
+ ProcessTaskWrapper<Integer> executeScriptAsync(String commands);
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b290fdd9/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java
----------------------------------------------------------------------
diff --cc
software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java
index ed34c1e,0000000..dbd1b7b
mode 100644,000000..100644
---
a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java
+++
b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/kafka/Kafka.java
@@@ -1,45 -1,0 +1,47 @@@
+/*
+ * 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.
+ */
+package org.apache.brooklyn.entity.messaging.kafka;
+
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
+
++import org.apache.brooklyn.core.util.flags.SetFromFlag;
++
+import brooklyn.config.ConfigKey;
+import brooklyn.entity.basic.Attributes;
+import brooklyn.entity.basic.ConfigKeys;
+import brooklyn.entity.basic.SoftwareProcess;
+import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
+
+/**
+ * Shared Kafka broker and zookeeper properties.
+ */
+public interface Kafka {
+
+ ConfigKey<String> SUGGESTED_VERSION =
ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION,
"2.9.2-0.8.2.1");
+
+ @SetFromFlag("downloadUrl")
+ BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = new
BasicAttributeSensorAndConfigKey<String>(
+ Attributes.DOWNLOAD_URL,
"http://apache.cbox.biz/kafka/0.8.2.1/kafka_${version}.tgz";);
+
+ // TODO: Upgrade to version 0.8.0, which will require refactoring of the
sensors to reflect the changes to the JMX beans
+// @SetFromFlag("downloadUrl")
+// BasicAttributeSensorAndConfigKey<String> DOWNLOAD_URL = new
BasicAttributeSensorAndConfigKey<String>(
+// Attributes.DOWNLOAD_URL,
"http://mirror.catn.com/pub/apache/kafka/${version}/kafka-${version}-src.tgz";);
+
+}
