Author: sppatel
Date: Mon Jul 2 05:37:06 2007
New Revision: 552483
URL: http://svn.apache.org/viewvc?view=rev&rev=552483
Log:
GERONIMODEVTOOLS-172 enable customization of New/Edit Server Runtime wizard
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeSourceWizardFragment.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?view=diff&rev=552483&r1=552482&r2=552483
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
Mon Jul 2 05:37:06 2007
@@ -109,6 +109,8 @@
org.apache.geronimo.util.jce.provider,
org.apache.geronimo.web.deployment,
org.apache.geronimo.xbeans.geronimo,
+ org.apache.geronimo.xbeans.geronimo.credentialstore,
+ org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
org.apache.geronimo.xbeans.geronimo.impl,
org.apache.geronimo.xbeans.geronimo.j2ee,
org.apache.geronimo.xbeans.geronimo.j2ee.impl,
@@ -118,15 +120,19 @@
org.apache.geronimo.xbeans.geronimo.naming.impl,
org.apache.geronimo.xbeans.geronimo.security,
org.apache.geronimo.xbeans.geronimo.security.impl,
+ org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
+ org.apache.geronimo.xbeans.geronimo.security.subjectinfo.impl,
org.apache.geronimo.xbeans.geronimo.web,
org.apache.geronimo.xbeans.geronimo.web.impl,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
schemaorg_apache_xmlbeans.element.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.element.URI_SHA_1_521F7E75CA17EA2C9BCBC0A5AE097E5AA9658CB3,
schemaorg_apache_xmlbeans.element.URI_SHA_1_7468FED616215A569CA8BA192F2C978B6D094868,
schemaorg_apache_xmlbeans.element.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
schemaorg_apache_xmlbeans.element.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
schemaorg_apache_xmlbeans.element.URI_SHA_1_B22752A1686A1CEE455ECA3E6939117CFFBD01B6,
schemaorg_apache_xmlbeans.element.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
schemaorg_apache_xmlbeans.element.URI_SHA_1_FC6A73DD7C82C014697AE4F129D88E53E294E396,
schemaorg_apache_xmlbeans.element.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
@@ -134,36 +140,42 @@
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.xbeans,
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.openejb.xbeans.ejbjar,
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.credentialstore,
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.j2ee,
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.loginconfig,
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.naming,
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.web,
schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
schemaorg_apache_xmlbeans.namespace.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.namespace.URI_SHA_1_521F7E75CA17EA2C9BCBC0A5AE097E5AA9658CB3,
schemaorg_apache_xmlbeans.namespace.URI_SHA_1_7468FED616215A569CA8BA192F2C978B6D094868,
schemaorg_apache_xmlbeans.namespace.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
schemaorg_apache_xmlbeans.namespace.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
schemaorg_apache_xmlbeans.namespace.URI_SHA_1_B22752A1686A1CEE455ECA3E6939117CFFBD01B6,
schemaorg_apache_xmlbeans.namespace.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
schemaorg_apache_xmlbeans.namespace.URI_SHA_1_FC6A73DD7C82C014697AE4F129D88E53E294E396,
schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
schemaorg_apache_xmlbeans.src,
+ schemaorg_apache_xmlbeans.system.s1E159143212F9BFF77034ED0498CCE9A,
schemaorg_apache_xmlbeans.system.s2A5EDA3EF2058DBC0CE211DBFA340232,
schemaorg_apache_xmlbeans.system.s2FAAE1AF20866AC7E3A206093AC8911B,
- schemaorg_apache_xmlbeans.system.s30CBD8173265B6C60D75D615B62E948E,
+ schemaorg_apache_xmlbeans.system.s32488B747FB146DEF853A618F4ED46AE,
schemaorg_apache_xmlbeans.system.s7DDEFA0D3AB7A44E0A6CD64AAA422DC8,
schemaorg_apache_xmlbeans.system.sAD0A02D5B50A03344A8F7BF41013BBFA,
- schemaorg_apache_xmlbeans.system.sB1B09023143946C77E5C39F2C0FB42D0,
schemaorg_apache_xmlbeans.system.sEDE7C0CB21AFE6786DC0D3F684755625,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_49ECB0F2825F3E0354472A5ECA1E17F1633EC2BE,
schemaorg_apache_xmlbeans.type.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_521F7E75CA17EA2C9BCBC0A5AE097E5AA9658CB3,
schemaorg_apache_xmlbeans.type.URI_SHA_1_7468FED616215A569CA8BA192F2C978B6D094868,
schemaorg_apache_xmlbeans.type.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
schemaorg_apache_xmlbeans.type.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
schemaorg_apache_xmlbeans.type.URI_SHA_1_B22752A1686A1CEE455ECA3E6939117CFFBD01B6,
schemaorg_apache_xmlbeans.type.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_F04B01A0100CE4D6D8E05EA89F04B1A3232530D3,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_F192CE7C4783FF6FCD001EBCFD7068507094E005,
schemaorg_apache_xmlbeans.type.URI_SHA_1_FC6A73DD7C82C014697AE4F129D88E53E294E396,
schemaorg_apache_xmlbeans.type.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2
Bundle-Vendor: Apache.org
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeSourceWizardFragment.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/GeronimoRuntimeSourceWizardFragment.java?view=diff&rev=552483&r1=552482&r2=552483
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeSourceWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeSourceWizardFragment.java
Mon Jul 2 05:37:06 2007
@@ -85,7 +85,8 @@
GridData data = new GridData();
data.horizontalSpan = 3;
label.setLayoutData(data);
- label.setToolTipText(Messages.tooltipLoc);
+ String tooltipLoc = Messages.bind(Messages.tooltipLoc, getRuntimeName());
+ label.setToolTipText(tooltipLoc);
srcLoc = new Text(composite, SWT.BORDER);
@@ -97,7 +98,7 @@
data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 2;
srcLoc.setLayoutData(data);
- srcLoc.setToolTipText(Messages.tooltipLoc);
+ srcLoc.setToolTipText(tooltipLoc);
srcLoc.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
getRuntimeDelegate().setRuntimeSourceLocation(srcLoc.getText());
@@ -123,6 +124,13 @@
if (wc == null)
return null;
return (GeronimoRuntimeDelegate) wc.loadAdapter(GeronimoRuntimeDelegate.class, new NullProgressMonitor());
+ }
+
+ protected String getRuntimeName() {
+ if (getRuntimeDelegate() != null
+ && getRuntimeDelegate().getRuntime() != null)
+ return getRuntimeDelegate().getRuntime().getName();
+ return null;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/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/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?view=diff&rev=552483&r1=552482&r2=552483
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
Mon Jul 2 05:37:06 2007
@@ -84,7 +84,7 @@
private Button jetty;
- private Group group;
+ protected Group group;
private IWizardHandle fWizard;
@@ -182,7 +182,7 @@
data = new GridData();
data.horizontalSpan = 3;
install.setLayoutData(data);
- install.setToolTipText(Messages.tooltipInstall);
+ install.setToolTipText(Messages.bind(Messages.tooltipInstall, getRuntimeName()));
install.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent se) {
if (installDir != null && isValidLocation()) {
@@ -237,7 +237,7 @@
}
}
- private GeronimoRuntimeDelegate getGeronimoRuntime() {
+ protected GeronimoRuntimeDelegate getGeronimoRuntime() {
if (geronimoRuntime == null)
geronimoRuntime = (GeronimoRuntimeDelegate) getRuntimeDelegate().getRuntime().loadAdapter(GeronimoRuntimeDelegate.class,
null);
return geronimoRuntime;
@@ -249,7 +249,8 @@
GridData data = new GridData();
data.horizontalSpan = 3;
label.setLayoutData(data);
- label.setToolTipText(Messages.tooltipLoc);
+ String tooltipLoc = Messages.bind(Messages.tooltipLoc, getRuntimeName());
+ label.setToolTipText(tooltipLoc);
installDir = new Text(composite, SWT.BORDER);
@@ -261,7 +262,7 @@
data = new GridData(GridData.FILL_HORIZONTAL);
data.horizontalSpan = 2;
installDir.setLayoutData(data);
- installDir.setToolTipText(Messages.tooltipLoc);
+ installDir.setToolTipText(tooltipLoc);
installDir.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
getRuntimeDelegate().getRuntimeWorkingCopy().setLocation(new Path(installDir.getText()));
@@ -469,7 +470,7 @@
return name;
}
- private String getRuntimeName() {
+ protected String getRuntimeName() {
if (getRuntimeDelegate() != null
&& getRuntimeDelegate().getRuntime() != null)
return getRuntimeDelegate().getRuntime().getName();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/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/org/apache/geronimo/st/ui/internal/Messages.properties?view=diff&rev=552483&r1=552482&r2=552483
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
Mon Jul 2 05:37:06 2007
@@ -200,8 +200,8 @@
jvmWarning=Geronimo is currently only certified on a 1.4 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 Geronimo installation or a path to install to.
-tooltipInstall=Downloads the selected Geronimo distribution and installs it to the specified
location.
+tooltipLoc=A location of an existing {0} installation or a path to install to.
+tooltipInstall=Downloads the selected {0} distribution and installs it to the specified location.
tooltipJetty=Selects the Jetty distribution of Geronimo to install.
tooltipTomcat=Selects the Tomcat distribution of Geronimo to install.
|