geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1102573 [3/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
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.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/PersUnitRefSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersUnitRefSection.java
Fri May 13 06:29:16 2011
@@ -22,6 +22,7 @@ import java.util.List;
 import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.jee.naming.PersistenceUnitRef;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v30.ui.Activator;
 import org.apache.geronimo.st.v30.ui.CommonMessages;
@@ -126,19 +127,20 @@ public class PersUnitRefSection extends 
             public String getText(Object element) {
                 if (JAXBElement.class.isInstance(element)) {
                     PersistenceUnitRef unitRef = (PersistenceUnitRef)((JAXBElement)element).getValue();
-                    String temp = "Persistence Unit Ref: name = \"" + unitRef.getPersistenceUnitRefName();
+                    String temp = Messages.editorPersUnitRefTitle + ":" + Messages.name +
" = \"" + unitRef.getPersistenceUnitRefName();
+                    
                     if (unitRef.getPersistenceUnitName() != null)
-                        temp += "\", unit name = \"" + unitRef.getPersistenceUnitName();
+                        temp += "\", " + Messages.unit + " " + Messages.name + " = \"" +
unitRef.getPersistenceUnitName();
                     if (unitRef.getPattern() != null && unitRef.getPattern().getName()
!= null)
-                        temp += "\", pattern name = \"" + unitRef.getPattern().getName();
+                        temp += "\", " + Messages.pattern + " " + Messages.name + " = \""
+ unitRef.getPattern().getName();
                     if (unitRef.getPattern() != null && unitRef.getPattern().getGroupId()
!= null)
-                        temp += "\", pattern group = \"" + unitRef.getPattern().getGroupId();
+                        temp += "\", " + Messages.pattern + " " + Messages.group + " = \""
+ unitRef.getPattern().getGroupId();
                     if (unitRef.getPattern() != null && unitRef.getPattern().getArtifactId()
!= null)
-                        temp += "\", pattern artifact = \"" + unitRef.getPattern().getArtifactId();
+                        temp += "\", " + Messages.pattern + " " + Messages.artifact + " =
\"" + unitRef.getPattern().getArtifactId();
                     if (unitRef.getPattern() != null && unitRef.getPattern().getVersion()
!= null)
-                        temp += "\", pattern version = \"" + unitRef.getPattern().getVersion();
+                        temp += "\", " + Messages.pattern + " " + Messages.version + " =
\"" + unitRef.getPattern().getVersion();
                     if (unitRef.getPattern() != null && unitRef.getPattern().getModule()
!= null)
-                        temp += "\", pattern module = \"" + unitRef.getPattern().getModule();
+                        temp += "\", " + Messages.pattern + " " + Messages.module + " = \""
+ unitRef.getPattern().getModule();
                     temp += "\"";
                     return temp;
                 }

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=1102573&r1=1102572&r2=1102573&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
Fri May 13 06:29:16 2011
@@ -51,7 +51,7 @@ public class SecurityRealmSection extend
 
     @Override
     public String getDescription() {
-    return CommonMessages.WizardSecurityRealmDescription;
+    return CommonMessages.wizardSecurityRealmDescription;
     // message
     }
 
@@ -62,7 +62,7 @@ public class SecurityRealmSection extend
 
     @Override
     public String getTitle() {
-    return CommonMessages.WizardSecurityRealmTitle;
+    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/sections/SecurityRoleMappingSection.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/SecurityRoleMappingSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRoleMappingSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/SecurityRoleMappingSection.java
Fri May 13 06:29:16 2011
@@ -28,6 +28,7 @@ import org.apache.geronimo.jee.security.
 import org.apache.geronimo.jee.security.Role;
 import org.apache.geronimo.jee.security.RoleMappings;
 import org.apache.geronimo.jee.security.Security;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.v30.core.descriptor.AbstractDeploymentDescriptor;
 import org.apache.geronimo.st.v30.core.descriptor.ApplicationDeploymentDescriptor;
 import org.apache.geronimo.st.v30.core.descriptor.EjbDeploymentDescriptor;
@@ -116,7 +117,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());
         }
     }
 
@@ -255,29 +256,30 @@ public class SecurityRoleMappingSection 
             public String getText(Object element) {
                 if (Role.class.isInstance(element)) {
                     Role role = (Role) element;
-                    return "Role: role-name = \"" + role.getRoleName() + "\"";
+                    return Messages.roleName + ": \"" + role.getRoleName() + "\"";
                 }
                 else if (element instanceof DistinguishedName) {
                     DistinguishedName object = (DistinguishedName) element;
-                    return "DistinguishedName: name = \"" + object.getName() + "\"";
+                    return Messages.distinguishedName + ": \"" + object.getName() + "\"";
                 }
                 else if (element instanceof RealmPrincipal) {
                     RealmPrincipal object = (RealmPrincipal) 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 LoginDomainPrincipal) {
                     LoginDomainPrincipal object = (LoginDomainPrincipal) 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 Principal) {
                     Principal object = (Principal) 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.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.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/ServiceRefSection.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServiceRefSection.java
Fri May 13 06:29:16 2011
@@ -23,6 +23,7 @@ import javax.xml.bind.JAXBElement;
 import org.apache.geronimo.jee.naming.Port;
 import org.apache.geronimo.jee.naming.PortCompletion;
 import org.apache.geronimo.jee.naming.ServiceRef;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.v30.ui.Activator;
 import org.apache.geronimo.st.v30.ui.CommonMessages;
 import org.apache.geronimo.st.v30.ui.wizards.ServiceRefWizard;
@@ -139,30 +140,31 @@ public class ServiceRefSection extends A
             public String getText(Object element) {
                 if (ServiceRef.class.isInstance(element)) {
                     ServiceRef serviceRef = (ServiceRef)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 (Port.class.isInstance(element)) {
                     Port port = (Port)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 (PortCompletion.class.isInstance(element)) {
                     PortCompletion portComp = (PortCompletion)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.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=1102573&r1=1102572&r2=1102573&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
Fri May 13 06:29:16 2011
@@ -37,6 +37,7 @@ import org.apache.geronimo.jee.deploymen
 import org.apache.geronimo.jee.deployment.Pattern;
 import org.apache.geronimo.jee.openejb.OpenejbJar;
 import org.apache.geronimo.jee.web.WebApp;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactory;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactoryImpl;
 import org.apache.geronimo.st.v30.ui.Activator;
@@ -133,25 +134,25 @@ public class DBPoolWizard extends Abstra
     if (page1.getPoolName() == null
         || page1.getPoolName().trim().length() == 0
         || page1.getPoolName().contains(" ")) {
-        MessageDialog.openWarning(this.getShell(), "Pool Name Invalid",
-            "Pool name specified is invalid");
+        MessageDialog.openWarning(this.getShell(), Messages.poolNameInvalidTitle,
+        		Messages.poolNameInvalidDesc);
         return false;
     }
     if (page1.getDBPooolType() == null
         || page1.getDBPooolType().trim().length() == 0) {
-        MessageDialog.openWarning(this.getShell(), "Pool type invalid",
-            "Pool type specified is invalid");
+        MessageDialog.openWarning(this.getShell(), Messages.poolTypeInvalidTitle,
+        		Messages.poolTypeInvalidDesc);
         return false;
     }
     if (page1.getDBName() == null || page1.getDBName().trim().length() == 0
         || page1.getDBName().contains(" ")) {
-        MessageDialog.openWarning(this.getShell(), "Database name invalid",
-            "Database name specified is invalid");
+        MessageDialog.openWarning(this.getShell(), Messages.dbNameInvalidTitle,
+        		Messages.dbNameInvalidDesc);
         return false;
     }
     if (page1.getDrivers() == null || page1.getDrivers().length == 0) {
-        MessageDialog.openWarning(this.getShell(), "Driver invalid",
-            "You havent selected a driver");
+        MessageDialog.openWarning(this.getShell(), Messages.dbDriverInvalidTitle,
+        		Messages.dbDriverInvalidDesc);
         return false;
     }
 
@@ -219,30 +220,31 @@ public class DBPoolWizard extends Abstra
 
         String[] loginData = page2.getLoginData();
         if (!loginData[1].equals(loginData[2])) {
+
         Status status = new Status(IStatus.WARNING, "Login Error", 0,
-            "Password provided in both fiels do not match", null);
+                Messages.dbLoginError0, null);
         ErrorDialog.openError(this.getShell(), "Login Error",
-            "Invalid Login Details", status);
+            Messages.dbLoginError1, status);
         return false;
         }
         ConfigPropertySetting setting1 = new ConfigPropertySetting();
-        setting1.setName("Password");
+        setting1.setName(Messages.dbWizardPwd);
         setting1.setValue(loginData[1]);
         instance.getConfigPropertySetting().add(setting1);
         ConfigPropertySetting setting2 = new ConfigPropertySetting();
-        setting2.setName("LoginTimeout");
+        setting2.setName(Messages.dbWizardLoginTimeout);
         setting2.setValue(page2.getLoginTimeout());
         instance.getConfigPropertySetting().add(setting2);
         ConfigPropertySetting setting3 = new ConfigPropertySetting();
-        setting3.setName("DatabaseName");
+        setting3.setName(Messages.dbWizardDbName);
         setting3.setValue(page1.getDBName());
         instance.getConfigPropertySetting().add(setting3);
         ConfigPropertySetting setting4 = new ConfigPropertySetting();
-        setting4.setName("CreateDatabase");
+        setting4.setName(Messages.dbWizardCreateDb);
         setting4.setValue(page2.getCreateDatabase());
         instance.getConfigPropertySetting().add(setting4);
         ConfigPropertySetting setting5 = new ConfigPropertySetting();
-        setting5.setName("UserName");
+        setting5.setName(Messages.dbWizardUserName);
         setting5.setValue(loginData[0]);
         instance.getConfigPropertySetting().add(setting5);
 
@@ -289,7 +291,7 @@ public class DBPoolWizard extends Abstra
         group.setLayoutData(groupGridData1);
 
         label = new Label(group, SWT.LEFT);
-        label.setText("Connector:");
+        label.setText(Messages.dbWizardConnector);
 
         text[0] = new Text(group, SWT.SINGLE | SWT.BORDER);
         textGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL
@@ -308,25 +310,25 @@ public class DBPoolWizard extends Abstra
         groupGridData2.horizontalSpan = 2;
         groupGridData2.verticalAlignment = GridData.FILL;
         group2.setLayoutData(groupGridData2);
-        group2.setText("External Path");
+        group2.setText(Messages.dbWizardExternalPath);
 
         label = new Label(group2, SWT.LEFT);
-        label.setText("Group Id:");
+        label.setText(Messages.dbWizardGroupId);
         text[1] = new Text(group2, SWT.SINGLE | SWT.BORDER);
         text[1].setLayoutData(textGridData);
 
         label = new Label(group2, SWT.LEFT);
-        label.setText("Artifact Id:");
+        label.setText(Messages.dbWizardArtifactId);
         text[2] = new Text(group2, SWT.SINGLE | SWT.BORDER);
         text[2].setLayoutData(textGridData);
 
         label = new Label(group2, SWT.LEFT);
-        label.setText("Version:");
+        label.setText(Messages.dbWizardArtifactVersion);
         text[3] = new Text(group2, SWT.SINGLE | SWT.BORDER);
         text[3].setLayoutData(textGridData);
 
         label = new Label(group2, SWT.LEFT);
-        label.setText("Type:");
+        label.setText(Messages.dbWizardArtifactType);
         text[4] = new Text(group2, SWT.SINGLE | SWT.BORDER);
         text[4].setLayoutData(textGridData);
 
@@ -358,12 +360,12 @@ public class DBPoolWizard extends Abstra
 
     @Override
     protected String getWizardPageDescription() {
-        return "Specify the connector rar in the repository";
+    	return Messages.dbWizardSpecifyConnectInRepository;
     }
 
     @Override
     protected String getWizardPageTitle() {
-        return "External Path";
+    	return Messages.dbWizardExternalPath;
     }
 
     }
@@ -472,7 +474,7 @@ public class DBPoolWizard extends Abstra
         });
         listViewer.setInput(getInput());
         MenuManager popupMenu = new MenuManager();
-        Action helpAction = new Action("Add New Driver") { //$NON-NLS-1$
+        Action helpAction = new Action(Messages.dbAddNewDriver) {
         public void run() {
             DriverDialog dialog = new DriverDialog(Display.getCurrent()
                 .getActiveShell());
@@ -615,16 +617,16 @@ public class DBPoolWizard extends Abstra
             java.util.List<ConfigPropertySetting> configPropertySettingList = conndefInstance
                 .getConfigPropertySetting();
             for (ConfigPropertySetting cps : configPropertySettingList) {
-            if (cps.getName().equals("CreateDatabase")) {
+            if (cps.getName().equals(Messages.dbWizardCreateDb)) {
                 if (cps.getValue().equals("true"))
                 createDatabase.setSelection(true);
                 else
                 createDatabase.setSelection(false);
-            } else if (cps.getName().equals("LoginTimeout")) {
+            } else if (cps.getName().equals(Messages.dbWizardLoginTimeout)) {
                 text[0].setText(cps.getValue());
-            } else if (cps.getName().equals("UserName")) {
+            } else if (cps.getName().equals(Messages.dbWizardUserName)) {
                 text[1].setText(cps.getValue());
-            } else if (cps.getName().equals("Password")) {
+            } else if (cps.getName().equals(Messages.dbWizardPwd)) {
                 text[2].setEchoChar('*');
                 text[2].setText(cps.getValue());
                 text[3].setEchoChar('*');

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/MessageDestWizard.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/MessageDestWizard.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/MessageDestWizard.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/MessageDestWizard.java
Fri May 13 06:29:16 2011
@@ -20,6 +20,7 @@ import java.util.List;
 
 import javax.xml.bind.JAXBElement;
 
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactoryImpl;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactory;
@@ -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.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=1102573&r1=1102572&r2=1102573&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
Fri May 13 06:29:16 2011
@@ -37,6 +37,7 @@ import org.apache.geronimo.jee.loginconf
 import org.apache.geronimo.jee.naming.Pattern;
 import org.apache.geronimo.jee.openejb.OpenejbJar;
 import org.apache.geronimo.jee.web.WebApp;
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactory;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBObjectFactoryImpl;
@@ -146,10 +147,10 @@ public class SecurityRealmWizard extends
     // password not match , popup a dialog
     if (!page3.textEntries[3].getText().equals(
         page3.textEntries[4].getText())) {
-        Status status = new Status(IStatus.WARNING, "Login Error", 0,
-            "Password provided in both fields do not match", null);
-        ErrorDialog.openError(this.getShell(), "Login Error",
-            "Invalid Login Details", status);
+        Status status = new Status(IStatus.WARNING, Messages.error, 0,
+            Messages.dbLoginError0, null);
+        ErrorDialog.openError(this.getShell(), Messages.error,
+        		Messages.dbLoginError1, status);
         return false;
     }
 
@@ -215,7 +216,7 @@ public class SecurityRealmWizard extends
     loginModule.setLoginDomainName(realmName);
 
     String realmType = page0.combo.getText().trim();
-    if (realmType.equals("Properties File Realm")) {
+    if (realmType.equals(Messages.propertiesFileRealm)) {
         loginModule
             .setLoginModuleClass("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
 
@@ -238,7 +239,7 @@ public class SecurityRealmWizard extends
         if (encoding != null)
         loginModule.getOption().add(encodingopt);
 
-    } else if (realmType.equals("SQL Realm")) {
+    } else if (realmType.equals(Messages.sqlRealm)) {
         loginModule
             .setLoginModuleClass("org.apache.geronimo.security.realm.providers.SQLLoginModule");
 
@@ -285,7 +286,7 @@ public class SecurityRealmWizard extends
         loginModule.getOption().add(algorithmopt);
         loginModule.getOption().add(encodingopt);
 
-    } else if (realmType.equals("LDAP Realm")) {
+    } else if (realmType.equals(Messages.ldapRealm)) {
         loginModule
             .setLoginModuleClass("org.apache.geronimo.security.realm.providers.LDAPLoginModule");
         String initialContextFactory = page4.combo[0].getText().trim();
@@ -466,7 +467,7 @@ public class SecurityRealmWizard extends
         composite.setLayoutData(data);
 
         Group basicGroup = new Group(composite, SWT.NONE);
-        basicGroup.setText("Basic Settings");
+        basicGroup.setText(Messages.basicGroup);
         GridLayout gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
         GridData data1 = new GridData();
@@ -483,9 +484,9 @@ public class SecurityRealmWizard extends
         combo = new Combo(basicGroup, SWT.NONE | SWT.READ_ONLY);
         combo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
             true, false, 3, 1));
-        combo.add("Properties File Realm");
-        combo.add("SQL Realm");
-        combo.add("LDAP Realm");
+        combo.add(Messages.propertiesFileRealm);
+        combo.add(Messages.sqlRealm);
+        combo.add(Messages.ldapRealm);
         combo.select(0);
 
         if (eObject != null) {
@@ -525,14 +526,14 @@ public class SecurityRealmWizard extends
 
     @Override
     public IWizardPage getNextPage() {
-        if (combo.getText().trim().equals("Properties File Realm")) {// properties
+        if (combo.getText().trim().equals(Messages.propertiesFileRealm)) {// properties
         // file
         // type
         return this.getWizard().getPage("PropertiesFileRealmPage");
-        } else if (combo.getText().trim().equals("SQL Realm")) {// sql realm
+        } else if (combo.getText().trim().equals(Messages.sqlRealm)) {// sql realm
         // type
         return this.getWizard().getPage("SelectSQLPage");
-        } else if (combo.getText().trim().equals("LDAP Realm")) {// ldap
+        } else if (combo.getText().trim().equals(Messages.ldapRealm)) {// ldap
         // realm
         // type
         return this.getWizard().getPage("LDAPConnectionPage");
@@ -547,8 +548,8 @@ public class SecurityRealmWizard extends
 
     public PropertiesFileRealmPage(String pageName) {
         super(pageName);
-        setTitle("Properties File Realm");
-        setDescription("Edit settings for users file and groups file's pathes");
+        setTitle(Messages.propertiesFileRealm);
+        setDescription(Messages.propertiesFileRealmDesc);
     }
 
     public void createControl(Composite parent) {
@@ -563,7 +564,7 @@ public class SecurityRealmWizard extends
         composite.setLayoutData(data);
 
         Group uriGroup = new Group(composite, SWT.NONE);
-        uriGroup.setText("Files's URI");
+        uriGroup.setText(Messages.fileUri);
         GridLayout gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
         uriGroup.setLayout(gridLayout);
@@ -574,12 +575,13 @@ public class SecurityRealmWizard extends
         data1.horizontalSpan = 2;
         data1.grabExcessHorizontalSpace = true;
         uriGroup.setLayoutData(data1);
-        createLabel(uriGroup, "Users File URI:", 1);
+        createLabel(uriGroup, Messages.userFileUri, 1);
         textEntries[0] = createText(uriGroup, 3);
-        createLabel(uriGroup, "Groups File URI:", 1);
+        createLabel(uriGroup, Messages.groupFileUri, 1);
         textEntries[1] = createText(uriGroup, 3);
 
         Group digestGroup = new Group(composite, SWT.NONE);
+        digestGroup.setText(Messages.digestConfig);
         digestGroup.setText("Digest Configuration");
         gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
@@ -591,9 +593,9 @@ public class SecurityRealmWizard extends
         data1.horizontalSpan = 2;
         data1.grabExcessHorizontalSpace = true;
         digestGroup.setLayoutData(data1);
-        createLabel(digestGroup, "Digest Algorithm:", 1);
+        createLabel(digestGroup, Messages.digestAlgorithm, 1);
         textEntries[2] = createText(digestGroup, 3);
-        createLabel(digestGroup, "Digest Encoding:", 1);
+        createLabel(digestGroup, Messages.digestEncoding, 1);
         textEntries[3] = createText(digestGroup, 3);
 
         if (eObject != null) {
@@ -631,8 +633,8 @@ public class SecurityRealmWizard extends
 
     public SelectSQLPage(String pageName) {
         super(pageName);
-        setTitle("SQL Realm");
-        setDescription("Edit settings for user and group select sql");
+        setTitle(Messages.sqlRealm);
+        setDescription(Messages.sqlRealmDesc);
     }
 
     public void createControl(Composite parent) {
@@ -647,7 +649,7 @@ public class SecurityRealmWizard extends
         composite.setLayoutData(data);
 
         Group uriGroup = new Group(composite, SWT.NONE);
-        uriGroup.setText("Select SQL");
+        uriGroup.setText(Messages.sqlQueries);
         GridLayout gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
         uriGroup.setLayout(gridLayout);
@@ -658,13 +660,13 @@ public class SecurityRealmWizard extends
         data1.horizontalSpan = 2;
         data1.grabExcessHorizontalSpace = true;
         uriGroup.setLayoutData(data1);
-        createLabel(uriGroup, "Users Select SQL:", 1);
+        createLabel(uriGroup, Messages.userSelectSQL, 1);
         textEntries[0] = createText(uriGroup, 3);
-        createLabel(uriGroup, "Groups Select SQL:", 1);
+        createLabel(uriGroup, Messages.groupSelectSQL, 1);
         textEntries[1] = createText(uriGroup, 3);
 
         Group digestGroup = new Group(composite, SWT.NONE);
-        digestGroup.setText("Digest Configuration");
+        digestGroup.setText(Messages.digestConfig);
         gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
         digestGroup.setLayout(gridLayout);
@@ -675,9 +677,9 @@ public class SecurityRealmWizard extends
         data1.horizontalSpan = 2;
         data1.grabExcessHorizontalSpace = true;
         digestGroup.setLayoutData(data1);
-        createLabel(digestGroup, "Digest Algorithm:", 1);
+        createLabel(digestGroup, Messages.digestAlgorithm, 1);
         textEntries[2] = createText(digestGroup, 3);
-        createLabel(digestGroup, "Digest Encoding:", 1);
+        createLabel(digestGroup, Messages.digestEncoding, 1);
         textEntries[3] = createText(digestGroup, 3);
 
         if (eObject != null) {
@@ -872,8 +874,8 @@ public class SecurityRealmWizard extends
 
     protected LDAPConnectionPage(String pageName) {
         super(pageName);
-        setTitle("LDAP Realm Connection");
-        setDescription("Edit settings for LDAP server connection");
+        setTitle(Messages.ldapRealm);
+        setDescription(Messages.ldapRealmDesc);
     }
 
     public void createControl(Composite parent) {
@@ -888,7 +890,7 @@ public class SecurityRealmWizard extends
         composite.setLayoutData(data);
 
         Group connectionGroup = new Group(composite, SWT.NULL);
-        connectionGroup.setText("LDAP server connection");
+        connectionGroup.setText(Messages.ldapServerConnection);
         GridLayout gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
         GridData data1 = new GridData();
@@ -898,37 +900,38 @@ public class SecurityRealmWizard extends
         connectionGroup.setLayout(gridLayout);
         connectionGroup.setLayoutData(data1);
 
-        createLabel(connectionGroup, "Initial Context Factory:", 1);
+        createLabel(connectionGroup, Messages.initContextFactory, 1);
         combo[0] = new Combo(connectionGroup, SWT.NONE);
         combo[0].setLayoutData(new GridData(GridData.FILL, GridData.FILL,
             true, false, 3, 1));
         combo[0].add("com.sun.jndi.ldap.LdapCtxFactory");
-        createLabel(connectionGroup, "Connection URL:", 1);
+        
+        createLabel(connectionGroup, Messages.connectionUrl, 1);
         combo[1] = new Combo(connectionGroup, SWT.NONE);
         combo[1].setLayoutData(new GridData(GridData.FILL, GridData.FILL,
             true, false, 3, 1));
         combo[1].add("ldap://localhost:1389");
         combo[1].add("ldap://localhost:389");
-        createLabel(connectionGroup, "Connect Username:", 1);
+        createLabel(connectionGroup, Messages.connectUsername, 1);
         text[0] = createText(connectionGroup, 3);
         text[0].setText("system");
-        createLabel(connectionGroup, "Connect Password:", 1);
+        createLabel(connectionGroup, Messages.conncetPwd, 1);
         text[1] = createText(connectionGroup, 3);
         text[1].setEchoChar('*');
         text[1].setText("manager");
-        createLabel(connectionGroup, "Confirm Password:", 1);
+        createLabel(connectionGroup, Messages.confirmPassword, 1);
         text[2] = createText(connectionGroup, 3);
         text[2].setEchoChar('*');
         text[2].setText("manager");
-        createLabel(connectionGroup, "Connect Protocol:", 1);
+        createLabel(connectionGroup, Messages.connectProtocol, 1);
         text[3] = createText(connectionGroup, 1);
-        createLabel(connectionGroup, "Authentication:", 1);
+        createLabel(connectionGroup, Messages.authentication, 1);
         combo[2] = new Combo(connectionGroup, SWT.NONE);
         combo[2].setLayoutData(new GridData(GridData.FILL, GridData.FILL,
             true, false, 1, 1));
-        combo[2].add("none");
-        combo[2].add("simple");
-        combo[2].add("strong");
+        combo[2].add(Messages.none);
+        combo[2].add(Messages.simple);
+        combo[2].add(Messages.strong);
         combo[2].select(1);
 
         if (eObject != null) {
@@ -977,8 +980,8 @@ public class SecurityRealmWizard extends
 
     protected LDAPSearchPage(String pageName) {
         super(pageName);
-        setTitle("LDAP Realm Search Configuration");
-        setDescription("Edit settings for LDAP realm search");
+        setTitle(Messages.ldapRealmSearchConfig);
+        setDescription(Messages.editLdapRealmSearch);
     }
 
     public void createControl(Composite parent) {
@@ -993,7 +996,7 @@ public class SecurityRealmWizard extends
         composite.setLayoutData(data);
 
         Group userGroup = new Group(composite, SWT.NULL);
-        userGroup.setText("User Search Configuration");
+        userGroup.setText(Messages.userSearchConfig);
         GridLayout gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
         GridData data1 = new GridData();
@@ -1003,18 +1006,18 @@ public class SecurityRealmWizard extends
         userGroup.setLayout(gridLayout);
         userGroup.setLayoutData(data1);
 
-        createLabel(userGroup, "User Base:", 1);
+        createLabel(userGroup, Messages.userBase, 1);
         text[0] = createText(userGroup, 3);
-        createLabel(userGroup, "User Search Matching:", 1);
+        createLabel(userGroup, Messages.userSearchMachting, 1);
         text[1] = createText(userGroup, 3);
         userSearchSubtree = new Button(userGroup, SWT.CHECK);
-        userSearchSubtree.setText("User Search Subtree");
+        userSearchSubtree.setText(Messages.userSearchSubtree);
         userSearchSubtree.setLayoutData(new GridData(GridData.FILL,
             GridData.FILL, true, false, 4, 1));
         userSearchSubtree.setSelection(true);
 
         Group roleGroup = new Group(composite, SWT.NULL);
-        roleGroup.setText("Role Search Configuration");
+        roleGroup.setText(Messages.roleSearchConfig);
         gridLayout = new GridLayout();
         gridLayout.numColumns = 4;
         data1 = new GridData();
@@ -1023,16 +1026,16 @@ public class SecurityRealmWizard extends
         data1.horizontalSpan = 2;
         roleGroup.setLayout(gridLayout);
         roleGroup.setLayoutData(data1);
-        createLabel(roleGroup, "Role Base:", 1);
+        createLabel(roleGroup, Messages.roleBase, 1);
         text[2] = createText(roleGroup, 3);
-        createLabel(roleGroup, "Role Name:", 1);
+        createLabel(roleGroup, Messages.roleName, 1);
         text[3] = createText(roleGroup, 3);
-        createLabel(roleGroup, "Role User Search String:", 1);
+        createLabel(roleGroup, Messages.roleUserSearchStr, 1);
         text[4] = createText(roleGroup, 3);
-        createLabel(roleGroup, "User Role Search String:", 1);
+        createLabel(roleGroup, Messages.userRoleSearchStr, 1);
         text[5] = createText(roleGroup, 3);
         roleSearchSubtree = new Button(roleGroup, SWT.CHECK);
-        roleSearchSubtree.setText("Role Search Subtree");
+        roleSearchSubtree.setText(Messages.roleSearchSubtree);
         roleSearchSubtree.setLayoutData(new GridData(GridData.FILL,
             GridData.FILL, true, false, 4, 1));
         roleSearchSubtree.setSelection(true);

Modified: 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
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/blueprint/BlueprintElementWizardProxy.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- 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
(original)
+++ 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
Fri May 13 06:29:16 2011
@@ -11,6 +11,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.apache.geronimo.st.v30.ui.internal.Messages;
 import org.apache.geronimo.st.ui.internal.Trace;
 import org.apache.geronimo.st.v30.core.jaxb.BlueprintJAXBHelper;
 import org.apache.geronimo.st.v30.core.jaxb.BlueprintJAXBHelper.SubClazzWrapper;
@@ -137,12 +138,12 @@ public class BlueprintElementWizardProxy
 
             @Override
             protected String getWizardPageTitle() {
-                return "Blueprint Configuration";
+            	return Messages.blueprintConfiguration;
             }
 
             @Override
             protected String getWizardPageDescription() {
-                return "Add or Edit elements in blueprint schema";
+            	return Messages.blueprintAddOrEditElementInSchema;
             }
             
             public HashMap<Field,String> getResult(){
@@ -182,12 +183,12 @@ public class BlueprintElementWizardProxy
 
         @Override
         protected String getAddWizardWindowTitle() {
-            return "Blueprint Editor - Adding";
+        	return Messages.blueprintEditorAdding;
         }
 
         @Override
         protected String getEditWizardWindowTitle() {
-            return "Blueprint Editor - Editing";
+        	return Messages.blueprintEditorEditing;
         }
 
         @Override

Modified: 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
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/facets/GeronimoJEEFacetInstallWizardPage.java?rev=1102573&r1=1102572&r2=1102573&view=diff
==============================================================================
--- 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
(original)
+++ 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
Fri May 13 06:29:16 2011
@@ -16,6 +16,7 @@
  */
 package org.apache.geronimo.st.v30.ui.wizards.facets;
 
+import org.apache.geronimo.st.ui.internal.Messages;
 import org.apache.geronimo.st.v30.core.facets.DeploymentPlanInstallConfig;
 import org.apache.geronimo.st.v30.ui.CommonMessages;
 import org.apache.geronimo.st.v30.ui.internal.Trace;
@@ -48,8 +49,8 @@ public class GeronimoJEEFacetInstallWiza
         super("geronimo.plan.install");
         Trace.tracePoint("Constructor Entry", "GeroniomoJEEFacetInstallWizardPage");
         
-        setTitle("Geronimo Deployment Plan");
-        setDescription("Configure the geronimo deployment plan.");
+        setTitle(Messages.geronimoDeploymentPlan);
+        setDescription(Messages.configGeronimoDeploymentPlan);
         
         Trace.tracePoint("Constructor Exit", "GeronimoJEEFacetInstallWizardPage");
     }



Mime
View raw message