You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/06/28 21:49:15 UTC
svn commit: r417861 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/
org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/
Author: sppatel
Date: Wed Jun 28 12:49:15 2006
New Revision: 417861
URL: http://svn.apache.org/viewvc?rev=417861&view=rev
Log:
fix always downloads 1.0
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java?rev=417861&r1=417860&r2=417861&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java Wed Jun 28 12:49:15 2006
@@ -108,4 +108,24 @@
}
return null;
}
+
+ public String getInstallableTomcatRuntimeId() {
+ String version = getRuntime().getRuntimeType().getVersion();
+ if("1.0".equals(version)) {
+ return "org.apache.geronimo.runtime.tomcat.10";
+ } else if("1.1".equals(version)) {
+ return "org.apache.geronimo.runtime.tomcat.11";
+ }
+ return null;
+ }
+
+ public String getInstallableJettyTomcatId() {
+ String version = getRuntime().getRuntimeType().getVersion();
+ if("1.0".equals(version)) {
+ return "org.apache.geronimo.runtime.jetty.10";
+ } else if("1.1".equals(version)) {
+ return "org.apache.geronimo.runtime.jetty.11";
+ }
+ return null;
+ }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java?rev=417861&r1=417860&r2=417861&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java Wed Jun 28 12:49:15 2006
@@ -68,10 +68,6 @@
public class GeronimoServerRuntimeWizardFragment extends ServerDefinitionTypeAwareWizardFragment {
- private static final String G_WITH_TOMCAT_ID = "org.apache.geronimo.runtime.tomcat.10";
-
- private static final String G_WITH_JETTY_ID = "org.apache.geronimo.runtime.jetty.10";
-
private GenericServerCompositeDecorator[] fDecorators;
protected Text installDir;
@@ -159,9 +155,11 @@
data = new GridData();
data = new GridData(GridData.FILL_BOTH);
data.horizontalSpan = 3;
+
+ GenericGeronimoServerRuntime gRuntime = (GenericGeronimoServerRuntime) getRuntimeDelegate().getRuntime().loadAdapter(GenericGeronimoServerRuntime.class, null);
- final IInstallableRuntime gWithTomcat = ServerPlugin.findInstallableRuntime(G_WITH_TOMCAT_ID);
- final IInstallableRuntime gWithJetty = ServerPlugin.findInstallableRuntime(G_WITH_JETTY_ID);
+ final IInstallableRuntime gWithTomcat = ServerPlugin.findInstallableRuntime(gRuntime.getInstallableJettyTomcatId());
+ final IInstallableRuntime gWithJetty = ServerPlugin.findInstallableRuntime(gRuntime.getInstallableJettyTomcatId());
if (gWithTomcat != null && gWithJetty != null) {
group = new Group(composite, SWT.NONE);