brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [1/8] git commit: Deprecate JcloudsUtil unused methods
Date Fri, 25 Jul 2014 16:45:38 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 1107f2f15 -> 2a4de4d72


Deprecate JcloudsUtil unused methods


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f5eb35b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f5eb35b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f5eb35b3

Branch: refs/heads/master
Commit: f5eb35b323266f97bdc79d5b560fc861737ee875
Parents: b5ea764
Author: Aled Sage <aled.sage@gmail.com>
Authored: Mon Jul 21 17:47:42 2014 +0100
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Tue Jul 22 12:37:04 2014 +0100

----------------------------------------------------------------------
 .../brooklyn/location/jclouds/JcloudsUtil.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5eb35b3/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsUtil.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsUtil.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsUtil.java
index c0f6555..f3fdb34 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsUtil.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsUtil.java
@@ -77,6 +77,7 @@ import brooklyn.util.collections.MutableList;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.config.ConfigBag;
 import brooklyn.util.net.Protocol;
+import brooklyn.util.ssh.BashCommands;
 import brooklyn.util.ssh.IptablesCommands;
 import brooklyn.util.ssh.IptablesCommands.Chain;
 import brooklyn.util.ssh.IptablesCommands.Policy;
@@ -154,6 +155,10 @@ public class JcloudsUtil implements JcloudsLocationConfig {
         }
     }
     
+    /**
+     * @deprecated since 0.7; {@see #installJavaAndCurl(OperatingSystem)}
+     */
+    @Deprecated
     public static final Statement APT_RUN_SCRIPT = newStatementList(//
           exec(installAfterUpdatingIfNotPresent("curl")),//
           exec("(which java && java -fullversion 2>&1|egrep -q 1.6 ) ||"),//
@@ -165,6 +170,10 @@ public class JcloudsUtil implements JcloudsLocationConfig {
                 .append("echo \"export PATH=\\\"$JAVA_HOME/bin/:$PATH\\\"\" >> /root/.bashrc")//
                 .toString()));
 
+    /**
+     * @deprecated since 0.7; {@see #installJavaAndCurl(OperatingSystem)}
+     */
+    @Deprecated
     public static final Statement YUM_RUN_SCRIPT = newStatementList(
           exec("which curl ||yum --nogpgcheck -y install curl"),//
           exec("(which java && java -fullversion 2>&1|egrep -q 1.6 ) ||"),//
@@ -174,6 +183,10 @@ public class JcloudsUtil implements JcloudsLocationConfig {
                 .append("echo \"export PATH=\\\"$JAVA_HOME/bin/:$PATH\\\"\" >> /root/.bashrc")//
                 .toString()));
 
+    /**
+     * @deprecated since 0.7; {@see #installJavaAndCurl(OperatingSystem)}
+     */
+    @Deprecated
     public static final Statement ZYPPER_RUN_SCRIPT = exec(new StringBuilder()//
           .append("echo nameserver 208.67.222.222 >> /etc/resolv.conf\n")//
           .append("which curl || zypper install curl\n")//
@@ -181,6 +194,10 @@ public class JcloudsUtil implements JcloudsLocationConfig {
           .toString());
 
     // Code taken from RunScriptData
+    /**
+     * @deprecated since 0.7; see {@link BashCommands#installJava7()} and {@link BashCommands#INSTALL_CURL}
+     */
+    @Deprecated
     public static Statement installJavaAndCurl(OperatingSystem os) {
        if (os == null || OperatingSystemPredicates.supportsApt().apply(os))
           return APT_RUN_SCRIPT;


Mime
View raw message