geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r411134 - in /geronimo/devtools/eclipse-plugin/trunk: emf/geronimo-1.0/ emf/geronimo-1.1/ plugins/org.apache.geronimo.common.deployment.model.edit/src/ plugins/org.apache.geronimo.common.deployment.model.edit/src/org/ plugins/org.apache.ger...
Date Fri, 02 Jun 2006 11:53:52 GMT
Author: sppatel
Date: Fri Jun  2 04:53:51 2006
New Revision: 411134

URL: http://svn.apache.org/viewvc?rev=411134&view=rev
Log:
fix gen sec and pkggen in common

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
  (with props)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
  (with props)
Removed:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/
Modified:
    geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml Fri Jun  2 04:53:51 2006
@@ -147,7 +147,7 @@
               <genmodel>${project.build.outputDirectory}/emf/geronimo-web-1.0.genmodel</genmodel>
               <packages>
                 <package>http://geronimo.apache.org/xml/ns/naming-1.0</package>
-                <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
+                <!--<package>http://geronimo.apache.org/xml/ns/security-1.1</package>-->
                 <package>http://geronimo.apache.org/xml/ns/deployment-1.0</package>
                 <package>http://geronimo.apache.org/xml/ns/j2ee/web-1.0</package>
               </packages>
@@ -184,7 +184,7 @@
               <genmodel>${project.build.outputDirectory}/emf/openejb-jar-2.0.genmodel</genmodel>
               <packages>
                 <package>http://www.openejb.org/xml/ns/openejb-jar-2.0</package>
-                <package>http://www.openejb.org/xml/ns/pkgen-2.0</package>
+                <!--<package>http://www.openejb.org/xml/ns/pkgen-2.0</package>-->
               </packages>
             </configuration>
           </execution>

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml Fri Jun  2 04:53:51 2006
@@ -147,7 +147,7 @@
               <genmodel>${project.build.outputDirectory}/emf/geronimo-web-1.1.genmodel</genmodel>
               <packages>
                 <package>http://geronimo.apache.org/xml/ns/naming-1.1</package>
-                <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
+                <!--<package>http://geronimo.apache.org/xml/ns/security-1.1</package>-->
                 <package>http://geronimo.apache.org/xml/ns/deployment-1.1</package>
                 <package>http://geronimo.apache.org/xml/ns/j2ee/web-1.1</package>
               </packages>
@@ -184,7 +184,7 @@
               <genmodel>${project.build.outputDirectory}/emf/openejb-jar-2.1.genmodel</genmodel>
               <packages>
                 <package>http://www.openejb.org/xml/ns/openejb-jar-2.1</package>
-                <package>http://www.openejb.org/xml/ns/pkgen-2.0</package>
+                <!--<package>http://www.openejb.org/xml/ns/pkgen-2.0</package>-->
               </packages>
             </configuration>
           </execution>

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java?rev=411134&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
Fri Jun  2 04:53:51 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.common.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/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/RoleTypeItemProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

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

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java?rev=411134&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
Fri Jun  2 04:53:51 2006
@@ -0,0 +1,476 @@
+/**
+ * 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
+{
+  /**
+   * 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/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/src/org/apache/geronimo/xml/ns/security/provider/SecurityItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

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

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
Fri Jun  2 04:53:51 2006
@@ -14,10 +14,9 @@
  org.apache.geronimo.xml.ns.j2ee.connector.provider,
  org.apache.geronimo.xml.ns.j2ee.web.provider,
  org.apache.geronimo.xml.ns.naming.provider,
- org.apache.geronimo.xml.ns.security.provider,
- org.openejb.xml.ns.openejb.jar.provider,
- org.openejb.xml.ns.pkgen.provider
+ org.openejb.xml.ns.openejb.jar.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.geronimo.deployment.model;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.apache.geronimo.common.deployment.model.edit;visibility:=reexport
 Eclipse-AutoStart: true

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
Fri Jun  2 04:53:51 2006
@@ -170,11 +170,15 @@
         </plugins>
     </build>
     <dependencies>
-        <!-- g plugin dependencies -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.deployment.model</artifactId>
             <version>${org.apache.geronimo.deployment.model_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.common.deployment.model.edit</artifactId>
+            <version>${org.apache.geronimo.common.deployment.model.edit_version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
Fri Jun  2 04:53:51 2006
@@ -8,7 +8,8 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi
+ org.eclipse.emf.ecore.xmi,
+ org.apache.geronimo.common.deployment.model;visibility:=reexport
 Eclipse-AutoStart: true
 Export-Package: org.apache.geronimo.deployment.model,
  org.apache.geronimo.xml.ns.deployment,
@@ -29,12 +30,6 @@
  org.apache.geronimo.xml.ns.naming,
  org.apache.geronimo.xml.ns.naming.impl,
  org.apache.geronimo.xml.ns.naming.util,
- org.apache.geronimo.xml.ns.security,
- org.apache.geronimo.xml.ns.security.impl,
- org.apache.geronimo.xml.ns.security.util,
  org.openejb.xml.ns.openejb.jar,
  org.openejb.xml.ns.openejb.jar.impl,
- org.openejb.xml.ns.openejb.jar.util,
- org.openejb.xml.ns.pkgen,
- org.openejb.xml.ns.pkgen.impl,
- org.openejb.xml.ns.pkgen.util
+ org.openejb.xml.ns.openejb.jar.util

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
Fri Jun  2 04:53:51 2006
@@ -171,4 +171,11 @@
             </plugin>
         </plugins>
     </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.common.deployment.model</artifactId>
+            <version>${org.apache.geronimo.common.deployment.model_version}</version>
+        </dependency>
+    </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
Fri Jun  2 04:53:51 2006
@@ -10,7 +10,8 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  com.ibm.etools.emf.event,
- org.apache.geronimo.v11.deployment.model
+ org.apache.geronimo.v11.deployment.model,
+ org.apache.geronimo.common.deployment.model.edit;visibility:=reexport
 Eclipse-AutoStart: true
 Export-Package: org.apache.geronimo.v11.deployment.model.edit,
  org.apache.geronimo.xml.ns.deployment.provider,
@@ -19,6 +20,4 @@
  org.apache.geronimo.xml.ns.j2ee.connector.provider,
  org.apache.geronimo.xml.ns.j2ee.web.provider,
  org.apache.geronimo.xml.ns.naming.provider,
- org.apache.geronimo.xml.ns.security.provider,
- org.openejb.xml.ns.openejb.jar.provider,
- org.openejb.xml.ns.pkgen.provider
+ org.openejb.xml.ns.openejb.jar.provider

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
Fri Jun  2 04:53:51 2006
@@ -177,5 +177,10 @@
             <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
             <version>${org.apache.geronimo.v11.deployment.model_version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.common.deployment.model.edit</artifactId>
+            <version>${org.apache.geronimo.common.deployment.model.edit_version}</version>
+        </dependency>
     </dependencies>   
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
Fri Jun  2 04:53:51 2006
@@ -8,7 +8,8 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi
+ org.eclipse.emf.ecore.xmi,
+ org.apache.geronimo.common.deployment.model;visibility:=reexport
 Eclipse-AutoStart: true
 Export-Package: org.apache.geronimo.v11.deployment.model,
  org.apache.geronimo.xml.ns.deployment,
@@ -29,12 +30,6 @@
  org.apache.geronimo.xml.ns.naming,
  org.apache.geronimo.xml.ns.naming.impl,
  org.apache.geronimo.xml.ns.naming.util,
- org.apache.geronimo.xml.ns.security,
- org.apache.geronimo.xml.ns.security.impl,
- org.apache.geronimo.xml.ns.security.util,
  org.openejb.xml.ns.openejb.jar,
  org.openejb.xml.ns.openejb.jar.impl,
- org.openejb.xml.ns.openejb.jar.util,
- org.openejb.xml.ns.pkgen,
- org.openejb.xml.ns.pkgen.impl,
- org.openejb.xml.ns.pkgen.util
+ org.openejb.xml.ns.openejb.jar.util

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml?rev=411134&r1=411133&r2=411134&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
Fri Jun  2 04:53:51 2006
@@ -171,4 +171,11 @@
             </plugin>
         </plugins>
     </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.common.deployment.model</artifactId>
+            <version>${org.apache.geronimo.common.deployment.model_version}</version>
+        </dependency>
+    </dependencies>
 </project>



Mime
View raw message