You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2018/03/26 12:51:39 UTC
[1/2] brooklyn-library git commit: Deprecate JBoss 6 entity
Repository: brooklyn-library
Updated Branches:
refs/heads/master a2814bba2 -> 4cb4272ba
Deprecate JBoss 6 entity
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/8b0da414
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/8b0da414
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/8b0da414
Branch: refs/heads/master
Commit: 8b0da414de7159e0cceafb940afb8e40db4501c5
Parents: a2814bb
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Fri Mar 9 13:45:05 2018 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Mon Mar 26 09:30:58 2018 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/webapp/jboss/JBoss6Driver.java | 4 ++++
.../org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java | 6 ++++++
.../apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java | 4 ++++
.../apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java | 4 ++++
software/webapp/src/main/resources/catalog.bom | 3 ++-
5 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8b0da414/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Driver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Driver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Driver.java
index d8ba9d7..b6c07f9 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Driver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Driver.java
@@ -20,5 +20,9 @@ package org.apache.brooklyn.entity.webapp.jboss;
import org.apache.brooklyn.entity.webapp.JavaWebAppDriver;
+/**
+ * @deprecated since 1.0.0; JBoss 6 is EOF
+ */
+@Deprecated
public interface JBoss6Driver extends JavaWebAppDriver {
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8b0da414/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java
index 73100b2..eb59cfc 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java
@@ -29,6 +29,12 @@ import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.time.Duration;
+import com.google.gson.annotations.Since;
+
+/**
+ * @deprecated since 1.0.0; JBoss 6 is EOF
+ */
+@Deprecated
@Catalog(name="JBoss Application Server 6", description="AS6: an open source Java application server from JBoss", iconUrl="classpath:///jboss-logo.png")
@ImplementedBy(JBoss6ServerImpl.class)
public interface JBoss6Server extends JavaWebAppSoftwareProcess, UsesJmx {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8b0da414/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java
index ecbd0c5..6520c09 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java
@@ -30,6 +30,10 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Functions;
+/**
+ * @deprecated since 1.0.0; JBoss 6 is EOF
+ */
+@Deprecated
public class JBoss6ServerImpl extends JavaWebAppSoftwareProcessImpl implements JBoss6Server {
public static final Logger log = LoggerFactory.getLogger(JBoss6ServerImpl.class);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8b0da414/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
index 1ed0e64..0efc517 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
@@ -39,6 +39,10 @@ import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.ssh.BashCommands;
import org.apache.brooklyn.util.time.Duration;
+/**
+ * @deprecated since 1.0.0; JBoss 6 is EOF
+ */
+@Deprecated
public class JBoss6SshDriver extends JavaWebAppSshDriver implements JBoss6Driver {
public static final String SERVER_TYPE = "standard";
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/8b0da414/software/webapp/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/resources/catalog.bom b/software/webapp/src/main/resources/catalog.bom
index 38ab15e..801afa1 100644
--- a/software/webapp/src/main/resources/catalog.bom
+++ b/software/webapp/src/main/resources/catalog.bom
@@ -48,8 +48,9 @@ brooklyn.catalog:
iconUrl: classpath:///jboss_logo.png
item:
type: org.apache.brooklyn.entity.webapp.jboss.JBoss6Server
- name: JBoss Application Server 6
+ name: "[DEPRECATED] JBoss Application Server 6"
description: AS6 - an open source Java application server from JBoss
+ deprecated: true
- id: org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server
iconUrl: classpath:///tomcat-logo.png
item:
[2/2] brooklyn-library git commit: Closes #150
Posted by ge...@apache.org.
Closes #150
Deprecate JBoss 6 entity
Same reason with #149, but this version is even older
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/4cb4272b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/4cb4272b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/4cb4272b
Branch: refs/heads/master
Commit: 4cb4272ba97605421d650253059d0ae550937905
Parents: a2814bb 8b0da41
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon Mar 26 13:51:31 2018 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon Mar 26 13:51:31 2018 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/webapp/jboss/JBoss6Driver.java | 4 ++++
.../org/apache/brooklyn/entity/webapp/jboss/JBoss6Server.java | 6 ++++++
.../apache/brooklyn/entity/webapp/jboss/JBoss6ServerImpl.java | 4 ++++
.../apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java | 4 ++++
software/webapp/src/main/resources/catalog.bom | 3 ++-
5 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------