| commit | c20857da53728b882117ab4e3d3613f13c27ca21 | [log] [tgz] |
|---|---|---|
| author | Duncan Godwin <duncan.godwin@cloudsoftcorp.com> | Fri Apr 14 13:23:48 2017 +0100 |
| committer | Richard Downer <richard@apache.org> | Tue Apr 18 13:40:16 2017 +0100 |
| tree | 56d0616c86a9e374bd804aaaa7a11803062c03d3 | |
| parent | 52962b0bc4ce64e364d6d8a5aa5dc23229f467a0 [diff] |
Specify Java version for JBoss (cherry picked from commit e8c7b9e9baf6d2f9c58cd5ef52d2821721c4d24f)
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 70d6a14..1426f5b 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
@@ -90,6 +90,14 @@ } @Override + public boolean installJava() { + /* + * JBoss only works on Java 7 or lower, see here: https://developer.jboss.org/message/808212 + */ + return checkForAndInstallJava("1.7"); + } + + @Override public void install() { List<String> urls = resolver.getTargets(); String saveAs = resolver.getFilename();
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 8a40947..5812f3a 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
@@ -110,6 +110,14 @@ } @Override + public boolean installJava() { + /* + * JBoss only works on Java 7 or lower, see here: https://developer.jboss.org/message/808212 + */ + return checkForAndInstallJava("1.7"); + } + + @Override public void install() { List<String> urls = resolver.getTargets(); String saveAs = resolver.getFilename();