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:52:21 UTC
[1/2] brooklyn-library git commit: Deprecate JBoss 7 entity
Repository: brooklyn-library
Updated Branches:
refs/heads/master 4cb4272ba -> 564e0bbe3
Deprecate JBoss 7 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/497f0a47
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/497f0a47
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/497f0a47
Branch: refs/heads/master
Commit: 497f0a477812e80803015755258ad2ad64eeb9db
Parents: a2814bb
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Fri Mar 9 13:41:26 2018 +0000
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Mon Mar 26 09:31:57 2018 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7Driver.java | 4 ++++
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java | 4 ++++
.../apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 4 ++++
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java | 4 ++++
software/webapp/src/main/resources/catalog.bom | 3 ++-
5 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/497f0a47/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Driver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Driver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Driver.java
index ad5e101..2bd858d 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Driver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Driver.java
@@ -20,6 +20,10 @@ package org.apache.brooklyn.entity.webapp.jboss;
import org.apache.brooklyn.entity.webapp.JavaWebAppDriver;
+/**
+ * @deprecated since 1.0.0; JBoss 7 is EOF
+ */
+@Deprecated
public interface JBoss7Driver extends JavaWebAppDriver{
/**
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/497f0a47/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java
index 7cb3e1b..af84504 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java
@@ -33,6 +33,10 @@ import org.apache.brooklyn.util.core.ResourcePredicates;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
import org.apache.brooklyn.util.javalang.JavaClassNames;
+/**
+ * @deprecated since 1.0.0; JBoss 7 is EOF
+ */
+@Deprecated
@Catalog(name="JBoss Application Server 7", description="AS7: an open source Java application server from JBoss", iconUrl="classpath:///jboss-logo.png")
@ImplementedBy(JBoss7ServerImpl.class)
public interface JBoss7Server extends JavaWebAppSoftwareProcess, HasShortName {
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/497f0a47/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
index 198cafa..b1dfba8 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java
@@ -37,6 +37,10 @@ import com.google.common.base.Functions;
import com.google.common.collect.ImmutableMap;
import com.google.common.net.HostAndPort;
+/**
+ * @deprecated since 1.0.0; JBoss 7 is EOF
+ */
+@Deprecated
public class JBoss7ServerImpl extends JavaWebAppSoftwareProcessImpl implements JBoss7Server {
public static final Logger log = LoggerFactory.getLogger(JBoss7ServerImpl.class);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/497f0a47/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
index 3627c27..7a079d7 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java
@@ -45,6 +45,10 @@ import com.google.common.base.Preconditions;
import com.google.common.hash.Hashing;
import com.google.common.io.BaseEncoding;
+/**
+ * @deprecated since 1.0.0; JBoss 7 is EOF
+ */
+@Deprecated
public class JBoss7SshDriver extends JavaWebAppSshDriver implements JBoss7Driver {
private static final Logger LOG = LoggerFactory.getLogger(JBoss7SshDriver.class);
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/497f0a47/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..7b762dd 100644
--- a/software/webapp/src/main/resources/catalog.bom
+++ b/software/webapp/src/main/resources/catalog.bom
@@ -28,8 +28,9 @@ brooklyn.catalog:
iconUrl: classpath:///jboss_logo.png
item:
type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
- name: JBoss Application Server 7
+ name: "[DEPRECATED] JBoss Application Server 7"
description: AS7 - an open source Java application server from JBoss
+ deprecated: true
- id: org.apache.brooklyn.entity.proxy.nginx.UrlMapping
item:
type: org.apache.brooklyn.entity.proxy.nginx.UrlMapping
[2/2] brooklyn-library git commit: Closes #149
Posted by ge...@apache.org.
Closes #149
Deprecate JBoss 7 entity
As the title, this deprecates JBoss 7, mainly because it is EOF.
See discussion here: https://lists.apache.org/thread.html/26d0225c8608fb398c2ea7b2d097a8a8784710c3bc7ea86270da28b4@%3Cdev.brooklyn.apache.org%3E
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/564e0bbe
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/564e0bbe
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/564e0bbe
Branch: refs/heads/master
Commit: 564e0bbe3236698cb4e196abe76a601136107333
Parents: 4cb4272 497f0a4
Author: Geoff Macartney <ge...@cloudsoftcorp.com>
Authored: Mon Mar 26 13:52:12 2018 +0100
Committer: Geoff Macartney <ge...@cloudsoftcorp.com>
Committed: Mon Mar 26 13:52:12 2018 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7Driver.java | 4 ++++
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7Server.java | 4 ++++
.../apache/brooklyn/entity/webapp/jboss/JBoss7ServerImpl.java | 4 ++++
.../org/apache/brooklyn/entity/webapp/jboss/JBoss7SshDriver.java | 4 ++++
software/webapp/src/main/resources/catalog.bom | 3 ++-
5 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/564e0bbe/software/webapp/src/main/resources/catalog.bom
----------------------------------------------------------------------