geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1102573 [1/3] - 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.ui/src/main/java/org/apache/geronimo/st/ui/pages/ org.apache.geronimo.st...
Date Fri, 13 May 2011 06:29:18 GMT
Author: hanhongfang
Date: Fri May 13 06:29:16 2011
New Revision: 1102573

URL: http://svn.apache.org/viewvc?rev=1102573&view=rev
Log:
GERONIMODEVTOOLS-742 NL supports, Thanks Yi Xiao for the patch.

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/pages/AbstractGeronimoFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AdminObjectSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AdminObjectSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRelationSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ExtModuleSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ModuleSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRoleMappingSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.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
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoConsoleAction.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoSupportAction.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractListSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRelationSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ExtModuleSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ModuleSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersContextRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRoleMappingSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/DBPoolWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/MessageDestWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/SecurityRealmWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/blueprint/BlueprintElementWizardProxy.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/facets/GeronimoJEEFacetInstallWizardPage.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java Fri May 13 06:29:16 2011
@@ -307,15 +307,13 @@ public class GeronimoRuntimeWizardFragme
     protected void validate() {
 
         IRuntime runtime = getRuntimeDelegate().getRuntime();
-
-        String runtimeName = runtime.getRuntimeType().getName();
-
         IWizardHandle wizard = getWizard();
-
         if (runtime == null) {
             wizard.setMessage("", IMessageProvider.ERROR);
             return;
         }
+        String runtimeName = runtime.getRuntimeType().getName();
+
 
         IRuntimeWorkingCopy runtimeWC = getRuntimeDelegate().getRuntimeWorkingCopy();
         getRuntimeDelegate().setInstanceProperty("serverRootDirectory", installDir.getText());

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=1102573&r1=1102572&r2=1102573&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 May 13 06:29:16 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.st.ui.internal;
 
+
 import org.apache.geronimo.st.ui.Activator;
 import org.eclipse.osgi.util.NLS;
 
@@ -25,11 +26,15 @@ import org.eclipse.osgi.util.NLS;
  * @version $Rev$ $Date$
  */
 public class Messages extends NLS {
-
-    static {
+   
+	static {
         NLS.initializeMessages(Activator.PLUGIN_ID + ".internal.Messages", Messages.class);
     }
-
+	
+	public static String dbAddNewDriver;
+    public static String formServerInfo;
+    public static String formHelp;
+    
     public static String editorTabSource;
 
     public static String editorSectionSecurityTitle;
@@ -539,4 +544,111 @@ public class Messages extends NLS {
     public static String installable;
     public static String event;
     public static String prerequisites;
+	public static String newSecurityRealm;
+	public static String editSecurityRealm;
+	public static String triggerUpdateServerInfo;
+	public static String syncDeployDescAndDeplPlan;
+	public static String poolNameInvalidTitle;
+	public static String poolNameInvalidDesc;
+	public static String poolTypeInvalidTitle;
+	public static String poolTypeInvalidDesc;
+	public static String dbNameInvalidTitle;
+	public static String dbNameInvalidDesc;
+	public static String dbDriverInvalidTitle;
+	public static String dbDriverInvalidDesc;
+	public static String dbLoginError0;
+	public static String dbLoginError1;
+	public static String dbWizardPwd;
+	public static String dbWizardLoginTimeout;
+	public static String dbWizardDbName;
+	public static String dbWizardCreateDb;
+	public static String dbWizardUserName;
+	public static String dbWizardConnector;
+	public static String dbWizardExternalPath;
+	public static String dbWizardGroupId;
+	public static String dbWizardArtifactId;
+	public static String dbWizardArtifactVersion;
+	public static String dbWizardArtifactType;
+	public static String dbWizardSpecifyConnectInRepository;
+	public static String ejbRelalitionName;
+	public static String ejbMTMTableName;
+	public static String ejbRelalitionRoleName;
+	public static String ejbCmrFiledMapping;
+	public static String gbean;
+	public static String clazz;
+	public static String attribute;
+	public static String dependency;
+	public static String artifact;
+	public static String group;
+	public static String module;
+	public static String reference;
+	public static String geronimoDeploymentPlan;
+	public static String configGeronimoDeploymentPlan;
+	public static String error;
+	public static String waring;
+	public static String pattern;
+	public static String unit;
+	public static String property;
+	public static String key;
+	public static String userBase;
+	public static String userSearchMachting;
+	public static String userSearchSubtree;
+	public static String roleSearchConfig;
+	public static String roleBase;
+	public static String roleName;
+	public static String roleUserSearchStr;
+	public static String userRoleSearchStr;
+	public static String roleSearchSubtree;
+	public static String propertiesFileRealm;
+	public static String sqlRealm;
+	public static String ldapRealm;
+	public static String propertiesFileRealmDesc;
+	public static String fileUri;
+	public static String userFileUri;
+	public static String groupFileUri;
+	public static String digestConfig;
+	public static String sqlRealmDesc;
+	public static String ldapRealmDesc;
+	public static String ldapServerConnection;
+	public static String initContextFactory;
+	public static String connectionUrl;
+	public static String connectUsername;
+	public static String conncetPwd;
+	public static String connectProtocol;
+	public static String authentication;
+	public static String ldapRealmSearchConfig;
+	public static String editLdapRealmSearch;
+	public static String userSearchConfig;
+	public static String none;
+	public static String simple;
+	public static String strong;
+	public static String distinguishedName;
+	public static String realmPrincipal;
+	public static String domainName;
+	public static String loginDomainPrincipal;
+	public static String principal;
+	public static String serviceReference;
+	public static String host;
+	public static String port;
+	public static String portCompletionName;
+	public static String editorSectionAdminObjectInstance;
+	public static String configPropertySetting;
+	public static String wizardDatabasePoolDescription;
+	public static String wizardDatabasePoolTitle;
+	public static String wizardDatabasePoolConnector;
+	public static String wizardDatabasePoolExternalPath;
+	public static String wizardDatabasePoolNew;
+	public static String wizardDatabasePoolEdit;
+	public static String gbeanType;
+	
+	public static String wizardSecurityRealmTitle;
+	public static String wizardSecurityRealmDescription;
+	public static String wizardSecurityRealmName;
+	public static String wizardLoginModuleClass;
+	public static String wizardSecurityRealmNew;
+	public static String wizardSecurityRealmEdit;
 }
+
+
+
+

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=1102573&r1=1102572&r2=1102573&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 May 13 06:29:16 2011
@@ -16,6 +16,57 @@
 #
 # $Rev$ $Date$
 #
+userBase=User Base:
+userSearchMachting=User Search Matching:
+userSearchSubtree=User Search Subtree
+roleSearchConfig=Role Search Configuration
+roleBase=Role Base:
+roleName=Role Name:
+roleUserSearchStr=Role User Search String:
+userRoleSearchStr=User Role Search String:
+roleSearchSubtree=Role Search Subtree
+
+copyTargetFileFailed=Copy target file failed.
+downloadServer=download server
+getServer=get server
+tooltip=tool tip
+geronimoDeploymentPlan=Geronimo Deployment Plan
+configGeronimoDeploymentPlan=Configure the geronimo deployment plan.
+poolNameInvalidTitle=Pool Name Invalid
+poolNameInvalidDesc=Pool name specified is invalid
+poolTypeInvalidTitle=Pool type invalid
+poolTypeInvalidDesc=Pool type specified is invalid
+dbNameInvalidTitle=Database name invalid
+dbNameInvalidDesc=Database name specified is invalid
+dbDriverInvalidTitle=Driver invalid
+dbDriverInvalidDesc=You haven't selected a driver
+dbLoginError0=Password provided in both fields do not match
+dbLoginError1=Invalid Login Details
+dbWizardPwd=Password
+dbWizardLoginTimeout=LoginTimeout
+dbWizardDbName=DatabaseName
+dbWizardCreateDb=CreateDatabase
+dbWizardUserName=UserName
+dbWizardConnector=Connector:
+dbWizardExternalPath=External Path
+dbWizardGroupId=Group Id:
+dbWizardArtifactId=Artifact Id:
+dbWizardArtifactVersion=Version:
+dbWizardArtifactType=Type:
+dbWizardSpecifyConnectInRepository=Specify the connector rar in the repository
+ejbRelalitionName=EJB Relation\: name \=
+ejbMTMTableName=MTM table name \=
+ejbRelalitionRoleName=EJB Relationship Role\: name \=
+ejbCmrFiledMapping=CMR Field Mapping
+
+syncDeployDescAndDeplPlan=Sync Deployment Descriptor and Deployment Plan
+triggerUpdateServerInfo=Trigger update of GeronimoServerInfo
+editSecurityRealm=Edit Security Realm
+newSecurityRealm=New Security Realm
+dbAddNewDriver=Add New Driver
+formServerInfo=serverInfo
+formHelp=help
+
 appGeneralPageTitle=Application Plan General Configuration
 appClientGeneralPageTitle=Application Client Plan General Configuration
 connectorOverViewPageTitle=Connector Plan General Configuration
@@ -56,6 +107,8 @@ editorSectionClientNonOverridableTitle=C
 editorSectionClientNonOverridableDescription=The following classes are not overridable in the client.
 
 editorSectionAdminObjectTitle=Admin Objects
+editorSectionAdminObjectInstance=Admin Object Instance
+configPropertySetting=Config Property Setting
 editorSectionAdminObjectDescription=The following admin objects are defined:
 editorSectionMessageDestTitle=Message Destinations
 editorSectionMessageDestDescription=The following message destinations are defined:
@@ -154,6 +207,9 @@ editorEjbRelationTitle = EJB Relations
 add=Add
 remove=Remove
 edit=Edit
+unit=unit
+pattern=pattern
+property=Property
 
 wizardNewTitle_ResRef=New Resource Reference
 wizardEditTitle_ResRef=Edit Resource Reference
@@ -216,9 +272,15 @@ wizardSecondPageTitle_SecurityRealm=Data
 wizardFirstPageDescription_SecurityRealm=Edit basic settings for creating new security realm.
 wizardSecondPageDescription_SecurityRealm=Edit settings for specifying data source.
 
+fileUri=Files's URI
+userFileUri=Users File URI:
+groupFileUri=Groups File URI:
+digestConfig=Digest Configuration
+
 basicSettings=Basic Settings
-realmName=Realm Name:
+realmName=Realm Name_modify:
 realmType=Realm Type:
+digestConfig=Digest Configuration
 digestAlgorithm=Digest Algorithm:
 digestEncoding=Digest Encoding:
 
@@ -336,6 +398,12 @@ groupName = Group name
 passwordNotEqual = Password do not match!
 manageAccount = Manage Account
 manageAccountDescription = Manage account for default .properties file Realm
+propertiesFileRealm=Properties File Realm
+propertiesFileRealmDesc=Edit settings for users file and groups file's paths
+sqlRealmDesc=Edit settings for user and group select sql
+ldapRealmDesc=Edit settings for LDAP server connection
+sqlRealm=SQL Realm
+ldapRealm=LDAP Realm
 cannotSave = Account information can not be stored!
 cannotRead = Account information can not be read!
 isNotLocalHost = It is not a local host.
@@ -348,6 +416,7 @@ type=Type
 element=Element
 customName=Custom Name
 value=Value
+key=key
 contextName=Context Name
 unitRefName=Unit Ref Name
 unitName=Unit Name
@@ -370,6 +439,16 @@ editorTabSource=Source
 
 name=Name
 description=Description
+gbean=Gbean
+gbeanType=Gbean type
+clazz=class
+attribute=Attribute
+dependency=dependency
+module=module
+artifact=artifact
+custom=custom
+reference=Reference
+group=group
 
 console={0} Console
 consoleTooltip={0} Console
@@ -410,6 +489,8 @@ tooltipInstall=Download the selected {0}
 tooltipJetty=Selects the Jetty distribution of Geronimo to install.
 tooltipTomcat=Selects the Tomcat distribution of Geronimo to install.
 
+host=host
+port=port
 hostName=Hostname:
 adminId=Administrator id:
 adminPassword=Administrator password:
@@ -439,6 +520,8 @@ editorSectionPublishAdvancedDescription=
 notRedeployJSPFilesReminder = Important 
 notRedeployJSPFilesInformation = You must enable \"Development Mode\" of your server's JSP compiler for this to function properly. 
 
+error=Error
+waring=Warning
 publishingTimeout=Publishing Timeout (ms):
 artifactType=Artifact Type:
 inverseClassloading=Inverse classloading
@@ -469,6 +552,7 @@ externalPath=External Path
 altDD=Alternate DD
 
 serviceCompletionName=Service Completion Name:
+portCompletionName=Port Completion Name:
 protocol=Protocol:
 credential=Credential:
 bindingName=Binding Name:
@@ -502,6 +586,14 @@ wizardPage4Title_PluginManager=Install P
 wizardPage4Description_PluginManager=Select plug-ins to be installed to the server.
 wizardPage5Title_PluginManager=Installation Complete
 wizardPage5Description_PluginManager=List of plug-ins that have been installed to the server. 
+
+wizardSecurityRealmTitle=Security Realm
+wizardSecurityRealmDescription=The following security realms are defined:
+wizardSecurityRealmName=Security Realm Name
+wizardLoginModuleClass=Login Module Class
+wizardSecurityRealmNew=New Security Realm
+wizardSecurityRealmEdit=Edit Security Realm
+
 localPluginRepo=Local Plug-in Repository:
 failedToSave=Failed to save {0}.
 savedSuccess={0} saved successfully.
@@ -538,5 +630,34 @@ driverGroup=Driver Details
 basicGroup=Basic Settings
 advancedGroup=Advanced Settings
 
-
+ldapServerConnection=LDAP server connection
+initContextFactory=Initial Context Factory:
+connectionUrl=Connection URL:
+connectUsername=Connect user name:
+conncetPwd=Connect Password:
+confirmPassword=Confirm Password:
+connectProtocol=Connect Protocol:
+authentication=Authentication:
+
+ldapRealmSearchConfig=LDAP Realm Search Configuration
+editLdapRealmSearch=Edit settings for LDAP realm search
+userSearchConfig=User Search Configuration
+
+none=none
+simple=simple
+strong=strong
+
+distinguishedName=DistinguishedName
+realmPrincipal=RealmPrincipal
+domainName=domain name
+loginDomainPrincipal=LoginDomainPrincipal
+principal=Principal
+
+#DBPoolsection
+wizardDatabasePoolConnector=Connector
+wizardDatabasePoolExternalPath=External Path
+wizardDatabasePoolTitle=Database Pools
+wizardDatabasePoolDescription=The following database pools are defined:
+wizardDatabasePoolNew=New Database Pool;
+wizardDatabasePoolEdit=Edit Database Pool;
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/pages/AbstractGeronimoFormPage.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/pages/AbstractGeronimoFormPage.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/pages/AbstractGeronimoFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/pages/AbstractGeronimoFormPage.java Fri May 13 06:29:16 2011
@@ -23,6 +23,7 @@ import org.apache.geronimo.st.core.descr
 import org.apache.geronimo.st.ui.Activator;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
 import org.apache.geronimo.st.ui.editors.SharedDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
@@ -99,7 +100,7 @@ public abstract class AbstractGeronimoFo
         toolkit.decorateFormHeading(form.getForm());
         IToolBarManager manager = form.getToolBarManager();
 
-        Action serverInfoRefresh = new Action("serverInfo") { //$NON-NLS-1$
+        Action serverInfoRefresh = new Action(Messages.formServerInfo) {
             public void run() {
                 BusyIndicator.showWhile(form.getDisplay(), new Runnable() {
                     public void run() {
@@ -108,12 +109,12 @@ public abstract class AbstractGeronimoFo
                 });
             }
         };
-        serverInfoRefresh.setToolTipText("Trigger update of GeronimoServerInfo");
+        serverInfoRefresh.setToolTipText(Messages.triggerUpdateServerInfo);
         serverInfoRefresh.setImageDescriptor(Activator.imageDescriptorFromPlugin("org.apache.geronimo.st.ui",
                 "icons/obj16/update.gif"));
         manager.add(serverInfoRefresh);
 
-        Action helpAction = new Action("help") { //$NON-NLS-1$
+        Action helpAction = new Action(Messages.formHelp) {
             public void run() {
                 BusyIndicator.showWhile(form.getDisplay(), new Runnable() {
                     public void run() {
@@ -122,7 +123,7 @@ public abstract class AbstractGeronimoFo
                 });
             }
         };
-        helpAction.setToolTipText("help");
+        helpAction.setToolTipText(Messages.formHelp);
         helpAction.setImageDescriptor(Activator.imageDescriptorFromPlugin("org.apache.geronimo.st.ui",
                 "icons/obj16/help.gif"));
         manager.add(helpAction);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.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/sections/AbstractListSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractListSection.java Fri May 13 06:29:16 2011
@@ -24,6 +24,7 @@ import javax.xml.bind.JAXBElement;
 import org.apache.geronimo.st.core.descriptor.AbstractDeploymentDescriptor;
 import org.apache.geronimo.st.ui.Activator;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.wizards.AbstractWizard;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
@@ -150,7 +151,7 @@ public abstract class AbstractListSectio
     }
 
     protected IAction getSyncAction() {
-        return new SyncAction("Sync Deployment Descriptor and Deployemnt Plan");
+    	return new SyncAction(Messages.syncDeployDescAndDeplPlan);
     }
 
     protected Composite createComposite(Composite parent, int numColumns) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AdminObjectSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AdminObjectSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AdminObjectSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/AdminObjectSection.java Fri May 13 06:29:16 2011
@@ -24,6 +24,7 @@ import org.apache.geronimo.j2ee.connecto
 import org.apache.geronimo.j2ee.connector.AdminobjectType;
 import org.apache.geronimo.j2ee.connector.ConfigPropertySettingType;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v11.ui.Activator;
 import org.apache.geronimo.st.v11.ui.wizards.AdminObjectWizard;
@@ -137,17 +138,17 @@ public class AdminObjectSection extends 
             public String getText(Object element) {
                 if (AdminobjectType.class.isInstance(element)) {
                 	AdminobjectType admin = (AdminobjectType)element;
-                    return "Admin Object: interface = \"" + admin.getAdminobjectInterface() +
-                            "\", class = \"" + admin.getAdminobjectClass() + "\"";
+                    return Messages.editorSectionAdminObjectTitle + ": " + Messages.interfaceName + " = \"" + admin.getAdminobjectInterface() +
+                    "\", " + Messages.clazz + " = \"" + admin.getAdminobjectClass() + "\"";
                 }
                 if (AdminobjectInstanceType.class.isInstance(element)) {
                 	AdminobjectInstanceType aoInstance = (AdminobjectInstanceType)element;
-                    return "Admin Object Instance: message destination name = \"" + aoInstance.getMessageDestinationName() + "\"";
+                    return Messages.editorSectionAdminObjectInstance + ": " +  Messages.messageDestinationName + " = \"" + aoInstance.getMessageDestinationName() + "\"";
                 }
                 if (ConfigPropertySettingType.class.isInstance(element)) {
                 	ConfigPropertySettingType property = (ConfigPropertySettingType)element;
-                    return "Config Property Setting: name = \"" + property.getName() +
-                            "\", value = \"" + property.getValue() + "\"";
+                    return Messages.configPropertySetting + ": " + Messages.name + " = \"" + property.getName() +
+                    "\", " + Messages.value + " = \"" + property.getValue() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/EjbRelationSection.java Fri May 13 06:29:16 2011
@@ -24,6 +24,7 @@ import org.apache.geronimo.j2ee.openejb_
 import org.apache.geronimo.j2ee.openejb_jar.EjbRelationshipRoleType;
 import org.apache.geronimo.j2ee.openejb_jar.RelationshipsType;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v11.ui.Activator;
 import org.apache.geronimo.st.v11.ui.wizards.EjbRelationWizard;
@@ -144,20 +145,21 @@ public class EjbRelationSection extends 
             public String getText(Object element) {
                 if (EjbRelationType.class.isInstance(element)) {
                 	EjbRelationType relation = (EjbRelationType)element;
-                    return "EJB Relation: name = \"" + relation.getEjbRelationName() +
-                            "\", MTM table name = \"" + relation.getManyToManyTableName() + "\"";
+                    return Messages.ejbRelalitionName + " \"" + relation.getEjbRelationName() +
+                    "\", " + Messages.ejbMTMTableName +  " \"" + relation.getManyToManyTableName() + "\"";
                 }
                 if (EjbRelationshipRoleType.class.isInstance(element)) {
                 	EjbRelationshipRoleType role = (EjbRelationshipRoleType)element;
-                    return "EJB Relationship Role: name = \"" + role.getEjbRelationshipRoleName() +
-                            "\", source = \"" + role.getRelationshipRoleSource().getEjbName() +
-                            "\", CMR field name = \"" + role.getCmrField().getCmrFieldName() + "\"";
+                    return Messages.ejbRelalitionRoleName + " \"" + role.getEjbRelationshipRoleName() +
+                    "\", " + Messages.ejbSourceName +  " = \"" + role.getRelationshipRoleSource().getEjbName() + 
+                    "\", " + Messages.cmrFieldName + " = \"" + role.getCmrField().getCmrFieldName() + "\"";
+
                 }
                 if (EjbRelationshipRoleType.RoleMapping.CmrFieldMapping.class.isInstance(element)) {
                 	EjbRelationshipRoleType.RoleMapping.CmrFieldMapping fieldMapping =
                             (EjbRelationshipRoleType.RoleMapping.CmrFieldMapping)element;
-                    return "CMR Field Mapping: key column = \"" + fieldMapping.getKeyColumn() +
-                            "\", foreign key column = \"" + fieldMapping.getForeignKeyColumn() + "\"";
+                    return Messages.ejbCmrFiledMapping + ": " +  Messages.keyColumn + " = \"" + fieldMapping.getKeyColumn() +
+                    "\", " + Messages.foreignKeyColumn + " = \"" + fieldMapping.getForeignKeyColumn() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ExtModuleSection.java Fri May 13 06:29:16 2011
@@ -22,6 +22,7 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.j2ee.application.ExtModuleType;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v11.ui.wizards.ExtModuleWizard;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -69,13 +70,13 @@ public class ExtModuleSection extends Ab
                     switch (columnIndex) {
                     case 0:
                         if (extModule.getConnector() != null) {
-                            return "connector";
+                            return Messages.connector;
                         } else if (extModule.getEjb() != null) {
-                            return "ejb";
+                            return Messages.ejb;
                         } else if (extModule.getJava() != null) {
-                            return "java";
+                            return Messages.java;
                         } else if (extModule.getWeb() != null) {
-                            return "web";
+                            return Messages.web;
                         }
                         return "";
                     case 1:

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java Fri May 13 06:29:16 2011
@@ -25,6 +25,7 @@ import org.apache.geronimo.j2ee.deployme
 import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils;
 import org.apache.geronimo.j2ee.naming.GbeanRefType;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v11.ui.Activator;
 import org.apache.geronimo.st.v11.ui.wizards.GBeanRefWizard;
@@ -177,18 +178,18 @@ public class GBeanRefSection extends Abs
                 }
                 if (GbeanRefType.class.isInstance(element)) {
                 	GbeanRefType gbeanRef = (GbeanRefType)element;
-                    return "Gbean Ref: name = \"" + gbeanRef.getRefName() + "\"";
+                    return Messages.editorGBeanRefTitle + ": " + Messages.name + " = \"" + gbeanRef.getRefName() + "\"";
                 }
                 else if (String.class.isInstance(element)) {
-                    return "Gbean type: name = \"" + (String)element + "\"";
+                    return Messages.gbeanType + ": " + Messages.name + " = \"" + (String)element + "\"";
                 }
                 else if (PatternType.class.isInstance(element)) {
                 	PatternType pattern = (PatternType)element;
-                    return "Pattern: name = \"" + pattern.getCustomFoo() + 
-                            "\", group = \"" + pattern.getGroupId() + 
-                            "\", artifact = \"" + pattern.getArtifactId() + 
-                            "\", version = \"" + pattern.getVersion() + 
-                            "\", module = \"" + pattern.getModule() + "\"";
+                    return Messages.pattern + ": " + Messages.name + " = \"" + pattern.getCustomFoo() + 
+                            "\", " + Messages.group + "  = \"" + pattern.getGroupId() + 
+                            "\", " + Messages.artifactId + "  = \"" + pattern.getArtifactId() + 
+                            "\", " + Messages.version + "  = \"" + pattern.getVersion() + 
+                            "\", " + Messages.module + "  = \"" + pattern.getModule() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanSection.java Fri May 13 06:29:16 2011
@@ -25,6 +25,7 @@ import org.apache.geronimo.j2ee.deployme
 import org.apache.geronimo.j2ee.deployment.PatternType;
 import org.apache.geronimo.j2ee.deployment.ReferenceType;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v11.ui.Activator;
 import org.apache.geronimo.st.v11.ui.wizards.GBeanWizard;
@@ -137,35 +138,35 @@ public class GBeanSection extends Abstra
                     Object object = ((JAXBElement)element).getValue();
                     if (GbeanType.class.isInstance(object)) {
                     	GbeanType gbean = (GbeanType)object;
-                        return "GBean: name = \"" + gbean.getName() +
-                                "\", class = \"" + gbean.getClazz() + "\"";
+            return Messages.gbean + ": " + Messages.name + " =\"" + gbean.getName() +
+            	"\", " + Messages.clazz + "\"" + gbean.getClazz() + "\"";
                     }
                     else if (AttributeType.class.isInstance(object)) {
                     	AttributeType attribute = (AttributeType)object;
-                        return "Attribute: name = \"" + attribute.getName() + 
-                                "\", type = \"" + attribute.getType() + 
-                                "\", value = \"" + attribute.getValue() + "\"";
+            return Messages.attribute + Messages.name + " = \"" + attribute.getName() + 
+            	"\", " + Messages.type + " = \"" + attribute.getType() + 
+            	"\", " + Messages.value + " = \"" + attribute.getValue() + "\"";
                     }
                     else if (PatternType.class.isInstance(object)) {
                     	PatternType dependency = (PatternType)object;
-                        return "Dependency: group = \"" + dependency.getGroupId() +
-                                "\", artifact = \"" + dependency.getArtifactId() +
-                                "\", version = \"" + dependency.getVersion() +
-                                "\", module = \"" + dependency.getModule() +
-                                "\", type = \"" + dependency.getType() +
-                                "\", custom name = \"" + dependency.getCustomFoo() + "\"";
+            return Messages.dependency + ": " + Messages.group + " = \"" + dependency.getGroupId() + 
+            	"\", " + Messages.artifact + " = \"" + dependency.getArtifactId() + 
+            	"\", " + Messages.version +  "= \"" + dependency.getVersion()+ 
+            	"\", " + Messages.module +  " = \"" + dependency.getModule()+ 
+            	"\", " + Messages.type + " = \"" + dependency.getType()+ 
+            	"\", " + Messages.customName + " = \"" + dependency.getCustomFoo() + "\"";
                     }
                     else if (ReferenceType.class.isInstance(object)) {
                     	ReferenceType reference = (ReferenceType)object;
-                        return "Reference: name = \"" + reference.getName() +
-                                "\", group = \"" + reference.getGroupId() +
-                                "\", artifact = \"" + reference.getArtifactId() +
-                                "\", version = \"" + reference.getVersion() +
-                                "\", module = \"" + reference.getModule() +
-                                "\", type = \"" + reference.getType() +
-                                "\", custom name = \"" + reference.getCustomFoo() + "\"";
-                    }
-                }
+            return Messages.reference + ":" + Messages.name + " = \"" + reference.getName()
+                + "\", " + Messages.group + " = \"" + reference.getGroupId()
+                + "\", " + Messages.artifact + " = \"" + reference.getArtifactId()
+                + "\", " + Messages.version + " = \"" + reference.getVersion()
+                + "\", " + Messages.module + " = \"" + reference.getModule()
+                + "\", " + Messages.type + " = \"" + reference.getType()
+                + "\", " + Messages.customName + " = \"" + reference.getCustomFoo() + "\"";
+            }
+        }
 
                 return null;
             }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ModuleSection.java Fri May 13 06:29:16 2011
@@ -22,6 +22,7 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.j2ee.application.ModuleType;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v11.ui.wizards.ModuleWizard;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -68,13 +69,13 @@ public class ModuleSection extends Abstr
                     switch (columnIndex) {
                     case 0:
                         if (module.getConnector() != null) {
-                            return "connector";
+                            return Messages.connector;
                         } else if (module.getEjb() != null) {
-                            return "ejb";
+                            return Messages.ejb;
                         } else if (module.getJava() != null) {
-                            return "java";
+                            return Messages.java;
                         } else if (module.getWeb() != null) {
-                            return "web";
+                            return Messages.web;
                         }
                         return "";
                     case 1:

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/SecurityRoleMappingSection.java Fri May 13 06:29:16 2011
@@ -35,6 +35,7 @@ import org.apache.geronimo.st.core.descr
 import org.apache.geronimo.st.core.descriptor.EjbDeploymentDescriptor;
 import org.apache.geronimo.st.core.descriptor.WebDeploymentDescriptor;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v11.ui.Activator;
 import org.apache.geronimo.st.v11.ui.wizards.SecurityRoleMappingWizard;
@@ -117,7 +118,7 @@ public class SecurityRoleMappingSection 
         try {
 			((ArrayList) JAXBUtils.getValue(role, selectedObject.getClass().getSimpleName())).remove(selectedObject);
 		} catch (Exception e) {
-			MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+            MessageDialog.openError(Display.getCurrent().getActiveShell(),Messages.error, e.getMessage());
 		}
     }
 
@@ -256,29 +257,30 @@ public class SecurityRoleMappingSection 
             public String getText(Object element) {
                 if (RoleType.class.isInstance(element)) {
                 	RoleType role = (RoleType) element;
-                    return "Role: role-name = \"" + role.getRoleName() + "\"";
+                    return Messages.roleName + ": \"" + role.getRoleName() + "\"";
                 }
                 else if (element instanceof DistinguishedNameType) {
                 	DistinguishedNameType object = (DistinguishedNameType) element;
-                    return "DistinguishedName: name = \"" + object.getName() + "\"";
+                    return Messages.distinguishedName + ": \"" + object.getName() + "\"";
                 }
                 else if (element instanceof RealmPrincipalType) {
                 	RealmPrincipalType object = (RealmPrincipalType) element;
-                    return "RealmPrincipal: name = \"" + object.getName() +
-                            "\", class = \"" + object.getClazz() +
-                            "\", domain-name = \"" + object.getDomainName() +
-                            "\", realm-name = \"" + object.getRealmName() +"\"";
+                    return Messages.realmPrincipal + ": \"" + object.getName() +
+                    "\", " + Messages.clazz + " = \"" + object.getClazz() +
+                    "\", " + Messages.domainName + " = \"" + object.getDomainName() +
+                    "\", " + Messages.realmName + " = \"" + object.getRealmName() +"\"";
+                    
                 }
                 else if (element instanceof LoginDomainPrincipalType) {
                 	LoginDomainPrincipalType object = (LoginDomainPrincipalType) element;
-                    return "LoginDomainPrincipal: name = \"" + object.getName() +
-                            "\", class = \"" + object.getClazz() +
-                            "\", domain-name = \"" + object.getDomainName() +"\"";
+                    return Messages.loginDomainPrincipal + ": = \"" + object.getName() +
+                    "\", " + Messages.clazz + " = \"" + object.getClazz() +
+                    "\", " + Messages.domainName + " = \"" + object.getDomainName() +"\"";
                 }
                 else if (element instanceof PrincipalType) {
                 	PrincipalType object = (PrincipalType) element;
-                    return "Principal: name = \"" + object.getName() +
-                            "\", class = \"" + object.getClazz() + "\"";
+                    return Messages.principal + " = \"" + object.getName() +
+                    "\", " + Messages.clazz + " = \"" + object.getClazz() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/ServiceRefSection.java Fri May 13 06:29:16 2011
@@ -25,6 +25,7 @@ import org.apache.geronimo.j2ee.naming.P
 import org.apache.geronimo.j2ee.naming.PortType;
 import org.apache.geronimo.j2ee.naming.ServiceRefType;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v11.ui.Activator;
 import org.apache.geronimo.st.v11.ui.wizards.ServiceRefWizard;
@@ -141,30 +142,31 @@ public class ServiceRefSection extends A
             public String getText(Object element) {
                 if (ServiceRefType.class.isInstance(element)) {
                 	ServiceRefType serviceRef = (ServiceRefType)element;
-                        String retString = "Service Ref: name = \"" + serviceRef.getServiceRefName() + "\"";
+                    	String retString = Messages.serviceReference + ": " + Messages.name + " = \"" + serviceRef.getServiceRefName() + "\"";
                         if (serviceRef.getServiceCompletion() != null) {
-                            retString += ", service completion name = \"" + serviceRef.getServiceCompletion().getServiceName() + "\"";
+                        	retString += ", " + Messages.serviceCompletionName + " = \"" + serviceRef.getServiceCompletion().getServiceName() + "\"";
                         }
                         return retString;
                 }
                 else if (PortType.class.isInstance(element)) {
                 	PortType port = (PortType)element;
-                    return "Port: name = \"" + port.getPortName() + 
-                            "\", protocol = \"" + port.getProtocol() + 
-                            "\", host = \"" + port.getHost() + 
-                            "\", port = \"" + port.getPort() + 
-                            "\", uri = \"" + port.getUri() + 
-                            "\", credential = \"" + port.getCredentialsName() + "\"";
+                    return Messages.portName + " = \"" + port.getPortName() + 
+                    "\", " + Messages.protocol + " = \"" + port.getProtocol() + 
+                    "\", " + Messages.host + " = \"" + port.getHost() + 
+                    "\", " + Messages.port + " = \"" + port.getPort() + 
+                    "\", " + Messages.uri + " = \"" + port.getUri() + 
+                    "\", " + Messages.credential + " = \"" + port.getCredentialsName() + "\"";
+
                 }
                 else if (PortCompletionType.class.isInstance(element)) {
                 	PortCompletionType portComp = (PortCompletionType)element;
-                    return "Port Completion: name = \"" + portComp.getPort().getPortName() + 
-                            "\", protocol = \"" + portComp.getPort().getProtocol() + 
-                            "\", host = \"" + portComp.getPort().getHost() + 
-                            "\", port = \"" + portComp.getPort().getPort() + 
-                            "\", uri = \"" + portComp.getPort().getUri() + 
-                            "\", credential = \"" + portComp.getPort().getCredentialsName() +
-                            "\", binding name = \"" + portComp.getBindingName() + "\"";
+                    return Messages.portCompletionName + " = \"" + portComp.getPort().getPortName() + 
+                            "\", " + Messages.protocol + " = \"" + portComp.getPort().getProtocol() + 
+                            "\", " + Messages.host + " = \"" + portComp.getPort().getHost() + 
+                            "\", " + Messages.port + " = \"" + portComp.getPort().getPort() + 
+                            "\", " + Messages.uri + " = \"" + portComp.getPort().getUri() + 
+                            "\", " + Messages.credential + " = \"" + portComp.getPort().getCredentialsName() +
+                            "\", " + Messages.bindingName + "  = \"" + portComp.getBindingName() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/FacetInstallPage.java Fri May 13 06:29:16 2011
@@ -17,6 +17,7 @@
 package org.apache.geronimo.st.v11.ui.wizards;
 
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.core.DeploymentPlanInstallConfig;
 import org.apache.geronimo.st.v11.ui.internal.Trace;
 import org.eclipse.swt.SWT;
@@ -45,8 +46,8 @@ public class FacetInstallPage extends Ab
         super("geronimo.plan.install");
         Trace.trace("Constructor Entry", "FacetInstallPage");
         
-        setTitle("Geronimo Deployment Plan");
-        setDescription("Configure the geronimo deployment plan.");
+        setTitle(Messages.geronimoDeploymentPlan);
+        setDescription(Messages.configGeronimoDeploymentPlan);
         
         Trace.trace("Constructor Exit", "FacetInstallPage");
     }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/wizards/MessageDestWizard.java Fri May 13 06:29:16 2011
@@ -25,6 +25,7 @@ import org.apache.geronimo.j2ee.naming.P
 import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory;
 import org.apache.geronimo.jaxbmodel.common.operations.JAXBUtils;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
 import org.apache.geronimo.j2ee.jaxbmodel.operations.JAXBModelUtils;
@@ -105,7 +106,7 @@ public class MessageDestWizard extends A
 						try {
 							value = (String) JAXBUtils.getValue(pattern,getTableColumnEAttributes()[i]);
 						} catch (Exception e) {
-							MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+                            MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
 						}
                         if (value != null) {
                             text.setText(value);
@@ -117,7 +118,7 @@ public class MessageDestWizard extends A
 						try {
 							value = (String) JAXBUtils.getValue(eObject,getTableColumnEAttributes()[i]);
 						} catch (Exception e) {
-							MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+                            MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
 						}
                         if (value != null) {
                             text.setText(value);
@@ -171,13 +172,13 @@ public class MessageDestWizard extends A
 				try {
 					JAXBUtils.setValue(eObject, attribute, value);
 				} catch (Exception e) {
-					MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+                    MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
 				}
 			else
 				try {
 					JAXBUtils.setValue(msgPattern, attribute, value);
 				} catch (Exception e) {
-					MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+                    MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
 				}
         }
         

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AdminObjectSection.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/AdminObjectSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AdminObjectSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AdminObjectSection.java Fri May 13 06:29:16 2011
@@ -24,6 +24,7 @@ import org.apache.geronimo.jee.connector
 import org.apache.geronimo.jee.connector.AdminobjectInstance;
 import org.apache.geronimo.jee.connector.ConfigPropertySetting;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.v21.ui.wizards.AdminObjectWizard;
@@ -137,17 +138,17 @@ public class AdminObjectSection extends 
             public String getText(Object element) {
                 if (Adminobject.class.isInstance(element)) {
                     Adminobject admin = (Adminobject)element;
-                    return "Admin Object: interface = \"" + admin.getAdminobjectInterface() +
-                            "\", class = \"" + admin.getAdminobjectClass() + "\"";
+                    return Messages.editorSectionAdminObjectTitle + ": " + Messages.interfaceName + " = \"" + admin.getAdminobjectInterface() +
+                    "\", " + Messages.clazz + " = \"" + admin.getAdminobjectClass() + "\"";
                 }
                 if (AdminobjectInstance.class.isInstance(element)) {
                     AdminobjectInstance aoInstance = (AdminobjectInstance)element;
-                    return "Admin Object Instance: message destination name = \"" + aoInstance.getMessageDestinationName() + "\"";
+                    return Messages.editorSectionAdminObjectInstance + ": " +  Messages.messageDestinationName + " = \"" + aoInstance.getMessageDestinationName() + "\"";
                 }
                 if (ConfigPropertySetting.class.isInstance(element)) {
                     ConfigPropertySetting property = (ConfigPropertySetting)element;
-                    return "Config Property Setting: name = \"" + property.getName() +
-                            "\", value = \"" + property.getValue() + "\"";
+                    return Messages.configPropertySetting + ": " + Messages.name + " = \"" + property.getName() +
+                    "\", " + Messages.value + " = \"" + property.getValue() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.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/DBPoolSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/DBPoolSection.java Fri May 13 06:29:16 2011
@@ -27,6 +27,7 @@ import org.apache.geronimo.jee.connector
 import org.apache.geronimo.jee.deployment.Gbean;
 import org.apache.geronimo.jee.deployment.Pattern;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.ui.sections.AbstractListSection.ContentProvider;
 import org.apache.geronimo.st.ui.sections.AbstractListSection.LabelProvider;
@@ -51,7 +52,7 @@ public class DBPoolSection extends Abstr
         FormToolkit toolkit, int style, List extModules) {
     super(plan, parent, toolkit, style);
     this.objectContainer = extModules;
-    COLUMN_NAMES = new String[] { "Connector", "External Path", };// TODO
+    COLUMN_NAMES = new String[] { Messages.wizardDatabasePoolConnector, Messages.wizardDatabasePoolExternalPath };// TODO
                                       // put
                                       // into
                                       // message
@@ -60,7 +61,7 @@ public class DBPoolSection extends Abstr
 
     @Override
     public String getDescription() {
-    return "The following database pools are defined:";// TODO put into
+    return Messages.wizardDatabasePoolDescription;// TODO put into
                                // message
     }
 
@@ -71,7 +72,7 @@ public class DBPoolSection extends Abstr
 
     @Override
     public String getTitle() {
-    return "Database Pools";// TODO put into message
+    return Messages.wizardDatabasePoolTitle;// TODO put into message
     }
 
     @Override

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRelationSection.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/EjbRelationSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRelationSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/EjbRelationSection.java Fri May 13 06:29:16 2011
@@ -24,6 +24,7 @@ import org.apache.geronimo.jee.openejb.E
 import org.apache.geronimo.jee.openejb.EjbRelationshipRole;
 import org.apache.geronimo.jee.openejb.Relationships;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.v21.ui.wizards.EjbRelationWizard;
@@ -144,20 +145,21 @@ public class EjbRelationSection extends 
             public String getText(Object element) {
                 if (EjbRelation.class.isInstance(element)) {
                     EjbRelation relation = (EjbRelation)element;
-                    return "EJB Relation: name = \"" + relation.getEjbRelationName() +
-                            "\", MTM table name = \"" + relation.getManyToManyTableName() + "\"";
+                    return Messages.ejbRelalitionName + " \"" + relation.getEjbRelationName() +
+                    "\", " + Messages.ejbMTMTableName +  " \"" + relation.getManyToManyTableName() + "\"";
                 }
                 if (EjbRelationshipRole.class.isInstance(element)) {
                     EjbRelationshipRole role = (EjbRelationshipRole)element;
-                    return "EJB Relationship Role: name = \"" + role.getEjbRelationshipRoleName() +
-                            "\", source = \"" + role.getRelationshipRoleSource().getEjbName() +
-                            "\", CMR field name = \"" + role.getCmrField().getCmrFieldName() + "\"";
+                    return Messages.ejbRelalitionRoleName + " \"" + role.getEjbRelationshipRoleName() +
+                    "\", " + Messages.ejbSourceName +  " = \"" + role.getRelationshipRoleSource().getEjbName() + 
+                    "\", " + Messages.cmrFieldName + " = \"" + role.getCmrField().getCmrFieldName() + "\"";
+
                 }
                 if (EjbRelationshipRole.RoleMapping.CmrFieldMapping.class.isInstance(element)) {
                     EjbRelationshipRole.RoleMapping.CmrFieldMapping fieldMapping =
                             (EjbRelationshipRole.RoleMapping.CmrFieldMapping)element;
-                    return "CMR Field Mapping: key column = \"" + fieldMapping.getKeyColumn() +
-                            "\", foreign key column = \"" + fieldMapping.getForeignKeyColumn() + "\"";
+                    return Messages.ejbCmrFiledMapping + ": " +  Messages.keyColumn + " = \"" + fieldMapping.getKeyColumn() +
+                    "\", " + Messages.foreignKeyColumn + " = \"" + fieldMapping.getForeignKeyColumn() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ExtModuleSection.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/ExtModuleSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ExtModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ExtModuleSection.java Fri May 13 06:29:16 2011
@@ -22,6 +22,7 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.jee.application.ExtModule;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v21.ui.pages.ConnectorPage;
 import org.apache.geronimo.st.v21.ui.pages.DeploymentPage;
@@ -95,65 +96,65 @@ public class ExtModuleSection extends Ab
 		}
 	}
 
-	@Override
-	public ITableLabelProvider getLabelProvider() {
-		return new LabelProvider() {
-			@Override
-			public String getColumnText(Object element, int columnIndex) {
-				if (ExtModule.class.isInstance(element)) {
-					ExtModule extModule = (ExtModule) element;
-					switch (columnIndex) {
-					case 0:
-						if (extModule.getConnector() != null) {
-							return "connector";
-						} else if (extModule.getEjb() != null) {
-							return "ejb";
-						} else if (extModule.getJava() != null) {
-							return "java";
-						} else if (extModule.getWeb() != null) {
-							return "web";
-						}
-						return "";
-					case 1:
-						if (extModule.getConnector() != null) {
-							return extModule.getConnector().getValue();
-						} else if (extModule.getEjb() != null) {
-							return extModule.getEjb().getValue();
-						} else if (extModule.getJava() != null) {
-							return extModule.getJava().getValue();
-						} else if (extModule.getWeb() != null) {
-							return extModule.getWeb().getValue();
-						}
-						return "";
-					case 2:
-						if (extModule.getInternalPath() != null) {
-							return extModule.getInternalPath();
-						}
-						return "";
-					case 3:
-						if (extModule.getExternalPath() != null) {
-							return extModule.getExternalPath().getGroupId();
-						}
-						return "";
-					case 4:
-						if (extModule.getExternalPath() != null) {
-							return extModule.getExternalPath().getArtifactId();
-						}
-						return "";
-					case 5:
-						if (extModule.getExternalPath() != null) {
-							return extModule.getExternalPath().getVersion();
-						}
-						return "";
-					case 6:
-						if (extModule.getExternalPath() != null) {
-							return extModule.getExternalPath().getType();
-						}
-						return "";
-					}
-				}
-				return null;
-			}
-		};
-	}
+    @Override
+    public ITableLabelProvider getLabelProvider() {
+        return new LabelProvider() {
+            @Override
+            public String getColumnText(Object element, int columnIndex) {
+                if (ExtModule.class.isInstance(element)) {
+                    ExtModule extModule = (ExtModule) element;
+                    switch (columnIndex) {
+                    case 0:
+                        if (extModule.getConnector() != null) {
+                            return Messages.connector;
+                        } else if (extModule.getEjb() != null) {
+                            return Messages.ejb;
+                        } else if (extModule.getJava() != null) {
+                            return Messages.java;
+                        } else if (extModule.getWeb() != null) {
+                            return Messages.web;
+                        }
+                        return "";
+                    case 1:
+                        if (extModule.getConnector() != null) {
+                            return extModule.getConnector().getValue();
+                        } else if (extModule.getEjb() != null) {
+                            return extModule.getEjb().getValue();
+                        } else if (extModule.getJava() != null) {
+                            return extModule.getJava().getValue();
+                        } else if (extModule.getWeb() != null) {
+                            return extModule.getWeb().getValue();
+                        }
+                        return "";
+                    case 2:
+                        if (extModule.getInternalPath() != null) {
+                            return extModule.getInternalPath();
+                        }
+                        return "";
+                    case 3:
+                        if (extModule.getExternalPath() != null) {
+                            return extModule.getExternalPath().getGroupId();
+                        }
+                        return "";
+                    case 4:
+                        if (extModule.getExternalPath() != null) {
+                            return extModule.getExternalPath().getArtifactId();
+                        }
+                        return "";
+                    case 5:
+                        if (extModule.getExternalPath() != null) {
+                            return extModule.getExternalPath().getVersion();
+                        }
+                        return "";
+                    case 6:
+                        if (extModule.getExternalPath() != null) {
+                            return extModule.getExternalPath().getType();
+                        }
+                        return "";
+                    }
+                }
+                return null;
+            }
+        };
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.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/GBeanRefSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java Fri May 13 06:29:16 2011
@@ -26,6 +26,7 @@ import org.apache.geronimo.jee.naming.Gb
 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.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.v21.ui.wizards.GBeanRefWizard;
@@ -178,18 +179,18 @@ public class GBeanRefSection extends Abs
                 }
                 if (GbeanRef.class.isInstance(element)) {
                     GbeanRef gbeanRef = (GbeanRef)element;
-                    return "Gbean Ref: name = \"" + gbeanRef.getRefName() + "\"";
+                    return Messages.editorGBeanRefTitle + ": " + Messages.name + " = \"" + gbeanRef.getRefName() + "\"";
                 }
                 else if (String.class.isInstance(element)) {
-                    return "Gbean type: name = \"" + (String)element + "\"";
+                    return Messages.gbeanType + ": " + Messages.name + " = \"" + (String)element + "\"";
                 }
                 else if (Pattern.class.isInstance(element)) {
                     Pattern pattern = (Pattern)element;
-                    return "Pattern: name = \"" + pattern.getName() + 
-                            "\", group = \"" + pattern.getGroupId() + 
-                            "\", artifact = \"" + pattern.getArtifactId() + 
-                            "\", version = \"" + pattern.getVersion() + 
-                            "\", module = \"" + pattern.getModule() + "\"";
+                    return Messages.pattern + ": " + Messages.name + " = \"" + pattern.getName() + 
+                            "\", " + Messages.group + "  = \"" + pattern.getGroupId() + 
+                            "\", " + Messages.artifactId + "  = \"" + pattern.getArtifactId() + 
+                            "\", " + Messages.version + "  = \"" + pattern.getVersion() + 
+                            "\", " + Messages.module + "  = \"" + pattern.getModule() + "\"";
                 }
 
                 return null;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.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/GBeanSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java Fri May 13 06:29:16 2011
@@ -25,6 +25,7 @@ import org.apache.geronimo.jee.deploymen
 import org.apache.geronimo.jee.deployment.Pattern;
 import org.apache.geronimo.jee.deployment.Reference;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
 import org.apache.geronimo.st.v21.ui.Activator;
 import org.apache.geronimo.st.v21.ui.pages.DeploymentPage;
@@ -166,44 +167,40 @@ public class GBeanSection extends Abstra
 
     @Override
     public ILabelProvider getLabelProvider() {
-	return new LabelProvider() {
-	    @Override
-	    public String getText(Object element) {
-		if (JAXBElement.class.isInstance(element)) {
-		    Object object = ((JAXBElement) element).getValue();
-		    if (Gbean.class.isInstance(object)) {
-			Gbean gbean = (Gbean) object;
-			return "GBean: name = \"" + gbean.getName()
-				+ "\", class = \"" + gbean.getClazz() + "\"";
-		    } else if (Attribute.class.isInstance(object)) {
-			Attribute attribute = (Attribute) object;
-			return "Attribute: name = \"" + attribute.getName()
-				+ "\", type = \"" + attribute.getType()
-				+ "\", value = \"" + attribute.getValue()
-				+ "\"";
-		    } else if (Pattern.class.isInstance(object)) {
-			Pattern dependency = (Pattern) object;
-			return "Dependency: group = \""
-				+ dependency.getGroupId() + "\", artifact = \""
-				+ dependency.getArtifactId()
-				+ "\", version = \"" + dependency.getVersion()
-				+ "\", module = \"" + dependency.getModule()
-				+ "\", type = \"" + dependency.getType()
-				+ "\", custom name = \""
-				+ dependency.getCustomFoo() + "\"";
-		    } else if (Reference.class.isInstance(object)) {
-			Reference reference = (Reference) object;
-			return "Reference: name = \"" + reference.getName()
-				+ "\", group = \"" + reference.getGroupId()
-				+ "\", artifact = \""
-				+ reference.getArtifactId()
-				+ "\", version = \"" + reference.getVersion()
-				+ "\", module = \"" + reference.getModule()
-				+ "\", type = \"" + reference.getType()
-				+ "\", custom name = \""
-				+ reference.getCustomFoo() + "\"";
-		    }
-		}
+    return new LabelProvider() {
+        @Override
+        public String getText(Object element) {
+        if (JAXBElement.class.isInstance(element)) {
+            Object object = ((JAXBElement) element).getValue();
+            if (Gbean.class.isInstance(object)) {
+            Gbean gbean = (Gbean) object;
+            return Messages.gbean + ": " + Messages.name + " =\"" + gbean.getName() +
+            	"\", " + Messages.clazz + "\"" + gbean.getClazz() + "\"";
+
+            } else if (Attribute.class.isInstance(object)) {
+            Attribute attribute = (Attribute) object;
+            return Messages.attribute + Messages.name + " = \"" + attribute.getName() + 
+            	"\", " + Messages.type + " = \"" + attribute.getType() + 
+            	"\", " + Messages.value + " = \"" + attribute.getValue() + "\"";
+            } else if (Pattern.class.isInstance(object)) {
+            Pattern dependency = (Pattern) object;
+            return Messages.dependency + ": " + Messages.group + " = \"" + dependency.getGroupId() + 
+            	"\", " + Messages.artifact + " = \"" + dependency.getArtifactId() + 
+            	"\", " + Messages.version +  "= \"" + dependency.getVersion()+ 
+            	"\", " + Messages.module +  " = \"" + dependency.getModule()+ 
+            	"\", " + Messages.type + " = \"" + dependency.getType()+ 
+            	"\", " + Messages.customName + " = \"" + dependency.getCustomFoo() + "\"";
+            } else if (Reference.class.isInstance(object)) {
+            Reference reference = (Reference) object;
+            return Messages.reference + ":" + Messages.name + " = \"" + reference.getName()
+                + "\", " + Messages.group + " = \"" + reference.getGroupId()
+                + "\", " + Messages.artifact + " = \"" + reference.getArtifactId()
+                + "\", " + Messages.version + " = \"" + reference.getVersion()
+                + "\", " + Messages.module + " = \"" + reference.getModule()
+                + "\", " + Messages.type + " = \"" + reference.getType()
+                + "\", " + Messages.customName + " = \"" + reference.getCustomFoo() + "\"";
+            }
+        }
 
 		return null;
 	    }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ModuleSection.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/ModuleSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ModuleSection.java Fri May 13 06:29:16 2011
@@ -22,6 +22,7 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.jee.application.Module;
 import org.apache.geronimo.st.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.ui.sections.AbstractTableSection;
 import org.apache.geronimo.st.v21.ui.wizards.ModuleWizard;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -68,13 +69,13 @@ public class ModuleSection extends Abstr
                     switch (columnIndex) {
                     case 0:
                         if (module.getConnector() != null) {
-                            return "connector";
+                            return Messages.connector;
                         } else if (module.getEjb() != null) {
-                            return "ejb";
+                            return Messages.ejb;
                         } else if (module.getJava() != null) {
-                            return "java";
+                            return Messages.java;
                         } else if (module.getWeb() != null) {
-                            return "web";
+                            return Messages.web;
                         }
                         return "";
                     case 1:



Mime
View raw message