geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1098990 - 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.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/ org.apache.ge...
Date Tue, 03 May 2011 09:55:37 GMT
Author: hanhongfang
Date: Tue May  3 09:55:36 2011
New Revision: 1098990

URL: http://svn.apache.org/viewvc?rev=1098990&view=rev
Log:
GERONIMODEVTOOLS-736 Review GEP code according to Eclipse UI guideline and do necessary updates.
Thank you Chi Run Hua for the patch.

Modified:
    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.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties
    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/ConnectorPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.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/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/SecurityRealmWizard.java

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=1098990&r1=1098989&r2=1098990&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
Tue May  3 09:55:36 2011
@@ -91,7 +91,7 @@ info=INFO
 debug=DEBUG
 
 editorSectionVMArgsTitle=Server VM Arguments
-editorSectionVMArgsDescription=Specify the Java VM Arguments to be provided on server startup.
+editorSectionVMArgsDescription=Specify the Java VM arguments to be provided on server startup.
 
 editorSectionStartupTitle=Server Startup
 editorSectionStartupDescription=Specify the server startup constraints.
@@ -137,8 +137,8 @@ editorPersContextRefDescription=The foll
 editorPersUnitRefTitle=Persistence Unit References
 editorPersUnitRefDescription=The following persistence unit references are defined:
 
-editorServiceRefDescription=The following  service references are defined:
-editorServiceRefTitle=Service Refs
+editorServiceRefDescription=The following service references are defined:
+editorServiceRefTitle=Service References
 editorServiceRefName=Name
 
 editorEjbRefDescription = The following ejb references are defined:
@@ -146,9 +146,9 @@ editorEjbRefTitle = EJB References
 editorEjbRefTargetName=Target Name
 editorEjbRefEjbLink=EJB Link
 
-editorEjbLocalRefDescription=The following ejb local refererencs are defined:
+editorEjbLocalRefDescription=The following EJB local references are defined:
 editorEjbLocalRefTitle=EJB Local References
-editorEjbRelationDescription = The following ejb relations are defined:
+editorEjbRelationDescription = The following EJB relations are defined:
 editorEjbRelationTitle = EJB Relations
 
 add=Add
@@ -165,20 +165,20 @@ wizardEditTitle_AdminObject=Edit Admin O
 wizardPageTitle_AdminObject=Admin Object Details
 wizardPageDescription_AdminObject=Provide details for this admin object.
     
-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_ResEnvRef=New Resource Environment Reference
+wizardEditTitle_ResEnvRef=Edit Resource Environment Reference
+wizardPageTitle_ResEnvRef=Resource Environment Reference Details
+wizardPageDescription_ResEnvRef=Provide details for this resource environment reference.
 
 wizardNewTitle_EjbRef=New EJB Reference
 wizardEditTitle_EjbRef=Edit EJB Reference
 wizardPageTitle_EjbRef=EJB Reference Details
-wizardPageDescription_EjbRef=Provide details for this ejb reference.
+wizardPageDescription_EjbRef=Provide details for this EJB reference.
 
 wizardNewTitle_EjbRelation=New EJB Relation
 wizardEditTitle_EjbRelation=Edit EJB Relation
 wizardPageTitle_EjbRelation=EJB Relation Details
-wizardPageDescription_EjbRelation=Provide details for this EJB Relation.
+wizardPageDescription_EjbRelation=Provide details for this EJB relation.
 
 wizardNewTitle_ServiceRef=New Service Reference
 wizardEditTitle_ServiceRef=Edit Service Reference
@@ -213,29 +213,29 @@ wizardPageDescription_SecurityRole=Provi
 wizardTitle_SecurityRealm=Security Realm Configuration
 wizardFirstPageTitle_SecurityRealm=Basic Settings
 wizardSecondPageTitle_SecurityRealm=Data Base related Settings
-wizardFirstPageDescription_SecurityRealm=Edit basic settings for creating new security realm
-wizardSecondPageDescription_SecurityRealm=Edit settings for specifying data source
+wizardFirstPageDescription_SecurityRealm=Edit basic settings for creating new security realm.
+wizardSecondPageDescription_SecurityRealm=Edit settings for specifying data source.
 
 basicSettings=Basic Settings
-realmName=Realm Name
-realmType=Realm Type
-digestAlgorithm=Digest Algorithm
-digestEncoding=Digest Encoding
+realmName=Realm Name:
+realmType=Realm Type:
+digestAlgorithm=Digest Algorithm:
+digestEncoding=Digest Encoding:
 
 sqlQueries=SQL queries
-userSelectSQL=User Select SQL
-groupSelectSQL=Group Select SQL
+userSelectSQL=User Select SQL:
+groupSelectSQL=Group Select SQL:
 
-dataBasePool=Data Base Pool
-useDataBasePool=Use Data Base Pool
-useDataBase=Use Data Base
-dataBasePoolName=Data Base Pool Name
+dataBasePool=Database Pool
+useDataBasePool=Use Database Pool
+useDataBase=Use Database
+dataBasePoolName=Database Pool Name
 
 jdbcDriverClass=JDBC Driver Class
-jdbcURL=JDBC URL
-jdbcDriver=JDBC Driver
-jdbcUserName=JDBC User Name
-jdbcPassword=Password
+jdbcURL=JDBC URL:
+jdbcDriver=JDBC Driver;
+jdbcUserName=JDBC User Name:
+jdbcPassword=Password:
 
 wizardNewTitle_Dependency=New Dependency
 wizardEditTitle_Dependency=Edit Dependency
@@ -286,13 +286,13 @@ wizardPageTitle_ServiceRef=Service Refer
 wizardPageDescription_ServiceRef=Provide details for this service reference.
 
 
-wizardNewTitle_DBpool=New Database Pool Wizard;
+wizardNewTitle_DBpool=New Database Pool Wizard
 wizardBasicPageTitle_DBPool=Basic Settings
 wizardBasicPageDescription_DBPool=Edit basic settings for creating database pool
 wizardAdvancedPageTitle__DBPool=Advanced Pool Settings
 wizardAdvancedPageDescription__DBPool=Edit advanced settings for creating database pool
 wizardConnectionPageTitle__DBPool=Connection Pool Parameters
-wizardConnectionPageDescription__DBPool=Edit Connection Pool parameters for Database pool
+wizardConnectionPageDescription__DBPool=Edit connection pool parameters for database pool.
 
 doasCurrentCaller=Do as current caller
 useContextHandler=Use context handler
@@ -333,11 +333,11 @@ oldPassword = Old password
 newPassword = New password
 confirmPassword = Confirm password 
 groupName = Group name
-passwordNotEqual = Password doesn't match!
+passwordNotEqual = Password do not match!
 manageAccount = Manage Account
-manageAccountDescription = Manage account for default "Properties File Realm"
-cannotSave = Account information can't be stored!
-cannotRead = Account information can't be read!
+manageAccountDescription = Manage account for default .properties file Realm
+cannotSave = Account information can not be stored!
+cannotRead = Account information can not be read!
 isNotLocalHost = It is not a local host.
 
 dependencyGroupLabel=Dependency type and location
@@ -404,9 +404,9 @@ installMessage=\nInstall {0} to {1} ?
 licenseAgreement=License Agreement:
 acceptLicenseAgreement=I accept the terms in the above license agreement.
 rejectLicenseAgreement=I do not accept the terms in the above license agreement.
-confirmLicenseRejection "Download and Install" will not continue unless you accept the license.\nDo
you really not accept the license?
+confirmLicenseRejection=The installation will not continue unless you accept the license.\nDo
you really not accept the license?
 tooltipLoc=A location of an existing {0} installation or a path to install to.
-tooltipInstall=Downloads the selected {0} distribution and installs it to the specified location.
+tooltipInstall=Download the selected {0} distribution and install it to the specified location.
 tooltipJetty=Selects the Jetty distribution of Geronimo to install.
 tooltipTomcat=Selects the Tomcat distribution of Geronimo to install.
 
@@ -417,14 +417,14 @@ specifyPorts=Specify the configured port
 portName=Port Name
 portValue=Port Value
 
-editorCorrect=There was an error opening the editor.  The elements in the plan may not be
qualified, do you want to try to auto-correct this? Otherwise the default text editor will
be opened.
-editorDefault=Could not load the deployment plan.  Opening default text editor.
-serverNotStarted=Server has not been started.  Please start the server and retry the action.
+editorCorrect=There was an error opening the editor. The elements in the plan may not be
qualified, do you want to try auto-fix? Otherwise the default text editor will be opened.
+editorDefault=Could not load the deployment plan. Opening default text editor.
+serverNotStarted=Server has not been started. Please start the server and retry the action.
 errorOpenDialog=Error opening editor.
 errorOpenWizard=Error opening wizard.
 
 sourceLocWizTitle=Geronimo Source
-sourceLocWizDescription=Choose the geronimo source zip file to locate source from during
debug sessions.
+sourceLocWizDescription=Locate the source zip file during debug sessions.
 sourceZipFile=Geronimo Source Archive:
 browseSrcDialog=Select the Geronimo Source Archive.
 
@@ -443,8 +443,8 @@ publishingTimeout=Publishing Timeout (ms
 artifactType=Artifact Type:
 inverseClassloading=Inverse classloading
 supressDefaultEnv=Suppress default environment
-sharedLibDepends=Add a runtime dependency to Geronimo's shared library
-addSharedLib=Add a runtime dependency to Geronimo's shared library
+sharedLibDepends=Add a runtime dependency to shared library
+addSharedLib=Add a runtime dependency to shared library
 webContainerSection=Web Container
 webContainerSectionDescription=Web Container Configuration
 useGBeanLink=Specify as GBean Link
@@ -455,7 +455,7 @@ moduleId=Module Id:
 useUnitName=Specify as Unit Name
 usePattern=Specify as Pattern
 cmpConnectionSection=C-M-P Connection Factory
-cmpConnectionSectionDescription=C-M-P Connection Factory Configuration
+cmpConnectionSectionDescription=C-M-P connection factory configuration
 useResourceLink=Specify as Resource Link
 resourceLink=Resource Link:
 useUrl=Specify as URL
@@ -479,40 +479,40 @@ ejb=EJB
 java=Java
 web=Web
 
-plugin=Plugin
-pluginActions=Plugin actions that can be performed on the server
+plugin=Plug-in
+pluginActions=Plug-in actions that can be performed on the server
 createCustomAssembly=Create Custom Assembly
-convertAppsToPlugins=Convert Apps to Plugins
+convertAppsToPlugins=Convert Apps to Plug-ins
 
 savePageTitle=Save Resource
 savePageMessage=Data must be saved before entering or leaving the Source page.
 
 wizardTitle_ManageAccount=Manage Account
 
-wizardTitle_PluginManager=Create and Install Geronimo Plugins
+wizardTitle_PluginManager=Create and Install Geronimo Plug-ins
 wizardPage0Title_PluginManager=Plugin Manager
-wizardPage0Description_PluginManager=Select your local plugin repository and the action to
take.
+wizardPage0Description_PluginManager=Select your local plug-in repository and the action
to take.
 wizardPage1Title_PluginManager=Application Selection
 wizardPage1Description_PluginManager=Choose a configuration in the current Geronimo server
to export as a Geronimo plugin.\nThe configuration will be saved as a CAR file to your local
file system.
-wizardPage2Title_PluginManager=Update Plugin Information
-wizardPage2Description_PluginManager=Update information for the plugin.
-wizardPage3Title_PluginManager=Update Plugin Information (continued)
-wizardPage3Description_PluginManager=Update information for the plugin.
-wizardPage4Title_PluginManager=Install Plugin
-wizardPage4Description_PluginManager=Select plugins to be installed to the server.
+wizardPage2Title_PluginManager=Update Plug-in Information
+wizardPage2Description_PluginManager=Update information for the plug-in.
+wizardPage3Title_PluginManager=Update Plug-in Information (continued)
+wizardPage3Description_PluginManager=Update information for the plug-in.
+wizardPage4Title_PluginManager=Install Plug-in
+wizardPage4Description_PluginManager=Select plug-ins to be installed to the server.
 wizardPage5Title_PluginManager=Installation Complete
-wizardPage5Description_PluginManager=List of plugins that have been installed to the server.

-localPluginRepo=Local Plugin Repository:
+wizardPage5Description_PluginManager=List of plug-ins that have been installed to the server.

+localPluginRepo=Local Plug-in Repository:
 failedToSave=Failed to save {0}.
 savedSuccess={0} saved successfully.
-createPlugin=create Geronimo plugin
-installPlugins=install Geronimo plugins
+createPlugin=create Geronimo plug-in
+installPlugins=install Geronimo plug-ins
 license=License
 osiApproved=OSI Approved
 id=id
 category=Category
 downloadRepos=Download Repos
-pluginURL=Plugin URL
+pluginURL=Plug-in URL
 author=Author
 geronimoVersions= Geronimo versions
 jvmVersions=JVM versions
@@ -528,8 +528,8 @@ dbName=Database Name
 createDatabase=Create Database
 confirmPassword=Confirm Password
 loginTimeout=Login Timeout
-blockingTimeout=Blocking Timeout(in ms)
-idleTimeout=Idle Timeout(in mins)
+blockingTimeout=Blocking Timeout (ms)
+idleTimeout=Idle Timeout (mins)
 minPoolSize=Min Size
 maxPoolSize=Max Size
 transactionType=Transaction Type

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Messages.properties
Tue May  3 09:55:36 2011
@@ -43,18 +43,18 @@ missingServer=Server does not exist
 errorNoProfiler=Could not launch in profiling mode because no profilers are configured.
 
 badConfigId=Bad configID; should never happen.
-errorDeletePlugin=Unable to delete old plugin at {0}.
-errorMovePlugin=Unable to move new plugin {0} to {1}.
-badadPlugin={0} is not a plugin.
-errorCreateMetadata=Cannot create plugin metadata file for {0}.
-errorUpdateMetadata=Unable to update plugin metadata.
+errorDeletePlugin=Unable to delete old plug-in at {0}.
+errorMovePlugin=Unable to move new plug-in {0} to {1}.
+badadPlugin={0} is not a plug-in.
+errorCreateMetadata=Cannot create plug-in metadata file for {0}.
+errorUpdateMetadata=Unable to update plug-in metadata.
 errorReadConfig=Cannot read configuration {0}.
 errorReadSerFile=Can not read configuration META-INF/config.ser file: {0}.
 errorNoSerFile=Configuration does not contain a META-INF/config.ser file: {0}.
 errorLoadClass=Unable to load class from config: {0}.
 requires= requires
 installed= to be installed.
-configSizeMismatch=A plugin configuration must include one plugin artifact, not {0}.
+configSizeMismatch=A plug-in configuration must include one plug-in artifact, not {0}.
 noDefaultServer=Invalid setup, no default server instance registered.
 
 moduleModified=Modified

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java
Tue May  3 09:55:36 2011
@@ -435,6 +435,15 @@ public class Messages extends NLS {
     public static String wizardConnectionPageTitle__DBPool;
     public static String wizardConnectionPageDescription__DBPool;
     //
+    
+    public static String WizardSecurityRealmTitle;
+    public static String WizardSecurityRealmDescription;
+    public static String wizardSecurityRealmName;
+    public static String wizardLoginModuleClass;  
+    public static String wizardSecurityRealmNew;
+    public static String wizardSecurityRealmEdit;
+    
+    
     public static String doasCurrentCaller;
     public static String useContextHandler;
     public static String defaultRole;
@@ -510,6 +519,13 @@ public class Messages extends NLS {
     public static String driverGroup;
     public static String basicGroup;
     public static String advancedGroup;
+    
+    public static String wizardDatabasePoolConnector;
+    public static String wizardDatabasePoolExternalPath;
+    public static String wizardDatabasePoolTitle;
+    public static String wizardDatabasePoolDescription;
+    public static String wizardDatabasePoolNew;
+    public static String wizardDatabasePoolEdit;
 
 
     public static String licenseAgreement;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
Tue May  3 09:55:36 2011
@@ -39,7 +39,7 @@ editorSectionClientDescription=Edit the 
 editorSectionSecurityRolesTitle=Security Roles
 editorSectionSecurityRolesDescription=The following security roles are defined:
 editorSectionSecurityAdvancedTitle=Advanced Security Configuration
-editorSectionSecurityAdvancedDescription=The following Advanced Security Settings are defined:
+editorSectionSecurityAdvancedDescription=The following advanced security settings are defined:
 
 editorSectionDependenciesTitle=Server Dependencies
 editorSectionDependenciesDescription=The following server dependencies are defined as common
libraries:
@@ -90,21 +90,21 @@ editorSectionLogLevelDescription=Select 
 info=INFO
 debug=DEBUG
 
-editorSectionCleanOSGiBundleCacheTitle=Clean OSGi bundle cache
+editorSectionCleanOSGiBundleCacheTitle=Clean OSGi Bundle Cache
 editorSectionCleanOSGiBundleCacheDescription=Select whether to clean the OSGi bundle cache.
 cleanOSGiBundleCache=Clean OSGi bundle cache
 
-editorSectionRefreshOSGiBundleTitle=Refresh OSGi bundle within OSGi application
+editorSectionRefreshOSGiBundleTitle=Refresh OSGi Bundle within OSGi Application
 editorSectionRefreshOSGiBundleDescription=Select whether to refresh the modified OSGi bundle
only.
 refreshOSGiBundle=Refresh the modified OSGi bundle only
-refreshOSGiBundleNotes=When you choose to refresh the modified OSGi bundle instead of re-deploying
the whole OSGi application, the updated OSGi bundle will be kept in Geronimo server cache.
If Geronimo server is restarted with the --clean option or the OSGi application is restarted,
all changes on server side will be lost.
+refreshOSGiBundleNotes=When you choose to refresh the modified OSGi bundle instead of re-deploying
the whole OSGi application, the updated OSGi bundle will be kept in Geronimo server cache.
\nIf Geronimo server is restarted with the --clean option or the OSGi application is restarted,
all changes on server side will be lost.
 
-editorSectionKarafShellTitle=Karaf shell in Eclipse console
+editorSectionKarafShellTitle=Karaf Shell in Eclipse Console
 editorSectionKarafShellDescription=Select whether to enable the Karaf shell in Eclipse console
window.
 enableKarafShell=Enable
 
 editorSectionVMArgsTitle=Server VM Arguments
-editorSectionVMArgsDescription=Specify the Java VM Arguments to be provided on server startup.
+editorSectionVMArgsDescription=Specify the Java VM arguments to be provided on server startup.
 
 editorSectionStartupTitle=Server Startup
 editorSectionStartupDescription=Specify the server startup constraints.
@@ -150,18 +150,18 @@ editorPersContextRefDescription=The foll
 editorPersUnitRefTitle=Persistence Unit References
 editorPersUnitRefDescription=The following persistence unit references are defined:
 
-editorServiceRefDescription=The following  service references are defined:
+editorServiceRefDescription=The following service references are defined:
 editorServiceRefTitle=Service References
 editorServiceRefName=Name
 
-editorEjbRefDescription = The following ejb references are defined:
+editorEjbRefDescription = The following EJB references are defined:
 editorEjbRefTitle = EJB References
 editorEjbRefTargetName=Target Name
 editorEjbRefEjbLink=EJB Link
 
-editorEjbLocalRefDescription=The following ejb local references are defined:
+editorEjbLocalRefDescription=The following EJB local references are defined:
 editorEjbLocalRefTitle=EJB Local References
-editorEjbRelationDescription = The following ejb relations are defined:
+editorEjbRelationDescription = The following EJB relations are defined:
 editorEjbRelationTitle = EJB Relations
 
 add=Add
@@ -186,12 +186,12 @@ wizardPageDescription_ResEnvRef=Provide 
 wizardNewTitle_EjbRef=New EJB Reference
 wizardEditTitle_EjbRef=Edit EJB Reference
 wizardPageTitle_EjbRef=EJB Reference Details
-wizardPageDescription_EjbRef=Provide details for this ejb reference.
+wizardPageDescription_EjbRef=Provide details for this EJB reference.
 
 wizardNewTitle_EjbRelation=New EJB Relation
 wizardEditTitle_EjbRelation=Edit EJB Relation
 wizardPageTitle_EjbRelation=EJB Relation Details
-wizardPageDescription_EjbRelation=Provide details for this EJB Relation.
+wizardPageDescription_EjbRelation=Provide details for this EJB relation.
 
 wizardNewTitle_ServiceRef=New Service Reference
 wizardEditTitle_ServiceRef=Edit Service Reference
@@ -201,7 +201,7 @@ wizardPageDescription_ServiceRef=Provide
 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.
+wizardPageDescription_EjbLocalRef=Provide details for this EJB local reference.
 
 wizardNewTitle_GBeanRef=New GBean Reference
 wizardEditTitle_GBeanRef=Edit GBean Reference
@@ -226,29 +226,29 @@ wizardPageDescription_SecurityRole=Provi
 wizardTitle_SecurityRealm=Security Realm Configuration
 wizardFirstPageTitle_SecurityRealm=Basic Settings
 wizardSecondPageTitle_SecurityRealm=Data Base related Settings
-wizardFirstPageDescription_SecurityRealm=Edit basic settings for creating new security realm
-wizardSecondPageDescription_SecurityRealm=Edit settings for specifying data source
+wizardFirstPageDescription_SecurityRealm=Edit basic settings for creating new security realm.
+wizardSecondPageDescription_SecurityRealm=Edit settings for specifying data source.
 
 basicSettings=Basic Settings
-realmName=Realm Name
-realmType=Realm Type
-digestAlgorithm=Digest Algorithm
-digestEncoding=Digest Encoding
+realmName=Realm Name:
+realmType=Realm Type:
+digestAlgorithm=Digest Algorithm:
+digestEncoding=Digest Encoding:
 
 sqlQueries=SQL queries
-userSelectSQL=User Select SQL
-groupSelectSQL=Group Select SQL
+userSelectSQL=User Select SQL:
+groupSelectSQL=Group Select SQL:
 
-dataBasePool=Data Base Pool
-useDataBasePool=Use Data Base Pool
-useDataBase=Use Data Base
-dataBasePoolName=Data Base Pool Name
+dataBasePool=Database Pool
+useDataBasePool=Use Database Pool
+useDataBase=Use Database
+dataBasePoolName=Database Pool Name
 
 jdbcDriverClass=JDBC Driver Class
-jdbcURL=JDBC URL
-jdbcDriver=JDBC Driver
-jdbcUserName=JDBC User Name
-jdbcPassword=Password
+jdbcURL=JDBC URL:
+jdbcDriver=JDBC Driver:
+jdbcUserName=JDBC User Name:
+jdbcPassword=Password:
 
 wizardNewTitle_Dependency=New Dependency
 wizardEditTitle_Dependency=Edit Dependency
@@ -299,13 +299,20 @@ wizardPageTitle_ServiceRef=Service Refer
 wizardPageDescription_ServiceRef=Provide details for this service reference.
 
 
-wizardNewTitle_DBpool=New Database Pool Wizard;
+wizardNewTitle_DBpool=New Database Pool Wizard
 wizardBasicPageTitle_DBPool=Basic Settings
-wizardBasicPageDescription_DBPool=Edit basic settings for creating database pool
+wizardBasicPageDescription_DBPool=Edit basic settings for creating database pool.
 wizardAdvancedPageTitle__DBPool=Advanced Pool Settings
-wizardAdvancedPageDescription__DBPool=Edit advanced settings for creating database pool
+wizardAdvancedPageDescription__DBPool=Edit advanced settings for creating database pool.
 wizardConnectionPageTitle__DBPool=Connection Pool Parameters
-wizardConnectionPageDescription__DBPool=Edit Connection Pool parameters for Database pool
+wizardConnectionPageDescription__DBPool=Edit connection pool parameters for database pool.
+
+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
 
 doasCurrentCaller=Do as current caller
 useContextHandler=Use context handler
@@ -329,8 +336,8 @@ wizardPageDescription_ServerCustomAssemb
 
 securityCredentialStore=Credential Store:
 securityDefaultSubject=Default Subject:
-securityDefaultSubjectRealmName=Realm Name
-securityDefaultSubjectId=Id
+securityDefaultSubjectRealmName=Realm Name:
+securityDefaultSubjectId=Id:
 securityDoasCurrentCaller=Do as current caller
 securityUseContextHandler=Use context handler
 securityRunAsSubjects=Run As Subjects:
@@ -348,7 +355,7 @@ confirmPassword = Confirm password 
 groupName = Group name
 passwordNotEqual = The passwords do not match!
 manageAccount = Manage Account
-manageAccountDescription = Manage account for default "Properties File Realm"
+manageAccountDescription = Manage account for default .properties file realm.
 cannotSave = Account information can not be stored!
 cannotRead = Account information can not be read!
 isNotLocalHost = Not a local host.
@@ -414,13 +421,13 @@ DownloadServerURL=http://geronimo.apache
 DownloadOSGiURL=http://www.ibm.com/developerworks/rational/downloads/10/rationaldevtoolsforosgiapplications.html
 jvmWarning={0} requires a 5.0+ JDK (J2SE 1.5.0+).
 installTitle=Install Confirmation
-installMessage=\nInstall {0} to {1} ?
+installMessage=\nInstall {0} to {1}?
 licenseAgreement=License Agreement:
 acceptLicenseAgreement=I accept the terms in the above license agreement.
 rejectLicenseAgreement=I do not accept the terms in the above license agreement.
-confirmLicenseRejection "Download and Install" will not continue unless you accept the license.\nDo
you really not accept the license?
+confirmLicenseRejection=The installation will not continue unless you accept the license.\nDo
you really not accept the license?
 tooltipLoc=A location of an existing {0} installation or a path to install to.
-tooltipInstall=Downloads the selected {0} distribution and installs it to the specified location.
+tooltipInstall=Download the selected {0} distribution and install it to the specified location.
 tooltipJetty=Selects the Jetty distribution of Geronimo to install.
 tooltipTomcat=Selects the Tomcat distribution of Geronimo to install.
 
@@ -438,7 +445,7 @@ errorOpenDialog=Error opening editor.
 errorOpenWizard=Error opening wizard.
 
 sourceLocWizTitle=Geronimo Source
-sourceLocWizDescription=Select the geronimo source zip file to locate source from during
debug sessions.
+sourceLocWizDescription=Locate the source zip file during debug sessions.
 sourceZipFile=Geronimo Source Archive:
 browseSrcDialog=Select the Geronimo Source Archive.
 
@@ -451,25 +458,25 @@ editorSectionSelectClasspathContainers=S
 editorSectionPublishAdvancedTitle=Publish Advanced
 editorSectionPublishAdvancedDescription=Additional options for publishing.
 notRedeployJSPFilesReminder=Important 
-notRedeployJSPFilesInformation=You must enable \"Development Mode\" of your server's JSP
compiler for this to function properly. 
+notRedeployJSPFilesInformation=You must enable \"Development Mode\" of JSP compiler for this
to function properly. 
 
 publishingTimeout=Publishing Timeout (ms):
 artifactType=Artifact Type:
 inverseClassloading=Inverse classloading
 supressDefaultEnv=Suppress default environment
-sharedLibDepends=Add a runtime dependency to Geronimo's shared library
-addSharedLib=Add a runtime dependency to Geronimo's shared library
+sharedLibDepends=Add a runtime dependency to shared library
+addSharedLib=Add a runtime dependency to shared library
 webContainerSection=Web Container
-webContainerSectionDescription=Web Container Configuration
+webContainerSectionDescription=Web container configuration
 useGBeanLink=Specify as GBean Link
 gBeanLink=GBean Link:
 useGBeanPattern=Specify as GBean Pattern
-moduleId=Module Id:
+moduleId=Module Id
 
 useUnitName=Specify as Unit Name
 usePattern=Specify as Pattern
 cmpConnectionSection=C-M-P Connection Factory
-cmpConnectionSectionDescription=C-M-P Connection Factory Configuration
+cmpConnectionSectionDescription=C-M-P connection factory configuration
 useResourceLink=Specify as Resource Link
 resourceLink=Resource Link:
 useUrl=Specify as URL
@@ -493,40 +500,40 @@ ejb=EJB
 java=Java
 web=Web
 
-plugin=Plugin
-pluginActions=Plugin actions that can be performed on the server
+plugin=Plug-in
+pluginActions=Plug-in actions that can be performed on the server
 createCustomAssembly=Create Custom Assembly
-convertAppsToPlugins=Convert Apps to Plugins
+convertAppsToPlugins=Convert Apps into Plug-ins
 
 savePageTitle=Save Resource
 savePageMessage=Data must be saved before entering or leaving the Source page.
 
 wizardTitle_ManageAccount=Manage Account
 
-wizardTitle_PluginManager=Create and Install Geronimo Plugins
-wizardPage0Title_PluginManager=Plugin Manager
-wizardPage0Description_PluginManager=Select your local plugin repository and the action to
take.
+wizardTitle_PluginManager=Create and Install Geronimo Plug-ins
+wizardPage0Title_PluginManager=Plug-in Manager
+wizardPage0Description_PluginManager=Select your local plug-in repository and the action
to take.
 wizardPage1Title_PluginManager=Application Selection
-wizardPage1Description_PluginManager=Select a configuration in the current Geronimo server
to export as a Geronimo plugin.\nThe configuration will be saved as a CAR file to your local
file system.
-wizardPage2Title_PluginManager=Update Plugin Information
-wizardPage2Description_PluginManager=Update information for the plugin.
-wizardPage3Title_PluginManager=Update Plugin Information (continued)
-wizardPage3Description_PluginManager=Update information for the plugin.
-wizardPage4Title_PluginManager=Install Plugin
-wizardPage4Description_PluginManager=Select plugins to be installed to the server.
+wizardPage1Description_PluginManager=Select a configuration in the current Geronimo server
to export as a Geronimo plug-in.\nThe configuration will be saved as a .car file to your local
file system.
+wizardPage2Title_PluginManager=Update Plug-in Information
+wizardPage2Description_PluginManager=Update information for the plug-in.
+wizardPage3Title_PluginManager=Update Plug-in Information (continued)
+wizardPage3Description_PluginManager=Update information for the plug-in.
+wizardPage4Title_PluginManager=Install Plug-in
+wizardPage4Description_PluginManager=Select plug-ins to be installed to the server.
 wizardPage5Title_PluginManager=Installation Complete
-wizardPage5Description_PluginManager=List of plugins that have been installed to the server.

-localPluginRepo=Local Plugin Repository:
+wizardPage5Description_PluginManager=List of plug-ins that have been installed to the server.

+localPluginRepo=Local Plug-in Repository:
 failedToSave=Failed to save {0}.
 savedSuccess={0} saved successfully.
-createPlugin=create Geronimo plugin
-installPlugins=install Geronimo plugins
+createPlugin=Create Geronimo plug-in
+installPlugins=Install Geronimo plug-ins
 license=License
 osiApproved=OSI Approved
-id=id
+id=Id
 category=Category
 downloadRepos=Download Repos
-pluginURL=Plugin URL
+pluginURL=Plug-in URL
 author=Author
 geronimoVersions=Geronimo versions
 jvmVersions=JVM versions
@@ -542,8 +549,8 @@ dbName=Database Name
 createDatabase=Create Database
 confirmPassword=Confirm Password
 loginTimeout=Login Timeout
-blockingTimeout=Blocking Timeout(in ms)
-idleTimeout=Idle Timeout(in mins)
+blockingTimeout=Blocking Timeout (ms)
+idleTimeout=Idle Timeout (mins)
 minPoolSize=Min Size
 maxPoolSize=Max Size
 transactionType=Transaction Type
@@ -552,6 +559,15 @@ driverGroup=Driver Details
 basicGroup=Basic Settings
 advancedGroup=Advanced Settings
 
+#DBPoolsection
+wizardDatabasePoolConnector=Connector
+wizardDatabasePoolExternalPath=External Path
+wizardDatabasePoolTitle=Database Pools
+wizardDatabasePoolDescription=The following database pools are defined:
+wizardDatabasePoolNew=New Database Pool;
+wizardDatabasePoolEdit=Edit Database Pool;
+
+
 #for blueprint editor
 editorTabService=Service
 editorTabReferenceList=Reference List
@@ -559,17 +575,17 @@ editorTabBean=Bean
 editorTabReference=Reference
 blueprintGeneralPageTitle=Blueprint General Configuration
 blueprintAttributeSectionTitle=Blueprint Attributes Configuration
-blueprintAttributeSectionDescription=Specify default attributes of blueprint
+blueprintAttributeSectionDescription=Specify default attributes of blueprint.
 blueprintDescriptionSectionTitle=Description
-blueprintDescriptionSectionDescription=The description for blueprint
+blueprintDescriptionSectionDescription=The description for blueprint.
 defaultActivation=Default Activation
 defaultTimeout=Default Timeout
 defaultAvailability=Default Availability
 blueprintTypeConverterSectionTitle=Type-Converters List
-blueprintTypeConverterSectionDescription=Specify configuration for type-converters 
+blueprintTypeConverterSectionDescription=Specify configuration for type-converters .
 
 blueprintOtherElementsSection=Blueprint Bean, Service, Reference List, Reference configuration

-blueprintOtherElementsSectionDescription=Specify other children elements of blueprint
+blueprintOtherElementsSectionDescription=Specify other children elements of blueprint.
 
 
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java
Tue May  3 09:55:36 2011
@@ -18,6 +18,7 @@ package org.apache.geronimo.st.v30.ui.pa
 
 import org.apache.geronimo.jee.application.Application;
 import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
 import org.apache.geronimo.st.v30.ui.sections.DBPoolSection;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.ui.forms.IManagedForm;
@@ -49,7 +50,7 @@ public class ConnectorPage extends Abstr
     }
 
     public String getFormTitle() {
-        return "Connector";//TODO
+        return CommonMessages.editorTabConnector;
     }
 
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/DBPoolSection.java
Tue May  3 09:55:36 2011
@@ -25,6 +25,7 @@ import javax.xml.bind.JAXBElement;
 import org.apache.geronimo.jee.application.ExtModule;
 import org.apache.geronimo.jee.connector.Connector;
 import org.apache.geronimo.jee.deployment.Pattern;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
 import org.apache.geronimo.st.v30.ui.pages.ConnectorPage;
 import org.apache.geronimo.st.v30.ui.wizards.DBPoolWizard;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -44,17 +45,13 @@ 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
-                                      // put
-                                      // into
-                                      // message
+    COLUMN_NAMES = new String[] { CommonMessages.wizardDatabasePoolConnector, CommonMessages.wizardDatabasePoolExternalPath};
     createClient();
     }
 
     @Override
     public String getDescription() {
-    return "The following database pools are defined:";// TODO put into
-                               // message
+    return CommonMessages.wizardDatabasePoolDescription;
     }
 
     @Override
@@ -64,7 +61,7 @@ public class DBPoolSection extends Abstr
 
     @Override
     public String getTitle() {
-    return "Database Pools";// TODO put into message
+    return CommonMessages.wizardDatabasePoolTitle;
     }
 
     @Override

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRealmSection.java
Tue May  3 09:55:36 2011
@@ -28,6 +28,7 @@ import org.apache.geronimo.jee.deploymen
 import org.apache.geronimo.jee.deployment.XmlAttributeType;
 import org.apache.geronimo.jee.loginconfig.LoginConfig;
 import org.apache.geronimo.jee.loginconfig.LoginModule;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
 import org.apache.geronimo.st.v30.ui.pages.SecurityPage;
 import org.apache.geronimo.st.v30.ui.wizards.SecurityRealmWizard;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -43,14 +44,14 @@ public class SecurityRealmSection extend
         Composite parent, FormToolkit toolkit, int style) {
     super(plan, parent, toolkit, style);
     this.objectContainer = gbeans;
-    COLUMN_NAMES = new String[] { "Security Realm Name",
-        "Login Module Class" };// TODO put into message
+    COLUMN_NAMES = new String[] {
+    		CommonMessages.wizardSecurityRealmName, CommonMessages.wizardLoginModuleClass};
     createClient();
     }
 
     @Override
     public String getDescription() {
-    return "The following security realms are defined:";// TODO put into
+    return CommonMessages.WizardSecurityRealmDescription;
     // message
     }
 
@@ -61,7 +62,7 @@ public class SecurityRealmSection extend
 
     @Override
     public String getTitle() {
-    return "Security Realm";// TODO put into message
+    return CommonMessages.WizardSecurityRealmTitle;
     }
 
     @Override

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/DBPoolWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/DBPoolWizard.java?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/DBPoolWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/DBPoolWizard.java
Tue May  3 09:55:36 2011
@@ -94,12 +94,12 @@ public class DBPoolWizard extends Abstra
 
     @Override
     protected String getAddWizardWindowTitle() {
-    return "New Database Pool";// TODO put into message
+    return CommonMessages.wizardDatabasePoolNew;
     }
 
     @Override
     protected String getEditWizardWindowTitle() {
-    return "Edit Database Pool";// TODO put into message
+    return CommonMessages.wizardDatabasePoolEdit;
     }
 
     public void addPages() {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/SecurityRealmWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/SecurityRealmWizard.java?rev=1098990&r1=1098989&r2=1098990&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/SecurityRealmWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/SecurityRealmWizard.java
Tue May  3 09:55:36 2011
@@ -119,12 +119,12 @@ public class SecurityRealmWizard extends
 
     @Override
     protected String getAddWizardWindowTitle() {
-    return "New Security Realm";// TODO put into message
+    	return CommonMessages.wizardSecurityRealmNew;
     }
 
     @Override
     protected String getEditWizardWindowTitle() {
-    return "Edit Security Realm";// TODO put into message
+	    return CommonMessages.wizardSecurityRealmEdit;
     }
 
     public boolean performFinish() {



Mime
View raw message