geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1393751 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal: GeronimoRuntimeWizardFragment.java Messages.properties
Date Wed, 03 Oct 2012 20:36:24 GMT
Author: gawor
Date: Wed Oct  3 20:36:24 2012
New Revision: 1393751

URL: http://svn.apache.org/viewvc?rev=1393751&view=rev
Log:
GERONIMODEVTOOLS-803: Recognize Java 7

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java?rev=1393751&r1=1393750&r2=1393751&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java
Wed Oct  3 20:36:24 2012
@@ -358,7 +358,7 @@ public class GeronimoRuntimeWizardFragme
         IVMInstall vmInstall = getRuntimeDelegate().getVMInstall();
         if (vmInstall instanceof IVMInstall2) {
             String javaVersion = ((IVMInstall2) vmInstall).getJavaVersion();
-            return javaVersion != null && (javaVersion.startsWith("1.5") || javaVersion.startsWith("1.6"));
+            return javaVersion != null && (javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7"));
         }
         return false;
     }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties?rev=1393751&r1=1393750&r2=1393751&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
Wed Oct  3 20:36:24 2012
@@ -442,7 +442,7 @@ getServer=Get Servers
 DownloadServerText=To download the {1} server, click: <br/> {0} .
 DownloadServerURL=http://geronimo.apache.org/downloads.html
 DownloadOSGiURL=http://www.ibm.com/developerworks/rational/downloads/10/rationaldevtoolsforosgiapplications.html
-jvmWarning={0} requires a 5.0+ JDK (J2SE 1.5.0+).
+jvmWarning={0} requires JRE version 6 or higher. 
 installTitle=Install Confirmation
 installMessage=\nInstall {0} to {1}?
 licenseAgreement=License Agreement:



Mime
View raw message