You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/05/07 03:20:04 UTC
svn commit: r653962 - in
/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal:
GeronimoRuntimeWizardFragment.java Messages.properties
Author: mcconne
Date: Tue May 6 18:20:04 2008
New Revision: 653962
URL: http://svn.apache.org/viewvc?rev=653962&view=rev
Log:
GERONIMODEVTOOLS-343 Fix valid JVM checks -- Thanks to Ted Kirby for this patch !!
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?rev=653962&r1=653961&r2=653962&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java Tue May 6 18:20:04 2008
@@ -435,14 +435,12 @@
}
private boolean isValidVM() {
- if (getRuntimeDelegate().getRuntime().getRuntimeType().getVersion().startsWith("1")) {
- IVMInstall vmInstall = getRuntimeDelegate().getVMInstall();
- if (vmInstall instanceof IVMInstall2) {
- String javaVersion = ((IVMInstall2) vmInstall).getJavaVersion();
- return javaVersion != null && javaVersion.startsWith("1.4");
- }
- }
- return true;
+ IVMInstall vmInstall = getRuntimeDelegate().getVMInstall();
+ if (vmInstall instanceof IVMInstall2) {
+ String javaVersion = ((IVMInstall2) vmInstall).getJavaVersion();
+ return javaVersion != null && javaVersion.startsWith("1.5");
+ }
+ return false;
}
/*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties?rev=653962&r1=653961&r2=653962&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties Tue May 6 18:20:04 2008
@@ -197,7 +197,7 @@
gWithTomcat=Geronimo with Tomcat
gWithJetty=Geronimo with Jetty
install=Download and Install
-jvmWarning=Geronimo is currently only certified on a 1.4 JVM. Use of any other version is not currently supported.
+jvmWarning=Geronimo is currently only certified on a 1.5 JVM. Use of any other version is not currently supported.
installTitle=Install Confirmation
installMessage=Install Apache Geronimo to {0} ?
tooltipLoc=A location of an existing {0} installation or a path to install to.