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/06/20 21:52:22 UTC
svn commit: r670046 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/
org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/
org.apache.geronimo...
Author: mcconne
Date: Fri Jun 20 12:52:22 2008
New Revision: 670046
URL: http://svn.apache.org/viewvc?rev=670046&view=rev
Log:
GERONIMODEVTOOLS-371 Add security tab to geronimo-application-client.xml deployment plan editor -- Thanks BJ Reed for the patch!!
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java (with props)
Removed:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/internal/Messages.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/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/Messages.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
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=670046&r1=670045&r2=670046&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 Fri Jun 20 12:52:22 2008
@@ -25,7 +25,11 @@
* @version $Rev$ $Date$
*/
public class Messages extends NLS {
-
+
+ static {
+ NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
+ }
+
public static String editorTabSource;
public static String editorSectionSecurityTitle;
@@ -99,10 +103,6 @@
public static String portName;
public static String portValue;
- static {
- NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
- }
-
public static String appGeneralPageTitle;
public static String appClientGeneralPageTitle;
public static String connectorOverViewPageTitle;
@@ -124,6 +124,7 @@
public static String editorApplicationName;
public static String editorCallbackHandler;
public static String editorRealmName;
+ public static String editorSubjectId;
public static String editorejbqlCompilerFactory;
public static String editordbSyntaxFactory;
public static String enforceForeignKeyConstraints;
@@ -249,4 +250,19 @@
public static String editorCorrect;
public static String editorDefault;
public static String errorOpenDialog;
+
+ public static String gBeanLink;
+ public static String moduleId;
+ public static String seeRestrictions;
+
+ public static String useGBeanLink;
+ public static String useGBeanPattern;
+ public static String artifactType;
+ public static String inverseClassloading;
+ public static String supressDefaultEnv;
+ public static String sharedLibDepends;
+
+ public static String addSharedLib;
+ public static String webContainerSection;
+ public static String webContainerSectionDescription;
}
\ No newline at end of file
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=670046&r1=670045&r2=670046&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 Fri Jun 20 12:52:22 2008
@@ -17,7 +17,7 @@
# $Rev$ $Date$
#
appGeneralPageTitle=Application Plan General Configuration
-appClientGeneralPageTitle=Application Plan General Configuration
+appClientGeneralPageTitle=Application Client Plan General Configuration
connectorOverViewPageTitle=Connector Plan General Configuration
deploymentPageTitle=Deployment Configuration
namingFormPageTitle=Defined References
@@ -86,6 +86,7 @@
editorSecurityRealmName=Security Realm Name:
editorCallbackHandler=Callback Handler:
editorRealmName=Realm Name:
+editorSubjectId=Subject Id:
editorApplicationName=Application Name:
editorejbqlCompilerFactory=EJB QL Compiler Factory:
editordbSyntaxFactory=DB Syntax Factory:
@@ -245,3 +246,15 @@
editorSectionSharedLibrariesInPlace=Enable in-place shared library support.
editorSectionRunFromWorkspace=Run modules directly from workspace.
editorSectionSelectClasspathContainers=Select the workspace classpath containers to be provided to the server.
+
+artifactType=Artifact Type:
+inverseClassloading=Inverse classloading
+supressDefaultEnv=Suppress default environment
+sharedLibDepends=Add a runtime dependency to Geronimo's shared library
+addSharedLib=Add a runtime dependency to Geronimo's shared library
+webContainerSection=Web Container
+webContainerSectionDescription=Web Container Configuration
+useGBeanLink=Specify as GBean Link
+gBeanLink=GBean Link:
+useGBeanPattern=Specify as GBean Pattern
+moduleId=Module Id:
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java?rev=670046&r1=670045&r2=670046&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java Fri Jun 20 12:52:22 2008
@@ -28,6 +28,7 @@
import org.apache.geronimo.st.v21.core.GeronimoV21Utils;
import org.apache.geronimo.st.v21.ui.pages.AppClientDeploymentPage;
import org.apache.geronimo.st.v21.ui.pages.AppClientGeneralPage;
+import org.apache.geronimo.st.v21.ui.pages.AppClientSecurityPage;
import org.apache.geronimo.st.v21.ui.pages.AppGeneralPage;
import org.apache.geronimo.st.v21.ui.pages.ConnectorOverviewPage;
import org.apache.geronimo.st.v21.ui.pages.DeploymentPage;
@@ -68,9 +69,9 @@
* @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addApplicationPlanPages(org.eclipse.ui.forms.editor.FormEditor)
*/
public void addApplicationClientPlanPages(FormEditor editor) throws PartInitException {
- editor.addPage(new AppClientGeneralPage(editor, "appgeneralpage", CommonMessages.editorTabGeneral));
+ editor.addPage(new AppClientGeneralPage(editor, "appclientgeneralpage", CommonMessages.editorTabGeneral));
editor.addPage(createNamingFormPage(editor));
- //editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity));
+ editor.addPage(new AppClientSecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity));
editor.addPage(new AppClientDeploymentPage(editor, "deploymentpage", CommonMessages.editorTabDeployment));
}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java?rev=670046&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java Fri Jun 20 12:52:22 2008
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.pages;
+
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v21.ui.sections.AppClientSecuritySection;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+public class AppClientSecurityPage extends AbstractGeronimoFormPage {
+
+ public AppClientSecurityPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
+ */
+ protected void fillBody(IManagedForm managedForm) {
+ managedForm.addPart(new AppClientSecuritySection(body, toolkit, getStyle(), getDeploymentPlan()));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getLayout()
+ */
+ protected GridLayout getLayout() {
+ GridLayout layout = super.getLayout();
+ layout.numColumns = 1;
+ return layout;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
+ */
+ public String getFormTitle() {
+ return CommonMessages.securityPageTitle;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AppClientSecurityPage.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java?rev=670046&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java Fri Jun 20 12:52:22 2008
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.sections;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.jee.applicationclient.ApplicationClient;
+import org.apache.geronimo.jee.security.Description;
+import org.apache.geronimo.jee.security.ObjectFactory;
+import org.apache.geronimo.jee.security.SubjectInfo;
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+
+public class AppClientSecuritySection extends AbstractSectionPart {
+
+ protected Text realm;
+
+ protected Text subjectId;
+
+ protected Text description;
+
+ ObjectFactory securityFactory;
+
+ public AppClientSecuritySection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
+ super(parent, toolkit, style, plan);
+ securityFactory = new ObjectFactory();
+ createClient();
+ }
+
+ protected void createClient() {
+
+ Section section = getSection();
+
+ section.setText(getSectionGeneralTitle());
+ section.setDescription(getSectionGeneralDescription());
+ section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+
+ Composite composite = toolkit.createComposite(section);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 2;
+ layout.marginHeight = 5;
+ layout.marginWidth = 10;
+ layout.verticalSpacing = 5;
+ layout.horizontalSpacing = 15;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+ section.setClient(composite);
+
+ createLabel(composite, CommonMessages.editorSubjectId);
+
+ subjectId = toolkit.createText(composite, getDefaultSubject().getId(), SWT.BORDER);
+ subjectId.setLayoutData(createTextFieldGridData());
+ subjectId.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ getDefaultSubject().setId(subjectId.getText());
+ markDirty();
+ }
+ });
+
+ createLabel(composite, CommonMessages.editorRealmName);
+
+ realm = toolkit.createText(composite, getDefaultSubject().getRealm(), SWT.BORDER);
+ realm.setLayoutData(createTextFieldGridData());
+ realm.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ getDefaultSubject().setRealm(realm.getText());
+ markDirty();
+ }
+ });
+
+ createLabel(composite, CommonMessages.description);
+
+ if (getDefaultSubject().getDescription().size() > 0)
+ description = toolkit.createText(composite, getDefaultSubject().getDescription().get(0).getValue(), SWT.BORDER);
+ else
+ description = toolkit.createText(composite, "", SWT.BORDER);
+ description.setLayoutData(createTextFieldGridData());
+ description.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ Description descText = securityFactory.createDescription();
+ descText.setValue(description.getText());
+ getDefaultSubject().getDescription().clear();
+ getDefaultSubject().getDescription().add(descText);
+ markDirty();
+ }
+ });
+ }
+
+ private SubjectInfo getDefaultSubject () {
+ ApplicationClient client = (ApplicationClient)getPlan().getValue();
+ SubjectInfo subjectInfo = client.getDefaultSubject();
+ if (subjectInfo == null) {
+ subjectInfo = securityFactory.createSubjectInfo();
+ client.setDefaultSubject(subjectInfo);
+ }
+ return subjectInfo;
+ }
+
+ protected String getSectionGeneralTitle() {
+ return CommonMessages.editorSectionSecurityTitle;
+ }
+
+ protected String getSectionGeneralDescription() {
+ return CommonMessages.editorSectionSecurityDescription;
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppClientSecuritySection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java?rev=670046&r1=670045&r2=670046&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java Fri Jun 20 12:52:22 2008
@@ -32,7 +32,6 @@
import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
-import org.apache.geronimo.st.v21.ui.internal.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -87,7 +86,7 @@
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
section.setClient(composite);
- createLabel(composite, Messages.groupId);
+ createLabel(composite, CommonMessages.groupId);
groupId = toolkit.createText(composite, getGroupId(), SWT.BORDER);
groupId.setLayoutData(createTextFieldGridData());
@@ -98,7 +97,7 @@
}
});
- createLabel(composite, Messages.artifactId);
+ createLabel(composite, CommonMessages.artifactId);
artifactId = toolkit.createText(composite, getArtifactId(), SWT.BORDER);
artifactId.setLayoutData(createTextFieldGridData());
@@ -109,7 +108,7 @@
}
});
- createLabel(composite, Messages.version);
+ createLabel(composite, CommonMessages.version);
version = toolkit.createText(composite, getVersion(), SWT.BORDER);
version.setLayoutData(createTextFieldGridData());
@@ -120,7 +119,7 @@
}
});
- createLabel(composite, Messages.artifactType);
+ createLabel(composite, CommonMessages.artifactType);
type = toolkit.createText(composite, getArtifact(), SWT.BORDER);
type.setLayoutData(createTextFieldGridData());
@@ -131,7 +130,7 @@
}
});
- inverseClassLoading = toolkit.createButton(composite, Messages.inverseClassloading, SWT.CHECK);
+ inverseClassLoading = toolkit.createButton(composite, CommonMessages.inverseClassloading, SWT.CHECK);
inverseClassLoading.setSelection(isInverseClassloading());
GridData data = new GridData();
data.horizontalSpan = 2;
@@ -147,7 +146,7 @@
}
});
- suppressDefaultEnv = toolkit.createButton(composite, Messages.supressDefaultEnv, SWT.CHECK);
+ suppressDefaultEnv = toolkit.createButton(composite, CommonMessages.supressDefaultEnv, SWT.CHECK);
suppressDefaultEnv.setSelection(isSuppressDefaultEnvironment());
data = new GridData();
data.horizontalSpan = 2;
@@ -163,7 +162,7 @@
}
});
- sharedLibDepends = toolkit.createButton(composite, Messages.sharedLibDepends, SWT.CHECK);
+ sharedLibDepends = toolkit.createButton(composite, CommonMessages.sharedLibDepends, SWT.CHECK);
sharedLibDepends.setSelection(isSharedLibDependency());
data = new GridData();
data.horizontalSpan = 2;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java?rev=670046&r1=670045&r2=670046&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java Fri Jun 20 12:52:22 2008
@@ -22,8 +22,8 @@
import org.apache.geronimo.jee.naming.ObjectFactory;
import org.apache.geronimo.jee.naming.Pattern;
import org.apache.geronimo.jee.web.WebApp;
+import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
-import org.apache.geronimo.st.v21.ui.internal.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -75,8 +75,8 @@
protected void createClient() {
Section section = getSection();
- section.setText(Messages.webContainerSection);
- section.setDescription(Messages.webContainerSectionDescription);
+ section.setText(CommonMessages.webContainerSection);
+ section.setDescription(CommonMessages.webContainerSectionDescription);
section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
Composite composite = toolkit.createComposite(section);
@@ -90,14 +90,14 @@
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
section.setClient(composite);
- specifyAsLink = toolkit.createButton(composite, Messages.useGBeanLink, SWT.RADIO);
+ specifyAsLink = toolkit.createButton(composite, CommonMessages.useGBeanLink, SWT.RADIO);
GridData data = new GridData();
data.horizontalSpan = 2;
specifyAsLink.setLayoutData(data);
GbeanLocator wc = plan.getWebContainer();
- toolkit.createLabel(composite, Messages.gBeanLink);
+ toolkit.createLabel(composite, CommonMessages.gBeanLink);
String value = wc != null ? wc.getGbeanLink() : null;
gBeanLink = toolkit.createText(composite, value, SWT.BORDER);
gBeanLink.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
@@ -108,10 +108,10 @@
}
});
- specifyAsPattern = toolkit.createButton(composite, Messages.useGBeanPattern, SWT.RADIO);
+ specifyAsPattern = toolkit.createButton(composite, CommonMessages.useGBeanPattern, SWT.RADIO);
specifyAsPattern.setLayoutData(data);
- toolkit.createLabel(composite, Messages.groupId);
+ toolkit.createLabel(composite, CommonMessages.groupId);
value = wc != null && wc.getPattern() != null ? wc.getPattern().getGroupId()
: null;
group = toolkit.createText(composite, value, SWT.BORDER);
@@ -123,7 +123,7 @@
}
});
- toolkit.createLabel(composite, Messages.artifactId);
+ toolkit.createLabel(composite, CommonMessages.artifactId);
value = wc != null && wc.getPattern() != null ? wc.getPattern().getArtifactId()
: null;
artifact = toolkit.createText(composite, value, SWT.BORDER);
@@ -135,7 +135,7 @@
}
});
- toolkit.createLabel(composite, Messages.moduleId);
+ toolkit.createLabel(composite, CommonMessages.moduleId);
value = wc != null && wc.getPattern() != null ? wc.getPattern().getModule()
: null;
module = toolkit.createText(composite, value, SWT.BORDER);
@@ -147,7 +147,7 @@
}
});
- toolkit.createLabel(composite, Messages.name);
+ toolkit.createLabel(composite, CommonMessages.name);
value = wc != null && wc.getPattern() != null ? wc.getPattern().getName()
: null;
name = toolkit.createText(composite, value, SWT.BORDER);
@@ -159,7 +159,7 @@
}
});
- toolkit.createLabel(composite, Messages.version);
+ toolkit.createLabel(composite, CommonMessages.version);
value = wc != null && wc.getPattern() != null ? wc.getPattern().getVersion()
: null;
version = toolkit.createText(composite, value, SWT.BORDER);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java?rev=670046&r1=670045&r2=670046&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java Fri Jun 20 12:52:22 2008
@@ -1,134 +1,134 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.st.v21.ui.wizards;
-
-import org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig;
-import org.apache.geronimo.st.v21.ui.internal.Messages;
-import org.apache.geronimo.st.v21.ui.internal.Trace;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
-
-public class FacetInstallPage extends AbstractFacetWizardPage {
-
- private DeploymentPlanInstallConfig config;
-
- private Text groupText;
- private Text artifactText;
- private Text versionText;
- private Text typeText;
- private Button sharedLib;
-
- public FacetInstallPage() {
- super("geronimo.plan.install");
- Trace.trace("Constructor Entry", "FacetInstallPage");
-
- setTitle("Geronimo Deployment Plan");
- setDescription("Configure the geronimo deployment plan.");
-
- Trace.trace("Constructor Exit", "FacetInstallPage");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
- */
- public void setConfig(Object config) {
- Trace.trace("Entry", "FacetInstallPage.setConfig", config);
-
- this.config = (DeploymentPlanInstallConfig) config;
-
- Trace.trace("Exit", "FacetInstallPage.setConfig");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- Trace.trace("Entry", "FacetInstallPage.createControl", parent);
-
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
-
- Label groupLabel = new Label(composite, SWT.NONE);
- groupLabel.setText(Messages.groupId);
-
- groupText = new Text(composite, SWT.BORDER);
- groupText.setLayoutData(createGridData());
- groupText.setText("default");
-
- Label artifactLabel = new Label(composite, SWT.NONE);
- artifactLabel.setText(Messages.artifactId);
-
- artifactText = new Text(composite, SWT.BORDER);
- artifactText.setLayoutData(createGridData());
-
- Label versionLabel = new Label(composite, SWT.NONE);
- versionLabel.setText(Messages.version);
-
- versionText = new Text(composite, SWT.BORDER);
- versionText.setLayoutData(createGridData());
- versionText.setText("1.0");
-
- Label typeLabel = new Label(composite, SWT.NONE);
- typeLabel.setText(Messages.artifactType);
-
- typeText = new Text(composite, SWT.BORDER);
- typeText.setLayoutData(createGridData());
- typeText.setText("car");
-
- sharedLib = new Button(composite, SWT.CHECK);
- GridData data = createGridData();
- data.horizontalSpan = 2;
- data.verticalIndent = 5;
- sharedLib.setLayoutData(data);
- sharedLib.setText(Messages.addSharedLib);
-
- setControl(composite);
-
- Trace.trace("Exit", "FacetInstallPage.createControl");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
- */
- public void transferStateToConfig() {
- Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");
-
- config.setGroupId(groupText.getText());
- config.setArtifactId(artifactText.getText());
- config.setVersion(versionText.getText());
- config.setType(typeText.getText());
- config.setSharedLib(sharedLib.getSelection());
-
- Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");
- }
-
- private static GridData createGridData() {
- return new GridData(GridData.FILL_HORIZONTAL);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v21.ui.wizards;
+
+import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig;
+import org.apache.geronimo.st.v21.ui.internal.Trace;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
+
+public class FacetInstallPage extends AbstractFacetWizardPage {
+
+ private DeploymentPlanInstallConfig config;
+
+ private Text groupText;
+ private Text artifactText;
+ private Text versionText;
+ private Text typeText;
+ private Button sharedLib;
+
+ public FacetInstallPage() {
+ super("geronimo.plan.install");
+ Trace.trace("Constructor Entry", "FacetInstallPage");
+
+ setTitle("Geronimo Deployment Plan");
+ setDescription("Configure the geronimo deployment plan.");
+
+ Trace.trace("Constructor Exit", "FacetInstallPage");
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
+ */
+ public void setConfig(Object config) {
+ Trace.trace("Entry", "FacetInstallPage.setConfig", config);
+
+ this.config = (DeploymentPlanInstallConfig) config;
+
+ Trace.trace("Exit", "FacetInstallPage.setConfig");
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+ */
+ public void createControl(Composite parent) {
+ Trace.trace("Entry", "FacetInstallPage.createControl", parent);
+
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setLayout(new GridLayout(2, false));
+
+ Label groupLabel = new Label(composite, SWT.NONE);
+ groupLabel.setText(CommonMessages.groupId);
+
+ groupText = new Text(composite, SWT.BORDER);
+ groupText.setLayoutData(createGridData());
+ groupText.setText("default");
+
+ Label artifactLabel = new Label(composite, SWT.NONE);
+ artifactLabel.setText(CommonMessages.artifactId);
+
+ artifactText = new Text(composite, SWT.BORDER);
+ artifactText.setLayoutData(createGridData());
+
+ Label versionLabel = new Label(composite, SWT.NONE);
+ versionLabel.setText(CommonMessages.version);
+
+ versionText = new Text(composite, SWT.BORDER);
+ versionText.setLayoutData(createGridData());
+ versionText.setText("1.0");
+
+ Label typeLabel = new Label(composite, SWT.NONE);
+ typeLabel.setText(CommonMessages.artifactType);
+
+ typeText = new Text(composite, SWT.BORDER);
+ typeText.setLayoutData(createGridData());
+ typeText.setText("car");
+
+ sharedLib = new Button(composite, SWT.CHECK);
+ GridData data = createGridData();
+ data.horizontalSpan = 2;
+ data.verticalIndent = 5;
+ sharedLib.setLayoutData(data);
+ sharedLib.setText(CommonMessages.addSharedLib);
+
+ setControl(composite);
+
+ Trace.trace("Exit", "FacetInstallPage.createControl");
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage#transferStateToConfig()
+ */
+ public void transferStateToConfig() {
+ Trace.trace("Entry", "FacetInstallPage.transferStateToConfig");
+
+ config.setGroupId(groupText.getText());
+ config.setArtifactId(artifactText.getText());
+ config.setVersion(versionText.getText());
+ config.setType(typeText.getText());
+ config.setSharedLib(sharedLib.getSelection());
+
+ Trace.trace("Exit", "FacetInstallPage.transferStateToConfig");
+ }
+
+ private static GridData createGridData() {
+ return new GridData(GridData.FILL_HORIZONTAL);
+ }
+}