You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ha...@apache.org on 2011/05/13 08:29:18 UTC
svn commit: r1102573 [2/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...
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.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/PersContextRefSection.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/PersContextRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/PersContextRefSection.java Fri May 13 06:29:16 2011
@@ -25,6 +25,7 @@ import org.apache.geronimo.jee.jaxbmodel
import org.apache.geronimo.jee.naming.PersistenceContextRef;
import org.apache.geronimo.jee.naming.Property;
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.PersContextRefWizard;
@@ -142,27 +143,28 @@ public class PersContextRefSection exten
public String getText(Object element) {
if (JAXBElement.class.isInstance(element)) {
PersistenceContextRef contextRef = (PersistenceContextRef)((JAXBElement)element).getValue();
- String temp = "Persistence Context Ref: name = \"" + contextRef.getPersistenceContextRefName() +
- "\", type = \"" + contextRef.getPersistenceContextType().value();
+ String temp = Messages.editorPersContextRefTitle + ":" + Messages.name + " = \"" + contextRef.getPersistenceContextRefName() +
+ "\", " + Messages.type + " = \"" + contextRef.getPersistenceContextType().value();
+
if (contextRef.getPersistenceUnitName() != null)
- temp += "\", unit name = \"" + contextRef.getPersistenceUnitName();
+ temp += "\", " + Messages.pattern + " " + Messages.unit + " = \"" + contextRef.getPersistenceUnitName();
if (contextRef.getPattern() != null && contextRef.getPattern().getName() != null)
- temp += "\", pattern name = \"" + contextRef.getPattern().getName();
+ temp += "\", " + Messages.pattern + " " + Messages.name + " = \"" + contextRef.getPattern().getName();
if (contextRef.getPattern() != null && contextRef.getPattern().getGroupId() != null)
- temp += "\", pattern group = \"" + contextRef.getPattern().getGroupId();
+ temp += "\", " + Messages.pattern + " " + Messages.group + " = \"" + contextRef.getPattern().getGroupId();
if (contextRef.getPattern() != null && contextRef.getPattern().getArtifactId() != null)
- temp += "\", pattern artifact = \"" + contextRef.getPattern().getArtifactId();
+ temp += "\", " + Messages.artifact + " " + Messages.unit + " = \"" + contextRef.getPattern().getArtifactId();
if (contextRef.getPattern() != null && contextRef.getPattern().getVersion() != null)
- temp += "\", pattern version = \"" + contextRef.getPattern().getVersion();
+ temp += "\", " + Messages.pattern + " " + Messages.version + " = \"" + contextRef.getPattern().getVersion();
if (contextRef.getPattern() != null && contextRef.getPattern().getModule() != null)
- temp += "\", pattern module = \"" + contextRef.getPattern().getModule();
+ temp += "\", " + Messages.pattern + " " + Messages.module + " = \"" + contextRef.getPattern().getModule();
temp += "\"";
return temp;
}
else if (Property.class.isInstance(element)) {
Property property = (Property)element;
- return "Property: key = \"" + property.getKey() +
- "\", value = \"" + property.getValue() + "\"";
+ return Messages.property + ": " + Messages.key + " = \"" + property.getKey() +
+ "\", " + 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/SecurityRoleMappingSection.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/SecurityRoleMappingSection.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/SecurityRoleMappingSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/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.v21.ui.Activator;
import org.apache.geronimo.st.v21.ui.wizards.SecurityRoleMappingWizard;
@@ -120,10 +121,10 @@ public class SecurityRoleMappingSection
Object selectedObject = selectedItem.getData();
Role role = (Role) selectedItem.getParentItem().getData();
try {
- ((ArrayList) JAXBUtils.getValue(role, selectedObject.getClass().getSimpleName())).remove(selectedObject);
- } catch (Exception e) {
- MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
- }
+ ((ArrayList) JAXBUtils.getValue(role, selectedObject.getClass().getSimpleName())).remove(selectedObject);
+ } catch (Exception e) {
+ MessageDialog.openError(Display.getCurrent().getActiveShell(),Messages.error, e.getMessage());
+ }
}
public Role getSelectedObject() {
@@ -261,29 +262,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.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.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/ServiceRefSection.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/ServiceRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java Fri May 13 06:29:16 2011
@@ -25,6 +25,7 @@ import org.apache.geronimo.jee.naming.Po
import org.apache.geronimo.jee.naming.PortCompletion;
import org.apache.geronimo.jee.naming.ServiceRef;
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.ServiceRefWizard;
@@ -141,30 +142,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.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.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/wizards/DBPoolWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DBPoolWizard.java Fri May 13 06:29:16 2011
@@ -39,6 +39,7 @@ import org.apache.geronimo.jee.web.WebAp
import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory;
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.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
import org.apache.geronimo.jee.jaxbmodel.operations.JAXBObjectFactoryImpl;
@@ -93,12 +94,12 @@ public class DBPoolWizard extends Abstra
@Override
protected String getAddWizardWindowTitle() {
- return "New Database Pool";// TODO put into message
+ return Messages.wizardDatabasePoolNew;// TODO put into message
}
@Override
protected String getEditWizardWindowTitle() {
- return "Edit Database Pool";// TODO put into message
+ return Messages.wizardDatabasePoolEdit;// TODO put into message
}
public void addPages() {
@@ -132,25 +133,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,29 +220,29 @@ 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);
@@ -288,7 +289,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
@@ -307,25 +308,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);
@@ -357,12 +358,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;
}
}
@@ -471,7 +472,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());
@@ -614,16 +615,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.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java?rev=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/wizards/FacetInstallPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java Fri May 13 06:29:16 2011
@@ -17,6 +17,7 @@
package org.apache.geronimo.st.v21.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.v21.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.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.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/wizards/MessageDestWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java Fri May 13 06:29:16 2011
@@ -23,6 +23,7 @@ import javax.xml.bind.JAXBElement;
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.jee.jaxbmodel.operations.JAXBModelUtils;
@@ -102,11 +103,11 @@ public class MessageDestWizard extends A
// get the pattern value
Pattern pattern = ((MessageDestination) eObject).getPattern();
String value = null;
- try {
- value = (String) JAXBUtils.getValue(pattern,getTableColumnEAttributes()[i]);
- } catch (Exception e) {
- MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
- }
+ try {
+ value = (String) JAXBUtils.getValue(pattern,getTableColumnEAttributes()[i]);
+ } catch (Exception e) {
+ MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
+ }
if (value != null) {
text.setText(value);
}
@@ -114,11 +115,11 @@ public class MessageDestWizard extends A
else
{
String value = null;
- try {
- value = (String) JAXBUtils.getValue(eObject,getTableColumnEAttributes()[i]);
- } catch (Exception e) {
- MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
- }
+ try {
+ value = (String) JAXBUtils.getValue(eObject,getTableColumnEAttributes()[i]);
+ } catch (Exception e) {
+ MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
+ }
if (value != null) {
text.setText(value);
}
@@ -168,17 +169,17 @@ public class MessageDestWizard extends A
String value = page.getTextEntry(i).getText();
String attribute = getTableColumnEAttributes()[i];
if (i < 3)
- try {
- JAXBUtils.setValue(eObject, attribute, value);
- } catch (Exception e) {
- MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
- }
- else
- try {
- JAXBUtils.setValue(msgPattern, attribute, value);
- } catch (Exception e) {
- MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
- }
+ try {
+ JAXBUtils.setValue(eObject, attribute, value);
+ } catch (Exception e) {
+ MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
+ }
+ else
+ try {
+ JAXBUtils.setValue(msgPattern, attribute, value);
+ } catch (Exception e) {
+ MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.error, e.getMessage());
+ }
}
if (section.getViewer().getInput() == section.getPlan()) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.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/wizards/SecurityRealmWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRealmWizard.java Fri May 13 06:29:16 2011
@@ -40,6 +40,7 @@ import org.apache.geronimo.jee.web.WebAp
import org.apache.geronimo.jaxbmodel.common.operations.JAXBObjectFactory;
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.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
import org.apache.geronimo.st.v21.core.GeronimoV21ServerInfo;
@@ -116,12 +117,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() {
@@ -140,15 +141,15 @@ public class SecurityRealmWizard extends
.getPage("LDAPConnectionPage");
LDAPSearchPage page5 = (LDAPSearchPage) this.getPage("LDAPSearchPage");
- // 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);
- return false;
- }
+ // password not match , popup a dialog
+ if (!page3.textEntries[3].getText().equals(
+ page3.textEntries[4].getText())) {
+ Status status = new Status(IStatus.WARNING, Messages.error, 0,
+ Messages.dbLoginError0, null);
+ ErrorDialog.openError(this.getShell(), Messages.error,
+ Messages.dbLoginError1, status);
+ return false;
+ }
// set a gbean according to the input from wizard
Gbean gbean = null;
@@ -211,10 +212,10 @@ public class SecurityRealmWizard extends
loginModule.setWrapPrincipals(false);
loginModule.setLoginDomainName(realmName);
- String realmType = page0.combo.getText().trim();
- if (realmType.equals("Properties File Realm")) {
- loginModule
- .setLoginModuleClass("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
+ String realmType = page0.combo.getText().trim();
+ if (realmType.equals(Messages.propertiesFileRealm)) {
+ loginModule
+ .setLoginModuleClass("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
String usersfile = page1.textEntries[0].getText().trim();
Option usersfileopt = createOption("usersURI", usersfile);
@@ -235,9 +236,9 @@ public class SecurityRealmWizard extends
if (encoding != null)
loginModule.getOption().add(encodingopt);
- } else if (realmType.equals("SQL Realm")) {
- loginModule
- .setLoginModuleClass("org.apache.geronimo.security.realm.providers.SQLLoginModule");
+ } else if (realmType.equals(Messages.sqlRealm)) {
+ loginModule
+ .setLoginModuleClass("org.apache.geronimo.security.realm.providers.SQLLoginModule");
String selectUsers = page2.textEntries[0].getText().trim();
Option selectUsersopt = createOption("userSelect", selectUsers);
@@ -282,29 +283,29 @@ public class SecurityRealmWizard extends
loginModule.getOption().add(algorithmopt);
loginModule.getOption().add(encodingopt);
- } else if (realmType.equals("LDAP Realm")) {
- loginModule
- .setLoginModuleClass("org.apache.geronimo.security.realm.providers.LDAPLoginModule");
- String initialContextFactory = page4.combo[0].getText().trim();
- loginModule.getOption()
- .add(
- createOption("initialContextFactory",
- initialContextFactory));
- String connectionURL = page4.combo[1].getText();
- loginModule.getOption().add(
- createOption("connectionURL", connectionURL));
- String connectionUsername = page4.text[0].getText();
- loginModule.getOption().add(
- createOption("connectionUsername", connectionUsername));
- String connectionPassword = page4.text[1].getText();
- loginModule.getOption().add(
- createOption("connectionPassword", connectionPassword));
- String connectionProtocol = page4.text[3].getText();
- loginModule.getOption().add(
- createOption("connectionProtocol", connectionProtocol));
- String authentication = page4.combo[2].getText();
- loginModule.getOption().add(
- createOption("authentication", authentication));
+ } else if (realmType.equals(Messages.ldapRealm)) {
+ loginModule
+ .setLoginModuleClass("org.apache.geronimo.security.realm.providers.LDAPLoginModule");
+ String initialContextFactory = page4.combo[0].getText().trim();
+ loginModule.getOption()
+ .add(
+ createOption("initialContextFactory",
+ initialContextFactory));
+ String connectionURL = page4.combo[1].getText();
+ loginModule.getOption().add(
+ createOption("connectionURL", connectionURL));
+ String connectionUsername = page4.text[0].getText();
+ loginModule.getOption().add(
+ createOption("connectionUsername", connectionUsername));
+ String connectionPassword = page4.text[1].getText();
+ loginModule.getOption().add(
+ createOption("connectionPassword", connectionPassword));
+ String connectionProtocol = page4.text[3].getText();
+ loginModule.getOption().add(
+ createOption("connectionProtocol", connectionProtocol));
+ String authentication = page4.combo[2].getText();
+ loginModule.getOption().add(
+ createOption("authentication", authentication));
String userBase = page5.text[0].getText();
loginModule.getOption().add(createOption("userBase", userBase));
@@ -462,28 +463,28 @@ public class SecurityRealmWizard extends
data.widthHint = 300;
composite.setLayoutData(data);
- Group basicGroup = new Group(composite, SWT.NONE);
- basicGroup.setText("Basic Settings");
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- GridData data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.grabExcessVerticalSpace = true;
- data1.horizontalSpan = 2;
- basicGroup.setLayout(gridLayout);
- data1.grabExcessHorizontalSpace = true;
- basicGroup.setLayoutData(data1);
- createLabel(basicGroup, CommonMessages.realmName, 1);
- textEntries[0] = createText(basicGroup, 3);
- createLabel(basicGroup, CommonMessages.realmType, 1);
- 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.select(0);
+ Group basicGroup = new Group(composite, SWT.NONE);
+ basicGroup.setText(Messages.basicGroup);
+ GridLayout gridLayout = new GridLayout();
+ gridLayout.numColumns = 4;
+ GridData data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.grabExcessVerticalSpace = true;
+ data1.horizontalSpan = 2;
+ basicGroup.setLayout(gridLayout);
+ data1.grabExcessHorizontalSpace = true;
+ basicGroup.setLayoutData(data1);
+ createLabel(basicGroup, CommonMessages.realmName, 1);
+ textEntries[0] = createText(basicGroup, 3);
+ createLabel(basicGroup, CommonMessages.realmType, 1);
+ combo = new Combo(basicGroup, SWT.NONE | SWT.READ_ONLY);
+ combo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
+ true, false, 3, 1));
+ combo.add(Messages.propertiesFileRealm);
+ combo.add(Messages.sqlRealm);
+ combo.add(Messages.ldapRealm);
+ combo.select(0);
if (eObject != null) {
Gbean gbean = (Gbean) ((JAXBElement) eObject).getValue();
@@ -520,33 +521,33 @@ public class SecurityRealmWizard extends
}
}
- @Override
- public IWizardPage getNextPage() {
- if (combo.getText().trim().equals("Properties File Realm")) {// properties
- // file
- // type
- return this.getWizard().getPage("PropertiesFileRealmPage");
- } else if (combo.getText().trim().equals("SQL Realm")) {// sql realm
- // type
- return this.getWizard().getPage("SelectSQLPage");
- } else if (combo.getText().trim().equals("LDAP Realm")) {// ldap
- // realm
- // type
- return this.getWizard().getPage("LDAPConnectionPage");
- }
- return null;
- }
+ @Override
+ public IWizardPage getNextPage() {
+ if (combo.getText().trim().equals(Messages.propertiesFileRealm)) {// properties
+ // file
+ // type
+ return this.getWizard().getPage("PropertiesFileRealmPage");
+ } else if (combo.getText().trim().equals(Messages.sqlRealm)) {// sql realm
+ // type
+ return this.getWizard().getPage("SelectSQLPage");
+ } else if (combo.getText().trim().equals(Messages.ldapRealm)) {// ldap
+ // realm
+ // type
+ return this.getWizard().getPage("LDAPConnectionPage");
+ }
+ return null;
+ }
}
public class PropertiesFileRealmPage extends WizardPage {
Text textEntries[] = new Text[4];
- public PropertiesFileRealmPage(String pageName) {
- super(pageName);
- setTitle("Properties File Realm");
- setDescription("Edit settings for users file and groups file's pathes");
- }
+ public PropertiesFileRealmPage(String pageName) {
+ super(pageName);
+ setTitle(Messages.propertiesFileRealm);
+ setDescription(Messages.propertiesFileRealmDesc);
+ }
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
@@ -559,39 +560,40 @@ public class SecurityRealmWizard extends
data.widthHint = 300;
composite.setLayoutData(data);
- Group uriGroup = new Group(composite, SWT.NONE);
- uriGroup.setText("Files's URI");
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- uriGroup.setLayout(gridLayout);
- GridData data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.grabExcessVerticalSpace = true;
- data1.horizontalSpan = 2;
- data1.grabExcessHorizontalSpace = true;
- uriGroup.setLayoutData(data1);
- createLabel(uriGroup, "Users File URI:", 1);
- textEntries[0] = createText(uriGroup, 3);
- createLabel(uriGroup, "Groups File URI:", 1);
- textEntries[1] = createText(uriGroup, 3);
-
- Group digestGroup = new Group(composite, SWT.NONE);
- digestGroup.setText("Digest Configuration");
- gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- digestGroup.setLayout(gridLayout);
- data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.grabExcessVerticalSpace = true;
- data1.horizontalSpan = 2;
- data1.grabExcessHorizontalSpace = true;
- digestGroup.setLayoutData(data1);
- createLabel(digestGroup, "Digest Algorithm:", 1);
- textEntries[2] = createText(digestGroup, 3);
- createLabel(digestGroup, "Digest Encoding:", 1);
- textEntries[3] = createText(digestGroup, 3);
+ Group uriGroup = new Group(composite, SWT.NONE);
+ uriGroup.setText(Messages.fileUri);
+ GridLayout gridLayout = new GridLayout();
+ gridLayout.numColumns = 4;
+ uriGroup.setLayout(gridLayout);
+ GridData data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.grabExcessVerticalSpace = true;
+ data1.horizontalSpan = 2;
+ data1.grabExcessHorizontalSpace = true;
+ uriGroup.setLayoutData(data1);
+ createLabel(uriGroup, Messages.userFileUri, 1);
+ textEntries[0] = createText(uriGroup, 3);
+ 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;
+ digestGroup.setLayout(gridLayout);
+ data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.grabExcessVerticalSpace = true;
+ data1.horizontalSpan = 2;
+ data1.grabExcessHorizontalSpace = true;
+ digestGroup.setLayoutData(data1);
+ createLabel(digestGroup, Messages.digestAlgorithm, 1);
+ textEntries[2] = createText(digestGroup, 3);
+ createLabel(digestGroup, Messages.digestEncoding, 1);
+ textEntries[3] = createText(digestGroup, 3);
if (eObject != null) {
Gbean gbean = (Gbean) ((JAXBElement) eObject).getValue();
@@ -626,11 +628,11 @@ public class SecurityRealmWizard extends
Text textEntries[] = new Text[4];
- public SelectSQLPage(String pageName) {
- super(pageName);
- setTitle("SQL Realm");
- setDescription("Edit settings for user and group select sql");
- }
+ public SelectSQLPage(String pageName) {
+ super(pageName);
+ setTitle(Messages.sqlRealm);
+ setDescription(Messages.sqlRealmDesc);
+ }
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
@@ -643,39 +645,39 @@ public class SecurityRealmWizard extends
data.widthHint = 300;
composite.setLayoutData(data);
- Group uriGroup = new Group(composite, SWT.NONE);
- uriGroup.setText("Select SQL");
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- uriGroup.setLayout(gridLayout);
- GridData data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.grabExcessVerticalSpace = true;
- data1.horizontalSpan = 2;
- data1.grabExcessHorizontalSpace = true;
- uriGroup.setLayoutData(data1);
- createLabel(uriGroup, "Users Select SQL:", 1);
- textEntries[0] = createText(uriGroup, 3);
- createLabel(uriGroup, "Groups Select SQL:", 1);
- textEntries[1] = createText(uriGroup, 3);
-
- Group digestGroup = new Group(composite, SWT.NONE);
- digestGroup.setText("Digest Configuration");
- gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- digestGroup.setLayout(gridLayout);
- data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.grabExcessVerticalSpace = true;
- data1.horizontalSpan = 2;
- data1.grabExcessHorizontalSpace = true;
- digestGroup.setLayoutData(data1);
- createLabel(digestGroup, "Digest Algorithm:", 1);
- textEntries[2] = createText(digestGroup, 3);
- createLabel(digestGroup, "Digest Encoding:", 1);
- textEntries[3] = createText(digestGroup, 3);
+ Group uriGroup = new Group(composite, SWT.NONE);
+ uriGroup.setText(Messages.sqlQueries);
+ GridLayout gridLayout = new GridLayout();
+ gridLayout.numColumns = 4;
+ uriGroup.setLayout(gridLayout);
+ GridData data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.grabExcessVerticalSpace = true;
+ data1.horizontalSpan = 2;
+ data1.grabExcessHorizontalSpace = true;
+ uriGroup.setLayoutData(data1);
+ createLabel(uriGroup, Messages.userSelectSQL, 1);
+ textEntries[0] = createText(uriGroup, 3);
+ createLabel(uriGroup, Messages.groupSelectSQL, 1);
+ textEntries[1] = createText(uriGroup, 3);
+
+ Group digestGroup = new Group(composite, SWT.NONE);
+ digestGroup.setText(Messages.digestConfig);
+ gridLayout = new GridLayout();
+ gridLayout.numColumns = 4;
+ digestGroup.setLayout(gridLayout);
+ data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.grabExcessVerticalSpace = true;
+ data1.horizontalSpan = 2;
+ data1.grabExcessHorizontalSpace = true;
+ digestGroup.setLayoutData(data1);
+ createLabel(digestGroup, Messages.digestAlgorithm, 1);
+ textEntries[2] = createText(digestGroup, 3);
+ createLabel(digestGroup, Messages.digestEncoding, 1);
+ textEntries[3] = createText(digestGroup, 3);
if (eObject != null) {
Gbean gbean = (Gbean) ((JAXBElement) eObject).getValue();
@@ -867,11 +869,11 @@ public class SecurityRealmWizard extends
Text[] text = new Text[4];
Combo[] combo = new Combo[3];
- protected LDAPConnectionPage(String pageName) {
- super(pageName);
- setTitle("LDAP Realm Connection");
- setDescription("Edit settings for LDAP server connection");
- }
+ protected LDAPConnectionPage(String pageName) {
+ super(pageName);
+ setTitle(Messages.ldapRealm);
+ setDescription(Messages.ldapRealmDesc);
+ }
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
@@ -884,49 +886,50 @@ public class SecurityRealmWizard extends
data.widthHint = 300;
composite.setLayoutData(data);
- Group connectionGroup = new Group(composite, SWT.NULL);
- connectionGroup.setText("LDAP server connection");
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- GridData data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.horizontalSpan = 2;
- connectionGroup.setLayout(gridLayout);
- connectionGroup.setLayoutData(data1);
-
- createLabel(connectionGroup, "Initial Context Factory:", 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);
- 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);
- text[0] = createText(connectionGroup, 3);
- text[0].setText("system");
- createLabel(connectionGroup, "Connect Password:", 1);
- text[1] = createText(connectionGroup, 3);
- text[1].setEchoChar('*');
- text[1].setText("manager");
- createLabel(connectionGroup, "Confirm Password:", 1);
- text[2] = createText(connectionGroup, 3);
- text[2].setEchoChar('*');
- text[2].setText("manager");
- createLabel(connectionGroup, "Connect Protocol:", 1);
- text[3] = createText(connectionGroup, 1);
- createLabel(connectionGroup, "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].select(1);
+ Group connectionGroup = new Group(composite, SWT.NULL);
+ connectionGroup.setText(Messages.ldapServerConnection);
+ GridLayout gridLayout = new GridLayout();
+ gridLayout.numColumns = 4;
+ GridData data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.horizontalSpan = 2;
+ connectionGroup.setLayout(gridLayout);
+ connectionGroup.setLayoutData(data1);
+
+ 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, 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, Messages.connectUsername, 1);
+ text[0] = createText(connectionGroup, 3);
+ text[0].setText("system");
+ createLabel(connectionGroup, Messages.conncetPwd, 1);
+ text[1] = createText(connectionGroup, 3);
+ text[1].setEchoChar('*');
+ text[1].setText("manager");
+ createLabel(connectionGroup, Messages.confirmPassword, 1);
+ text[2] = createText(connectionGroup, 3);
+ text[2].setEchoChar('*');
+ text[2].setText("manager");
+ createLabel(connectionGroup, Messages.connectProtocol, 1);
+ text[3] = createText(connectionGroup, 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(Messages.none);
+ combo[2].add(Messages.simple);
+ combo[2].add(Messages.strong);
+ combo[2].select(1);
if (eObject != null) {
Gbean gbean = (Gbean) ((JAXBElement) eObject).getValue();
@@ -972,11 +975,11 @@ public class SecurityRealmWizard extends
Text[] text = new Text[6];
Button userSearchSubtree, roleSearchSubtree;
- protected LDAPSearchPage(String pageName) {
- super(pageName);
- setTitle("LDAP Realm Search Configuration");
- setDescription("Edit settings for LDAP realm search");
- }
+ protected LDAPSearchPage(String pageName) {
+ super(pageName);
+ setTitle(Messages.ldapRealmSearchConfig);
+ setDescription(Messages.editLdapRealmSearch);
+ }
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
@@ -989,50 +992,50 @@ public class SecurityRealmWizard extends
data.widthHint = 300;
composite.setLayoutData(data);
- Group userGroup = new Group(composite, SWT.NULL);
- userGroup.setText("User Search Configuration");
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- GridData data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.horizontalSpan = 2;
- userGroup.setLayout(gridLayout);
- userGroup.setLayoutData(data1);
-
- createLabel(userGroup, "User Base:", 1);
- text[0] = createText(userGroup, 3);
- createLabel(userGroup, "User Search Matching:", 1);
- text[1] = createText(userGroup, 3);
- userSearchSubtree = new Button(userGroup, SWT.CHECK);
- userSearchSubtree.setText("User Search Subtree");
- 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");
- gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- data1 = new GridData();
- data1.horizontalAlignment = GridData.FILL;
- data1.grabExcessHorizontalSpace = true;
- data1.horizontalSpan = 2;
- roleGroup.setLayout(gridLayout);
- roleGroup.setLayoutData(data1);
- createLabel(roleGroup, "Role Base:", 1);
- text[2] = createText(roleGroup, 3);
- createLabel(roleGroup, "Role Name:", 1);
- text[3] = createText(roleGroup, 3);
- createLabel(roleGroup, "Role User Search String:", 1);
- text[4] = createText(roleGroup, 3);
- createLabel(roleGroup, "User Role Search String:", 1);
- text[5] = createText(roleGroup, 3);
- roleSearchSubtree = new Button(roleGroup, SWT.CHECK);
- roleSearchSubtree.setText("Role Search Subtree");
- roleSearchSubtree.setLayoutData(new GridData(GridData.FILL,
- GridData.FILL, true, false, 4, 1));
- roleSearchSubtree.setSelection(true);
+ Group userGroup = new Group(composite, SWT.NULL);
+ userGroup.setText(Messages.userSearchConfig);
+ GridLayout gridLayout = new GridLayout();
+ gridLayout.numColumns = 4;
+ GridData data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.horizontalSpan = 2;
+ userGroup.setLayout(gridLayout);
+ userGroup.setLayoutData(data1);
+
+ createLabel(userGroup, Messages.userBase, 1);
+ text[0] = createText(userGroup, 3);
+ createLabel(userGroup, Messages.userSearchMachting, 1);
+ text[1] = createText(userGroup, 3);
+ userSearchSubtree = new Button(userGroup, SWT.CHECK);
+ 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(Messages.roleSearchConfig);
+ gridLayout = new GridLayout();
+ gridLayout.numColumns = 4;
+ data1 = new GridData();
+ data1.horizontalAlignment = GridData.FILL;
+ data1.grabExcessHorizontalSpace = true;
+ data1.horizontalSpan = 2;
+ roleGroup.setLayout(gridLayout);
+ roleGroup.setLayoutData(data1);
+ createLabel(roleGroup, Messages.roleBase, 1);
+ text[2] = createText(roleGroup, 3);
+ createLabel(roleGroup, Messages.roleName, 1);
+ text[3] = createText(roleGroup, 3);
+ createLabel(roleGroup, Messages.roleUserSearchStr, 1);
+ text[4] = createText(roleGroup, 3);
+ createLabel(roleGroup, Messages.userRoleSearchStr, 1);
+ text[5] = createText(roleGroup, 3);
+ roleSearchSubtree = new Button(roleGroup, SWT.CHECK);
+ roleSearchSubtree.setText(Messages.roleSearchSubtree);
+ roleSearchSubtree.setLayoutData(new GridData(GridData.FILL,
+ GridData.FILL, true, false, 4, 1));
+ roleSearchSubtree.setSelection(true);
if (eObject != null) {
Gbean gbean = (Gbean) ((JAXBElement<?>) eObject).getValue();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoConsoleAction.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/actions/LaunchGeronimoConsoleAction.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/actions/LaunchGeronimoConsoleAction.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoConsoleAction.java Fri May 13 06:29:16 2011
@@ -80,7 +80,7 @@ public class LaunchGeronimoConsoleAction
try {
int style = IWorkbenchBrowserSupport.AS_EDITOR
| IWorkbenchBrowserSupport.STATUS;
- IWebBrowser browser = WorkbenchBrowserSupport.getInstance().createBrowser(style, "console",
+ IWebBrowser browser = WorkbenchBrowserSupport.getInstance().createBrowser(style, Messages.console0,
Messages.bind(Messages.console, server.getName()),
Messages.bind(Messages.consoleTooltip, server
.getName()));
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoSupportAction.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/actions/LaunchGeronimoSupportAction.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/actions/LaunchGeronimoSupportAction.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoSupportAction.java Fri May 13 06:29:16 2011
@@ -89,8 +89,8 @@ public class LaunchGeronimoSupportAction
IWebBrowser browser = WorkbenchBrowserSupport.getInstance()
.createBrowser(
style,
- "supportWebPage",
- supportURL,
+ Messages.supportWebPage0,
+ Messages.supportURL,
Messages.bind(Messages.supportWebPageTooltip, server
.getName()));
URL url = getConsoleUrl();
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=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/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 Fri May 13 06:29:16 2011
@@ -16,6 +16,7 @@
*/
package org.apache.geronimo.st.v30.ui.internal;
+
import org.apache.geronimo.st.v30.ui.Activator;
import org.eclipse.osgi.util.NLS;
@@ -31,7 +32,6 @@ public class Messages extends NLS {
}
public static String editorTabSource;
-
public static String editorSectionSecurityTitle;
public static String editorSectionSecurityDescription;
public static String editorSectionPortsTitle;
@@ -436,8 +436,8 @@ public class Messages extends NLS {
public static String wizardConnectionPageDescription__DBPool;
//
- public static String WizardSecurityRealmTitle;
- public static String WizardSecurityRealmDescription;
+ public static String wizardSecurityRealmTitle;
+ public static String wizardSecurityRealmDescription;
public static String wizardSecurityRealmName;
public static String wizardLoginModuleClass;
public static String wizardSecurityRealmNew;
@@ -591,5 +591,18 @@ public class Messages extends NLS {
public static String blueprintTypeConverterSectionTitle;
public static String blueprintTypeConverterSectionDescription;
+ public static String blueprintConfiguration;
+ public static String blueprintAddOrEditElementInSchema;
+ public static String blueprintEditorAdding;
+ public static String blueprintEditorEditing;
+ public static String downloadServer;
+ public static String getServer;
+ public static String tooltip;
+
+ public static String serverVersion;
+ public static String copyTargetFileFailed;
+ public static String supportWebPage0;
+ public static String supportURL;
+ public static String console0;
}
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=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/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 Fri May 13 06:29:16 2011
@@ -16,6 +16,14 @@
#
# $Rev$ $Date$
#
+serverVersion=Apache Geronimo 3.0
+blueprintEditorEditing=Blueprint Editor - Editing
+blueprintEditorAdding=Blueprint Editor - Adding
+blueprintAddOrEditElementInSchema=Add or Edit elements in blueprint schema
+blueprintConfiguration=Blueprint Configuration
+formServerInfo=serverInfo
+formHelp=help
+
appGeneralPageTitle=Application Plan General Configuration
appClientGeneralPageTitle=Application Client Plan General Configuration
connectorOverViewPageTitle=Connector Plan General Configuration
@@ -307,8 +315,8 @@ wizardAdvancedPageDescription__DBPool=Ed
wizardConnectionPageTitle__DBPool=Connection Pool Parameters
wizardConnectionPageDescription__DBPool=Edit connection pool parameters for database pool.
-WizardSecurityRealmTitle=Security Realm
-WizardSecurityRealmDescription=The following security realms are defined:
+wizardSecurityRealmTitle=Security Realm
+wizardSecurityRealmDescription=The following security realms are defined:
wizardSecurityRealmName=Security Realm Name
wizardLoginModuleClass=Login Module Class
wizardSecurityRealmNew=New Security Realm
@@ -391,12 +399,14 @@ editorTabSource=Source
name=Name
description=Description
+console0=Console
console={0} Console
-consoleTooltip={0} Console
+consoleTooltip={0} Console tool tip
+supportWebPage0=supportWebPage
supportWebPage={0} Support
supportWebPageTooltip={0} Support Web Page
-
+supportURL=supportURL
newServerWizardTitle=New {0} Server
newServerWizardDescription=New {0} Server
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.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/AbstractGeronimoFormPage.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/pages/AbstractGeronimoFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.java Fri May 13 06:29:16 2011
@@ -19,6 +19,7 @@ package org.apache.geronimo.st.v30.ui.pa
import javax.xml.bind.JAXBElement;
import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
+import org.apache.geronimo.st.ui.internal.Messages;
import org.apache.geronimo.st.v30.ui.Activator;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.Action;
@@ -96,7 +97,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() {
@@ -110,7 +111,7 @@ public abstract class AbstractGeronimoFo
"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() {
@@ -119,7 +120,7 @@ public abstract class AbstractGeronimoFo
});
}
};
- helpAction.setToolTipText("help");
+ helpAction.setToolTipText(Messages.formHelp);
helpAction.setImageDescriptor(Activator.imageDescriptorFromPlugin("org.apache.geronimo.st.v30.ui",
"icons/obj16/help.gif"));
manager.add(helpAction);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractListSection.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/AbstractListSection.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/AbstractListSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/AbstractListSection.java Fri May 13 06:29:16 2011
@@ -21,6 +21,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.descriptor.AbstractDeploymentDescriptor;
import org.apache.geronimo.st.v30.ui.Activator;
import org.apache.geronimo.st.v30.ui.CommonMessages;
@@ -152,7 +153,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.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRelationSection.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/EjbRelationSection.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/EjbRelationSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/EjbRelationSection.java Fri May 13 06:29:16 2011
@@ -23,6 +23,7 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.openejb.EjbRelation;
import org.apache.geronimo.jee.openejb.EjbRelationshipRole;
import org.apache.geronimo.jee.openejb.Relationships;
+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.EjbRelationWizard;
@@ -143,20 +144,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.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ExtModuleSection.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/ExtModuleSection.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/ExtModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/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.v30.ui.CommonMessages;
+import org.apache.geronimo.st.v30.ui.internal.Messages;
import org.apache.geronimo.st.v30.ui.pages.DeploymentPage;
import org.apache.geronimo.st.v30.ui.wizards.ExtModuleWizard;
import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -102,13 +103,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.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanRefSection.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/GBeanRefSection.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/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanRefSection.java Fri May 13 06:29:16 2011
@@ -23,6 +23,7 @@ import javax.xml.bind.JAXBElement;
import org.apache.geronimo.jee.naming.GbeanRef;
import org.apache.geronimo.jee.naming.Pattern;
+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;
@@ -176,18 +177,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.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanSection.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/GBeanSection.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/GBeanSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/GBeanSection.java Fri May 13 06:29:16 2011
@@ -26,6 +26,7 @@ import org.apache.geronimo.jee.deploymen
import org.apache.geronimo.jee.deployment.Reference;
import org.apache.geronimo.st.v30.ui.Activator;
import org.apache.geronimo.st.v30.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
import org.apache.geronimo.st.v30.ui.pages.DeploymentPage;
import org.apache.geronimo.st.v30.ui.wizards.GBeanWizard;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -172,35 +173,31 @@ public class GBeanSection extends Abstra
Object object = ((JAXBElement) element).getValue();
if (Gbean.class.isInstance(object)) {
Gbean gbean = (Gbean) object;
- return "GBean: name = \"" + gbean.getName()
- + "\", class = \"" + gbean.getClazz() + "\"";
+ return Messages.gbean + ": " + Messages.name + " =\"" + gbean.getName() +
+ "\", " + Messages.clazz + "\"" + gbean.getClazz() + "\"";
+
} else if (Attribute.class.isInstance(object)) {
Attribute attribute = (Attribute) 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 (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() + "\"";
+ 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 "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() + "\"";
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ModuleSection.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/ModuleSection.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/ModuleSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/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.v30.ui.CommonMessages;
+import org.apache.geronimo.st.ui.internal.Messages;
import org.apache.geronimo.st.v30.ui.wizards.ModuleWizard;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.wizard.Wizard;
@@ -67,13 +68,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.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersContextRefSection.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/PersContextRefSection.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/PersContextRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PersContextRefSection.java Fri May 13 06:29:16 2011
@@ -26,6 +26,7 @@ import org.apache.geronimo.jee.naming.Pr
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;
+import org.apache.geronimo.st.ui.internal.Messages;
import org.apache.geronimo.st.v30.ui.wizards.PersContextRefWizard;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -141,27 +142,28 @@ public class PersContextRefSection exten
public String getText(Object element) {
if (JAXBElement.class.isInstance(element)) {
PersistenceContextRef contextRef = (PersistenceContextRef)((JAXBElement)element).getValue();
- String temp = "Persistence Context Ref: name = \"" + contextRef.getPersistenceContextRefName() +
- "\", type = \"" + contextRef.getPersistenceContextType().value();
+ String temp = Messages.editorPersContextRefTitle + ":" + Messages.name + " = \"" + contextRef.getPersistenceContextRefName() +
+ "\", " + Messages.type + " = \"" + contextRef.getPersistenceContextType().value();
+
if (contextRef.getPersistenceUnitName() != null)
- temp += "\", unit name = \"" + contextRef.getPersistenceUnitName();
+ temp += "\", " + Messages.pattern + " " + Messages.unit + " = \"" + contextRef.getPersistenceUnitName();
if (contextRef.getPattern() != null && contextRef.getPattern().getName() != null)
- temp += "\", pattern name = \"" + contextRef.getPattern().getName();
+ temp += "\", " + Messages.pattern + " " + Messages.name + " = \"" + contextRef.getPattern().getName();
if (contextRef.getPattern() != null && contextRef.getPattern().getGroupId() != null)
- temp += "\", pattern group = \"" + contextRef.getPattern().getGroupId();
+ temp += "\", " + Messages.pattern + " " + Messages.group + " = \"" + contextRef.getPattern().getGroupId();
if (contextRef.getPattern() != null && contextRef.getPattern().getArtifactId() != null)
- temp += "\", pattern artifact = \"" + contextRef.getPattern().getArtifactId();
+ temp += "\", " + Messages.artifact + " " + Messages.unit + " = \"" + contextRef.getPattern().getArtifactId();
if (contextRef.getPattern() != null && contextRef.getPattern().getVersion() != null)
- temp += "\", pattern version = \"" + contextRef.getPattern().getVersion();
+ temp += "\", " + Messages.pattern + " " + Messages.version + " = \"" + contextRef.getPattern().getVersion();
if (contextRef.getPattern() != null && contextRef.getPattern().getModule() != null)
- temp += "\", pattern module = \"" + contextRef.getPattern().getModule();
+ temp += "\", " + Messages.pattern + " " + Messages.module + " = \"" + contextRef.getPattern().getModule();
temp += "\"";
return temp;
}
else if (Property.class.isInstance(element)) {
Property property = (Property)element;
- return "Property: key = \"" + property.getKey() +
- "\", value = \"" + property.getValue() + "\"";
+ return Messages.property + ": " + Messages.key + " = \"" + property.getKey() +
+ "\", " + Messages.value + " = \"" + property.getValue() + "\"";
}
return null;