geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r366883 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins: org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/ org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provi...
Date Sat, 07 Jan 2006 19:06:31 GMT
Author: sppatel
Date: Sat Jan  7 11:06:10 2006
New Revision: 366883

URL: http://svn.apache.org/viewcvs?rev=366883&view=rev
Log:
migration cont..

Added:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java   (with props)
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java   (with props)
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java   (with props)
Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DynamicAddEditWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbLocalRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceEnvRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceRefWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/SecurityRoleWizard.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java?rev=366883&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java Sat Jan  7 11:06:10 2006
@@ -0,0 +1,299 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.xml.ns.security.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin;
+import org.apache.geronimo.xml.ns.security.RoleType;
+import org.apache.geronimo.xml.ns.security.SecurityFactory;
+import org.apache.geronimo.xml.ns.security.SecurityPackage;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.apache.geronimo.xml.ns.security.RoleType} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
+ * @generated NOT
+ */
+public class RoleTypeItemProvider extends ItemProviderAdapter implements
+		IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+		ITableItemLabelProvider {
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public static final String copyright = "";
+
+	/**
+	 * This constructs an instance from a factory and a notifier. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public RoleTypeItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public List getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addRoleNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Role Name feature. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected void addRoleNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(
+				((ComposeableAdapterFactory) adapterFactory)
+						.getRootAdapterFactory(), getResourceLocator(),
+				getString("_UI_RoleType_roleName_feature"), getString(
+						"_UI_PropertyDescriptor_description",
+						"_UI_RoleType_roleName_feature", "_UI_RoleType_type"),
+				SecurityPackage.eINSTANCE.getRoleType_RoleName(), true,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to
+	 * deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand},
+	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in
+	 * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Collection getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(SecurityPackage.eINSTANCE
+					.getRoleType_Description());
+			childrenFeatures.add(SecurityPackage.eINSTANCE
+					.getRoleType_RealmPrincipal());
+			childrenFeatures.add(SecurityPackage.eINSTANCE
+					.getRoleType_LoginDomainPrincipal());
+			childrenFeatures.add(SecurityPackage.eINSTANCE
+					.getRoleType_Principal());
+			childrenFeatures.add(SecurityPackage.eINSTANCE
+					.getRoleType_DistinguishedName());
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper
+		// feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns RoleType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Object getImage(Object object) {
+		return getResourceLocator().getImage("full/obj16/RoleType");
+	}
+
+	/**
+	 * This returns the label text for the adapted class. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getText(Object object) {
+		String label = ((RoleType) object).getRoleName();
+		return label == null || label.length() == 0 ? getString("_UI_RoleType_type")
+				: getString("_UI_RoleType_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to
+	 * update any cached children and by creating a viewer notification, which
+	 * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(RoleType.class)) {
+		case SecurityPackage.ROLE_TYPE__ROLE_NAME:
+			fireNotifyChanged(new ViewerNotification(notification, notification
+					.getNotifier(), false, true));
+			return;
+		case SecurityPackage.ROLE_TYPE__DESCRIPTION:
+		case SecurityPackage.ROLE_TYPE__REALM_PRINCIPAL:
+		case SecurityPackage.ROLE_TYPE__LOGIN_DOMAIN_PRINCIPAL:
+		case SecurityPackage.ROLE_TYPE__PRINCIPAL:
+		case SecurityPackage.ROLE_TYPE__DISTINGUISHED_NAME:
+			fireNotifyChanged(new ViewerNotification(notification, notification
+					.getNotifier(), true, false));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds to the collection of
+	 * {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of
+	 * the children that can be created under this object. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors,
+			Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_Description(), SecurityFactory.eINSTANCE
+				.createDescriptionType()));
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_RealmPrincipal(), SecurityFactory.eINSTANCE
+				.createRealmPrincipalType()));
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_LoginDomainPrincipal(), SecurityFactory.eINSTANCE
+				.createLoginDomainPrincipalType()));
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_LoginDomainPrincipal(), SecurityFactory.eINSTANCE
+				.createRealmPrincipalType()));
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_Principal(), SecurityFactory.eINSTANCE
+				.createPrincipalType()));
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_Principal(), SecurityFactory.eINSTANCE
+				.createLoginDomainPrincipalType()));
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_Principal(), SecurityFactory.eINSTANCE
+				.createRealmPrincipalType()));
+
+		newChildDescriptors.add(createChildParameter(SecurityPackage.eINSTANCE
+				.getRoleType_DistinguishedName(), SecurityFactory.eINSTANCE
+				.createDistinguishedNameType()));
+	}
+
+	/**
+	 * This returns the label text for
+	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getCreateChildText(Object owner, Object feature,
+			Object child, Collection selection) {
+		Object childFeature = feature;
+		Object childObject = child;
+
+		boolean qualify = childFeature == SecurityPackage.eINSTANCE
+				.getRoleType_RealmPrincipal()
+				|| childFeature == SecurityPackage.eINSTANCE
+						.getRoleType_LoginDomainPrincipal()
+				|| childFeature == SecurityPackage.eINSTANCE
+						.getRoleType_Principal();
+
+		if (qualify) {
+			return getString("_UI_CreateChild_text2", new Object[] {
+					getTypeText(childObject), getFeatureText(childFeature),
+					getTypeText(owner) });
+		}
+		return super.getCreateChildText(owner, feature, child, selection);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return GeronimoEMFEditPlugin.INSTANCE;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object,
+	 *      int)
+	 */
+	public String getColumnText(Object object, int columnIndex) {
+		RoleType o = (RoleType) object;
+		switch (columnIndex) {
+		case 0:
+			return o.getRoleName();
+		}
+		return "";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object,
+	 *      int)
+	 */
+	public Object getColumnImage(Object object, int columnIndex) {
+		if (columnIndex == 0) {
+			return getImage(object);
+		}
+		return null;
+	}
+
+}

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java?rev=366883&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java Sat Jan  7 11:06:10 2006
@@ -0,0 +1,483 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.xml.ns.security.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.geronimo.xml.ns.security.util.SecurityAdapterFactory;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final String copyright = "";
+
+  /**
+   * This keeps track of the root adapter factory that delegates to this adapter factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ComposedAdapterFactory parentAdapterFactory;
+
+  /**
+   * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+  /**
+   * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Collection supportedTypes = new ArrayList();
+
+  /**
+   * This constructs an instance.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated NOT
+   */
+  public SecurityItemProviderAdapterFactory()
+  {
+    supportedTypes.add(IEditingDomainItemProvider.class);
+    supportedTypes.add(IStructuredItemContentProvider.class);
+    supportedTypes.add(ITreeItemContentProvider.class);
+    supportedTypes.add(IItemLabelProvider.class);
+    supportedTypes.add(IItemPropertySource.class);		
+    supportedTypes.add(ITableItemLabelProvider.class);
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.DefaultPrincipalType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DefaultPrincipalTypeItemProvider defaultPrincipalTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.DefaultPrincipalType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createDefaultPrincipalTypeAdapter()
+  {
+    if (defaultPrincipalTypeItemProvider == null)
+    {
+      defaultPrincipalTypeItemProvider = new DefaultPrincipalTypeItemProvider(this);
+    }
+
+    return defaultPrincipalTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.DescriptionType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DescriptionTypeItemProvider descriptionTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.DescriptionType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createDescriptionTypeAdapter()
+  {
+    if (descriptionTypeItemProvider == null)
+    {
+      descriptionTypeItemProvider = new DescriptionTypeItemProvider(this);
+    }
+
+    return descriptionTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.DistinguishedNameType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DistinguishedNameTypeItemProvider distinguishedNameTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.DistinguishedNameType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createDistinguishedNameTypeAdapter()
+  {
+    if (distinguishedNameTypeItemProvider == null)
+    {
+      distinguishedNameTypeItemProvider = new DistinguishedNameTypeItemProvider(this);
+    }
+
+    return distinguishedNameTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.DocumentRoot} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DocumentRootItemProvider documentRootItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.DocumentRoot}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createDocumentRootAdapter()
+  {
+    if (documentRootItemProvider == null)
+    {
+      documentRootItemProvider = new DocumentRootItemProvider(this);
+    }
+
+    return documentRootItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.LoginDomainPrincipalType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected LoginDomainPrincipalTypeItemProvider loginDomainPrincipalTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.LoginDomainPrincipalType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createLoginDomainPrincipalTypeAdapter()
+  {
+    if (loginDomainPrincipalTypeItemProvider == null)
+    {
+      loginDomainPrincipalTypeItemProvider = new LoginDomainPrincipalTypeItemProvider(this);
+    }
+
+    return loginDomainPrincipalTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.NamedUsernamePasswordCredentialType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected NamedUsernamePasswordCredentialTypeItemProvider namedUsernamePasswordCredentialTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.NamedUsernamePasswordCredentialType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createNamedUsernamePasswordCredentialTypeAdapter()
+  {
+    if (namedUsernamePasswordCredentialTypeItemProvider == null)
+    {
+      namedUsernamePasswordCredentialTypeItemProvider = new NamedUsernamePasswordCredentialTypeItemProvider(this);
+    }
+
+    return namedUsernamePasswordCredentialTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.PrincipalType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected PrincipalTypeItemProvider principalTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.PrincipalType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createPrincipalTypeAdapter()
+  {
+    if (principalTypeItemProvider == null)
+    {
+      principalTypeItemProvider = new PrincipalTypeItemProvider(this);
+    }
+
+    return principalTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.RealmPrincipalType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected RealmPrincipalTypeItemProvider realmPrincipalTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.RealmPrincipalType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createRealmPrincipalTypeAdapter()
+  {
+    if (realmPrincipalTypeItemProvider == null)
+    {
+      realmPrincipalTypeItemProvider = new RealmPrincipalTypeItemProvider(this);
+    }
+
+    return realmPrincipalTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.RoleMappingsType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected RoleMappingsTypeItemProvider roleMappingsTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.RoleMappingsType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createRoleMappingsTypeAdapter()
+  {
+    if (roleMappingsTypeItemProvider == null)
+    {
+      roleMappingsTypeItemProvider = new RoleMappingsTypeItemProvider(this);
+    }
+
+    return roleMappingsTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.RoleType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected RoleTypeItemProvider roleTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.RoleType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createRoleTypeAdapter()
+  {
+    if (roleTypeItemProvider == null)
+    {
+      roleTypeItemProvider = new RoleTypeItemProvider(this);
+    }
+
+    return roleTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.security.SecurityType} instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected SecurityTypeItemProvider securityTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.security.SecurityType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createSecurityTypeAdapter()
+  {
+    if (securityTypeItemProvider == null)
+    {
+      securityTypeItemProvider = new SecurityTypeItemProvider(this);
+    }
+
+    return securityTypeItemProvider;
+  }
+
+  /**
+   * This returns the root adapter factory that contains this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public ComposeableAdapterFactory getRootAdapterFactory()
+  {
+    return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+  }
+
+  /**
+   * This sets the composed adapter factory that contains this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
+  {
+    this.parentAdapterFactory = parentAdapterFactory;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public boolean isFactoryForType(Object type)
+  {
+    return supportedTypes.contains(type) || super.isFactoryForType(type);
+  }
+
+  /**
+   * This implementation substitutes the factory itself as the key for the adapter.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter adapt(Notifier notifier, Object type)
+  {
+    return super.adapt(notifier, this);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Object adapt(Object object, Object type)
+  {
+    if (isFactoryForType(type))
+    {
+      Object adapter = super.adapt(object, type);
+      if (!(type instanceof Class) || (((Class)type).isInstance(adapter)))
+      {
+        return adapter;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * This adds a listener.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void addListener(INotifyChangedListener notifyChangedListener)
+  {
+    changeNotifier.addListener(notifyChangedListener);
+  }
+
+  /**
+   * This removes a listener.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void removeListener(INotifyChangedListener notifyChangedListener)
+  {
+    changeNotifier.removeListener(notifyChangedListener);
+  }
+
+  /**
+   * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void fireNotifyChanged(Notification notification)
+  {
+    changeNotifier.fireNotifyChanged(notification);
+
+    if (parentAdapterFactory != null)
+    {
+      parentAdapterFactory.fireNotifyChanged(notification);
+    }
+  }
+
+  /**
+   * This disposes all of the item providers created by this factory. 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void dispose()
+  {
+    if (defaultPrincipalTypeItemProvider != null) defaultPrincipalTypeItemProvider.dispose();
+    if (descriptionTypeItemProvider != null) descriptionTypeItemProvider.dispose();
+    if (distinguishedNameTypeItemProvider != null) distinguishedNameTypeItemProvider.dispose();
+    if (documentRootItemProvider != null) documentRootItemProvider.dispose();
+    if (loginDomainPrincipalTypeItemProvider != null) loginDomainPrincipalTypeItemProvider.dispose();
+    if (namedUsernamePasswordCredentialTypeItemProvider != null) namedUsernamePasswordCredentialTypeItemProvider.dispose();
+    if (principalTypeItemProvider != null) principalTypeItemProvider.dispose();
+    if (realmPrincipalTypeItemProvider != null) realmPrincipalTypeItemProvider.dispose();
+    if (roleMappingsTypeItemProvider != null) roleMappingsTypeItemProvider.dispose();
+    if (roleTypeItemProvider != null) roleTypeItemProvider.dispose();
+    if (securityTypeItemProvider != null) securityTypeItemProvider.dispose();
+  }
+
+}

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java Sat Jan  7 11:06:10 2006
@@ -59,14 +59,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-     */
-    public EFactory getEFactory() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
      */
     public EReference getEReference() {
@@ -78,14 +70,6 @@
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnNames()
      */
     public String[] getTableColumnNames() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-     */
-    public EAttribute[] getTableColumnEAttributes() {
         // TODO Auto-generated method stub
         return null;
     }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java Sat Jan  7 11:06:10 2006
@@ -16,22 +16,15 @@
 package org.apache.geronimo.ui.sections;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.wizards.DependencyWizard;
-import org.apache.geronimo.xml.ns.deployment.DependencyType;
-import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
 import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
 import org.apache.geronimo.xml.ns.deployment.provider.DeploymentItemProviderAdapterFactory;
 import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
-import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -39,7 +32,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 
@@ -84,15 +76,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-     */
-    public EFactory getEFactory() {
-        return DeploymentFactory.eINSTANCE;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
      */
     public EReference getEReference() {
@@ -111,15 +94,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-     */
-    public EAttribute[] getTableColumnEAttributes() {
-        return new EAttribute[] {};
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getWizard()
      */
     public Wizard getWizard() {
@@ -143,46 +117,14 @@
     public boolean isHeaderVisible() {
         return false;
     }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#fillTableItems()
-     */
-    /*protected void fillTableItems() {
-        EList list = (EList) getPlan().eGet(getEReference());
-
-        for (int j = 0; j < list.size(); j++) {
-            TableItem item = new TableItem(table, SWT.NONE);
-            String[] tableTextData = getTableText((EObject) list.get(j));
-            item.setImage(getImage());
-            item.setText(tableTextData);
-            item.setData((EObject) list.get(j));
-        }
-
-    }*/
-
-
-    /* (non-Javadoc)
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableText(org.eclipse.emf.ecore.EObject)
-     */
-    /*public String[] getTableText(EObject eObject) {
-        DependencyType dt = (DependencyType) eObject;
-        if (dt.eIsSet(DeploymentPackage.eINSTANCE.getDependencyType_Uri())) {
-            return new String[] { dt.getUri() };
-        } else {
-            return new String[] { dt.getGroupId() + "/" + dt.getArtifactId()
-                    + "-" + dt.getVersion() + ".jar" };
-        }
-    }*/
     
     /* (non-Javadoc)
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
      */
-    /*public ImageDescriptor getImageDescriptor() {
+    public ImageDescriptor getImageDescriptor() {
         return GeronimoUIPlugin.imageDescriptorFromPlugin(
                 "org.eclipse.jdt.ui", "icons/full/obj16/jar_obj.gif");
-    }*/
+    }
     
     public List getFactories() {
     	List factories = new ArrayList();

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java Sat Jan  7 11:06:10 2006
@@ -201,7 +201,7 @@
 	/**
 	 * @deprecated
 	 */
-	protected void fillTableItems() {
+	protected final void fillTableItems() {
 		EList list = (EList) plan.eGet(getEReference());
 
 		for (int j = 0; j < list.size(); j++) {
@@ -328,8 +328,8 @@
 	 * @param eObject
 	 * @return
 	 */
-	public String[] getTableText(EObject eObject) {
-		List tableText = new ArrayList();
+	public final String[] getTableText(EObject eObject) {
+		/*List tableText = new ArrayList();
 		for (int i = 0; i < getTableColumnEAttributes().length; i++) {
 			if (getTableColumnEAttributes()[i].getEContainingClass().equals(
 					eObject.eClass())) {
@@ -342,7 +342,8 @@
 				}
 			}
 		}
-		return (String[]) tableText.toArray(new String[tableText.size()]);
+		return (String[]) tableText.toArray(new String[tableText.size()]);*/
+		return null;
 	}
 
 	/**
@@ -393,24 +394,12 @@
 	 * @deprecated
 	 * @return
 	 */
-	abstract public EFactory getEFactory();
-
-	/**
-	 * @deprecated
-	 * @return
-	 */
 	abstract public EReference getEReference();
 
 	/**
 	 * @return
 	 */
 	abstract public String[] getTableColumnNames();
-
-	/**
-	 * @deprecated
-	 * @return
-	 */
-	abstract public EAttribute[] getTableColumnEAttributes();;
 
 	/**
 	 * @return

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java Sat Jan  7 11:06:10 2006
@@ -68,15 +68,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-     */
-    public EFactory getEFactory() {
-        return NamingFactory.eINSTANCE;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
      */
     public EReference getEReference() {
@@ -92,17 +83,6 @@
         return new String[] { Messages.editorEjbRefTargetName,
                 Messages.editorEjbRefEjbLink };
 
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-     */
-    public EAttribute[] getTableColumnEAttributes() {
-        return new EAttribute[] {
-                NamingPackage.eINSTANCE.getEjbLocalRefType_TargetName(),
-                NamingPackage.eINSTANCE.getEjbLocalRefType_EjbLink() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java Sat Jan  7 11:06:10 2006
@@ -75,15 +75,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-     */
-    public EFactory getEFactory() {
-        return NamingFactory.eINSTANCE;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
      */
     public EReference getEReference() {
@@ -98,17 +89,6 @@
     public String[] getTableColumnNames() {
         return new String[] { Messages.editorEjbRefTargetName,
                 Messages.editorEjbRefEjbLink };
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-     */
-    public EAttribute[] getTableColumnEAttributes() {
-        return new EAttribute[] {
-                NamingPackage.eINSTANCE.getEjbRefType_TargetName(),
-                NamingPackage.eINSTANCE.getEjbRefType_EjbLink() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java Sat Jan  7 11:06:10 2006
@@ -66,15 +66,6 @@
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-	 */
-	public EFactory getEFactory() {
-		return NamingFactory.eINSTANCE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
 	 */
 	public EReference getEReference() {
@@ -89,18 +80,6 @@
 	public String[] getTableColumnNames() {
 		return new String[] { Messages.editorGBeanRefName,
 				Messages.editorGBeanRefType, Messages.editorGBeanRefProxyType };
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-	 */
-	public EAttribute[] getTableColumnEAttributes() {
-		return new EAttribute[] {
-				NamingPackage.eINSTANCE.getGbeanRefType_RefName(),
-				NamingPackage.eINSTANCE.getGbeanRefType_RefType(),
-				NamingPackage.eINSTANCE.getGbeanRefType_ProxyType() };
 	}
 
 	/*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java Sat Jan  7 11:06:10 2006
@@ -72,15 +72,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-     */
-    public EFactory getEFactory() {
-        return DeploymentFactory.eINSTANCE;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
      */
     public EReference getEReference() {
@@ -95,18 +86,6 @@
     public String[] getTableColumnNames() {
         return new String[] { Messages.name, Messages.GbeanName,
                 Messages.className };
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-     */
-    public EAttribute[] getTableColumnEAttributes() {
-        return new EAttribute[] {
-                DeploymentPackage.eINSTANCE.getGbeanType_Name(),
-                DeploymentPackage.eINSTANCE.getGbeanType_GbeanName(),
-                DeploymentPackage.eINSTANCE.getGbeanType_Class() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceEnvRefSection.java Sat Jan  7 11:06:10 2006
@@ -44,7 +44,6 @@
             FormToolkit toolkit, int style,  EReference resourceEnvRefERef) {
         super(plan, parent, toolkit, style);
         this.resourceEnvRefERef = resourceEnvRefERef;
-        //create();
         createNew();
     }
 
@@ -69,15 +68,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-     */
-    public EFactory getEFactory() {
-        return NamingFactory.eINSTANCE;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
      */
     public EReference getEReference() {
@@ -92,18 +82,6 @@
     public String[] getTableColumnNames() {
         return new String[] { Messages.editorResEnvRefNameTitle,
                 Messages.editorResEnvRefMsgDestTitle };
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-     */
-    public EAttribute[] getTableColumnEAttributes() {
-        return new EAttribute[] {
-                NamingPackage.eINSTANCE.getResourceEnvRefType_RefName(),
-                NamingPackage.eINSTANCE
-                        .getResourceEnvRefType_MessageDestinationLink() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ResourceRefSection.java Sat Jan  7 11:06:10 2006
@@ -56,7 +56,6 @@
         this.resourceRefERef = resourceRefERef;
         this.factory = factory;
         createNew();
-        //super.createClient();
     }  
 
     /*
@@ -80,15 +79,6 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-     */
-    public EFactory getEFactory() {
-        return NamingFactory.eINSTANCE;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
      */
     public EReference getEReference() {
@@ -108,18 +98,6 @@
 
     public Class getWizardClass() {
         return ResourceRefWizard.class;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-     */
-    public EAttribute[] getTableColumnEAttributes() {
-        return new EAttribute[] {
-                NamingPackage.eINSTANCE.getResourceRefType_RefName(),
-                NamingPackage.eINSTANCE.getResourceRefType_ResourceLink(),
-                NamingPackage.eINSTANCE.getResourceRefType_TargetName() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java Sat Jan  7 11:06:10 2006
@@ -15,22 +15,19 @@
  */
 package org.apache.geronimo.ui.sections;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.geronimo.ui.internal.GeronimoUIPlugin;
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.wizards.SecurityRoleWizard;
+import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
 import org.apache.geronimo.xml.ns.security.DescriptionType;
-import org.apache.geronimo.xml.ns.security.RoleMappingsType;
 import org.apache.geronimo.xml.ns.security.RoleType;
 import org.apache.geronimo.xml.ns.security.SecurityFactory;
 import org.apache.geronimo.xml.ns.security.SecurityPackage;
-import org.apache.geronimo.xml.ns.security.SecurityType;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
+import org.apache.geronimo.xml.ns.security.provider.SecurityItemProviderAdapterFactory;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -48,10 +45,6 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
 
-/**
- * 
- * 
- */
 public class SecuritySection extends DynamicTableSection {
 
     public EReference securityERef;
@@ -89,13 +82,6 @@
     /**
      * @return
      */
-    public EFactory getEFactory() {
-        return SecurityFactory.eINSTANCE;
-    }
-
-    /**
-     * @return
-     */
     public EReference getEReference() {
         return SecurityFactory.eINSTANCE.getSecurityPackage()
                 .getRoleMappingsType_Role();
@@ -111,13 +97,6 @@
     /**
      * @return
      */
-    public EAttribute[] getTableColumnEAttributes() {
-        return new EAttribute[] {SecurityPackage.eINSTANCE.getRoleType_RoleName()};
-    }
-
-    /**
-     * @return
-     */
     public Wizard getWizard() {
         return new SecurityRoleWizard(this);
     }
@@ -132,7 +111,10 @@
     }
     
     public List getFactories() {
-    	return Collections.EMPTY_LIST;
+     	List factories = new ArrayList();
+		factories.add(new WebItemProviderAdapterFactory());
+		factories.add(new SecurityItemProviderAdapterFactory());
+		return factories;
     }
 
 	public EClass getTableEntryObjectType() {
@@ -153,9 +135,9 @@
      * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#createClient()
      */
-    public void createClient() {
+    public void createClientNew() {
 
-        super.createClient();
+        super.createClientNew();
 
         Composite detail = toolkit.createComposite(table.getParent());
         GridLayout gl = new GridLayout();
@@ -204,7 +186,7 @@
      * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#fillTableItems()
      */
-    protected void fillTableItems() {
+   /* protected void fillTableItems() {
 
         SecurityType secType = (SecurityType) getPlan().eGet(securityERef);
 
@@ -223,7 +205,7 @@
                 }
             }
         }
-    }
+    }*/
 
     /*
      * (non-Javadoc)

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java Sat Jan  7 11:06:10 2006
@@ -60,13 +60,6 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
-	 */
-	public EFactory getEFactory() {
-		return NamingFactory.eINSTANCE;
-	}
-
-	/* (non-Javadoc)
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
 	 */
 	public EReference getEReference() {
@@ -78,14 +71,6 @@
 	 */
 	public String[] getTableColumnNames() {
 		 return new String[] { Messages.editorServiceRefName};
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
-	 */
-	public EAttribute[] getTableColumnEAttributes() {
-		  return new EAttribute[] {
-	                NamingPackage.eINSTANCE.getServiceRefType_ServiceRefName()};
 	}
 
 	/* (non-Javadoc)

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java Sat Jan  7 11:06:10 2006
@@ -18,7 +18,10 @@
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
 import org.apache.geronimo.xml.ns.deployment.DependencyType;
+import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
 import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
@@ -68,6 +71,20 @@
 	public DependencyWizard(DynamicTableSection section) {
 		super(section);
 	}
+	
+    /* (non-Javadoc)
+     * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getEFactory()
+     */
+    public EFactory getEFactory() {
+        return DeploymentFactory.eINSTANCE;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.geronimo.ui.wizards.DynamicAddEditWizard#getTableColumnEAttributes()
+     */
+    public EAttribute[] getTableColumnEAttributes() {
+        return new EAttribute[] {};
+    }
 
 	/*
 	 * (non-Javadoc)
@@ -139,7 +156,7 @@
 
 	public class DependencyWizardPage extends WizardPage {
 
-		Text[] textEntries = new Text[section.getTableColumnEAttributes().length];
+		Text[] textEntries = new Text[getTableColumnEAttributes().length];
 
 		public DependencyWizardPage(String pageName) {
 			super(pageName);

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DynamicAddEditWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DynamicAddEditWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DynamicAddEditWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DynamicAddEditWizard.java Sat Jan  7 11:06:10 2006
@@ -30,169 +30,148 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-public abstract class DynamicAddEditWizard extends Wizard {
+public abstract class DynamicAddEditWizard extends Wizard implements TableWizard {
 
-    DynamicTableSection section;
+	DynamicTableSection section;
 
-    EObject eObject;
-    
-    ImageDescriptor descriptor = GeronimoUIPlugin.imageDescriptorFromPlugin(
-            "org.apache.geronimo.ui", "icons/bigG.gif");
-
-    /**
-     * 
-     */
-    public DynamicAddEditWizard(DynamicTableSection section) {
-        super();
-        this.section = section;
-        setWindowTitle(getAddWizardWindowTitle());      
-    }
-
-    /**
-     * @return
-     */
-    abstract public String getAddWizardWindowTitle();
-
-    /**
-     * @return
-     */
-    abstract public String getEditWizardWindowTitle();
-
-    /**
-     * @return
-     */
-    abstract public String getWizardFirstPageTitle();
-
-    /**
-     * @return
-     */
-    abstract public String getWizardFirstPageDescription();
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.wizard.Wizard#performFinish()
-     */
-    public boolean performFinish() {
-        DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
-
-        if (eObject == null) {
-            eObject = section.getEFactory().create(
-                    section.getTableColumnEAttributes()[0]
-                            .getEContainingClass());
-            EObject plan = section.getPlan();           
-            
-            ((EList) plan.eGet(section.getEReference())).add(eObject);
-        }
-        
-        processEAttributes(page);
+	EObject eObject;
 
-        return true;
-    }
+	ImageDescriptor descriptor = GeronimoUIPlugin.imageDescriptorFromPlugin(
+			"org.apache.geronimo.ui", "icons/bigG.gif");
+
+	/**
+	 * 
+	 */
+	public DynamicAddEditWizard(DynamicTableSection section) {
+		super();
+		this.section = section;
+		setWindowTitle(getAddWizardWindowTitle());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
+	 */
+	public boolean performFinish() {
+		DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
+
+		if (eObject == null) {
+			eObject = getEFactory().create(
+					getTableColumnEAttributes()[0].getEContainingClass());
+			EObject plan = section.getPlan();
+
+			((EList) plan.eGet(section.getEReference())).add(eObject);
+		}
+
+		processEAttributes(page);
+
+		return true;
+	}
 
 	public void processEAttributes(DynamicWizardPage page) {
-		for (int i = 0; i < section.getTableColumnEAttributes().length; i++) {
-            String value = page.textEntries[i].getText();
-            EAttribute attribute = section.getTableColumnEAttributes()[i];
-            if (attribute.getEContainingClass().equals(eObject.eClass())) {
-                eObject.eSet(attribute, value);
-            } else {
-            	//TODO
-            }
-        }
-	}
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.wizard.IWizard#addPages()
-     */
-    public void addPages() {
-        WizardPage page = new DynamicWizardPage("Page0");
-        page.setImageDescriptor(descriptor);
-        addPage(page);
-    }
-
-    /**
-     * @param section
-     */
-    public void setSection(DynamicTableSection section) {
-        this.section = section;
-    }
-
-    /**
-     * @param object
-     */
-    public void setEObject(EObject object) {
-        eObject = object;
-    }
-
-    public class DynamicWizardPage extends WizardPage {
-
-        Text[] textEntries = new Text[section.getTableColumnEAttributes().length];
-
-        public DynamicWizardPage(String pageName) {
-            super(pageName);
-            setTitle(getWizardFirstPageTitle());
-            setDescription(getWizardFirstPageDescription());
-        }
-
-        public DynamicWizardPage(String pageName, String title,
-                ImageDescriptor titleImage) {
-            super(pageName, title, titleImage);
-        }
+		for (int i = 0; i < getTableColumnEAttributes().length; i++) {
+			String value = page.textEntries[i].getText();
+			EAttribute attribute = getTableColumnEAttributes()[i];
+			if (attribute.getEContainingClass().equals(eObject.eClass())) {
+				eObject.eSet(attribute, value);
+			} else {
+				// TODO
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.wizard.IWizard#addPages()
+	 */
+	public void addPages() {
+		WizardPage page = new DynamicWizardPage("Page0");
+		page.setImageDescriptor(descriptor);
+		addPage(page);
+	}
+
+	/**
+	 * @param section
+	 */
+	public void setSection(DynamicTableSection section) {
+		this.section = section;
+	}
 
-        public void createControl(Composite parent) {
+	/**
+	 * @param object
+	 */
+	public void setEObject(EObject object) {
+		eObject = object;
+	}
+
+	public class DynamicWizardPage extends WizardPage {
+
+		Text[] textEntries = new Text[getTableColumnEAttributes().length];
+
+		public DynamicWizardPage(String pageName) {
+			super(pageName);
+			setTitle(getWizardFirstPageTitle());
+			setDescription(getWizardFirstPageDescription());
+		}
+
+		public DynamicWizardPage(String pageName, String title,
+				ImageDescriptor titleImage) {
+			super(pageName, title, titleImage);
+		}
+
+		public void createControl(Composite parent) {
 			Composite composite = createComposite(parent);
-            for (int i = 0; i < section.getTableColumnNames().length; i++) {
-                Label label = new Label(composite, SWT.LEFT);
-                String columnName = section.getTableColumnNames()[i];
-                if(!columnName.endsWith(":"))
-                    columnName = columnName.concat(":");
-                label.setText(columnName);
-                GridData data = new GridData();
-                data.horizontalAlignment = GridData.FILL;
-                label.setLayoutData(data);
-
-                Text text = new Text(composite, SWT.SINGLE | SWT.BORDER);
-                data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
-                        | GridData.VERTICAL_ALIGN_FILL);
-                data.grabExcessHorizontalSpace = true;
-                data.widthHint = 100;
-                text.setLayoutData(data);
-
-                if (eObject != null) {
-                    String value = (String) eObject.eGet(section
-                            .getTableColumnEAttributes()[i]);
-                    if (value != null) {
-                        text.setText(value);
-                    }
-                }
-                textEntries[i] = text;
-            }
-            
-            doCustom(composite);
-            setControl(composite);                                    
-            textEntries[0].setFocus();
-        }
+			for (int i = 0; i < section.getTableColumnNames().length; i++) {
+				Label label = new Label(composite, SWT.LEFT);
+				String columnName = section.getTableColumnNames()[i];
+				if (!columnName.endsWith(":"))
+					columnName = columnName.concat(":");
+				label.setText(columnName);
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				label.setLayoutData(data);
+
+				Text text = new Text(composite, SWT.SINGLE | SWT.BORDER);
+				data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+						| GridData.VERTICAL_ALIGN_FILL);
+				data.grabExcessHorizontalSpace = true;
+				data.widthHint = 100;
+				text.setLayoutData(data);
+
+				if (eObject != null) {
+					String value = (String) eObject
+							.eGet(getTableColumnEAttributes()[i]);
+					if (value != null) {
+						text.setText(value);
+					}
+				}
+				textEntries[i] = text;
+			}
+
+			doCustom(composite);
+			setControl(composite);
+			textEntries[0].setFocus();
+		}
 
 		public Composite createComposite(Composite parent) {
 			Composite composite = new Composite(parent, SWT.NULL);
-            GridLayout layout = new GridLayout();
-            layout.numColumns = 2;
-            composite.setLayout(layout);
-            GridData data = new GridData();
-            data.verticalAlignment = GridData.FILL;
-            data.horizontalAlignment = GridData.FILL;
-            data.widthHint = 300;
-            composite.setLayoutData(data);
+			GridLayout layout = new GridLayout();
+			layout.numColumns = 2;
+			composite.setLayout(layout);
+			GridData data = new GridData();
+			data.verticalAlignment = GridData.FILL;
+			data.horizontalAlignment = GridData.FILL;
+			data.widthHint = 300;
+			composite.setLayoutData(data);
 			return composite;
 		}
-        
-        public void doCustom(Composite parent) {
-        	
-        }
 
-    }
+		public void doCustom(Composite parent) {
+
+		}
+
+	}
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbLocalRefWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbLocalRefWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbLocalRefWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbLocalRefWizard.java Sat Jan  7 11:06:10 2006
@@ -17,12 +17,15 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
+import org.apache.geronimo.xml.ns.naming.NamingFactory;
+import org.apache.geronimo.xml.ns.naming.NamingPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 
 public class EjbLocalRefWizard extends DynamicAddEditWizard {
 
     public EjbLocalRefWizard(DynamicTableSection section) {
         super(section);
-        // TODO Auto-generated constructor stub
     }
 
     /* (non-Javadoc)
@@ -30,6 +33,16 @@
      */
     public String getAddWizardWindowTitle() {
         return Messages.wizardNewTitle_EjbLocalRef;
+    }
+    
+    public EFactory getEFactory() {
+        return NamingFactory.eINSTANCE;
+    }
+    
+    public EAttribute[] getTableColumnEAttributes() {
+        return new EAttribute[] {
+                NamingPackage.eINSTANCE.getEjbLocalRefType_TargetName(),
+                NamingPackage.eINSTANCE.getEjbLocalRefType_EjbLink() };
     }
 
     /* (non-Javadoc)

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbRefWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbRefWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbRefWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/EjbRefWizard.java Sat Jan  7 11:06:10 2006
@@ -17,12 +17,25 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
+import org.apache.geronimo.xml.ns.naming.NamingFactory;
+import org.apache.geronimo.xml.ns.naming.NamingPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 
 public class EjbRefWizard extends DynamicAddEditWizard {
 
     public EjbRefWizard(DynamicTableSection section) {
         super(section);
-        // TODO Auto-generated constructor stub
+    }
+    
+    public EFactory getEFactory() {
+        return NamingFactory.eINSTANCE;
+    }
+    
+    public EAttribute[] getTableColumnEAttributes() {
+        return new EAttribute[] {
+                NamingPackage.eINSTANCE.getEjbRefType_TargetName(),
+                NamingPackage.eINSTANCE.getEjbRefType_EjbLink() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanRefWizard.java Sat Jan  7 11:06:10 2006
@@ -17,11 +17,26 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
+import org.apache.geronimo.xml.ns.naming.NamingFactory;
+import org.apache.geronimo.xml.ns.naming.NamingPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 
 public class GBeanRefWizard extends DynamicAddEditWizard {
 
 	public GBeanRefWizard(DynamicTableSection section) {
 		super(section);
+	}
+	
+	public EFactory getEFactory() {
+		return NamingFactory.eINSTANCE;
+	}
+	
+	public EAttribute[] getTableColumnEAttributes() {
+		return new EAttribute[] {
+				NamingPackage.eINSTANCE.getGbeanRefType_RefName(),
+				NamingPackage.eINSTANCE.getGbeanRefType_RefType(),
+				NamingPackage.eINSTANCE.getGbeanRefType_ProxyType() };
 	}
 
 	/* (non-Javadoc)

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/GBeanWizard.java Sat Jan  7 11:06:10 2006
@@ -17,6 +17,10 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
+import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
+import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 
 public class GBeanWizard extends DynamicAddEditWizard {
 
@@ -25,6 +29,17 @@
      */
     public GBeanWizard(DynamicTableSection section) {
         super(section);
+    }
+    
+    public EFactory getEFactory() {
+        return DeploymentFactory.eINSTANCE;
+    }
+    
+    public EAttribute[] getTableColumnEAttributes() {
+        return new EAttribute[] {
+                DeploymentPackage.eINSTANCE.getGbeanType_Name(),
+                DeploymentPackage.eINSTANCE.getGbeanType_GbeanName(),
+                DeploymentPackage.eINSTANCE.getGbeanType_Class() };
     }
 
     /* (non-Javadoc)

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceEnvRefWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceEnvRefWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceEnvRefWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceEnvRefWizard.java Sat Jan  7 11:06:10 2006
@@ -17,6 +17,10 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
+import org.apache.geronimo.xml.ns.naming.NamingFactory;
+import org.apache.geronimo.xml.ns.naming.NamingPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 
 public class ResourceEnvRefWizard extends DynamicAddEditWizard {
 
@@ -25,6 +29,17 @@
      */
     public ResourceEnvRefWizard(DynamicTableSection section) {
         super(section);
+    }
+    
+    public EFactory getEFactory() {
+        return NamingFactory.eINSTANCE;
+    }
+    
+    public EAttribute[] getTableColumnEAttributes() {
+        return new EAttribute[] {
+                NamingPackage.eINSTANCE.getResourceEnvRefType_RefName(),
+                NamingPackage.eINSTANCE
+                        .getResourceEnvRefType_MessageDestinationLink() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceRefWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceRefWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceRefWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ResourceRefWizard.java Sat Jan  7 11:06:10 2006
@@ -17,6 +17,10 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
+import org.apache.geronimo.xml.ns.naming.NamingFactory;
+import org.apache.geronimo.xml.ns.naming.NamingPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 
 public class ResourceRefWizard extends DynamicAddEditWizard {
 
@@ -25,6 +29,17 @@
      */
     public ResourceRefWizard(DynamicTableSection section) {
         super(section);
+    }
+    
+    public EFactory getEFactory() {
+        return NamingFactory.eINSTANCE;
+    }
+    
+    public EAttribute[] getTableColumnEAttributes() {
+        return new EAttribute[] {
+                NamingPackage.eINSTANCE.getResourceRefType_RefName(),
+                NamingPackage.eINSTANCE.getResourceRefType_ResourceLink(),
+                NamingPackage.eINSTANCE.getResourceRefType_TargetName() };
     }
 
     /*

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/SecurityRoleWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/SecurityRoleWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/SecurityRoleWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/SecurityRoleWizard.java Sat Jan  7 11:06:10 2006
@@ -24,6 +24,8 @@
 import org.apache.geronimo.xml.ns.security.SecurityFactory;
 import org.apache.geronimo.xml.ns.security.SecurityPackage;
 import org.apache.geronimo.xml.ns.security.SecurityType;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -37,6 +39,14 @@
     public SecurityRoleWizard(DynamicTableSection section) {
         super(section);
     }
+    
+    public EFactory getEFactory() {
+        return SecurityFactory.eINSTANCE;
+    }
+    
+    public EAttribute[] getTableColumnEAttributes() {
+        return new EAttribute[] {SecurityPackage.eINSTANCE.getRoleType_RoleName()};
+    }
 
     public String getAddWizardWindowTitle() {
         return Messages.wizardNewTitle_SecurityRole;
@@ -106,11 +116,9 @@
     public boolean performFinish() {
     	SecurityRoleWizardPage page = (SecurityRoleWizardPage) getPages()[0];
 
-        boolean isNew = false;
-
         if (eObject == null) {
-            eObject = section.getEFactory().create(
-                    section.getTableColumnEAttributes()[0]
+            eObject = getEFactory().create(
+                    getTableColumnEAttributes()[0]
                             .getEContainingClass());
             EObject plan = section.getPlan();
 
@@ -129,7 +137,6 @@
             }
 
             roleMappingsType.getRole().add(eObject);
-            isNew = true;
         }
 
         processEAttributes(page);
@@ -147,7 +154,7 @@
         type.setValue(page.descriptionText.getText());
        
 
-        String[] tableText = section.getTableText(eObject);
+        /*String[] tableText = section.getTableText(eObject);
 
         if (isNew) {
             TableItem item = new TableItem(section.getTableViewer().getTable(),
@@ -163,7 +170,7 @@
                         index);
                 item.setText(tableText);
             }
-        }
+        }*/
 
         return true;
     }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java?rev=366883&r1=366882&r2=366883&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/ServiceRefWizard.java Sat Jan  7 11:06:10 2006
@@ -17,6 +17,10 @@
 
 import org.apache.geronimo.ui.internal.Messages;
 import org.apache.geronimo.ui.sections.DynamicTableSection;
+import org.apache.geronimo.xml.ns.naming.NamingFactory;
+import org.apache.geronimo.xml.ns.naming.NamingPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
 
 public class ServiceRefWizard extends DynamicAddEditWizard {
 
@@ -25,6 +29,15 @@
 	 */
 	public ServiceRefWizard(DynamicTableSection section) {
 		super(section);
+	}
+
+	public EFactory getEFactory() {
+		return NamingFactory.eINSTANCE;
+	}
+	
+	public EAttribute[] getTableColumnEAttributes() {
+		  return new EAttribute[] {
+	                NamingPackage.eINSTANCE.getServiceRefType_ServiceRefName()};
 	}
 
 	/* (non-Javadoc)

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java?rev=366883&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java (added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java Sat Jan  7 11:06:10 2006
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.ui.wizards;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EFactory;
+
+public interface TableWizard {
+	
+	 public EFactory getEFactory();
+
+	 public EAttribute[] getTableColumnEAttributes();
+
+	 public String getAddWizardWindowTitle();
+
+	 public String getEditWizardWindowTitle();
+	 
+	 public String getWizardFirstPageTitle();
+
+	 public String getWizardFirstPageDescription();
+	 
+}

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/TableWizard.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message