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/23 15:31:32 UTC

svn commit: r416715 [1/2] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/ org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/ org.apache.geronimo.st.ui/src/org/apache/geronimo...

Author: sppatel
Date: Fri Jun 23 06:31:30 2006
New Revision: 416715

URL: http://svn.apache.org/viewvc?rev=416715&view=rev
Log:
cleanup/fix nls messages

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/CommonMessages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/AbstractTableSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/DependencyWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbLocalRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ImportWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceEnvRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/SecurityRoleWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ServiceRefWizard.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/CommonMessages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/CommonMessages.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/CommonMessages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/CommonMessages.java Fri Jun 23 06:31:30 2006
@@ -18,5 +18,5 @@
 import org.apache.geronimo.st.ui.internal.Messages;
 
 public class CommonMessages extends Messages {
-
+	
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/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/org/apache/geronimo/st/ui/internal/Messages.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/Messages.java Fri Jun 23 06:31:30 2006
@@ -7,6 +7,49 @@
  * Translated messages.
  */
 public class Messages extends NLS {
+	
+	public static String editorTabSource;
+	
+	public static String editorSectionSecurityTitle;
+	public static String editorSectionSecurityDescription;
+	public static String editorSectionPortsTitle;
+	public static String editorSectionPortsDescription;
+	public static String editorSectionLogLevelTitle;
+	public static String editorSectionLogLevelDescription;
+	public static String info;
+	public static String debug;
+	public static String httpPort;
+	public static String rmiPort;
+	public static String username;
+	public static String password;
+	public static String console;
+	public static String consoleTooltip;
+	
+	//
+	public static String serverWizardDescription;
+	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 downloadOptions;
+	public static String chooseWebContainer;
+	public static String gWithTomcat;
+	public static String gWithJetty;
+	public static String install;
+	public static String jvmWarning;
+	public static String installTitle;
+	public static String installMessage;
+	public static String tooltipLoc;
+	public static String tooltipInstall;
+	public static String tooltipJetty;
+	public static String tooltipTomcat;
+
+	static {
+		NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
+	}
+	
 	public static String appGeneralPageTitle;
 	public static String connectorOverViewPageTitle;
 	public static String deploymentPageTitle;
@@ -17,18 +60,11 @@
 	public static String editorTabNaming;
 	public static String editorTabSecurity;
 	public static String editorTabDeployment;
-	public static String editorTabSource;
 	public static String errorCouldNotOpenFile;
 	public static String editorTitle;
 	public static String editorSectionGeneralTitle;
 	public static String editorSectionGeneralDescription;
-	public static String editorConfigId;
-	public static String editorParentId;
 	public static String editorContextRoot;
-	public static String editorClassloader;
-	public static String editorClassloaderServer;
-	public static String editorClassloaderWebApp;
-	public static String securityRealmName;
 	//
 	public static String editorSectionSecurityRolesTitle;
 	public static String editorSectionSecurityRolesDescription;
@@ -115,9 +151,7 @@
 	public static String wizardPageTitle_Dependency;
 	public static String wizardPageDescription_Dependency;
 	public static String dependencyGroupLabel;
-	public static String serverRepos;
-	public static String uri;
-	public static String mavenArtifact;
+
 	public static String groupId;
 	public static String artifactId;
 	public static String version;
@@ -136,48 +170,8 @@
 	public static String wizardEditTitle_SecurityRole;
 	public static String wizardPageTitle_SecurityRole;
 	public static String wizardPageDescription_SecurityRole;
-	public static String editorSectionSecurityTitle;
-	public static String editorSectionSecurityDescription;
-	public static String editorSectionPortsTitle;
-	public static String editorSectionPortsDescription;
-	public static String editorSectionLogLevelTitle;
-	public static String editorSectionLogLevelDescription;
-	public static String info;
-	public static String debug;
-	public static String httpPort;
-	public static String rmiPort;
-	public static String username;
-	public static String password;
-	public static String console;
-	public static String consoleTooltip;
-	public int i;
 	//
 	public static String doasCurrentCaller;
 	public static String useContextHandler;
 	public static String defaultRole;
-
-	// GeronimoServerRuntimeWizardFragment
-	public static String serverWizardDescription;
-	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 downloadOptions;
-	public static String chooseWebContainer;
-	public static String gWithTomcat;
-	public static String gWithJetty;
-	public static String install;
-	public static String jvmWarning;
-	public static String installTitle;
-	public static String installMessage;
-	public static String tooltipLoc;
-	public static String tooltipInstall;
-	public static String tooltipJetty;
-	public static String tooltipTomcat;
-
-	static {
-		NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
-	}
 }

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?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- 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 Fri Jun 23 06:31:30 2006
@@ -137,8 +137,6 @@
 defaultRole=Default Role:
 
 dependencyGroupLabel=Dependency type and location    
-serverRepos=Specify dependency by path    
-uri=URI:
 mavenArtifact=Specify Maven-style dependency
 groupId=Group Id:
 artifactId=Artifact Id:

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/AbstractTableSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/AbstractTableSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/AbstractTableSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/AbstractTableSection.java Fri Jun 23 06:31:30 2006
@@ -1,6 +1,6 @@
 package org.apache.geronimo.st.ui.sections;
 
-import org.apache.geronimo.st.ui.internal.Messages;
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.ecore.EClass;
@@ -170,7 +170,7 @@
 	}
 
 	protected void createRemoveButton(FormToolkit toolkit, Composite buttonComp) {
-		removeButton = toolkit.createButton(buttonComp, Messages.remove, SWT.NONE);
+		removeButton = toolkit.createButton(buttonComp, CommonMessages.remove, SWT.NONE);
 		removeButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				int[] selectedIndices = table.getSelectionIndices();
@@ -187,7 +187,7 @@
 	}
 
 	protected void createAddButton(FormToolkit toolkit, Composite buttonComp) {
-		addButton = toolkit.createButton(buttonComp, Messages.add, SWT.NONE);
+		addButton = toolkit.createButton(buttonComp, CommonMessages.add, SWT.NONE);
 
 		addButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
@@ -208,7 +208,7 @@
 	}
 
 	protected void createEditButton(FormToolkit toolkit, Composite buttonComp) {
-		editButton = toolkit.createButton(buttonComp, Messages.edit, SWT.NONE);
+		editButton = toolkit.createButton(buttonComp, CommonMessages.edit, SWT.NONE);
 
 		editButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/editors/GeronimoFormContentLoader.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.editors;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader;
 import org.apache.geronimo.st.v1.core.GeronimoV1Utils;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.pages.AppGeneralPage;
 import org.apache.geronimo.st.v1.ui.pages.ConnectorOverviewPage;
 import org.apache.geronimo.st.v1.ui.pages.DeploymentPage;
@@ -48,8 +48,8 @@
 	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addApplicationPlanPages(org.eclipse.ui.forms.editor.FormEditor)
 	 */
 	public void addApplicationPlanPages(FormEditor editor) throws PartInitException {
-		editor.addPage(new AppGeneralPage(editor, "appgeneralpage", Messages.editorTabGeneral));
-		editor.addPage(new SecurityPage(editor, "securitypage", Messages.editorTabSecurity, ApplicationPackage.eINSTANCE.getApplicationType_Security()));
+		editor.addPage(new AppGeneralPage(editor, "appgeneralpage", CommonMessages.editorTabGeneral));
+		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, ApplicationPackage.eINSTANCE.getApplicationType_Security()));
 		editor.addPage(getApplicationDeploymentPage(editor));
 	}
 
@@ -57,7 +57,7 @@
 	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addConnectorPlanPages(org.eclipse.ui.forms.editor.FormEditor)
 	 */
 	public void addConnectorPlanPages(FormEditor editor) throws PartInitException {
-		editor.addPage(new ConnectorOverviewPage(editor, "connectoroverview", Messages.editorTabGeneral));
+		editor.addPage(new ConnectorOverviewPage(editor, "connectoroverview", CommonMessages.editorTabGeneral));
 		editor.addPage(getConnectorDeploymentPage(editor));
 	}
 
@@ -67,9 +67,9 @@
 	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addOpenEjbPlanPages()
 	 */
 	public void addOpenEjbPlanPages(FormEditor editor) throws PartInitException {
-		editor.addPage(new EjbOverviewPage(editor, "ejboverview", Messages.editorTabGeneral));
+		editor.addPage(new EjbOverviewPage(editor, "ejboverview", CommonMessages.editorTabGeneral));
 		// TODO Add naming page but broken down for each bean type
-		editor.addPage(new SecurityPage(editor, "securitypage", Messages.editorTabSecurity, JarPackage.eINSTANCE.getOpenejbJarType_Security()));
+		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, JarPackage.eINSTANCE.getOpenejbJarType_Security()));
 		editor.addPage(getEjbJarDeploymentPage(editor));
 	}
 
@@ -79,9 +79,9 @@
 	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoFormContentLoader#addWebPlanPages()
 	 */
 	public void addWebPlanPages(FormEditor editor) throws PartInitException {
-		editor.addPage(new WebGeneralPage(editor, "generalpage", Messages.editorTabGeneral));
+		editor.addPage(new WebGeneralPage(editor, "generalpage", CommonMessages.editorTabGeneral));
 		editor.addPage(getWebNamingPage(editor));
-		editor.addPage(new SecurityPage(editor, "securitypage", Messages.editorTabSecurity, WebPackageImpl.eINSTANCE.getWebAppType_Security()));
+		editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity, WebPackageImpl.eINSTANCE.getWebAppType_Security()));
 		editor.addPage(getWebDeploymentPage(editor));
 	}
 
@@ -144,11 +144,11 @@
 	
 	//TODO push to superclass
 	private NamingFormPage createNamingFormPage(FormEditor editor) {
-		return new NamingFormPage(editor, "namingpage", Messages.editorTabNaming);
+		return new NamingFormPage(editor, "namingpage", CommonMessages.editorTabNaming);
 	}
 	
 	//TODO Push to superclass
 	private DeploymentPage createDeploymentFormPage(FormEditor editor) {
-		return new DeploymentPage(editor, "deploymentpage", Messages.editorTabDeployment);
+		return new DeploymentPage(editor, "deploymentpage", CommonMessages.editorTabDeployment);
 	}
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.java Fri Jun 23 06:31:30 2006
@@ -7,21 +7,7 @@
  * Translated messages.
  */
 public class Messages extends NLS {
-	public static String appGeneralPageTitle;
-	public static String connectorOverViewPageTitle;
-	public static String deploymentPageTitle;
-	public static String namingFormPageTitle;
-	public static String securityPageTitle;
-	public static String webGeneralPageTitle;
-	public static String editorTabGeneral;
-	public static String editorTabNaming;
-	public static String editorTabSecurity;
-	public static String editorTabDeployment;
-	public static String editorTabSource;
-	public static String errorCouldNotOpenFile;
-	public static String editorTitle;
-	public static String editorSectionGeneralTitle;
-	public static String editorSectionGeneralDescription;
+
 	public static String editorConfigId;
 	public static String editorParentId;
 	public static String editorContextRoot;
@@ -29,132 +15,11 @@
 	public static String editorClassloaderServer;
 	public static String editorClassloaderWebApp;
 	public static String securityRealmName;
-	//
-	public static String editorSectionSecurityRolesTitle;
-	public static String editorSectionSecurityRolesDescription;
-	public static String name;
-	public static String description;
-	//
-	public static String editorSectionDependenciesTitle;
-	public static String editorSectionDependenciesDescription;
-	//
-	public static String editorSectionImportTitle;
-	public static String editorSectionImportDescription;
-	//
-	public static String editorSectionGBeanTitle;
-	public static String editorSectionGBeanDescription;
-	public static String className;
-	public static String GbeanName;
-	//
-	public static String editorResourceRefDescription;
-	public static String editorResourceRefTitle;
-	public static String editorResRefTargetNameTitle;
-	public static String editorResRefLinkTitle;
-	public static String editorResRefNameTitle;
-	//
-	public static String editorGBeanRefTitle;
-	public static String editorGBeanRefDescription;
-	public static String editorGBeanRefName;
-	public static String editorGBeanRefType;
-	public static String editorGBeanRefTargetName;
-	public static String editorGBeanRefProxyType;
-	//
-	public static String editorServiceRefDescription;
-	public static String editorServiceRefTitle;
-	public static String editorServiceRefName;
-	//
-	public static String editorResourceEnvRefDescription;
-	public static String editorResourceEnvRefTitle;
-	public static String editorResEnvRefMsgDestTitle;
-	public static String editorResEnvRefNameTitle;
-	//
-	public static String editorEjbLocalRefDescription;
-	public static String editorEjbLocalRefTitle;
-	public static String editorEjbRefTargetName;
-	public static String editorEjbRefEjbLink;
-	//
-	public static String editorEjbRefDescription;
-	public static String editorEjbRefTitle;
-	// Buttons
-	public static String add;
-	public static String remove;
-	public static String edit;
-	// Wizard/Wizard Pages
-	public static String wizardNewTitle_ResRef;
-	public static String wizardEditTitle_ResRef;
-	public static String wizardPageTitle_ResRef;
-	public static String wizardPageDescription_ResRef;
-	//
-	public static String wizardNewTitle_GBeanRef;
-	public static String wizardEditTitle_GBeanRef;
-	public static String wizardPageTitle_GBeanRef;
-	public static String wizardPageDescription_GBeanRef;
-	//
-	public static String wizardNewTitle_ServiceRef;
-	public static String wizardEditTitle_ServiceRef;
-	public static String wizardPageTitle_ServiceRef;
-	public static String wizardPageDescription_ServiceRef;
-	//
-	public static String wizardNewTitle_ResEnvRef;
-	public static String wizardEditTitle_ResEnvRef;
-	public static String wizardPageTitle_ResEnvRef;
-	public static String wizardPageDescription_ResEnvRef;
-	//
-	public static String wizardNewTitle_EjbRef;
-	public static String wizardEditTitle_EjbRef;
-	public static String wizardPageTitle_EjbRef;
-	public static String wizardPageDescription_EjbRef;
-	//
-	public static String wizardNewTitle_EjbLocalRef;
-	public static String wizardEditTitle_EjbLocalRef;
-	public static String wizardPageTitle_EjbLocalRef;
-	public static String wizardPageDescription_EjbLocalRef;
-	//
-	public static String wizardNewTitle_Dependency;
-	public static String wizardEditTitle_Dependency;
-	public static String wizardPageTitle_Dependency;
-	public static String wizardPageDescription_Dependency;
+
 	public static String dependencyGroupLabel;
 	public static String serverRepos;
 	public static String uri;
 	public static String mavenArtifact;
-	public static String groupId;
-	public static String artifactId;
-	public static String version;
-	//
-	public static String wizardNewTitle_Import;
-	public static String wizardEditTitle_Import;
-	public static String wizardPageTitle_Import;
-	public static String wizardPageDescription_Import;
-	//
-	public static String wizardNewTitle_GBean;
-	public static String wizardEditTitle_GBean;
-	public static String wizardPageTitle_GBean;
-	public static String wizardPageDescription_GBean;
-	//
-	public static String wizardNewTitle_SecurityRole;
-	public static String wizardEditTitle_SecurityRole;
-	public static String wizardPageTitle_SecurityRole;
-	public static String wizardPageDescription_SecurityRole;
-	public static String editorSectionSecurityTitle;
-	public static String editorSectionSecurityDescription;
-	public static String editorSectionPortsTitle;
-	public static String editorSectionPortsDescription;
-	public static String editorSectionLogLevelTitle;
-	public static String editorSectionLogLevelDescription;
-	public static String info;
-	public static String debug;
-	public static String httpPort;
-	public static String rmiPort;
-	public static String username;
-	public static String password;
-	public static String console;
-	public static String consoleTooltip;
-	public int i;
-	//
-	public static String doasCurrentCaller;
-	public static String useContextHandler;
-	public static String defaultRole;
 
 	// GeronimoServerRuntimeWizardFragment
 	public static String serverWizardDescription;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/internal/Messages.properties Fri Jun 23 06:31:30 2006
@@ -1,45 +1,3 @@
-appGeneralPageTitle=Application Plan General Configuration
-connectorOverViewPageTitle=Connector Plan General Configuration
-deploymentPageTitle=Deployment Configuration
-namingFormPageTitle=Defined References
-securityPageTitle=Security Configuration
-webGeneralPageTitle=Web Deployment Plan General Configuration
-
-errorCouldNotOpenFile=Could not open file
-
-editorTitle=Geronimo Deployment Plan Editor
-editorSectionGeneralTitle=General
-editorSectionGeneralDescription=Edit the common deployment settings.
-
-editorSectionSecurityRolesTitle=Security Roles
-editorSectionSecurityRolesDescription=The following security roles are defined:
-
-editorSectionDependenciesTitle=Dependencies
-editorSectionDependenciesDescription=The following dependencies are defined as common libraries.
-
-editorSectionImportTitle=Imports
-editorSectionImportDescription=The following configurations are imported into this plan.
-
-editorSectionGBeanTitle=GBeans
-editorSectionGBeanDescription=The following gbeans are defined in this plan.
-className=Class
-GbeanName=Gbean Name
-
-editorSectionSecurityTitle=Security
-editorSectionSecurityDescription=Specify the security settings.
-username=User ID:
-password=Password:
-
-editorSectionPortsTitle=Port Configuration
-editorSectionPortsDescription=Specify the ports for this server instance.
-httpPort=HTTP Port:
-rmiPort=RMI Naming Port:
-
-editorSectionLogLevelTitle=Console Output
-editorSectionLogLevelDescription=Select the server console output log level.
-info=INFO
-debug=DEBUG
-
 editorConfigId=Config Id:
 editorParentId=Parent Id:
 editorContextRoot=Context Root:
@@ -48,121 +6,16 @@
 editorClassloaderServer=Search the Geronimo server environment first (recomended)
 editorClassloaderWebApp=Search the web app first
 
-editorResourceRefTitle=Resource References
-editorResourceRefDescription=The following resource references are defined:
-editorResRefTargetNameTitle=Target Name
-editorResRefLinkTitle=Resource Link
-editorResRefNameTitle=Reference Name
-
-editorResourceEnvRefTitle=Resource Environment References
-editorResourceEnvRefDescription=The following resource environment references are defined:
-editorResEnvRefNameTitle=Reference Name
-editorResEnvRefMsgDestTitle=Message destination
-
-editorGBeanRefTitle=GBean References
-editorGBeanRefDescription=The following gbean references are defined:
-editorGBeanRefName=Name
-editorGBeanRefType=Type
-editorGBeanRefTargetName=Target
-editorGBeanRefProxyType=Proxy Type
-
-editorServiceRefDescription=The following  service references are defined:
-editorServiceRefTitle=Service Refs
-editorServiceRefName=Name
-
-editorEjbRefDescription = The following ejb references are defined:
-editorEjbRefTitle = EJB References
-editorEjbRefTargetName=Target Name
-editorEjbRefEjbLink=EJB Link
-
-editorEjbLocalRefDescription=The following ejb local refererencs are defined:
-editorEjbLocalRefTitle=EJB Local References
-
-add=Add
-remove=Remove
-edit=Edit
-
-wizardNewTitle_ResRef=New Resource Reference
-wizardEditTitle_ResRef=Edit Resource Reference
-wizardPageTitle_ResRef=Resource Reference Details
-wizardPageDescription_ResRef=Provide details for this resource reference.
-    
-wizardNewTitle_ResEnvRef=New Resource Enviornment Reference
-wizardEditTitle_ResEnvRef=Edit Resource Enviornment Reference
-wizardPageTitle_ResEnvRef=Resource Enviornment Reference Details
-wizardPageDescription_ResEnvRef=Provide details for this resource enviornment reference.
-
-wizardNewTitle_EjbRef=New EJB Reference
-wizardEditTitle_EjbRef=Edit EJB Reference
-wizardPageTitle_EjbRef=EJB Reference Details
-wizardPageDescription_EjbRef=Provide details for this ejb reference.
-
-wizardNewTitle_ServiceRef=New Service Reference
-wizardEditTitle_ServiceRef=Edit Service Reference
-wizardPageTitle_ServiceRef=Service Reference Details
-wizardPageDescription_ServiceRef=Provide details for this service reference
-
-wizardNewTitle_EjbLocalRef=New EJB Local Reference
-wizardEditTitle_EjbLocalRef=Edit EJB Local Reference
-wizardPageTitle_EjbLocalRef=EJB Reference Local Details
-wizardPageDescription_EjbLocalRef=Provide details for this ejb local reference.
-
-wizardNewTitle_GBeanRef=New GBean Reference
-wizardEditTitle_GBeanRef=Edit GBean Reference
-wizardPageTitle_GBeanRef=GBean Reference Details
-wizardPageDescription_GBeanRef=Provide details for this gbean reference.
-
-wizardNewTitle_SecurityRole=New Security Role
-wizardEditTitle_SecurityRole=Edit Security Role
-wizardPageTitle_SecurityRole=Security Role Details
-wizardPageDescription_SecurityRole=Provide details for this security role.
-
-wizardNewTitle_Dependency=New Dependency
-wizardEditTitle_Dependency=Edit Dependency
-wizardPageTitle_Dependency=Dependency Details
-wizardPageDescription_Dependency=Provide details for this dependency.
-
-wizardNewTitle_Import=New Import
-wizardEditTitle_Import=Edit Import
-wizardPageTitle_Import=Import Details
-wizardPageDescription_Import=Provide details for this dependency.
-
-wizardNewTitle_GBean=New GBean
-wizardEditTitle_GBean=Edit Gbean
-wizardPageTitle_GBean=Gbean Details
-wizardPageDescription_GBean=Provide details for this gbean.
-
-doasCurrentCaller=Do as current caller
-useContextHandler=Use context handler
-defaultRole=Default Role:
-
 dependencyGroupLabel=Dependency type and location    
 serverRepos=Specify dependency by path    
 uri=URI:
 mavenArtifact=Specify Maven-style dependency
-groupId=Group Id:
-artifactId=Artifact Id:
-version=Version:
-
-editorTabGeneral=General
-editorTabNaming=Naming
-editorTabSecurity=Security
-editorTabDeployment=Deployment
-editorTabSource=Source
-
-name=Name
-description=Description
-
-console=Geronimo Console
-consoleTooltip=Apache Geronimo Console
 
 serverWizardDescription=Specify the location of an existing 1.0 Geronimo 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 Geronimo is currently installed or where you would like it to be installed.
 noSuchDir=The specified directory does not exist.
-noImageFound=A Geronimo installation does not exist at this location.
-cannotInstallAtLocation=A Geronimo installation does not exist and cannot be installed at this location.
 downloadOptions=Download Options
 chooseWebContainer=Select a web container:
 gWithTomcat=Geronimo with Tomcat

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/AppGeneralPage.java Fri Jun 23 06:31:30 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.geronimo.st.v1.ui.pages;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.sections.AppGeneralSection;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
@@ -42,7 +42,7 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
 	 */
 	public String getFormTitle() {
-		return Messages.appGeneralPageTitle;
+		return CommonMessages.appGeneralPageTitle;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/ConnectorOverviewPage.java Fri Jun 23 06:31:30 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.geronimo.st.v1.ui.pages;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.sections.ConnectorGeneralSection;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
@@ -42,7 +42,7 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
 	 */
 	public String getFormTitle() {
-		return Messages.connectorOverViewPageTitle;
+		return CommonMessages.connectorOverViewPageTitle;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/DeploymentPage.java Fri Jun 23 06:31:30 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.geronimo.st.v1.ui.pages;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.sections.DependencySection;
 import org.apache.geronimo.st.v1.ui.sections.GBeanSection;
 import org.apache.geronimo.st.v1.ui.sections.ImportSection;
@@ -58,7 +58,7 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
 	 */
 	public String getFormTitle() {
-		return Messages.deploymentPageTitle;
+		return CommonMessages.deploymentPageTitle;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/NamingFormPage.java Fri Jun 23 06:31:30 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.geronimo.st.v1.ui.pages;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.sections.EjbLocalRefSection;
 import org.apache.geronimo.st.v1.ui.sections.EjbRefSection;
 import org.apache.geronimo.st.v1.ui.sections.GBeanRefSection;
@@ -65,7 +65,7 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
 	 */
 	public String getFormTitle() {
-		return Messages.namingFormPageTitle;
+		return CommonMessages.namingFormPageTitle;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/SecurityPage.java Fri Jun 23 06:31:30 2006
@@ -1,7 +1,7 @@
 package org.apache.geronimo.st.v1.ui.pages;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.sections.SecurityRootSection;
 import org.apache.geronimo.st.v1.ui.sections.SecuritySection;
 import org.eclipse.emf.ecore.EReference;
@@ -45,7 +45,7 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
 	 */
 	public String getFormTitle() {
-		return Messages.securityPageTitle;
+		return CommonMessages.securityPageTitle;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/pages/WebGeneralPage.java Fri Jun 23 06:31:30 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.geronimo.st.v1.ui.pages;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.sections.WebGeneralSection;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormEditor;
@@ -42,6 +42,6 @@
 	 * @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#getFormTitle()
 	 */
 	public String getFormTitle() {
-		return Messages.webGeneralPageTitle;
+		return CommonMessages.webGeneralPageTitle;
 	}
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/CommonGeneralSection.java Fri Jun 23 06:31:30 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
 import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.eclipse.emf.ecore.EAttribute;
@@ -45,8 +46,8 @@
 
 		Section section = getSection();
 
-		section.setText(Messages.editorSectionGeneralTitle);
-		section.setDescription(Messages.editorSectionGeneralDescription);
+		section.setText(CommonMessages.editorSectionGeneralTitle);
+		section.setDescription(CommonMessages.editorSectionGeneralDescription);
 		section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
 
 		Composite composite = toolkit.createComposite(section);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/DependencySection.java Fri Jun 23 06:31:30 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.Activator;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.DependencyWizard;
 import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -57,7 +57,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorSectionDependenciesTitle;
+		return CommonMessages.editorSectionDependenciesTitle;
 	}
 
 	/*
@@ -66,7 +66,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorSectionDependenciesDescription;
+		return CommonMessages.editorSectionDependenciesDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbLocalRefSection.java Fri Jun 23 06:31:30 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.Activator;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.EjbLocalRefWizard;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,7 +35,7 @@
 	EReference ejbLocalRefERef;
 
 	private static final String[] COLUMN_NAMES = new String[] {
-			Messages.editorEjbRefTargetName, Messages.editorEjbRefEjbLink };
+		CommonMessages.editorEjbRefTargetName, CommonMessages.editorEjbRefEjbLink };
 
 	public EjbLocalRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference ejbLocalRefERef) {
 		super(plan, parent, toolkit, style);
@@ -49,7 +49,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorEjbLocalRefTitle;
+		return CommonMessages.editorEjbLocalRefTitle;
 	}
 
 	/*
@@ -58,7 +58,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorEjbLocalRefDescription;
+		return CommonMessages.editorEjbLocalRefDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/EjbRefSection.java Fri Jun 23 06:31:30 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.Activator;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.EjbRefWizard;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,7 +35,7 @@
 	EReference ejbRefERef;
 
 	private static final String[] COLUMN_NAMES = new String[] {
-			Messages.editorEjbRefTargetName, Messages.editorEjbRefEjbLink };
+		CommonMessages.editorEjbRefTargetName, CommonMessages.editorEjbRefEjbLink };
 
 	/**
 	 * @param plan
@@ -55,7 +55,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorEjbRefTitle;
+		return CommonMessages.editorEjbRefTitle;
 	}
 
 	/*
@@ -64,7 +64,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorEjbRefDescription;
+		return CommonMessages.editorEjbRefDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanRefSection.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.GBeanRefWizard;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -33,8 +33,8 @@
 	EReference gbeanERef;
 
 	private static final String[] COLUMN_NAMES = new String[] {
-			Messages.editorGBeanRefName, Messages.editorGBeanRefType,
-			Messages.editorGBeanRefProxyType };
+		CommonMessages.editorGBeanRefName, CommonMessages.editorGBeanRefType,
+		CommonMessages.editorGBeanRefProxyType };
 
 	public GBeanRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference gbeanERef) {
 		super(plan, parent, toolkit, style);
@@ -48,7 +48,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorGBeanRefTitle;
+		return CommonMessages.editorGBeanRefTitle;
 	}
 
 	/*
@@ -57,7 +57,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorGBeanRefDescription;
+		return CommonMessages.editorGBeanRefDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/GBeanSection.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.GBeanWizard;
 import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -32,8 +32,8 @@
 
 	private EReference gBeanERef;
 
-	private static final String[] COLUMN_NAMES = new String[] { Messages.name,
-			Messages.GbeanName, Messages.className };
+	private static final String[] COLUMN_NAMES = new String[] { CommonMessages.name,
+		CommonMessages.GbeanName, CommonMessages.className };
 
 	/**
 	 * @param plan
@@ -53,7 +53,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorSectionGBeanTitle;
+		return CommonMessages.editorSectionGBeanTitle;
 	}
 
 	/*
@@ -62,7 +62,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorSectionGBeanDescription;
+		return CommonMessages.editorSectionGBeanDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ImportSection.java Fri Jun 23 06:31:30 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
-import org.apache.geronimo.st.v1.ui.internal.Messages;
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.v1.ui.wizards.ImportWizard;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
@@ -35,7 +35,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorSectionImportTitle;
+		return CommonMessages.editorSectionImportTitle;
 	}
 
 	/*
@@ -44,7 +44,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorSectionImportDescription;
+		return CommonMessages.editorSectionImportDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceEnvRefSection.java Fri Jun 23 06:31:30 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.Activator;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.ResourceEnvRefWizard;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,8 +35,8 @@
 	EReference resourceEnvRefERef;
 
 	private static final String[] COLUMN_NAMES = new String[] {
-			Messages.editorResEnvRefNameTitle,
-			Messages.editorResEnvRefMsgDestTitle };
+		CommonMessages.editorResEnvRefNameTitle,
+		CommonMessages.editorResEnvRefMsgDestTitle };
 
 	public ResourceEnvRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference resourceEnvRefERef) {
 		super(plan, parent, toolkit, style);
@@ -50,7 +50,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorResourceEnvRefTitle;
+		return CommonMessages.editorResourceEnvRefTitle;
 	}
 
 	/*
@@ -59,7 +59,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorResourceEnvRefDescription;
+		return CommonMessages.editorResourceEnvRefDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ResourceRefSection.java Fri Jun 23 06:31:30 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.Activator;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.ResourceRefWizard;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -35,8 +35,8 @@
 	EReference resourceRefERef;
 
 	private static final String[] COLUMN_NAMES = new String[] {
-			Messages.editorResRefNameTitle, Messages.editorResRefLinkTitle,
-			Messages.editorResRefTargetNameTitle };
+		CommonMessages.editorResRefNameTitle, CommonMessages.editorResRefLinkTitle,
+		CommonMessages.editorResRefTargetNameTitle };
 
 	public ResourceRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference resourceRefERef) {
 		super(plan, parent, toolkit, style);
@@ -50,7 +50,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorResourceRefTitle;
+		return CommonMessages.editorResourceRefTitle;
 	}
 
 	/*
@@ -59,7 +59,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorResourceRefDescription;
+		return CommonMessages.editorResourceRefDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecurityRootSection.java Fri Jun 23 06:31:30 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.xml.ns.security.SecurityFactory;
 import org.apache.geronimo.xml.ns.security.SecurityPackage;
 import org.apache.geronimo.xml.ns.security.SecurityType;
@@ -68,8 +68,8 @@
 	protected void createClient() {
 		Section section = getSection();
 
-		section.setText(Messages.editorSectionGeneralTitle);
-		section.setDescription(Messages.editorSectionGeneralDescription);
+		section.setText(CommonMessages.editorSectionGeneralTitle);
+		section.setDescription(CommonMessages.editorSectionGeneralDescription);
 		section.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
 
 		Composite composite = toolkit.createComposite(section);
@@ -83,7 +83,7 @@
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
 		section.setClient(composite);
 
-		createLabel(composite, Messages.defaultRole, toolkit);
+		createLabel(composite, CommonMessages.defaultRole, toolkit);
 		defaultRole = toolkit.createText(composite, getDefaultRole(), SWT.BORDER);
 		GridData gd = new GridData();
 		gd.widthHint = 150;
@@ -95,7 +95,7 @@
 			}
 		});
 
-		doas = toolkit.createButton(composite, Messages.doasCurrentCaller, SWT.CHECK);
+		doas = toolkit.createButton(composite, CommonMessages.doasCurrentCaller, SWT.CHECK);
 		doas.setLayoutData(createGridData());
 		doas.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -107,7 +107,7 @@
 			}
 		});
 
-		useCtxHdl = toolkit.createButton(composite, Messages.useContextHandler, SWT.CHECK);
+		useCtxHdl = toolkit.createButton(composite, CommonMessages.useContextHandler, SWT.CHECK);
 		useCtxHdl.setLayoutData(createGridData());
 		useCtxHdl.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/SecuritySection.java Fri Jun 23 06:31:30 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.Activator;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.SecurityRoleWizard;
 import org.apache.geronimo.xml.ns.security.DescriptionType;
 import org.apache.geronimo.xml.ns.security.RoleType;
@@ -50,7 +50,7 @@
 
 	Text roleDescriptionText;
 
-	private static final String[] COLUMN_NAMES = new String[] { Messages.name };
+	private static final String[] COLUMN_NAMES = new String[] { CommonMessages.name };
 
 	/**
 	 * @param plan
@@ -70,7 +70,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorSectionSecurityRolesTitle;
+		return CommonMessages.editorSectionSecurityRolesTitle;
 	}
 
 	/*
@@ -79,7 +79,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorSectionSecurityRolesDescription;
+		return CommonMessages.editorSectionSecurityRolesDescription;
 	}
 
 	/*
@@ -144,7 +144,7 @@
 		detail.setLayout(gl);
 		detail.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
-		Label roleNameLabel = toolkit.createLabel(detail, Messages.name + ":");
+		Label roleNameLabel = toolkit.createLabel(detail, CommonMessages.name + ":");
 		roleNameLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
 		roleNameLabel.setEnabled(true);
 
@@ -152,7 +152,7 @@
 		roleNameText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		roleNameText.setEnabled(true);
 
-		Label roleDescriptionLabel = toolkit.createLabel(detail, Messages.description
+		Label roleDescriptionLabel = toolkit.createLabel(detail, CommonMessages.description
 				+ ":");
 		roleDescriptionLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
 		roleDescriptionLabel.setEnabled(true);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/sections/ServiceRefSection.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.sections;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v1.ui.internal.EMFEditorContext;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.wizards.ServiceRefWizard;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -32,7 +32,7 @@
 
 	EReference serviceRefERef;
 
-	private static final String[] COLUMN_NAMES = new String[] { Messages.editorServiceRefName };
+	private static final String[] COLUMN_NAMES = new String[] { CommonMessages.editorServiceRefName };
 
 	public ServiceRefSection(EObject plan, Composite parent, FormToolkit toolkit, int style, EReference serviceRefERef) {
 		super(plan, parent, toolkit, style);
@@ -46,7 +46,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getTitle()
 	 */
 	public String getTitle() {
-		return Messages.editorServiceRefTitle;
+		return CommonMessages.editorServiceRefTitle;
 	}
 
 	/*
@@ -55,7 +55,7 @@
 	 * @see org.apache.geronimo.ui.sections.AbstractTableSection#getDescription()
 	 */
 	public String getDescription() {
-		return Messages.editorServiceRefDescription;
+		return CommonMessages.editorServiceRefDescription;
 	}
 
 	/*

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/DependencyWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/DependencyWizard.java Fri Jun 23 06:31:30 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
 import org.apache.geronimo.st.v1.ui.internal.Messages;
@@ -98,7 +99,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardNewTitle_Dependency;
+		return CommonMessages.wizardNewTitle_Dependency;
 	}
 
 	/*
@@ -107,7 +108,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_Dependency;
+		return CommonMessages.wizardEditTitle_Dependency;
 	}
 
 	/*
@@ -116,7 +117,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_Dependency;
+		return CommonMessages.wizardPageTitle_Dependency;
 	}
 
 	/*
@@ -125,7 +126,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_Dependency;
+		return CommonMessages.wizardPageDescription_Dependency;
 	}
 
 	/*
@@ -206,21 +207,21 @@
 			mavenButton.setLayoutData(data);
 
 			groupIdLabel = new Label(group, SWT.LEFT);
-			groupIdLabel.setText(Messages.groupId);
+			groupIdLabel.setText(CommonMessages.groupId);
 			groupIdLabel.setLayoutData(createLabelGridData());
 
 			groupIdText = new Text(group, SWT.SINGLE | SWT.BORDER);
 			groupIdText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 			artifactIdLabel = new Label(group, SWT.LEFT);
-			artifactIdLabel.setText(Messages.artifactId);
+			artifactIdLabel.setText(CommonMessages.artifactId);
 			artifactIdLabel.setLayoutData(createLabelGridData());
 
 			artifactIdText = new Text(group, SWT.SINGLE | SWT.BORDER);
 			artifactIdText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 			versionLabel = new Label(group, SWT.LEFT);
-			versionLabel.setText(Messages.version);
+			versionLabel.setText(CommonMessages.version);
 			versionLabel.setLayoutData(createLabelGridData());
 
 			versionText = new Text(group, SWT.SINGLE | SWT.BORDER);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbLocalRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbLocalRefWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbLocalRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbLocalRefWizard.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.xml.ns.naming.NamingFactory;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.ecore.EAttribute;
@@ -35,7 +35,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardNewTitle_EjbLocalRef;
+		return CommonMessages.wizardNewTitle_EjbLocalRef;
 	}
 
 	public EFactory getEFactory() {
@@ -54,7 +54,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_EjbLocalRef;
+		return CommonMessages.wizardEditTitle_EjbLocalRef;
 	}
 
 	/*
@@ -63,7 +63,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_EjbLocalRef;
+		return CommonMessages.wizardPageTitle_EjbLocalRef;
 	}
 
 	/*
@@ -72,7 +72,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_EjbLocalRef;
+		return CommonMessages.wizardPageDescription_EjbLocalRef;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbRefWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/EjbRefWizard.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.xml.ns.naming.NamingFactory;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.ecore.EAttribute;
@@ -45,7 +45,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardNewTitle_EjbRef;
+		return CommonMessages.wizardNewTitle_EjbRef;
 	}
 
 	/*
@@ -54,7 +54,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_EjbRef;
+		return CommonMessages.wizardEditTitle_EjbRef;
 	}
 
 	/*
@@ -63,7 +63,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_EjbRef;
+		return CommonMessages.wizardPageTitle_EjbRef;
 	}
 
 	/*
@@ -72,7 +72,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_EjbRef;
+		return CommonMessages.wizardPageDescription_EjbRef;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanRefWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanRefWizard.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.xml.ns.naming.NamingFactory;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.ecore.EAttribute;
@@ -46,7 +46,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardNewTitle_GBeanRef;
+		return CommonMessages.wizardNewTitle_GBeanRef;
 	}
 
 	/*
@@ -55,7 +55,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_GBeanRef;
+		return CommonMessages.wizardEditTitle_GBeanRef;
 	}
 
 	/*
@@ -64,7 +64,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_GBeanRef;
+		return CommonMessages.wizardPageTitle_GBeanRef;
 	}
 
 	/*
@@ -73,7 +73,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_GBeanRef;
+		return CommonMessages.wizardPageDescription_GBeanRef;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/GBeanWizard.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
 import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
 import org.eclipse.emf.ecore.EAttribute;
@@ -49,7 +49,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardNewTitle_GBean;
+		return CommonMessages.wizardNewTitle_GBean;
 	}
 
 	/*
@@ -58,7 +58,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_GBean;
+		return CommonMessages.wizardEditTitle_GBean;
 	}
 
 	/*
@@ -67,7 +67,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardEditTitle_GBean;
+		return CommonMessages.wizardEditTitle_GBean;
 	}
 
 	/*
@@ -76,7 +76,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageTitle_GBean;
+		return CommonMessages.wizardPageTitle_GBean;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ImportWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ImportWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ImportWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ImportWizard.java Fri Jun 23 06:31:30 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 
 public class ImportWizard extends DependencyWizard {
 
@@ -33,7 +33,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardNewTitle_Import;
+		return CommonMessages.wizardNewTitle_Import;
 	}
 
 	/*
@@ -42,7 +42,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_Import;
+		return CommonMessages.wizardEditTitle_Import;
 	}
 
 	/*
@@ -51,7 +51,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_Import;
+		return CommonMessages.wizardPageTitle_Import;
 	}
 
 	/*
@@ -60,7 +60,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_Import;
+		return CommonMessages.wizardPageDescription_Import;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceEnvRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceEnvRefWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceEnvRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceEnvRefWizard.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.xml.ns.naming.NamingFactory;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.ecore.EAttribute;
@@ -48,7 +48,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardPageTitle_ResEnvRef;
+		return CommonMessages.wizardPageTitle_ResEnvRef;
 	}
 
 	/*
@@ -57,7 +57,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_ResEnvRef;
+		return CommonMessages.wizardEditTitle_ResEnvRef;
 	}
 
 	/*
@@ -66,7 +66,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_ResEnvRef;
+		return CommonMessages.wizardPageTitle_ResEnvRef;
 	}
 
 	/*
@@ -75,7 +75,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_ResEnvRef;
+		return CommonMessages.wizardPageDescription_ResEnvRef;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceRefWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/ResourceRefWizard.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.xml.ns.naming.NamingFactory;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
 import org.eclipse.emf.ecore.EAttribute;
@@ -49,7 +49,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getAddWizardWindowTitle()
 	 */
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardPageTitle_ResRef;
+		return CommonMessages.wizardPageTitle_ResRef;
 	}
 
 	/*
@@ -58,7 +58,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEditWizardWindowTitle()
 	 */
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_ResRef;
+		return CommonMessages.wizardEditTitle_ResRef;
 	}
 
 	/*
@@ -67,7 +67,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageTitle()
 	 */
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_ResRef;
+		return CommonMessages.wizardPageTitle_ResRef;
 	}
 
 	/*
@@ -76,7 +76,7 @@
 	 * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getWizardFirstPageDescription()
 	 */
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_ResRef;
+		return CommonMessages.wizardPageDescription_ResRef;
 	}
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/SecurityRoleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/SecurityRoleWizard.java?rev=416715&r1=416714&r2=416715&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/SecurityRoleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/src/org/apache/geronimo/st/v1/ui/wizards/SecurityRoleWizard.java Fri Jun 23 06:31:30 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.geronimo.st.v1.ui.wizards;
 
+import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
-import org.apache.geronimo.st.v1.ui.internal.Messages;
 import org.apache.geronimo.st.v1.ui.sections.SecuritySection;
 import org.apache.geronimo.xml.ns.security.DescriptionType;
 import org.apache.geronimo.xml.ns.security.RoleMappingsType;
@@ -49,19 +49,19 @@
 	}
 
 	public String getAddWizardWindowTitle() {
-		return Messages.wizardNewTitle_SecurityRole;
+		return CommonMessages.wizardNewTitle_SecurityRole;
 	}
 
 	public String getEditWizardWindowTitle() {
-		return Messages.wizardEditTitle_SecurityRole;
+		return CommonMessages.wizardEditTitle_SecurityRole;
 	}
 
 	public String getWizardFirstPageTitle() {
-		return Messages.wizardPageTitle_SecurityRole;
+		return CommonMessages.wizardPageTitle_SecurityRole;
 	}
 
 	public String getWizardFirstPageDescription() {
-		return Messages.wizardPageDescription_SecurityRole;
+		return CommonMessages.wizardPageDescription_SecurityRole;
 	}
 
 	/*
@@ -90,7 +90,7 @@
 		 */
 		public void doCustom(Composite parent) {
 			Label label = new Label(parent, SWT.LEFT);
-			String columnName = Messages.description;
+			String columnName = CommonMessages.description;
 			if (!columnName.endsWith(":"))
 				columnName = columnName.concat(":");
 			label.setText(columnName);