geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r685026 - in /geronimo/devtools/eclipse-plugin/trunk: assembly/ assembly/src/main/assembly/ features/ features/org.apache.geronimo.server.jetty.v20.feature/ features/org.apache.geronimo.server.jetty.v21.feature/ features/org.apache.geronimo...
Date Tue, 12 Aug 2008 02:45:57 GMT
Author: tkirby
Date: Mon Aug 11 19:45:56 2008
New Revision: 685026

URL: http://svn.apache.org/viewvc?rev=685026&view=rev
Log:
GERONIMODEVTOOLS-476 Don't download server images. Refer to AG website for this.

Removed:
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v21.feature/
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v21.feature/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/ConfirmInstallDialog.java
Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
    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.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/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=685026&r1=685025&r2=685026&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Mon Aug 11 19:45:56 2008
@@ -132,30 +132,6 @@
          -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.server.jetty.v20.feature</artifactId>
-            <version>${org.apache.geronimo.server.jetty.v20.feature_version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.server.tomcat.v20.feature</artifactId>
-            <version>${org.apache.geronimo.server.tomcat.v20.feature_version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.server.jetty.v21.feature</artifactId>
-            <version>${org.apache.geronimo.server.jetty.v21.feature_version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.server.tomcat.v21.feature</artifactId>
-            <version>${org.apache.geronimo.server.tomcat.v21.feature_version}</version>
-        </dependency>
-           
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.v20.feature</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=685026&r1=685025&r2=685026&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Mon Aug
11 19:45:56 2008
@@ -69,10 +69,6 @@
             <outputDirectory>eclipse/features/</outputDirectory>
             <unpack>true</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v20.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v20.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v21.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v21.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
             </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml?rev=685026&r1=685025&r2=685026&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml Mon Aug 11
19:45:56 2008
@@ -107,12 +107,6 @@
     <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1.jar"
id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.1">
         <category name="Geronimo Runtime"/>
     </feature>
-    <feature url="features/org.apache.geronimo.server.jetty.v20.feature_2.1.2.jar" id="org.apache.geronimo.server.jetty.v20.feature"
version="2.1.2">
-        <category name="Geronimo Runtime"/>
-    </feature>
-    <feature url="features/org.apache.geronimo.server.jetty.v21.feature_2.1.2.jar" id="org.apache.geronimo.server.jetty.v21.feature"
version="2.1.2">
-        <category name="Geronimo Runtime"/>
-    </feature>
     
     <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_1.0.0/geronimo-jetty-j2ee-1.0.zip"
        url="../../1.0/geronimo-jetty-j2ee-1.0.zip"/>
     <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_1.1.0/geronimo-jetty-j2ee-1.1.zip"
        url="../../1.1/geronimo-jetty-j2ee-1.1.zip"/>
@@ -120,8 +114,6 @@
     <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1/geronimo-jetty6-jee5-2.0.1.zip"
     url="../../2.0.1/geronimo-jetty6-jee5-2.0.1-bin.zip"/>
     <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0/geronimo-jetty6-javaee5-2.1.zip"
    url="../../2.1/geronimo-jetty6-javaee5-2.1-bin.zip"/>
     <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1/geronimo-jetty6-javaee5-2.1.1.zip"
  url="../../2.1.1/geronimo-jetty6-javaee5-2.1.1-bin.zip"/>
-    <archive path="features/org.apache.geronimo.server.jetty.v20.feature_2.1.2/geronimo-jetty6-jee5-2.0.2.zip"
  url="../../2.0.2/geronimo-jetty6-javaee5-2.0.2-bin.zip"/>
-    <archive path="features/org.apache.geronimo.server.jetty.v21.feature_2.1.2/geronimo-jetty6-javaee5-2.1.2.zip"
  url="../../2.1.2/geronimo-jetty6-javaee5-2.1.2-bin.zip"/>
 
     
     <!-- 
@@ -147,12 +139,6 @@
     <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1.jar"
id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.1.1">
         <category name="Geronimo Runtime"/>
     </feature>
-    <feature url="features/org.apache.geronimo.server.tomcat.v20.feature_2.1.2.jar" id="org.apache.geronimo.server.tomcat.v20.feature"
version="2.1.2">
-        <category name="Geronimo Runtime"/>
-    </feature>
-    <feature url="features/org.apache.geronimo.server.tomcat.v21.feature_2.1.2.jar" id="org.apache.geronimo.server.tomcat.v21.feature"
version="2.1.2">
-        <category name="Geronimo Runtime"/>
-    </feature>
 
     <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_1.0.0/geronimo-tomcat-j2ee-1.0.zip"
          url="../../1.0/geronimo-tomcat-j2ee-1.0.zip"/>
     <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_1.1.0/geronimo-tomcat-j2ee-1.1.zip"
          url="../../1.1/geronimo-tomcat-j2ee-1.1.zip"/>
@@ -160,7 +146,5 @@
     <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1/geronimo-tomcat6-jee5-2.0.1.zip"
       url="../../2.0.1/geronimo-tomcat6-jee5-2.0.1-bin.zip"/>
     <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0/geronimo-tomcat6-javaee5-2.1.zip"
      url="../../2.1/geronimo-tomcat6-javaee5-2.1-bin.zip"/>
     <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1/geronimo-tomcat6-javaee5-2.1.1.zip"
    url="../../2.1.1/geronimo-tomcat6-javaee5-2.1.1-bin.zip"/>
-    <archive path="features/org.apache.geronimo.server.tomcat.v20.feature_2.1.2/geronimo-tomcat6-jee5-2.0.2.zip"
    url="../../2.0.2/geronimo-tomcat6-jee5-2.0.2-bin.zip"/>
-    <archive path="features/org.apache.geronimo.server.tomcat.v21.feature_2.1.2/geronimo-tomcat6-javaee5-2.1.2.zip"
    url="../../2.1.2/geronimo-tomcat6-javaee5-2.1.2-bin.zip"/>
   
 </site>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=685026&r1=685025&r2=685026&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Mon Aug
11 19:45:56 2008
@@ -68,10 +68,6 @@
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v20.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v20.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v21.feature</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v21.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
             </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=685026&r1=685025&r2=685026&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Mon Aug 11 19:45:56 2008
@@ -31,9 +31,5 @@
     <modules>
         <module>org.apache.geronimo.v20.feature</module>
         <module>org.apache.geronimo.v21.feature</module>
-        <module>org.apache.geronimo.server.jetty.v20.feature</module>
-        <module>org.apache.geronimo.server.jetty.v21.feature</module>
-        <module>org.apache.geronimo.server.tomcat.v20.feature</module>
-        <module>org.apache.geronimo.server.tomcat.v21.feature</module>
     </modules>
 </project>

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=685026&r1=685025&r2=685026&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
Mon Aug 11 19:45:56 2008
@@ -17,7 +17,8 @@
 package org.apache.geronimo.st.ui.internal;
 
 import java.io.File;
-import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -25,9 +26,7 @@
 
 import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
 import org.apache.geronimo.st.ui.Activator;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
@@ -35,9 +34,7 @@
 import org.eclipse.jdt.launching.IVMInstall2;
 import org.eclipse.jdt.launching.IVMInstallType;
 import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.preference.IPreferenceNode;
 import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.jface.preference.PreferenceManager;
@@ -55,19 +52,21 @@
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.browser.IWebBrowser;
+import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.widgets.FormText;
+import org.eclipse.ui.internal.browser.WorkbenchBrowserSupport;
 import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.IRuntimeType;
 import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
 import org.eclipse.wst.server.core.ServerCore;
 import org.eclipse.wst.server.core.TaskModel;
-import org.eclipse.wst.server.core.internal.IInstallableRuntime;
-import org.eclipse.wst.server.core.internal.InstallableRuntime;
-import org.eclipse.wst.server.core.internal.ServerPlugin;
 import org.eclipse.wst.server.core.model.RuntimeDelegate;
 import org.eclipse.wst.server.ui.internal.SWTUtil;
 import org.eclipse.wst.server.ui.wizard.IWizardHandle;
@@ -85,12 +84,6 @@
 
     protected Text installDir;
 
-    private Button tomcat;
-
-    private Button jetty;
-
-    protected Group group;
-
     private IWizardHandle fWizard;
 
     protected List<IVMInstall> installedJREs;
@@ -129,7 +122,7 @@
         handle.setImageDescriptor(Activator.getImageDescriptor((Activator.IMG_WIZ_GERONIMO)));
         handle.setTitle(Messages.bind(Messages.runtimeWizardTitle, getRuntimeName()));
         String name = getGeronimoRuntime().getRuntime().getRuntimeType().getName();
-        handle.setDescription(Messages.bind(Messages.runtimeWizardDescription, name));
+        //handle.setDescription(Messages.bind(Messages.runtimeWizardDescription, name));
         createContent(container, handle);
         return container;
     }
@@ -143,153 +136,40 @@
 
         addJRESelection(composite);
         addInstallDirSection(composite);
-        addInstallableRuntimeSection(composite);
+        addDownloadServerSection(composite);
     }
 
-    protected void addInstallableRuntimeSection(Composite composite) {
-        GridData data = new GridData();
-        data = new GridData(GridData.FILL_BOTH);
-        data.horizontalSpan = 3;
-
-        GeronimoRuntimeDelegate gRuntime = getGeronimoRuntime();
-
-        final IInstallableRuntime gWithTomcat = ServerPlugin.findInstallableRuntime(gRuntime
-                .getInstallableTomcatRuntimeId());
-        final IInstallableRuntime gWithJetty = ServerPlugin.findInstallableRuntime(gRuntime
-                .getInstallableJettyRuntimeId());
-
-        if (gWithTomcat != null && gWithJetty != null) {
-            group = new Group(composite, SWT.NONE);
-            group.setText(Messages.downloadOptions);
-            group.setLayoutData(data);
-            group.setLayout(composite.getLayout());
-            group.setEnabled(false);
-
-            Label webContainer = new Label(group, SWT.NONE);
-            webContainer.setText(Messages.chooseWebContainer);
-            data = new GridData();
-            data.horizontalSpan = 3;
-            webContainer.setLayoutData(data);
-
-            tomcat = new Button(group, SWT.RADIO);
-            tomcat.setSelection(true);
-            tomcat.setText(Messages.gWithTomcat);
-            data = new GridData();
-            data.horizontalSpan = 3;
-            tomcat.setLayoutData(data);
-            tomcat.setToolTipText(Messages.tooltipTomcat);
-
-            jetty = new Button(group, SWT.RADIO);
-            jetty.setText(Messages.gWithJetty);
-            data = new GridData();
-            data.horizontalSpan = 3;
-            jetty.setLayoutData(data);
-            jetty.setToolTipText(Messages.tooltipJetty);
-
-            Button install = SWTUtil.createButton(group, Messages.install);
-            data = new GridData();
-            data.horizontalSpan = 3;
-            install.setLayoutData(data);
-            String runtimeName = getRuntimeName();
-            install.setToolTipText(Messages.bind(Messages.tooltipInstall, getRuntimeName()));
-            install.addSelectionListener(new SelectionAdapter() {
-                private String license;
-
-                public void widgetSelected(SelectionEvent se) {
-                    if (installDir != null && isValidLocation()) {
-                        Shell shell = installDir.getShell();
-
-                        final IInstallableRuntime installable = tomcat.getSelection() ? gWithTomcat
: gWithJetty;
-                        final Path installPath = new Path(installDir.getText());
-                        
-                        license = null;
-                        
-                        IRunnableWithProgress runnable = new IRunnableWithProgress() {
-                            public void run(IProgressMonitor monitor) throws InvocationTargetException,
-                                    InterruptedException {
-                                try {
-                                    license = installable.getLicense(monitor);
-                                } catch (CoreException e) {
-                                    Trace.trace(Trace.SEVERE, "Error installing runtime",
e);
-                                }
-                            }
-                        };
-
-                        try {
-                            getWizard().run(true, false, runnable);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        } catch (InvocationTargetException e) {
-                            e.printStackTrace();
-                        } catch (Exception e) {
-                            Trace.trace(Trace.SEVERE, "Error installing runtime", e);
-                        }
-                        
-                        ConfirmInstallDialog dialog = new ConfirmInstallDialog(shell, getRuntimeName(),
installDir
-                                .getText(), license);
-                        dialog.open();
-                        if (dialog.getReturnCode() == IDialogConstants.OK_ID) {
-
-                            runnable = new IRunnableWithProgress() {
-                                public void run(IProgressMonitor monitor) throws InvocationTargetException,
-                                        InterruptedException {
-                                    try {
-                                        installable.install(installPath, monitor);
-                                    } catch (CoreException e) {
-                                        Trace.trace(Trace.SEVERE, "Error installing runtime",
e);
-                                    }
-                                }
-                            };
-
-                            try {
-                                getWizard().run(true, false, runnable);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            } catch (InvocationTargetException e) {
-                                e.printStackTrace();
-                            } catch (Exception e) {
-                                Trace.trace(Trace.SEVERE, "Error installing runtime", e);
-                            }
-
-                            updateInstallDir(installPath);
-
-                        }
-                    }
-                }
-
-                boolean isValidLocation() {
-                    return true;
-                }
-
-                /**
-                 * server zips have the server name in them as the root
-                 * directory. We need to add that to the install directory. The
-                 * server name comes from the installableruntime definitions in
-                 * org.apache.gernoimo.st.v2{0.1}.core/plugin.xml. A main method
-                 * below is used to test this code in development.
-                 * 
-                 * @param installPath
-                 */
-                void updateInstallDir(IPath installPath) {
-                    InstallableRuntime installable = (InstallableRuntime) (tomcat.getSelection()
? gWithTomcat
-                            : gWithJetty);
-                    String path = installable.getPath();
-                    Matcher matcher = SERVER_NAME_VERSION_PATTERN.matcher(path);
-                    if (matcher.find()) {
-                        String serverName = matcher.group(1);
-                        String serverVersion = matcher.group(2);
-                        installPath = installPath.append(serverName + serverVersion);
-                    } else {
-                        Trace.trace(Trace.SEVERE, "No version found in path = " + path);
-                        installPath = installPath.append(path);
-                    }
-                    installDir.setText(installPath.toOSString());
-                }
-            });
-        } else {
-            Trace.trace(Trace.SEVERE, "Error finding installable runtime(s)");
-        }
-    }
+    protected void addDownloadServerSection(final Composite composite) {
+		FormText downloadServerText = new FormText(composite, SWT.WRAP);
+		IRuntime runtime = getRuntimeDelegate().getRuntime();
+		String runtimeName = runtime.getRuntimeType().getName();
+		String text = "<form>"
+				+ Messages.bind(Messages.DownloadServerText,
+						Messages.DownloadServerURL, runtimeName) + "</form>";
+		downloadServerText.setText(text, true, true);
+		GridData data = new GridData();
+		data.horizontalSpan = 3;
+		downloadServerText.setLayoutData(data);
+		downloadServerText.addHyperlinkListener(new HyperlinkAdapter() {
+			@Override
+			public void linkActivated(HyperlinkEvent hyperlinkEvent) {
+				String url = hyperlinkEvent.getHref().toString();
+				Trace.trace(Trace.INFO, "Hyperlink " + url + ".");
+				try {
+					int style = IWorkbenchBrowserSupport.AS_EXTERNAL
+							| IWorkbenchBrowserSupport.STATUS;
+					IWebBrowser browser = WorkbenchBrowserSupport.getInstance()
+							.createBrowser(style, "download server",
+									"get server", "tool tip");
+					browser.openURL(new URL(url));
+				} catch (MalformedURLException e) {
+					e.printStackTrace();
+				} catch (PartInitException e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
 
     protected GeronimoRuntimeDelegate getGeronimoRuntime() {
         if (geronimoRuntime == null)
@@ -447,10 +327,8 @@
             IStatus status = runtimeWC.validate(null);
             if (status == null || status.isOK()) {
                 // a valid install found
-                wizard.setMessage(null, IMessageProvider.NONE);
-                group.setEnabled(false);
+                wizard.setMessage(Messages.bind(Messages.serverDetected, runtimeName), IMessageProvider.NONE);
             } else if (status.getCode() == GeronimoRuntimeDelegate.INCORRECT_VERSION) {
-                group.setEnabled(false);
                 if (status.getSeverity() == IStatus.ERROR) {
                     wizard.setMessage(status.getMessage(), IMessageProvider.ERROR);
                     return;
@@ -461,8 +339,6 @@
                 return;
             } else {
                 File file = new Path(installDir.getText()).toFile();
-                boolean enableGroup = file.isDirectory() && file.canWrite() ? true
: false;
-                group.setEnabled(enableGroup);
                 if (file.isDirectory()) {
                     String message = file.canWrite() ? Messages.noImageFound : Messages.cannotInstallAtLocation;
                     message = Messages.bind(message, runtimeName);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.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/Messages.java?rev=685026&r1=685025&r2=685026&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
Mon Aug 11 19:45:56 2008
@@ -70,19 +70,21 @@
     public static String installedJRE;
     public static String installedJREs;
     public static String runtimeDefaultJRE;
-    public static String runtimeWizardTitle;    
-    public static String runtimeWizardDescription;
+    public static String runtimeWizardTitle; 
     public static String browse;
     public static String installDir;
     public static String installDirInfo;
     public static String noSuchDir;
     public static String noImageFound;
     public static String cannotInstallAtLocation;
+    public static String serverDetected;
     public static String downloadOptions;
     public static String chooseWebContainer;
     public static String gWithTomcat;
     public static String gWithJetty;
-    public static String install;
+    public static String DownloadServerButtonLabel;
+    public static String DownloadServerText;
+    public static String DownloadServerURL;
     public static String jvmWarning;
     public static String installTitle;
     public static String installMessage;

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=685026&r1=685025&r2=685026&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
Mon Aug 11 19:45:56 2008
@@ -240,18 +240,20 @@
 installedJREs=&Installed JREs...
 runtimeDefaultJRE=Workbench default JRE
 runtimeWizardTitle=New {0} Runtime
-runtimeWizardDescription=Specify the location of an existing {0} installation.  If none exists,
specify an install location and press "Download and Install".
 browse=Browse
 installDir=Application Server Installation Directory:
-installDirInfo=Please enter the directory where {0} is currently installed or where you would
like it to be installed.
+installDirInfo=Please enter the directory where {0} is installed.
 noSuchDir=The specified directory does not exist.
-noImageFound=A {0} installation does not exist at this location.  You can install an image
at this location.
+noImageFound=A {0} installation does not exist at this location.
 cannotInstallAtLocation=A {0} installation cannot be found nor can it be installed at this
location.
+serverDetected {0} installation detected.  Press Next to continue.
 downloadOptions=Download Options
 chooseWebContainer=Select a web container:
 gWithTomcat=Geronimo with Tomcat
 gWithJetty=Geronimo with Jetty
-install=Download and Install
+DownloadServerButtonLabel=Download Server
+DownloadServerText=To download the {1} server, click: <br/> {0} .
+DownloadServerURL=http://geronimo.apache.org/downloads.html
 jvmWarning={0} is currently only certified on a 1.5 JVM. Use of any other version is not
currently supported.
 installTitle=Install Confirmation
 installMessage=\nInstall {0} to {1} ?



Mime
View raw message