You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/03/26 04:05:04 UTC
svn commit: r641128 [2/2] - in
/geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/
org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/
org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronim...
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRootSection.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/SecurityRootSection.java?rev=641128&r1=641127&r2=641128&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRootSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecurityRootSection.java Tue Mar 25 20:05:02 2008
@@ -22,7 +22,7 @@
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
-import org.apache.geronimo.xml.ns.security_2.SecurityType;
+import org.apache.geronimo.jee.security.Security;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -40,7 +40,7 @@
public class SecurityRootSection extends AbstractSectionPart {
- SecurityType secERef;
+ Security secERef;
Text defaultRole;
@@ -60,7 +60,7 @@
* @param toolkit
* @param style
*/
- public SecurityRootSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan, SecurityType secERef) {
+ public SecurityRootSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan, Security secERef) {
super(parent, toolkit, style, plan);
this.secERef = secERef;
createClient();
@@ -91,7 +91,7 @@
defaultRole.setLayoutData(gd);
defaultRole.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
- getSecurityType().setDefaultRole(defaultRole.getText());
+ getSecurity().setDefaultRole(defaultRole.getText());
markDirty();
}
});
@@ -103,11 +103,11 @@
}
public void widgetSelected(SelectionEvent e) {
- getSecurityType().setDoasCurrentCaller(doas.getSelection());
+ getSecurity().setDoasCurrentCaller(doas.getSelection());
markDirty();
}
});
- doas.setSelection(getSecurityType().isDoasCurrentCaller());
+ doas.setSelection(getSecurity().isDoasCurrentCaller());
useCtxHdl = toolkit.createButton(composite, CommonMessages.useContextHandler, SWT.CHECK);
useCtxHdl.setLayoutData(createGridData());
@@ -116,11 +116,11 @@
}
public void widgetSelected(SelectionEvent e) {
- getSecurityType().setUseContextHandler(useCtxHdl.getSelection());
+ getSecurity().setUseContextHandler(useCtxHdl.getSelection());
markDirty();
}
});
- useCtxHdl.setSelection(getSecurityType().isUseContextHandler());
+ useCtxHdl.setSelection(getSecurity().isUseContextHandler());
}
@@ -138,21 +138,21 @@
}
private String getDefaultRole() {
- SecurityType secType = JAXBModelUtils.getSecurityType(getPlan());
- if (secType != null
- && secType.getDefaultRole() != null ) {
- return secType.getDefaultRole();
+ Security security = JAXBModelUtils.getSecurity(getPlan());
+ if (security != null
+ && security.getDefaultRole() != null ) {
+ return security.getDefaultRole();
}
return "";
}
- private SecurityType getSecurityType() {
- SecurityType secType = JAXBModelUtils.getSecurityType(getPlan());
- if (secType == null) {
- secType = (SecurityType)JAXBObjectFactoryImpl.getInstance().create( SecurityType.class );
- JAXBModelUtils.setSecurityType(getPlan(),secType);
+ private Security getSecurity() {
+ Security security = JAXBModelUtils.getSecurity(getPlan());
+ if (security == null) {
+ security = (Security)JAXBObjectFactoryImpl.getInstance().create( Security.class );
+ JAXBModelUtils.setSecurity(getPlan(),security);
}
- return secType;
+ return security;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.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/SecuritySection.java?rev=641128&r1=641127&r2=641128&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java Tue Mar 25 20:05:02 2008
@@ -26,12 +26,11 @@
import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v21.ui.Activator;
import org.apache.geronimo.st.v21.ui.wizards.SecurityRoleWizard;
-import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
-import org.apache.geronimo.xml.ns.naming_1.ResourceRefType;
-import org.apache.geronimo.xml.ns.security_2.DescriptionType;
-import org.apache.geronimo.xml.ns.security_2.RoleMappingsType;
-import org.apache.geronimo.xml.ns.security_2.RoleType;
-import org.apache.geronimo.xml.ns.security_2.SecurityType;
+import org.apache.geronimo.jee.naming.ResourceRef;
+import org.apache.geronimo.jee.security.Description;
+import org.apache.geronimo.jee.security.RoleMappings;
+import org.apache.geronimo.jee.security.Role;
+import org.apache.geronimo.jee.security.Security;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.SWT;
@@ -48,7 +47,7 @@
public class SecuritySection extends AbstractTableSection {
- public RoleMappingsType roleMappings;
+ public RoleMappings roleMappings;
Text roleNameText;
@@ -62,7 +61,7 @@
* @param toolkit
* @param style
*/
- public SecuritySection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, RoleMappingsType roleMappings) {
+ public SecuritySection(JAXBElement plan, Composite parent, FormToolkit toolkit, int style, RoleMappings roleMappings) {
super(plan, parent, toolkit, style);
this.roleMappings = roleMappings;
createClient();
@@ -114,7 +113,7 @@
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
public Class getTableEntryObjectType() {
- return RoleType.class;
+ return Role.class;
}
/*
@@ -181,9 +180,9 @@
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getInput()
*/
public Object getInput() {
- SecurityType secType = JAXBModelUtils.getSecurityType(getPlan());//.eGet(securityERef);
- if (secType != null) {
- return secType.getRoleMappings();
+ Security sec = JAXBModelUtils.getSecurity(getPlan());//.eGet(securityERef);
+ if (sec != null) {
+ return sec.getRoleMappings();
}
return super.getInput();
}
@@ -196,11 +195,11 @@
public void widgetSelected(SelectionEvent e) {
TableItem item = (TableItem) e.item;
- RoleType roleType = (RoleType) item.getData();
- roleNameText.setText(roleType.getRoleName());
+ Role role = (Role) item.getData();
+ roleNameText.setText(role.getRoleName());
- if (!roleType.getDescription().isEmpty()) {
- roleDescriptionText.setText(((DescriptionType) roleType.getDescription().get(0)).getValue());
+ if (!role.getDescription().isEmpty()) {
+ roleDescriptionText.setText(((Description) role.getDescription().get(0)).getValue());
} else {
roleDescriptionText.setText("");
}
@@ -215,15 +214,15 @@
public AdapterFactory getAdapterFactory() {
return new AdapterFactory() {
public Object[] getElements(Object inputElement) {
- if (!RoleMappingsType.class.isInstance(inputElement)) {
+ if (!RoleMappings.class.isInstance(inputElement)) {
return new String[] { "" };
}
- RoleMappingsType plan = (RoleMappingsType)inputElement;
+ RoleMappings plan = (RoleMappings)inputElement;
return plan.getRole().toArray();
}
public String getColumnText(Object element, int columnIndex) {
- if (RoleType.class.isInstance(element)) {
- RoleType role = (RoleType)element;
+ if (Role.class.isInstance(element)) {
+ Role role = (Role)element;
switch (columnIndex) {
case 0: return role.getRoleName();
}
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=641128&r1=641127&r2=641128&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 Tue Mar 25 20:05:02 2008
@@ -23,7 +23,7 @@
import org.apache.geronimo.st.ui.CommonMessages;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.v21.ui.wizards.ServiceRefWizard;
-import org.apache.geronimo.xml.ns.naming_1.ServiceRefType;
+import org.apache.geronimo.jee.naming.ServiceRef;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -91,7 +91,7 @@
* @see org.apache.geronimo.ui.sections.AbstractTableSection#getTableEntryObjectType()
*/
public Class getTableEntryObjectType() {
- return ServiceRefType.class;
+ return ServiceRef.class;
}
// /*
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.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/WebContainerSection.java?rev=641128&r1=641127&r2=641128&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java Tue Mar 25 20:05:02 2008
@@ -18,11 +18,11 @@
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.jee.web.WebApp;
import org.apache.geronimo.st.ui.sections.AbstractSectionPart;
import org.apache.geronimo.st.v21.ui.internal.Messages;
-import org.apache.geronimo.xml.ns.deployment_1.PatternType;
-import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
-import org.apache.geronimo.xml.ns.naming_1.GbeanLocatorType;
+import org.apache.geronimo.jee.deployment.Pattern;
+import org.apache.geronimo.jee.naming.GbeanLocator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -56,7 +56,7 @@
protected Button specifyAsPattern;
- WebAppType plan;
+ WebApp plan;
/**
* @param parent
@@ -66,7 +66,7 @@
*/
public WebContainerSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
super(parent, toolkit, style, plan);
- this.plan = (WebAppType) plan.getValue();
+ this.plan = (WebApp) plan.getValue();
createClient();
}
@@ -93,7 +93,7 @@
data.horizontalSpan = 2;
specifyAsLink.setLayoutData(data);
- GbeanLocatorType wc = plan.getWebContainer();
+ GbeanLocator wc = plan.getWebContainer();
createLabel(composite, Messages.gBeanLink);
String value = wc != null ? wc.getGbeanLink() : null;
@@ -195,15 +195,15 @@
// markDirty();
// }
if (group.getText().length() > 0) {
- getPatternType().setGroupId(group.getText());
+ getPattern().setGroupId(group.getText());
markDirty();
}
if (artifact.getText().length() > 0) {
- getPatternType().setArtifactId(artifact.getText());
+ getPattern().setArtifactId(artifact.getText());
markDirty();
}
if (module.getText().length() > 0) {
- getPatternType().setModule(module.getText());
+ getPattern().setModule(module.getText());
markDirty();
}
if (name.getText().length() > 0) {
@@ -211,7 +211,7 @@
// markDirty();
}
if (version.getText().length() > 0) {
- getPatternType().setVersion(version.getText());
+ getPattern().setVersion(version.getText());
markDirty();
}
toggle();
@@ -240,8 +240,8 @@
/**
* @return
*/
- private GbeanLocatorType getGBeanLocator() {
- GbeanLocatorType wc = plan.getWebContainer();
+ private GbeanLocator getGBeanLocator() {
+ GbeanLocator wc = plan.getWebContainer();
if (wc == null) {
// wc = NamingFactory.eINSTANCE.createGbeanLocatorType();
plan.setWebContainer(wc);
@@ -252,8 +252,8 @@
/**
* @return
*/
- private PatternType getPatternType() {
- GbeanLocatorType locator = getGBeanLocator();
+ private Pattern getPattern() {
+ GbeanLocator locator = getGBeanLocator();
// PatternType pattern = locator.getPattern();
// if (pattern == null) {
// pattern = NamingFactory.eINSTANCE.createPatternType();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.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/WebGeneralSection.java?rev=641128&r1=641127&r2=641128&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java Tue Mar 25 20:05:02 2008
@@ -18,8 +18,8 @@
import javax.xml.bind.JAXBElement;
+import org.apache.geronimo.jee.web.WebApp;
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.xml.ns.j2ee.web_2_0.WebAppType;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -32,11 +32,11 @@
protected Text contextRoot;
- WebAppType plan;
+ WebApp plan;
public WebGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan) {
super(parent, toolkit, style, plan);
- this.plan = (WebAppType) plan.getValue();
+ this.plan = (WebApp) plan.getValue();
createClient();
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.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/DependencyWizard.java?rev=641128&r1=641127&r2=641128&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java Tue Mar 25 20:05:02 2008
@@ -22,7 +22,7 @@
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v21.ui.internal.Trace;
-import org.apache.geronimo.xml.ns.deployment_1.ArtifactType;
+import org.apache.geronimo.jee.deployment.Artifact;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
@@ -129,7 +129,7 @@
public void processEAttributes(IWizardPage page) {
// Trace.trace("Entry", "DependencyWizard.processEAttributes", page);
- ArtifactType dt = (ArtifactType) eObject;
+ Artifact dt = (Artifact) eObject;
dt.setArtifactId(artifactIdText.getText());
dt.setGroupId(groupIdText.getText());
dt.setVersion(versionText.getText());
@@ -213,7 +213,7 @@
typeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
if (eObject != null) {
- ArtifactType artifact = (ArtifactType)eObject;
+ Artifact artifact = (Artifact)eObject;
groupIdText.setText(artifact.getGroupId());
artifactIdText.setText(artifact.getArtifactId());
versionText.setText(artifact.getVersion());
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleWizard.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/SecurityRoleWizard.java?rev=641128&r1=641127&r2=641128&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleWizard.java Tue Mar 25 20:05:02 2008
@@ -25,10 +25,10 @@
import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
import org.apache.geronimo.st.v21.core.jaxb.JAXBObjectFactoryImpl;
import org.apache.geronimo.st.v21.ui.sections.SecuritySection;
-import org.apache.geronimo.xml.ns.security_2.DescriptionType;
-import org.apache.geronimo.xml.ns.security_2.RoleMappingsType;
-import org.apache.geronimo.xml.ns.security_2.RoleType;
-import org.apache.geronimo.xml.ns.security_2.SecurityType;
+import org.apache.geronimo.jee.security.Description;
+import org.apache.geronimo.jee.security.RoleMappings;
+import org.apache.geronimo.jee.security.Role;
+import org.apache.geronimo.jee.security.Security;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -106,10 +106,10 @@
data.widthHint = 100;
descriptionText.setLayoutData(data);
- if (eObject != null && eObject instanceof RoleType) {
- RoleType roleType = (RoleType) eObject;
- if (!roleType.getDescription().isEmpty()) {
- DescriptionType desc = (DescriptionType) roleType.getDescription().get(0);
+ if (eObject != null && eObject instanceof Role) {
+ Role role = (Role) eObject;
+ if (!role.getDescription().isEmpty()) {
+ Description desc = (Description) role.getDescription().get(0);
if (desc.getValue() != null) {
descriptionText.setText(desc.getValue());
}
@@ -122,33 +122,33 @@
SecurityRoleWizardPage page = (SecurityRoleWizardPage) getPages()[0];
if (eObject == null) {
- eObject = getEFactory().create(RoleType.class);
+ eObject = getEFactory().create(Role.class);
JAXBElement plan = section.getPlan();
- SecurityType securityType = JAXBModelUtils.getSecurityType(plan);
- if (securityType == null) {
- securityType = (SecurityType)getEFactory().create(SecurityType.class);
- JAXBModelUtils.setSecurityType(plan, securityType);
+ Security security = JAXBModelUtils.getSecurity(plan);
+ if (security == null) {
+ security = (Security)getEFactory().create(Security.class);
+ JAXBModelUtils.setSecurity(plan, security);
}
- RoleMappingsType roleMappingsType = securityType.getRoleMappings();
- if (roleMappingsType == null) {
- roleMappingsType = (RoleMappingsType)getEFactory().create(RoleMappingsType.class);
- securityType.setRoleMappings(roleMappingsType);
+ RoleMappings roleMappings = security.getRoleMappings();
+ if (roleMappings == null) {
+ roleMappings = (RoleMappings)getEFactory().create(RoleMappings.class);
+ security.setRoleMappings(roleMappings);
}
- roleMappingsType.getRole().add((RoleType)eObject);
+ roleMappings.getRole().add((Role)eObject);
}
processEAttributes(page);
- DescriptionType type = null;
- RoleType roleType = (RoleType) eObject;
- if (roleType.getDescription().isEmpty()) {
- type = (DescriptionType)getEFactory().create(DescriptionType.class);
- roleType.getDescription().add(type);
+ Description type = null;
+ Role role = (Role) eObject;
+ if (role.getDescription().isEmpty()) {
+ type = (Description)getEFactory().create(Description.class);
+ role.getDescription().add(type);
} else {
- type = (DescriptionType) roleType.getDescription().get(0);
+ type = (Description) role.getDescription().get(0);
}
type.setValue(page.descriptionText.getText());