### Eclipse Workspace Patch 1.0 #P org.eclipse.jst.j2ee.core Index: jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java,v retrieving revision 1.3 diff -u -r1.3 InterceptorsType.java --- jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java 15 Oct 2009 18:52:01 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java 13 Jan 2010 17:57:30 -0000 @@ -24,7 +24,7 @@ * * * The interceptorsType element declares one or more interceptor - * classes used by components within this ejb-jar. The declaration + * classes used by components within this ejb-jar or .war. The declaration * consists of : * * - An optional description. Index: jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java,v retrieving revision 1.2 diff -u -r1.2 StatefulTimeoutType.java --- jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java 16 Oct 2009 03:33:21 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java 13 Jan 2010 17:57:30 -0000 @@ -26,6 +26,10 @@ * a stateful session bean can be idle(not receive any client * invocations) before it is eligible for removal by the container. * + * A timeout value of 0 means the bean is immediately eligible for removal. + * + * A timeout value of -1 means the bean will never be removed due to timeout. + * * @since Java EE 6, EJB 3.1 * * Index: jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java,v retrieving revision 1.2 diff -u -r1.2 AccessTimeoutType.java --- jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java 16 Oct 2009 03:33:21 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java 13 Jan 2010 17:57:30 -0000 @@ -27,6 +27,10 @@ * a concurrency lock before throwing a timeout exception to the * client. * + * A timeout value of 0 means concurrent access is not permitted. + * + * A timeout value of -1 means wait indefinitely to acquire a lock. + * * @since Java EE 6, EJB 3.1 * * Index: jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java,v retrieving revision 1.2 diff -u -r1.2 AsyncMethodType.java --- jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java 16 Oct 2009 03:33:21 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java 13 Jan 2010 17:57:30 -0000 @@ -23,10 +23,6 @@ * The async-methodType element specifies that a session * bean method has asynchronous invocation semantics. * - * The optional method-intf element constrains the async - * method behavior to the client views of the given method-intf - * type. This value must be either Remote or Local. - * * @since Java EE 6, EJB 3.1 * * @@ -36,7 +32,6 @@ * *

@@ -97,61 +92,6 @@ void setMethodParams(MethodParams value); /** - * Returns the value of the 'Method Intf' attribute. - * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.MethodInterfaceType}. - * - *

- * If the meaning of the 'Method Intf' attribute isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Method Intf' attribute. - * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType - * @see #isSetMethodIntf() - * @see #unsetMethodIntf() - * @see #setMethodIntf(MethodInterfaceType) - * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAsyncMethodType_MethodIntf() - * @generated - */ - MethodInterfaceType getMethodIntf(); - - /** - * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}' attribute. - * - * - * @param value the new value of the 'Method Intf' attribute. - * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType - * @see #isSetMethodIntf() - * @see #unsetMethodIntf() - * @see #getMethodIntf() - * @generated - */ - void setMethodIntf(MethodInterfaceType value); - - /** - * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}' attribute. - * - * - * @see #isSetMethodIntf() - * @see #getMethodIntf() - * @see #setMethodIntf(MethodInterfaceType) - * @generated - */ - void unsetMethodIntf(); - - /** - * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}' attribute is set. - * - * - * @return whether the value of the 'Method Intf' attribute is set. - * @see #unsetMethodIntf() - * @see #getMethodIntf() - * @see #setMethodIntf(MethodInterfaceType) - * @generated - */ - boolean isSetMethodIntf(); - - /** * Returns the value of the 'Id' attribute. * *

Index: jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java,v retrieving revision 1.3 diff -u -r1.3 EJBJar.java --- jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java 15 Oct 2009 18:52:02 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java 13 Jan 2010 17:57:30 -0000 @@ -34,6 +34,8 @@ * icon file name * - an optional module name. Only applicable to * stand-alone ejb-jars or ejb-jars packaged in an ear. + * Ignored if specified for an ejb-jar.xml within a .war. + * In that case, standard .war module-name rules apply. * - structural information about all included * enterprise beans that is not specified through * annotations @@ -51,10 +53,10 @@ *

* The following features are supported: *

*

@@ -124,6 +125,26 @@ protected String mappedName = MAPPED_NAME_EDEFAULT; /** + * The default value of the '{@link #getLookupName() Lookup Name}' attribute. + * + * + * @see #getLookupName() + * @generated + * @ordered + */ + protected static final String LOOKUP_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getLookupName() Lookup Name}' attribute. + * + * + * @see #getLookupName() + * @generated + * @ordered + */ + protected String lookupName = LOOKUP_NAME_EDEFAULT; + + /** * The default value of the '{@link #getId() Id}' attribute. * * @@ -245,6 +266,27 @@ * * @generated */ + public String getLookupName() { + return lookupName; + } + + /** + * + * + * @generated + */ + public void setLookupName(String newLookupName) { + String oldLookupName = lookupName; + lookupName = newLookupName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME, oldLookupName, lookupName)); + } + + /** + * + * + * @generated + */ public String getId() { return id; } @@ -297,6 +339,8 @@ return getMessageDestinationName(); case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME: return getMappedName(); + case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME: + return getLookupName(); case JavaeePackage.MESSAGE_DESTINATION__ID: return getId(); } @@ -330,6 +374,9 @@ case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME: setMappedName((String)newValue); return; + case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME: + setLookupName((String)newValue); + return; case JavaeePackage.MESSAGE_DESTINATION__ID: setId((String)newValue); return; @@ -360,6 +407,9 @@ case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME: setMappedName(MAPPED_NAME_EDEFAULT); return; + case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME: + setLookupName(LOOKUP_NAME_EDEFAULT); + return; case JavaeePackage.MESSAGE_DESTINATION__ID: setId(ID_EDEFAULT); return; @@ -385,6 +435,8 @@ return MESSAGE_DESTINATION_NAME_EDEFAULT == null ? messageDestinationName != null : !MESSAGE_DESTINATION_NAME_EDEFAULT.equals(messageDestinationName); case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME: return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName); + case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME: + return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName); case JavaeePackage.MESSAGE_DESTINATION__ID: return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); } @@ -405,6 +457,8 @@ result.append(messageDestinationName); result.append(", mappedName: "); //$NON-NLS-1$ result.append(mappedName); + result.append(", lookupName: "); //$NON-NLS-1$ + result.append(lookupName); result.append(", id: "); //$NON-NLS-1$ result.append(id); result.append(')'); Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java,v retrieving revision 1.5 diff -u -r1.5 ServiceRefImpl.java --- jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java 15 Oct 2009 18:52:02 -0000 1.5 +++ jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java 13 Jan 2010 17:57:29 -0000 @@ -748,7 +748,7 @@ setJaxrpcMappingFile((String)newValue); return; case JavaeePackage.SERVICE_REF__SERVICE_QNAME: - setServiceQname((QName)newValue); + setServiceQname(newValue); return; case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS: getPortComponentRefs().clear(); Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java,v retrieving revision 1.3 diff -u -r1.3 JavaeePackageImpl.java --- jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java 15 Oct 2009 18:52:02 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java 13 Jan 2010 17:57:29 -0000 @@ -1465,7 +1465,7 @@ * * @generated */ - public EAttribute getMessageDestination_Id() { + public EAttribute getMessageDestination_LookupName() { return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(5); } @@ -1474,6 +1474,15 @@ * * @generated */ + public EAttribute getMessageDestination_Id() { + return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(6); + } + + /** + * + * + * @generated + */ public EClass getMessageDestinationRef() { return messageDestinationRefEClass; } @@ -1681,17 +1690,8 @@ * * @generated */ - public EAttribute getPersistenceContextRef_LookupName() { - return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(7); - } - - /** - * - * - * @generated - */ public EAttribute getPersistenceContextRef_Id() { - return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(8); + return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(7); } /** @@ -1753,17 +1753,8 @@ * * @generated */ - public EAttribute getPersistenceUnitRef_LookupName() { - return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(5); - } - - /** - * - * - * @generated - */ public EAttribute getPersistenceUnitRef_Id() { - return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(6); + return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(5); } /** @@ -2999,6 +2990,7 @@ createEReference(messageDestinationEClass, MESSAGE_DESTINATION__ICONS); createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME); createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MAPPED_NAME); + createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__LOOKUP_NAME); createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__ID); messageDestinationRefEClass = createEClass(MESSAGE_DESTINATION_REF); @@ -3026,7 +3018,6 @@ createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES); createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__MAPPED_NAME); createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS); - createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__LOOKUP_NAME); createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__ID); persistenceUnitRefEClass = createEClass(PERSISTENCE_UNIT_REF); @@ -3035,7 +3026,6 @@ createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME); createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__MAPPED_NAME); createEReference(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__INJECTION_TARGETS); - createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__LOOKUP_NAME); createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__ID); portComponentRefEClass = createEClass(PORT_COMPONENT_REF); @@ -3311,6 +3301,7 @@ initEReference(getMessageDestination_Icons(), this.getIcon(), null, "icons", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getMessageDestination_MessageDestinationName(), theXMLTypePackage.getToken(), "messageDestinationName", null, 1, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getMessageDestination_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getMessageDestination_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getMessageDestination_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -3338,7 +3329,6 @@ initEReference(getPersistenceContextRef_PersistenceProperties(), this.getPropertyType(), null, "persistenceProperties", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getPersistenceContextRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getPersistenceContextRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPersistenceContextRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getPersistenceContextRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(persistenceUnitRefEClass, PersistenceUnitRef.class, "PersistenceUnitRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -3347,7 +3337,6 @@ initEAttribute(getPersistenceUnitRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getPersistenceUnitRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getPersistenceUnitRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getPersistenceUnitRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getPersistenceUnitRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -3464,7 +3453,6 @@ addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.NO); initEEnum(isolationLevelTypeEEnum, IsolationLevelType.class, "IsolationLevelType"); //$NON-NLS-1$ - addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONNONE); addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADUNCOMMITTED); addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADCOMMITTED); addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREPEATABLEREAD); @@ -4334,6 +4322,14 @@ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation + (getMessageDestination_LookupName(), + source, + new String[] { + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$ + "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getMessageDestination_Id(), @@ -4551,14 +4547,6 @@ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getPersistenceContextRef_LookupName(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$ - "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getPersistenceContextRef_Id(), @@ -4626,14 +4614,6 @@ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getPersistenceUnitRef_LookupName(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$ - "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getPersistenceUnitRef_Id(), Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java,v retrieving revision 1.4 diff -u -r1.4 PersistenceContextRefImpl.java --- jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java 15 Oct 2009 18:52:02 -0000 1.4 +++ jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java 13 Jan 2010 17:57:29 -0000 @@ -49,7 +49,6 @@ *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceProperties Persistence Properties}
    • *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getMappedName Mapped Name}
    • *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getInjectionTargets Injection Targets}
    • - *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getLookupName Lookup Name}
    • *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getId Id}
    • * *

    @@ -177,26 +176,6 @@ protected EList injectionTargets; /** - * The default value of the '{@link #getLookupName() Lookup Name}' attribute. - * - * - * @see #getLookupName() - * @generated - * @ordered - */ - protected static final String LOOKUP_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getLookupName() Lookup Name}' attribute. - * - * - * @see #getLookupName() - * @generated - * @ordered - */ - protected String lookupName = LOOKUP_NAME_EDEFAULT; - - /** * The default value of the '{@link #getId() Id}' attribute. * * @@ -385,27 +364,6 @@ * * @generated */ - public String getLookupName() { - return lookupName; - } - - /** - * - * - * @generated - */ - public void setLookupName(String newLookupName) { - String oldLookupName = lookupName; - lookupName = newLookupName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME, oldLookupName, lookupName)); - } - - /** - * - * - * @generated - */ public String getId() { return id; } @@ -462,8 +420,6 @@ return getMappedName(); case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS: return getInjectionTargets(); - case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME: - return getLookupName(); case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID: return getId(); } @@ -503,9 +459,6 @@ getInjectionTargets().clear(); getInjectionTargets().addAll((Collection)newValue); return; - case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME: - setLookupName((String)newValue); - return; case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID: setId((String)newValue); return; @@ -542,9 +495,6 @@ case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS: getInjectionTargets().clear(); return; - case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME: - setLookupName(LOOKUP_NAME_EDEFAULT); - return; case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID: setId(ID_EDEFAULT); return; @@ -574,8 +524,6 @@ return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName); case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS: return injectionTargets != null && !injectionTargets.isEmpty(); - case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME: - return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName); case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID: return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); } @@ -600,8 +548,6 @@ if (persistenceContextTypeESet) result.append(persistenceContextType); else result.append(""); //$NON-NLS-1$ result.append(", mappedName: "); //$NON-NLS-1$ result.append(mappedName); - result.append(", lookupName: "); //$NON-NLS-1$ - result.append(lookupName); result.append(", id: "); //$NON-NLS-1$ result.append(id); result.append(')'); Index: jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java,v retrieving revision 1.4 diff -u -r1.4 PersistenceUnitRefImpl.java --- jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java 15 Oct 2009 18:52:02 -0000 1.4 +++ jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java 13 Jan 2010 17:57:29 -0000 @@ -45,7 +45,6 @@ *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getPersistenceUnitName Persistence Unit Name}
    • *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getMappedName Mapped Name}
    • *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getInjectionTargets Injection Targets}
    • - *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getLookupName Lookup Name}
    • *
  • {@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getId Id}
    • * *

    @@ -134,26 +133,6 @@ protected EList injectionTargets; /** - * The default value of the '{@link #getLookupName() Lookup Name}' attribute. - * - * - * @see #getLookupName() - * @generated - * @ordered - */ - protected static final String LOOKUP_NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getLookupName() Lookup Name}' attribute. - * - * - * @see #getLookupName() - * @generated - * @ordered - */ - protected String lookupName = LOOKUP_NAME_EDEFAULT; - - /** * The default value of the '{@link #getId() Id}' attribute. * * @@ -284,27 +263,6 @@ * * @generated */ - public String getLookupName() { - return lookupName; - } - - /** - * - * - * @generated - */ - public void setLookupName(String newLookupName) { - String oldLookupName = lookupName; - lookupName = newLookupName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME, oldLookupName, lookupName)); - } - - /** - * - * - * @generated - */ public String getId() { return id; } @@ -355,8 +313,6 @@ return getMappedName(); case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS: return getInjectionTargets(); - case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME: - return getLookupName(); case JavaeePackage.PERSISTENCE_UNIT_REF__ID: return getId(); } @@ -389,9 +345,6 @@ getInjectionTargets().clear(); getInjectionTargets().addAll((Collection)newValue); return; - case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME: - setLookupName((String)newValue); - return; case JavaeePackage.PERSISTENCE_UNIT_REF__ID: setId((String)newValue); return; @@ -422,9 +375,6 @@ case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS: getInjectionTargets().clear(); return; - case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME: - setLookupName(LOOKUP_NAME_EDEFAULT); - return; case JavaeePackage.PERSISTENCE_UNIT_REF__ID: setId(ID_EDEFAULT); return; @@ -450,8 +400,6 @@ return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName); case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS: return injectionTargets != null && !injectionTargets.isEmpty(); - case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME: - return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName); case JavaeePackage.PERSISTENCE_UNIT_REF__ID: return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); } @@ -474,8 +422,6 @@ result.append(persistenceUnitName); result.append(", mappedName: "); //$NON-NLS-1$ result.append(mappedName); - result.append(", lookupName: "); //$NON-NLS-1$ - result.append(lookupName); result.append(", id: "); //$NON-NLS-1$ result.append(id); result.append(')'); Index: jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java,v retrieving revision 1.2 diff -u -r1.2 SecurityPermission.java --- jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java 16 Oct 2009 03:33:20 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java 13 Jan 2010 17:57:32 -0000 @@ -79,7 +79,7 @@ * implementation of the security permission * specification: * - * http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax + * http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html * * @since Java EE 6, Connector 1.6 * Index: jee-models/org/eclipse/jst/javaee/jca/Connector.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/Connector.java,v retrieving revision 1.2 diff -u -r1.2 Connector.java --- jee-models/org/eclipse/jst/javaee/jca/Connector.java 16 Oct 2009 03:33:20 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/jca/Connector.java 13 Jan 2010 17:57:32 -0000 @@ -34,6 +34,7 @@ *

    * The following features are supported: *

      + *
    • {@link org.eclipse.jst.javaee.jca.Connector#getModuleName Module Name}
      • *
    • {@link org.eclipse.jst.javaee.jca.Connector#getDescriptions Descriptions}
      • *
    • {@link org.eclipse.jst.javaee.jca.Connector#getDisplayNames Display Names}
      • *
    • {@link org.eclipse.jst.javaee.jca.Connector#getIcons Icons}
      • @@ -55,6 +56,41 @@ */ public interface Connector extends JavaEEObject { /** + * Returns the value of the 'Module Name' attribute. + * + * + * + * + * + * The element module-name specifies the name of the + * resource adapter. + * + * If there is no module-name specified, the module-name + * is determined as defined in Section EE.8.1.1 and EE.8.1.2 + * of the Java Platform, Enterprise Edition (Java EE) + * Specification, version 6. + * + * @since Java EE 6, Connector 1.6 + * + * + * @return the value of the 'Module Name' attribute. + * @see #setModuleName(String) + * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_ModuleName() + * @generated + */ + String getModuleName(); + + /** + * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getModuleName Module Name}' attribute. + * + * + * @param value the new value of the 'Module Name' attribute. + * @see #getModuleName() + * @generated + */ + void setModuleName(String value); + + /** * Returns the value of the 'Descriptions' containment reference list. * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}. * @@ -108,6 +144,10 @@ * * The element vendor-name specifies the name of * resource adapter provider vendor. + * + * If there is no vendor-name specified, the application + * server must consider the default "" (empty string) as + * the name of the resource adapter provider vendor. * * @since Java EE 6, Connector 1.6 * @@ -144,6 +184,10 @@ * This helps in identifying EIS instances that can be * used with this resource adapter. * + * If there is no eis-type specified, the application + * server must consider the default "" (empty string) as + * the type of the EIS. + * * @since Java EE 6, Connector 1.6 * * @@ -175,6 +219,11 @@ * of the resource adapter from the resource adapter * provider. * + * If there is no resourceadapter-version specified, the application + * server must consider the default "" (empty string) as + * the version of the resource adapter. + * + * * @since Java EE 6, Connector 1.6 * * Index: jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java,v retrieving revision 1.2 diff -u -r1.2 OutboundResourceAdapter.java --- jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java 16 Oct 2009 03:33:20 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java 13 Jan 2010 17:57:32 -0000 @@ -30,11 +30,30 @@ * provided, one or more authentication mechanisms supported * and additional required security permissions. * + * If any of the outbound resource adapter elements (transaction-support, + * authentication-mechanism, reauthentication-support) is specified through + * this element or metadata annotations, and no connection-definition is + * specified as part of this element or through annotations, the + * application server must consider this an error and fail deployment. + * * If there is no authentication-mechanism specified as part of - * resource adapter element then the resource adapter does not - * support any standard security authentication mechanisms as - * part of security contract. The application server ignores - * the security part of the system contracts in this case. + * this element or metadata annotations, then the resource adapter does + * not support any standard security authentication mechanisms as + * part of security contract. The application server ignores the security + * part of the system contracts in this case. + * + * If there is no transaction-support specified as part of this element + * or metadata annotation, then the application server must consider that + * the resource adapter does not support either the resource manager local + * or JTA transactions and must consider the transaction support as + * NoTransaction. Note that resource adapters may specify the level of + * transaction support to be used at runtime for a ManagedConnectionFactory + * through the TransactionSupport interface. + * + * If there is no reauthentication-support specified as part of + * this element or metadata annotation, then the application server must consider + * that the resource adapter does not support re-authentication of + * ManagedConnections. * * @since Java EE 6, Connector 1.6 * Index: jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java,v retrieving revision 1.2 diff -u -r1.2 WebfragmentPackage.java --- jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java 16 Oct 2009 03:33:22 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java 13 Jan 2010 17:57:34 -0000 @@ -32,33 +32,32 @@ * @(#)web-fragment_3_0.xsds * * - * - * ... - * - * - * The instance documents may indicate the published version of - * the schema using the xsi:schemaLocation attribute for Java EE - * namespace with the following location: - * - * http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd - * - * ]]> + * + * ... + * + * + * The instance documents may indicate the published version of + * the schema using the xsi:schemaLocation attribute for Java EE + * namespace with the following location: + * + * http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd + * + * ]]> * * * @@ -77,7 +76,7 @@ * * * - * $Id: WebfragmentPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $ + * $Id: web-common_3_0.xsd,v 1.5 2009/10/15 19:08:12 ccc Exp $ * * * @@ -125,7 +124,7 @@ * * * - * $Id: WebfragmentPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $ + * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $ * * * @@ -150,7 +149,7 @@ * * * - * $Id: WebfragmentPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $ + * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -319,46 +318,12 @@ * * * - * Copyright 2003-2009 Sun Microsystems, Inc. - * 4150 Network Circle - * Santa Clara, California 95054 - * U.S.A - * All rights reserved. - * - * Sun Microsystems, Inc. has intellectual property rights - * relating to technology described in this document. In - * particular, and without limitation, these intellectual - * property rights may include one or more of the U.S. patents - * listed at http://www.sun.com/patents and one or more - * additional patents or pending patent applications in the - * U.S. and other countries. - * - * This document and the technology which it describes are - * distributed under licenses restricting their use, copying, - * distribution, and decompilation. No part of this document - * may be reproduced in any form by any means without prior - * written authorization of Sun and its licensors, if any. - * - * Third-party software, including font technology, is - * copyrighted and licensed from Sun suppliers. - * - * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE, - * JavaServer Pages, Enterprise JavaBeans and the Java Coffee - * Cup logo are trademarks or registered trademarks of Sun - * Microsystems, Inc. in the U.S. and other countries. - * - * Federal Acquisitions: Commercial Software - Government Users - * Subject to Standard License Terms and Conditions. - * - * - * - * * This is the XML Schema for the JSP 2.2 deployment descriptor * types. The JSP 2.2 schema contains all the special * structures and datatypes that are necessary to use JSP files * from a web application. * - * The contents of this schema is used by the web-app_3_0.xsd + * The contents of this schema is used by the web-common_3_0.xsd * file to define JSP specific content. * * Index: jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java,v retrieving revision 1.4 diff -u -r1.4 WebPackage.java --- jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java 15 Oct 2009 18:52:21 -0000 1.4 +++ jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java 13 Jan 2010 17:57:34 -0000 @@ -32,7 +32,7 @@ * * * - * $Id: WebPackage.java,v 1.4 2009/10/15 18:52:21 canderson Exp $ + * $Id: web-common_3_0.xsd,v 1.5 2009/10/15 19:08:12 ccc Exp $ * * * @@ -80,7 +80,7 @@ * * * - * $Id: WebPackage.java,v 1.4 2009/10/15 18:52:21 canderson Exp $ + * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $ * * * @@ -105,7 +105,7 @@ * * * - * $Id: WebPackage.java,v 1.4 2009/10/15 18:52:21 canderson Exp $ + * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -274,46 +274,12 @@ * * * - * Copyright 2003-2009 Sun Microsystems, Inc. - * 4150 Network Circle - * Santa Clara, California 95054 - * U.S.A - * All rights reserved. - * - * Sun Microsystems, Inc. has intellectual property rights - * relating to technology described in this document. In - * particular, and without limitation, these intellectual - * property rights may include one or more of the U.S. patents - * listed at http://www.sun.com/patents and one or more - * additional patents or pending patent applications in the - * U.S. and other countries. - * - * This document and the technology which it describes are - * distributed under licenses restricting their use, copying, - * distribution, and decompilation. No part of this document - * may be reproduced in any form by any means without prior - * written authorization of Sun and its licensors, if any. - * - * Third-party software, including font technology, is - * copyrighted and licensed from Sun suppliers. - * - * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE, - * JavaServer Pages, Enterprise JavaBeans and the Java Coffee - * Cup logo are trademarks or registered trademarks of Sun - * Microsystems, Inc. in the U.S. and other countries. - * - * Federal Acquisitions: Commercial Software - Government Users - * Subject to Standard License Terms and Conditions. - * - * - * - * * This is the XML Schema for the JSP 2.2 deployment descriptor * types. The JSP 2.2 schema contains all the special * structures and datatypes that are necessary to use JSP files * from a web application. * - * The contents of this schema is used by the web-app_3_0.xsd + * The contents of this schema is used by the web-common_3_0.xsd * file to define JSP specific content. * * @@ -1645,40 +1611,40 @@ int WEB_APP__GROUP = 0; /** - * The feature id for the 'Descriptions' containment reference list. + * The feature id for the 'Module Name' attribute list. * * * @generated * @ordered */ - int WEB_APP__DESCRIPTIONS = 1; + int WEB_APP__MODULE_NAME = 1; /** - * The feature id for the 'Display Names' containment reference list. + * The feature id for the 'Descriptions' containment reference list. * * * @generated * @ordered */ - int WEB_APP__DISPLAY_NAMES = 2; + int WEB_APP__DESCRIPTIONS = 2; /** - * The feature id for the 'Icons' containment reference list. + * The feature id for the 'Display Names' containment reference list. * * * @generated * @ordered */ - int WEB_APP__ICONS = 3; + int WEB_APP__DISPLAY_NAMES = 3; /** - * The feature id for the 'Name' attribute list. + * The feature id for the 'Icons' containment reference list. * * * @generated * @ordered */ - int WEB_APP__NAME = 4; + int WEB_APP__ICONS = 4; /** * The feature id for the 'Distributables' containment reference list. @@ -1942,22 +1908,13 @@ int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 33; /** - * The feature id for the 'Module Name' attribute list. - * - * - * @generated - * @ordered - */ - int WEB_APP__MODULE_NAME = 34; - - /** * The feature id for the 'Absolute Ordering' containment reference list. * * * @generated * @ordered */ - int WEB_APP__ABSOLUTE_ORDERING = 35; + int WEB_APP__ABSOLUTE_ORDERING = 34; /** * The feature id for the 'Id' attribute. @@ -1966,7 +1923,7 @@ * @generated * @ordered */ - int WEB_APP__ID = 36; + int WEB_APP__ID = 35; /** * The feature id for the 'Metadata Complete' attribute. @@ -1975,7 +1932,7 @@ * @generated * @ordered */ - int WEB_APP__METADATA_COMPLETE = 37; + int WEB_APP__METADATA_COMPLETE = 36; /** * The feature id for the 'Version' attribute. @@ -1984,7 +1941,7 @@ * @generated * @ordered */ - int WEB_APP__VERSION = 38; + int WEB_APP__VERSION = 37; /** * The number of structural features of the 'App' class. @@ -1993,7 +1950,7 @@ * @generated * @ordered */ - int WEB_APP_FEATURE_COUNT = 39; + int WEB_APP_FEATURE_COUNT = 38; /** * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl App Deployment Descriptor}' class. @@ -2070,40 +2027,40 @@ int WEB_FRAGMENT__GROUP = 0; /** - * The feature id for the 'Descriptions' containment reference list. + * The feature id for the 'Name' attribute list. * * * @generated * @ordered */ - int WEB_FRAGMENT__DESCRIPTIONS = 1; + int WEB_FRAGMENT__NAME = 1; /** - * The feature id for the 'Display Names' containment reference list. + * The feature id for the 'Descriptions' containment reference list. * * * @generated * @ordered */ - int WEB_FRAGMENT__DISPLAY_NAMES = 2; + int WEB_FRAGMENT__DESCRIPTIONS = 2; /** - * The feature id for the 'Icons' containment reference list. + * The feature id for the 'Display Names' containment reference list. * * * @generated * @ordered */ - int WEB_FRAGMENT__ICONS = 3; + int WEB_FRAGMENT__DISPLAY_NAMES = 3; /** - * The feature id for the 'Name' attribute list. + * The feature id for the 'Icons' containment reference list. * * * @generated * @ordered */ - int WEB_FRAGMENT__NAME = 4; + int WEB_FRAGMENT__ICONS = 4; /** * The feature id for the 'Distributables' containment reference list. @@ -4006,17 +3963,6 @@ EReference getWebApp_Icons(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getName Name}'. - * - * - * @return the meta object for the attribute list 'Name'. - * @see org.eclipse.jst.javaee.web.WebApp#getName() - * @see #getWebApp() - * @generated - */ - EAttribute getWebApp_Name(); - - /** * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDistributables Distributables}'. * * @@ -6207,14 +6153,6 @@ EReference WEB_APP__ICONS = eINSTANCE.getWebApp_Icons(); /** - * The meta object literal for the 'Name' attribute list feature. - * - * - * @generated - */ - EAttribute WEB_APP__NAME = eINSTANCE.getWebApp_Name(); - - /** * The meta object literal for the 'Distributables' containment reference list feature. * * Index: jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java,v retrieving revision 1.3 diff -u -r1.3 JcaPackage.java --- jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java 24 Nov 2009 19:57:55 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java 13 Jan 2010 17:57:32 -0000 @@ -32,7 +32,7 @@ * * * - * $Id: JcaPackage.java,v 1.3 2009/11/24 19:57:55 canderson Exp $ + * $Id: connector_1_6.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -81,7 +81,7 @@ * * * - * $Id: JcaPackage.java,v 1.3 2009/11/24 19:57:55 canderson Exp $ + * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $ * * * @@ -106,7 +106,7 @@ * * * - * $Id: JcaPackage.java,v 1.3 2009/11/24 19:57:55 canderson Exp $ + * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -656,13 +656,22 @@ int CONNECTOR = 5; /** + * The feature id for the 'Module Name' attribute. + * + * + * @generated + * @ordered + */ + int CONNECTOR__MODULE_NAME = 0; + + /** * The feature id for the 'Descriptions' containment reference list. * * * @generated * @ordered */ - int CONNECTOR__DESCRIPTIONS = 0; + int CONNECTOR__DESCRIPTIONS = 1; /** * The feature id for the 'Display Names' containment reference list. @@ -671,7 +680,7 @@ * @generated * @ordered */ - int CONNECTOR__DISPLAY_NAMES = 1; + int CONNECTOR__DISPLAY_NAMES = 2; /** * The feature id for the 'Icons' containment reference list. @@ -680,7 +689,7 @@ * @generated * @ordered */ - int CONNECTOR__ICONS = 2; + int CONNECTOR__ICONS = 3; /** * The feature id for the 'Vendor Name' attribute. @@ -689,7 +698,7 @@ * @generated * @ordered */ - int CONNECTOR__VENDOR_NAME = 3; + int CONNECTOR__VENDOR_NAME = 4; /** * The feature id for the 'Eis Type' attribute. @@ -698,7 +707,7 @@ * @generated * @ordered */ - int CONNECTOR__EIS_TYPE = 4; + int CONNECTOR__EIS_TYPE = 5; /** * The feature id for the 'Resourceadapter Version' attribute. @@ -707,7 +716,7 @@ * @generated * @ordered */ - int CONNECTOR__RESOURCEADAPTER_VERSION = 5; + int CONNECTOR__RESOURCEADAPTER_VERSION = 6; /** * The feature id for the 'License' containment reference. @@ -716,7 +725,7 @@ * @generated * @ordered */ - int CONNECTOR__LICENSE = 6; + int CONNECTOR__LICENSE = 7; /** * The feature id for the 'Resourceadapter' containment reference. @@ -725,7 +734,7 @@ * @generated * @ordered */ - int CONNECTOR__RESOURCEADAPTER = 7; + int CONNECTOR__RESOURCEADAPTER = 8; /** * The feature id for the 'Required Work Context' attribute list. @@ -734,7 +743,7 @@ * @generated * @ordered */ - int CONNECTOR__REQUIRED_WORK_CONTEXT = 8; + int CONNECTOR__REQUIRED_WORK_CONTEXT = 9; /** * The feature id for the 'Id' attribute. @@ -743,7 +752,7 @@ * @generated * @ordered */ - int CONNECTOR__ID = 9; + int CONNECTOR__ID = 10; /** * The feature id for the 'Metadata Complete' attribute. @@ -752,7 +761,7 @@ * @generated * @ordered */ - int CONNECTOR__METADATA_COMPLETE = 10; + int CONNECTOR__METADATA_COMPLETE = 11; /** * The feature id for the 'Version' attribute. @@ -761,7 +770,7 @@ * @generated * @ordered */ - int CONNECTOR__VERSION = 11; + int CONNECTOR__VERSION = 12; /** * The number of structural features of the 'Connector' class. @@ -770,7 +779,7 @@ * @generated * @ordered */ - int CONNECTOR_FEATURE_COUNT = 12; + int CONNECTOR_FEATURE_COUNT = 13; /** * The meta object id for the '{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorDeploymentDescriptorImpl Connector Deployment Descriptor}' class. @@ -1660,6 +1669,17 @@ EClass getConnector(); /** + * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jca.Connector#getModuleName Module Name}'. + * + * + * @return the meta object for the attribute 'Module Name'. + * @see org.eclipse.jst.javaee.jca.Connector#getModuleName() + * @see #getConnector() + * @generated + */ + EAttribute getConnector_ModuleName(); + + /** * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jca.Connector#getDescriptions Descriptions}'. * * @@ -2602,6 +2622,14 @@ EClass CONNECTOR = eINSTANCE.getConnector(); /** + * The meta object literal for the 'Module Name' attribute feature. + * + * + * @generated + */ + EAttribute CONNECTOR__MODULE_NAME = eINSTANCE.getConnector_ModuleName(); + + /** * The meta object literal for the 'Descriptions' containment reference list feature. * * Index: jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java,v retrieving revision 1.2 diff -u -r1.2 IsolationLevelType.java --- jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java 16 Oct 2009 03:33:21 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java 13 Jan 2010 17:57:28 -0000 @@ -24,9 +24,12 @@ * * * - * public enum isolation-level-type { TRANSACTION_NONE, - * TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, - * TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE }; + * The following transaction isolation levels are allowed + * (see documentation for the java.sql.Connection interface): + * TRANSACTION_READ_UNCOMMITTED + * TRANSACTION_READ_COMMITTED + * TRANSACTION_REPEATABLE_READ + * TRANSACTION_SERIALIZABLE * * @since Java EE 6 * @@ -35,15 +38,6 @@ * @generated */ public enum IsolationLevelType implements Enumerator { - /** - * The 'TRANSACTIONNONE' literal object. - * - * - * @see #TRANSACTIONNONE_VALUE - * @generated - * @ordered - */ - TRANSACTIONNONE(0, "TRANSACTIONNONE", "TRANSACTION_NONE"), //$NON-NLS-1$ //$NON-NLS-2$ /** * The 'TRANSACTIONREADUNCOMMITTED' literal object. @@ -53,7 +47,7 @@ * @generated * @ordered */ - TRANSACTIONREADUNCOMMITTED(1, "TRANSACTIONREADUNCOMMITTED", "TRANSACTION_READ_UNCOMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$ + TRANSACTIONREADUNCOMMITTED(0, "TRANSACTIONREADUNCOMMITTED", "TRANSACTION_READ_UNCOMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$ /** * The 'TRANSACTIONREADCOMMITTED' literal object. @@ -63,7 +57,7 @@ * @generated * @ordered */ - TRANSACTIONREADCOMMITTED(2, "TRANSACTIONREADCOMMITTED", "TRANSACTION_READ_COMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$ + TRANSACTIONREADCOMMITTED(1, "TRANSACTIONREADCOMMITTED", "TRANSACTION_READ_COMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$ /** * The 'TRANSACTIONREPEATABLEREAD' literal object. @@ -73,7 +67,7 @@ * @generated * @ordered */ - TRANSACTIONREPEATABLEREAD(3, "TRANSACTIONREPEATABLEREAD", "TRANSACTION_REPEATABLE_READ"), //$NON-NLS-1$ //$NON-NLS-2$ + TRANSACTIONREPEATABLEREAD(2, "TRANSACTIONREPEATABLEREAD", "TRANSACTION_REPEATABLE_READ"), //$NON-NLS-1$ //$NON-NLS-2$ /** * The 'TRANSACTIONSERIALIZABLE' literal object. @@ -83,21 +77,7 @@ * @generated * @ordered */ - TRANSACTIONSERIALIZABLE(4, "TRANSACTIONSERIALIZABLE", "TRANSACTION_SERIALIZABLE"); //$NON-NLS-1$ //$NON-NLS-2$ - - /** - * The 'TRANSACTIONNONE' literal value. - * - *

      - * If the meaning of 'TRANSACTIONNONE' literal object isn't clear, - * there really should be more of a description here... - *

      - * - * @see #TRANSACTIONNONE - * @generated - * @ordered - */ - public static final int TRANSACTIONNONE_VALUE = 0; + TRANSACTIONSERIALIZABLE(3, "TRANSACTIONSERIALIZABLE", "TRANSACTION_SERIALIZABLE"); //$NON-NLS-1$ //$NON-NLS-2$ /** * The 'TRANSACTIONREADUNCOMMITTED' literal value. @@ -111,7 +91,7 @@ * @generated * @ordered */ - public static final int TRANSACTIONREADUNCOMMITTED_VALUE = 1; + public static final int TRANSACTIONREADUNCOMMITTED_VALUE = 0; /** * The 'TRANSACTIONREADCOMMITTED' literal value. @@ -125,7 +105,7 @@ * @generated * @ordered */ - public static final int TRANSACTIONREADCOMMITTED_VALUE = 2; + public static final int TRANSACTIONREADCOMMITTED_VALUE = 1; /** * The 'TRANSACTIONREPEATABLEREAD' literal value. @@ -139,7 +119,7 @@ * @generated * @ordered */ - public static final int TRANSACTIONREPEATABLEREAD_VALUE = 3; + public static final int TRANSACTIONREPEATABLEREAD_VALUE = 2; /** * The 'TRANSACTIONSERIALIZABLE' literal value. @@ -153,7 +133,7 @@ * @generated * @ordered */ - public static final int TRANSACTIONSERIALIZABLE_VALUE = 4; + public static final int TRANSACTIONSERIALIZABLE_VALUE = 3; /** * An array of all the 'Isolation Level Type' enumerators. @@ -163,7 +143,6 @@ */ private static final IsolationLevelType[] VALUES_ARRAY = new IsolationLevelType[] { - TRANSACTIONNONE, TRANSACTIONREADUNCOMMITTED, TRANSACTIONREADCOMMITTED, TRANSACTIONREPEATABLEREAD, @@ -218,7 +197,6 @@ */ public static IsolationLevelType get(int value) { switch (value) { - case TRANSACTIONNONE_VALUE: return TRANSACTIONNONE; case TRANSACTIONREADUNCOMMITTED_VALUE: return TRANSACTIONREADUNCOMMITTED; case TRANSACTIONREADCOMMITTED_VALUE: return TRANSACTIONREADCOMMITTED; case TRANSACTIONREPEATABLEREAD_VALUE: return TRANSACTIONREPEATABLEREAD; Index: jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java,v retrieving revision 1.3 diff -u -r1.3 PersistenceUnitRef.java --- jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java 15 Oct 2009 18:52:04 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java 13 Jan 2010 17:57:28 -0000 @@ -58,7 +58,6 @@ *
    • {@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName Persistence Unit Name}
      • *
    • {@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName Mapped Name}
      • *
    • {@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getInjectionTargets Injection Targets}
      • - *
    • {@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName Lookup Name}
      • *
    • {@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId Id}
      • *
    *

    @@ -215,35 +214,6 @@ List getInjectionTargets(); /** - * Returns the value of the 'Lookup Name' attribute. - * - * - * - * - * - * The JNDI name to be looked up to resolve a resource reference. - * - * @since Java EE 6 - * - * - * @return the value of the 'Lookup Name' attribute. - * @see #setLookupName(String) - * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_LookupName() - * @generated - */ - String getLookupName(); - - /** - * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName Lookup Name}' attribute. - * - * - * @param value the new value of the 'Lookup Name' attribute. - * @see #getLookupName() - * @generated - */ - void setLookupName(String value); - - /** * Returns the value of the 'Id' attribute. * *

    Index: jee-models/org/eclipse/jst/javaee/core/DataSourceType.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/DataSourceType.java,v retrieving revision 1.2 diff -u -r1.2 DataSourceType.java --- jee-models/org/eclipse/jst/javaee/core/DataSourceType.java 16 Oct 2009 03:33:21 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/core/DataSourceType.java 13 Jan 2010 17:57:28 -0000 @@ -334,7 +334,7 @@ * * * - * JDBC DataSource Propertry. This may be a vendor-specific + * JDBC DataSource property. This may be a vendor-specific * property or a less commonly used DataSource property. * * @since Java EE 6 Index: jee-models/org/eclipse/jst/javaee/core/MessageDestination.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestination.java,v retrieving revision 1.3 diff -u -r1.3 MessageDestination.java --- jee-models/org/eclipse/jst/javaee/core/MessageDestination.java 15 Oct 2009 18:52:03 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/core/MessageDestination.java 13 Jan 2010 17:57:28 -0000 @@ -33,6 +33,7 @@ * among message destination names within the same * Deployment File. * - an optional mapped name + * - an optional lookup name * * Example: * @@ -54,6 +55,7 @@ *

  • {@link org.eclipse.jst.javaee.core.MessageDestination#getIcons Icons}
    • *
  • {@link org.eclipse.jst.javaee.core.MessageDestination#getMessageDestinationName Message Destination Name}
    • *
  • {@link org.eclipse.jst.javaee.core.MessageDestination#getMappedName Mapped Name}
    • + *
  • {@link org.eclipse.jst.javaee.core.MessageDestination#getLookupName Lookup Name}
    • *
  • {@link org.eclipse.jst.javaee.core.MessageDestination#getId Id}
    • * *

    @@ -151,9 +153,9 @@ * should be mapped to. Each message-destination-ref * element that references this message destination will * define a name in the namespace of the referencing - * component. (It's a name in the JNDI java:comp/env - * namespace.) Many application servers provide a way to - * map these local names to names of resources known to the + * component or in one of the other predefined namespaces. + * Many application servers provide a way to map these + * local names to names of resources known to the * application server. This mapped name is often a global * JNDI name, but may be a name of any form. Each of the * local names should be mapped to this same global name. @@ -185,6 +187,35 @@ void setMappedName(String value); /** + * Returns the value of the 'Lookup Name' attribute. + * + * + * + * + * + * The JNDI name to be looked up to resolve the message destination. + * + * @since Java EE 6 + * + * + * @return the value of the 'Lookup Name' attribute. + * @see #setLookupName(String) + * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_LookupName() + * @generated + */ + String getLookupName(); + + /** + * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestination#getLookupName Lookup Name}' attribute. + * + * + * @param value the new value of the 'Lookup Name' attribute. + * @see #getLookupName() + * @generated + */ + void setLookupName(String value); + + /** * Returns the value of the 'Id' attribute. * *

    Index: jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java,v retrieving revision 1.3 diff -u -r1.3 MessageDestinationRef.java --- jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java 15 Oct 2009 18:52:03 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java 13 Jan 2010 17:57:28 -0000 @@ -104,10 +104,7 @@ * The message-destination-ref-name element specifies * the name of a message destination reference; its * value is the environment entry name used in - * Deployment Component code. The name is a JNDI name - * relative to the java:comp/env context and must be - * unique within an ejb-jar (for enterprise beans) or a - * Deployment File (for others). + * Deployment Component code. * * @since Java EE 5 * Index: jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java,v retrieving revision 1.3 diff -u -r1.3 PersistenceContextRef.java --- jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java 15 Oct 2009 18:52:03 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java 13 Jan 2010 17:57:28 -0000 @@ -65,7 +65,6 @@ *

  • {@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceProperties Persistence Properties}
    • *
  • {@link org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName Mapped Name}
    • *
  • {@link org.eclipse.jst.javaee.core.PersistenceContextRef#getInjectionTargets Injection Targets}
    • - *
  • {@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName Lookup Name}
    • *
  • {@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId Id}
    • * *

    @@ -302,35 +301,6 @@ List getInjectionTargets(); /** - * Returns the value of the 'Lookup Name' attribute. - * - * - * - * - * - * The JNDI name to be looked up to resolve a resource reference. - * - * @since Java EE 6 - * - * - * @return the value of the 'Lookup Name' attribute. - * @see #setLookupName(String) - * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_LookupName() - * @generated - */ - String getLookupName(); - - /** - * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName Lookup Name}' attribute. - * - * - * @param value the new value of the 'Lookup Name' attribute. - * @see #getLookupName() - * @generated - */ - void setLookupName(String value); - - /** * Returns the value of the 'Id' attribute. * *

    Index: jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java,v retrieving revision 1.1 diff -u -r1.1 MultipartConfigType.java --- jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java 15 Oct 2009 18:52:03 -0000 1.1 +++ jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java 13 Jan 2010 17:57:32 -0000 @@ -18,12 +18,8 @@ * * * - * This element contains a sequence of "name" elements, each of which - * refers to an application configuration resource by the "name" - * declared on its web.xml fragment. This element can also contain - * a single "others" element which specifies that this document comes - * before or after other documents within the application. - * See section 8.2.2 of the specification for details. + * This element specifies configuration information related to the + * handling of multipart/form-data requests. * * @since Java EE 6, Web 3.0 * @@ -52,6 +48,13 @@ * there really should be more of a description here... *

    * + * + * + * + * The directory location where uploaded files will be stored + * + * + * * @return the value of the 'Location' attribute. * @see #setLocation(String) * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_Location() @@ -77,6 +80,13 @@ * there really should be more of a description here... *

    * + * + * + * + * The maximum size limit of uploaded files + * + * + * * @return the value of the 'Max File Size' attribute. * @see #isSetMaxFileSize() * @see #unsetMaxFileSize() @@ -129,6 +139,13 @@ * there really should be more of a description here... *

    * + * + * + * + * The maximum size limit of multipart/form-data requests + * + * + * * @return the value of the 'Max Request Size' attribute. * @see #isSetMaxRequestSize() * @see #unsetMaxRequestSize() @@ -181,6 +198,14 @@ * there really should be more of a description here... *

    * + * + * + * + * The size threshold after which an uploaded file will be + * written to disk + * + * + * * @return the value of the 'File Size Threshold' attribute. * @see #setFileSizeThreshold(BigInteger) * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_FileSizeThreshold() Index: jee-models/org/eclipse/jst/javaee/web/WebApp.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebApp.java,v retrieving revision 1.3 diff -u -r1.3 WebApp.java --- jee-models/org/eclipse/jst/javaee/web/WebApp.java 15 Oct 2009 18:52:03 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/web/WebApp.java 13 Jan 2010 17:57:33 -0000 @@ -45,10 +45,10 @@ * The following features are supported: *
      *
    • {@link org.eclipse.jst.javaee.web.WebApp#getGroup Group}
      • + *
    • {@link org.eclipse.jst.javaee.web.WebApp#getModuleName Module Name}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getDescriptions Descriptions}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getDisplayNames Display Names}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getIcons Icons}
      • - *
    • {@link org.eclipse.jst.javaee.web.WebApp#getName Name}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getDistributables Distributables}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getContextParams Context Params}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getFilters Filters}
      • @@ -78,7 +78,6 @@ *
    • {@link org.eclipse.jst.javaee.web.WebApp#getDataSource Data Source}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations Message Destinations}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists Local Encoding Mappings Lists}
      • - *
    • {@link org.eclipse.jst.javaee.web.WebApp#getModuleName Module Name}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering Absolute Ordering}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#getId Id}
      • *
    • {@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete Metadata Complete}
      • @@ -152,22 +151,6 @@ List getIcons(); /** - * Returns the value of the 'Name' attribute list. - * The list contents are of type {@link java.lang.String}. - * - * - * - * - * @since Java EE 6, Web 3.0 - * - * - * @return the value of the 'Name' attribute list. - * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Name() - * @generated - */ - List getName(); - - /** * Returns the value of the 'Distributables' containment reference list. * The list contents are of type {@link org.eclipse.jst.javaee.core.EmptyType}. * Index: jee-models/org/eclipse/jst/javaee/web/WebFragment.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/WebFragment.java,v retrieving revision 1.1 diff -u -r1.1 WebFragment.java --- jee-models/org/eclipse/jst/javaee/web/WebFragment.java 15 Oct 2009 18:52:03 -0000 1.1 +++ jee-models/org/eclipse/jst/javaee/web/WebFragment.java 13 Jan 2010 17:57:33 -0000 @@ -48,10 +48,10 @@ * The following features are supported: *
        *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getGroup Group}
        • + *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getName Name}
        • *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getDescriptions Descriptions}
        • *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getDisplayNames Display Names}
        • *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getIcons Icons}
        • - *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getName Name}
        • *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getDistributables Distributables}
        • *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getContextParams Context Params}
        • *
      • {@link org.eclipse.jst.javaee.web.WebFragment#getFilters Filters}
        • @@ -158,11 +158,6 @@ * The list contents are of type {@link java.lang.String}. * * - * - * - * @since Java EE 6, Web 3.0 - * - * * @return the value of the 'Name' attribute list. * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Name() * @generated Index: jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java,v retrieving revision 1.3 diff -u -r1.3 JspPackage.java --- jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java 15 Oct 2009 18:52:17 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java 13 Jan 2010 17:57:32 -0000 @@ -34,46 +34,12 @@ * * * - * Copyright 2003-2009 Sun Microsystems, Inc. - * 4150 Network Circle - * Santa Clara, California 95054 - * U.S.A - * All rights reserved. - * - * Sun Microsystems, Inc. has intellectual property rights - * relating to technology described in this document. In - * particular, and without limitation, these intellectual - * property rights may include one or more of the U.S. patents - * listed at http://www.sun.com/patents and one or more - * additional patents or pending patent applications in the - * U.S. and other countries. - * - * This document and the technology which it describes are - * distributed under licenses restricting their use, copying, - * distribution, and decompilation. No part of this document - * may be reproduced in any form by any means without prior - * written authorization of Sun and its licensors, if any. - * - * Third-party software, including font technology, is - * copyrighted and licensed from Sun suppliers. - * - * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE, - * JavaServer Pages, Enterprise JavaBeans and the Java Coffee - * Cup logo are trademarks or registered trademarks of Sun - * Microsystems, Inc. in the U.S. and other countries. - * - * Federal Acquisitions: Commercial Software - Government Users - * Subject to Standard License Terms and Conditions. - * - * - * - * * This is the XML Schema for the JSP 2.2 deployment descriptor * types. The JSP 2.2 schema contains all the special * structures and datatypes that are necessary to use JSP files * from a web application. * - * The contents of this schema is used by the web-app_3_0.xsd + * The contents of this schema is used by the web-common_3_0.xsd * file to define JSP specific content. * * @@ -94,7 +60,7 @@ * * * - * $Id: JspPackage.java,v 1.3 2009/10/15 18:52:17 canderson Exp $ + * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $ * * * @@ -119,7 +85,7 @@ * * * - * $Id: JspPackage.java,v 1.3 2009/10/15 18:52:17 canderson Exp $ + * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java,v retrieving revision 1.5 diff -u -r1.5 WebAppImpl.java --- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java 15 Oct 2009 18:52:05 -0000 1.5 +++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java 13 Jan 2010 17:57:33 -0000 @@ -71,10 +71,10 @@ * The following features are implemented: *
          *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getGroup Group}
          • + *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getModuleName Module Name}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDescriptions Descriptions}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDisplayNames Display Names}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getIcons Icons}
          • - *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getName Name}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDistributables Distributables}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getContextParams Context Params}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getFilters Filters}
          • @@ -104,7 +104,6 @@ *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDataSource Data Source}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations Message Destinations}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists Local Encoding Mappings Lists}
          • - *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getModuleName Module Name}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAbsoluteOrdering Absolute Ordering}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId Id}
          • *
        • {@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete Metadata Complete}
          • @@ -266,15 +265,6 @@ * * @generated */ - public List getName() { - return getGroup().list(WebPackage.Literals.WEB_APP__NAME); - } - - /** - * - * - * @generated - */ public List getDistributables() { return getGroup().list(WebPackage.Literals.WEB_APP__DISTRIBUTABLES); } @@ -753,14 +743,14 @@ case WebPackage.WEB_APP__GROUP: if (coreType) return getGroup(); return ((FeatureMap.Internal)getGroup()).getWrapper(); + case WebPackage.WEB_APP__MODULE_NAME: + return getModuleName(); case WebPackage.WEB_APP__DESCRIPTIONS: return getDescriptions(); case WebPackage.WEB_APP__DISPLAY_NAMES: return getDisplayNames(); case WebPackage.WEB_APP__ICONS: return getIcons(); - case WebPackage.WEB_APP__NAME: - return getName(); case WebPackage.WEB_APP__DISTRIBUTABLES: return getDistributables(); case WebPackage.WEB_APP__CONTEXT_PARAMS: @@ -819,8 +809,6 @@ return getMessageDestinations(); case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS: return getLocalEncodingMappingsLists(); - case WebPackage.WEB_APP__MODULE_NAME: - return getModuleName(); case WebPackage.WEB_APP__ABSOLUTE_ORDERING: return getAbsoluteOrdering(); case WebPackage.WEB_APP__ID: @@ -845,6 +833,10 @@ case WebPackage.WEB_APP__GROUP: ((FeatureMap.Internal)getGroup()).set(newValue); return; + case WebPackage.WEB_APP__MODULE_NAME: + getModuleName().clear(); + getModuleName().addAll((Collection)newValue); + return; case WebPackage.WEB_APP__DESCRIPTIONS: getDescriptions().clear(); getDescriptions().addAll((Collection)newValue); @@ -857,10 +849,6 @@ getIcons().clear(); getIcons().addAll((Collection)newValue); return; - case WebPackage.WEB_APP__NAME: - getName().clear(); - getName().addAll((Collection)newValue); - return; case WebPackage.WEB_APP__DISTRIBUTABLES: getDistributables().clear(); getDistributables().addAll((Collection)newValue); @@ -977,10 +965,6 @@ getLocalEncodingMappingsLists().clear(); getLocalEncodingMappingsLists().addAll((Collection)newValue); return; - case WebPackage.WEB_APP__MODULE_NAME: - getModuleName().clear(); - getModuleName().addAll((Collection)newValue); - return; case WebPackage.WEB_APP__ABSOLUTE_ORDERING: getAbsoluteOrdering().clear(); getAbsoluteOrdering().addAll((Collection)newValue); @@ -1009,6 +993,9 @@ case WebPackage.WEB_APP__GROUP: getGroup().clear(); return; + case WebPackage.WEB_APP__MODULE_NAME: + getModuleName().clear(); + return; case WebPackage.WEB_APP__DESCRIPTIONS: getDescriptions().clear(); return; @@ -1018,9 +1005,6 @@ case WebPackage.WEB_APP__ICONS: getIcons().clear(); return; - case WebPackage.WEB_APP__NAME: - getName().clear(); - return; case WebPackage.WEB_APP__DISTRIBUTABLES: getDistributables().clear(); return; @@ -1108,9 +1092,6 @@ case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS: getLocalEncodingMappingsLists().clear(); return; - case WebPackage.WEB_APP__MODULE_NAME: - getModuleName().clear(); - return; case WebPackage.WEB_APP__ABSOLUTE_ORDERING: getAbsoluteOrdering().clear(); return; @@ -1137,14 +1118,14 @@ switch (featureID) { case WebPackage.WEB_APP__GROUP: return group != null && !group.isEmpty(); + case WebPackage.WEB_APP__MODULE_NAME: + return !getModuleName().isEmpty(); case WebPackage.WEB_APP__DESCRIPTIONS: return !getDescriptions().isEmpty(); case WebPackage.WEB_APP__DISPLAY_NAMES: return !getDisplayNames().isEmpty(); case WebPackage.WEB_APP__ICONS: return !getIcons().isEmpty(); - case WebPackage.WEB_APP__NAME: - return !getName().isEmpty(); case WebPackage.WEB_APP__DISTRIBUTABLES: return !getDistributables().isEmpty(); case WebPackage.WEB_APP__CONTEXT_PARAMS: @@ -1203,8 +1184,6 @@ return !getMessageDestinations().isEmpty(); case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS: return !getLocalEncodingMappingsLists().isEmpty(); - case WebPackage.WEB_APP__MODULE_NAME: - return !getModuleName().isEmpty(); case WebPackage.WEB_APP__ABSOLUTE_ORDERING: return !getAbsoluteOrdering().isEmpty(); case WebPackage.WEB_APP__ID: Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java,v retrieving revision 1.1 diff -u -r1.1 WebFragmentImpl.java --- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java 15 Oct 2009 18:52:05 -0000 1.1 +++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java 13 Jan 2010 17:57:33 -0000 @@ -69,10 +69,10 @@ * The following features are implemented: *
            *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getGroup Group}
            • + *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getName Name}
            • *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDescriptions Descriptions}
            • *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDisplayNames Display Names}
            • *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getIcons Icons}
            • - *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getName Name}
            • *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDistributables Distributables}
            • *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getContextParams Context Params}
            • *
          • {@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getFilters Filters}
            • @@ -741,14 +741,14 @@ case WebPackage.WEB_FRAGMENT__GROUP: if (coreType) return getGroup(); return ((FeatureMap.Internal)getGroup()).getWrapper(); + case WebPackage.WEB_FRAGMENT__NAME: + return getName(); case WebPackage.WEB_FRAGMENT__DESCRIPTIONS: return getDescriptions(); case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES: return getDisplayNames(); case WebPackage.WEB_FRAGMENT__ICONS: return getIcons(); - case WebPackage.WEB_FRAGMENT__NAME: - return getName(); case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES: return getDistributables(); case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS: @@ -831,6 +831,10 @@ case WebPackage.WEB_FRAGMENT__GROUP: ((FeatureMap.Internal)getGroup()).set(newValue); return; + case WebPackage.WEB_FRAGMENT__NAME: + getName().clear(); + getName().addAll((Collection)newValue); + return; case WebPackage.WEB_FRAGMENT__DESCRIPTIONS: getDescriptions().clear(); getDescriptions().addAll((Collection)newValue); @@ -843,10 +847,6 @@ getIcons().clear(); getIcons().addAll((Collection)newValue); return; - case WebPackage.WEB_FRAGMENT__NAME: - getName().clear(); - getName().addAll((Collection)newValue); - return; case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES: getDistributables().clear(); getDistributables().addAll((Collection)newValue); @@ -991,6 +991,9 @@ case WebPackage.WEB_FRAGMENT__GROUP: getGroup().clear(); return; + case WebPackage.WEB_FRAGMENT__NAME: + getName().clear(); + return; case WebPackage.WEB_FRAGMENT__DESCRIPTIONS: getDescriptions().clear(); return; @@ -1000,9 +1003,6 @@ case WebPackage.WEB_FRAGMENT__ICONS: getIcons().clear(); return; - case WebPackage.WEB_FRAGMENT__NAME: - getName().clear(); - return; case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES: getDistributables().clear(); return; @@ -1116,14 +1116,14 @@ switch (featureID) { case WebPackage.WEB_FRAGMENT__GROUP: return group != null && !group.isEmpty(); + case WebPackage.WEB_FRAGMENT__NAME: + return !getName().isEmpty(); case WebPackage.WEB_FRAGMENT__DESCRIPTIONS: return !getDescriptions().isEmpty(); case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES: return !getDisplayNames().isEmpty(); case WebPackage.WEB_FRAGMENT__ICONS: return !getIcons().isEmpty(); - case WebPackage.WEB_FRAGMENT__NAME: - return !getName().isEmpty(); case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES: return !getDistributables().isEmpty(); case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS: Index: jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java,v retrieving revision 1.3 diff -u -r1.3 WebPackageImpl.java --- jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java 15 Oct 2009 18:52:05 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java 13 Jan 2010 17:57:33 -0000 @@ -1590,15 +1590,6 @@ * @generated */ public EReference getWebApp_Descriptions() { - return (EReference)webAppEClass.getEStructuralFeatures().get(1); - } - - /** - * - * - * @generated - */ - public EReference getWebApp_DisplayNames() { return (EReference)webAppEClass.getEStructuralFeatures().get(2); } @@ -1607,7 +1598,7 @@ * * @generated */ - public EReference getWebApp_Icons() { + public EReference getWebApp_DisplayNames() { return (EReference)webAppEClass.getEStructuralFeatures().get(3); } @@ -1616,8 +1607,8 @@ * * @generated */ - public EAttribute getWebApp_Name() { - return (EAttribute)webAppEClass.getEStructuralFeatures().get(4); + public EReference getWebApp_Icons() { + return (EReference)webAppEClass.getEStructuralFeatures().get(4); } /** @@ -1887,7 +1878,7 @@ * @generated */ public EAttribute getWebApp_ModuleName() { - return (EAttribute)webAppEClass.getEStructuralFeatures().get(34); + return (EAttribute)webAppEClass.getEStructuralFeatures().get(1); } /** @@ -1896,7 +1887,7 @@ * @generated */ public EReference getWebApp_AbsoluteOrdering() { - return (EReference)webAppEClass.getEStructuralFeatures().get(35); + return (EReference)webAppEClass.getEStructuralFeatures().get(34); } /** @@ -1905,7 +1896,7 @@ * @generated */ public EAttribute getWebApp_Id() { - return (EAttribute)webAppEClass.getEStructuralFeatures().get(36); + return (EAttribute)webAppEClass.getEStructuralFeatures().get(35); } /** @@ -1914,7 +1905,7 @@ * @generated */ public EAttribute getWebApp_MetadataComplete() { - return (EAttribute)webAppEClass.getEStructuralFeatures().get(37); + return (EAttribute)webAppEClass.getEStructuralFeatures().get(36); } /** @@ -1923,7 +1914,7 @@ * @generated */ public EAttribute getWebApp_Version() { - return (EAttribute)webAppEClass.getEStructuralFeatures().get(38); + return (EAttribute)webAppEClass.getEStructuralFeatures().get(37); } /** @@ -1995,7 +1986,7 @@ * @generated */ public EReference getWebFragment_Descriptions() { - return (EReference)webFragmentEClass.getEStructuralFeatures().get(1); + return (EReference)webFragmentEClass.getEStructuralFeatures().get(2); } /** @@ -2004,7 +1995,7 @@ * @generated */ public EReference getWebFragment_DisplayNames() { - return (EReference)webFragmentEClass.getEStructuralFeatures().get(2); + return (EReference)webFragmentEClass.getEStructuralFeatures().get(3); } /** @@ -2013,7 +2004,7 @@ * @generated */ public EReference getWebFragment_Icons() { - return (EReference)webFragmentEClass.getEStructuralFeatures().get(3); + return (EReference)webFragmentEClass.getEStructuralFeatures().get(4); } /** @@ -2022,7 +2013,7 @@ * @generated */ public EAttribute getWebFragment_Name() { - return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(4); + return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(1); } /** @@ -2768,10 +2759,10 @@ webAppEClass = createEClass(WEB_APP); createEAttribute(webAppEClass, WEB_APP__GROUP); + createEAttribute(webAppEClass, WEB_APP__MODULE_NAME); createEReference(webAppEClass, WEB_APP__DESCRIPTIONS); createEReference(webAppEClass, WEB_APP__DISPLAY_NAMES); createEReference(webAppEClass, WEB_APP__ICONS); - createEAttribute(webAppEClass, WEB_APP__NAME); createEReference(webAppEClass, WEB_APP__DISTRIBUTABLES); createEReference(webAppEClass, WEB_APP__CONTEXT_PARAMS); createEReference(webAppEClass, WEB_APP__FILTERS); @@ -2801,7 +2792,6 @@ createEReference(webAppEClass, WEB_APP__DATA_SOURCE); createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS); createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS); - createEAttribute(webAppEClass, WEB_APP__MODULE_NAME); createEReference(webAppEClass, WEB_APP__ABSOLUTE_ORDERING); createEAttribute(webAppEClass, WEB_APP__ID); createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE); @@ -2815,10 +2805,10 @@ webFragmentEClass = createEClass(WEB_FRAGMENT); createEAttribute(webFragmentEClass, WEB_FRAGMENT__GROUP); + createEAttribute(webFragmentEClass, WEB_FRAGMENT__NAME); createEReference(webFragmentEClass, WEB_FRAGMENT__DESCRIPTIONS); createEReference(webFragmentEClass, WEB_FRAGMENT__DISPLAY_NAMES); createEReference(webFragmentEClass, WEB_FRAGMENT__ICONS); - createEAttribute(webFragmentEClass, WEB_FRAGMENT__NAME); createEReference(webFragmentEClass, WEB_FRAGMENT__DISTRIBUTABLES); createEReference(webFragmentEClass, WEB_FRAGMENT__CONTEXT_PARAMS); createEReference(webFragmentEClass, WEB_FRAGMENT__FILTERS); @@ -2969,7 +2959,7 @@ initEReference(getFilter_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getFilter_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getFilter_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getFilter_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getFilter_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getFilter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -3065,10 +3055,10 @@ initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getWebApp_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getWebApp_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getWebApp_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -3098,7 +3088,6 @@ initEReference(getWebApp_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getWebApp_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebApp_AbsoluteOrdering(), this.getAbsoluteOrderingType(), null, "absoluteOrdering", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getWebApp_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getWebApp_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -3112,10 +3101,10 @@ initEClass(webFragmentEClass, WebFragment.class, "WebFragment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getWebFragment_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getWebFragment_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebFragment_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebFragment_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebFragment_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getWebFragment_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebFragment_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebFragment_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getWebFragment_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -3802,7 +3791,7 @@ new String[] { "name", "multipart-configType", //$NON-NLS-1$ //$NON-NLS-2$ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + }); addAnnotation (getMultipartConfigType_Location(), source, @@ -3810,7 +3799,7 @@ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ "name", "location", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ - }); + }); addAnnotation (getMultipartConfigType_MaxFileSize(), source, @@ -3818,7 +3807,7 @@ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ "name", "max-file-size", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ - }); + }); addAnnotation (getMultipartConfigType_MaxRequestSize(), source, @@ -3826,7 +3815,7 @@ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ "name", "max-request-size", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ - }); + }); addAnnotation (getMultipartConfigType_FileSizeThreshold(), source, @@ -4232,6 +4221,15 @@ new String[] { "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$ "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation + (getWebApp_ModuleName(), + source, + new String[] { + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$ + "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$ + "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getWebApp_Descriptions(), @@ -4259,15 +4257,6 @@ "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$ "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getWebApp_Name(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name", //$NON-NLS-1$ //$NON-NLS-2$ - "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$ - "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getWebApp_Distributables(), @@ -4531,15 +4520,6 @@ "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation - (getWebApp_ModuleName(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$ - "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$ - "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation (getWebApp_AbsoluteOrdering(), source, new String[] { @@ -4633,6 +4613,15 @@ "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation + (getWebFragment_Name(), + source, + new String[] { + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name", //$NON-NLS-1$ //$NON-NLS-2$ + "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$ + "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation (getWebFragment_Descriptions(), source, new String[] { @@ -4658,15 +4647,6 @@ "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$ "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getWebFragment_Name(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name", //$NON-NLS-1$ //$NON-NLS-2$ - "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$ - "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getWebFragment_Distributables(), Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java,v retrieving revision 1.3 diff -u -r1.3 EjbPackageImpl.java --- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java 15 Oct 2009 18:52:06 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java 13 Jan 2010 17:57:31 -0000 @@ -977,17 +977,8 @@ * * @generated */ - public EAttribute getAsyncMethodType_MethodIntf() { - return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(2); - } - - /** - * - * - * @generated - */ public EAttribute getAsyncMethodType_Id() { - return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(3); + return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(2); } /** @@ -1203,7 +1194,7 @@ * @generated */ public EReference getEJBJar_Descriptions() { - return (EReference)ejbJarEClass.getEStructuralFeatures().get(0); + return (EReference)ejbJarEClass.getEStructuralFeatures().get(1); } /** @@ -1212,7 +1203,7 @@ * @generated */ public EReference getEJBJar_DisplayNames() { - return (EReference)ejbJarEClass.getEStructuralFeatures().get(1); + return (EReference)ejbJarEClass.getEStructuralFeatures().get(2); } /** @@ -1221,7 +1212,7 @@ * @generated */ public EReference getEJBJar_Icons() { - return (EReference)ejbJarEClass.getEStructuralFeatures().get(2); + return (EReference)ejbJarEClass.getEStructuralFeatures().get(3); } /** @@ -1230,7 +1221,7 @@ * @generated */ public EAttribute getEJBJar_ModuleName() { - return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(3); + return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(0); } /** @@ -3886,7 +3877,6 @@ asyncMethodTypeEClass = createEClass(ASYNC_METHOD_TYPE); createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_NAME); createEReference(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_PARAMS); - createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_INTF); createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__ID); cmpFieldEClass = createEClass(CMP_FIELD); @@ -3917,10 +3907,10 @@ createEAttribute(dependsOnTypeEClass, DEPENDS_ON_TYPE__ID); ejbJarEClass = createEClass(EJB_JAR); + createEAttribute(ejbJarEClass, EJB_JAR__MODULE_NAME); createEReference(ejbJarEClass, EJB_JAR__DESCRIPTIONS); createEReference(ejbJarEClass, EJB_JAR__DISPLAY_NAMES); createEReference(ejbJarEClass, EJB_JAR__ICONS); - createEAttribute(ejbJarEClass, EJB_JAR__MODULE_NAME); createEReference(ejbJarEClass, EJB_JAR__ENTERPRISE_BEANS); createEReference(ejbJarEClass, EJB_JAR__INTERCEPTORS); createEReference(ejbJarEClass, EJB_JAR__RELATIONSHIPS); @@ -4275,7 +4265,7 @@ // Initialize classes and features; add operations and parameters initEClass(accessTimeoutTypeEClass, AccessTimeoutType.class, "AccessTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getAccessTimeoutType_Timeout(), theXMLTypePackage.getPositiveInteger(), "timeout", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getAccessTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getAccessTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getAccessTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -4316,7 +4306,6 @@ initEClass(asyncMethodTypeEClass, AsyncMethodType.class, "AsyncMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getAsyncMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getAsyncMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getAsyncMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getAsyncMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(cmpFieldEClass, CMPField.class, "CMPField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -4347,10 +4336,10 @@ initEAttribute(getDependsOnType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getEJBJar_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getEJBJar_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getEJBJar_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getEJBJar_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getEJBJar_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBeans(), null, "enterpriseBeans", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getEJBJar_Interceptors(), this.getInterceptorsType(), null, "interceptors", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getEJBJar_Relationships(), this.getRelationships(), null, "relationships", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -4613,7 +4602,7 @@ initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(statefulTimeoutTypeEClass, StatefulTimeoutType.class, "StatefulTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEAttribute(getStatefulTimeoutType_Timeout(), theXMLTypePackage.getPositiveInteger(), "timeout", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getStatefulTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getStatefulTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getStatefulTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -4650,7 +4639,6 @@ initEEnum(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeType"); //$NON-NLS-1$ addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.BEAN); addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.CONTAINER); - addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.NOT_ALLOWED); initEEnum(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.class, "ConcurrentLockTypeType"); //$NON-NLS-1$ addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.READ); @@ -5004,14 +4992,6 @@ "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation - (getAsyncMethodType_MethodIntf(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "method-intf", //$NON-NLS-1$ //$NON-NLS-2$ - "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation (getAsyncMethodType_Id(), source, new String[] { @@ -5249,6 +5229,14 @@ new String[] { "name", "ejb-jarType", //$NON-NLS-1$ //$NON-NLS-2$ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation + (getEJBJar_ModuleName(), + source, + new String[] { + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$ + "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getEJBJar_Descriptions(), @@ -5273,14 +5261,6 @@ "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$ "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$ - }); - addAnnotation - (getEJBJar_ModuleName(), - source, - new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$ - "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getEJBJar_EnterpriseBeans(), Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java,v retrieving revision 1.2 diff -u -r1.2 AsyncMethodTypeImpl.java --- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java 16 Oct 2009 03:33:20 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java 13 Jan 2010 17:57:30 -0000 @@ -20,7 +20,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.jst.javaee.ejb.AsyncMethodType; -import org.eclipse.jst.javaee.ejb.MethodInterfaceType; import org.eclipse.jst.javaee.ejb.MethodParams; import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage; @@ -34,7 +33,6 @@ *
              *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodName Method Name}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodParams Method Params}
              • - *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodIntf Method Intf}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getId Id}
              • *
            *

            @@ -73,35 +71,6 @@ protected MethodParams methodParams; /** - * The default value of the '{@link #getMethodIntf() Method Intf}' attribute. - * - * - * @see #getMethodIntf() - * @generated - * @ordered - */ - protected static final MethodInterfaceType METHOD_INTF_EDEFAULT = MethodInterfaceType.HOME_LITERAL; - - /** - * The cached value of the '{@link #getMethodIntf() Method Intf}' attribute. - * - * - * @see #getMethodIntf() - * @generated - * @ordered - */ - protected MethodInterfaceType methodIntf = METHOD_INTF_EDEFAULT; - - /** - * This is true if the Method Intf attribute has been set. - * - * - * @generated - * @ordered - */ - protected boolean methodIntfESet; - - /** * The default value of the '{@link #getId() Id}' attribute. * * @@ -209,52 +178,6 @@ * * @generated */ - public MethodInterfaceType getMethodIntf() { - return methodIntf; - } - - /** - * - * - * @generated - */ - public void setMethodIntf(MethodInterfaceType newMethodIntf) { - MethodInterfaceType oldMethodIntf = methodIntf; - methodIntf = newMethodIntf == null ? METHOD_INTF_EDEFAULT : newMethodIntf; - boolean oldMethodIntfESet = methodIntfESet; - methodIntfESet = true; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF, oldMethodIntf, methodIntf, !oldMethodIntfESet)); - } - - /** - * - * - * @generated - */ - public void unsetMethodIntf() { - MethodInterfaceType oldMethodIntf = methodIntf; - boolean oldMethodIntfESet = methodIntfESet; - methodIntf = METHOD_INTF_EDEFAULT; - methodIntfESet = false; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF, oldMethodIntf, METHOD_INTF_EDEFAULT, oldMethodIntfESet)); - } - - /** - * - * - * @generated - */ - public boolean isSetMethodIntf() { - return methodIntfESet; - } - - /** - * - * - * @generated - */ public String getId() { return id; } @@ -297,8 +220,6 @@ return getMethodName(); case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS: return getMethodParams(); - case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF: - return getMethodIntf(); case EjbPackage.ASYNC_METHOD_TYPE__ID: return getId(); } @@ -319,9 +240,6 @@ case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS: setMethodParams((MethodParams)newValue); return; - case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF: - setMethodIntf((MethodInterfaceType)newValue); - return; case EjbPackage.ASYNC_METHOD_TYPE__ID: setId((String)newValue); return; @@ -343,9 +261,6 @@ case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS: setMethodParams((MethodParams)null); return; - case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF: - unsetMethodIntf(); - return; case EjbPackage.ASYNC_METHOD_TYPE__ID: setId(ID_EDEFAULT); return; @@ -365,8 +280,6 @@ return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName); case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS: return methodParams != null; - case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF: - return isSetMethodIntf(); case EjbPackage.ASYNC_METHOD_TYPE__ID: return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); } @@ -385,8 +298,6 @@ StringBuffer result = new StringBuffer(super.toString()); result.append(" (methodName: "); //$NON-NLS-1$ result.append(methodName); - result.append(", methodIntf: "); //$NON-NLS-1$ - if (methodIntfESet) result.append(methodIntf); else result.append(""); //$NON-NLS-1$ result.append(", id: "); //$NON-NLS-1$ result.append(id); result.append(')'); Index: jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java,v retrieving revision 1.4 diff -u -r1.4 EJBJarImpl.java --- jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java 15 Oct 2009 18:52:06 -0000 1.4 +++ jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java 13 Jan 2010 17:57:30 -0000 @@ -39,10 +39,10 @@ *

            * The following features are implemented: *

              + *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getModuleName Module Name}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDescriptions Descriptions}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDisplayNames Display Names}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getIcons Icons}
              • - *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getModuleName Module Name}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getEnterpriseBeans Enterprise Beans}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getInterceptors Interceptors}
              • *
            • {@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getRelationships Relationships}
              • @@ -58,54 +58,54 @@ */ public class EJBJarImpl extends EObjectImpl implements EJBJar { /** - * The cached value of the '{@link #getDescriptions() Descriptions}' containment reference list. + * The default value of the '{@link #getModuleName() Module Name}' attribute. * * - * @see #getDescriptions() + * @see #getModuleName() * @generated * @ordered */ - protected EList descriptions; + protected static final String MODULE_NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list. + * The cached value of the '{@link #getModuleName() Module Name}' attribute. * * - * @see #getDisplayNames() + * @see #getModuleName() * @generated * @ordered */ - protected EList displayNames; + protected String moduleName = MODULE_NAME_EDEFAULT; /** - * The cached value of the '{@link #getIcons() Icons}' containment reference list. + * The cached value of the '{@link #getDescriptions() Descriptions}' containment reference list. * * - * @see #getIcons() + * @see #getDescriptions() * @generated * @ordered */ - protected EList icons; + protected EList descriptions; /** - * The default value of the '{@link #getModuleName() Module Name}' attribute. + * The cached value of the '{@link #getDisplayNames() Display Names}' containment reference list. * * - * @see #getModuleName() + * @see #getDisplayNames() * @generated * @ordered */ - protected static final String MODULE_NAME_EDEFAULT = null; + protected EList displayNames; /** - * The cached value of the '{@link #getModuleName() Module Name}' attribute. + * The cached value of the '{@link #getIcons() Icons}' containment reference list. * * - * @see #getModuleName() + * @see #getIcons() * @generated * @ordered */ - protected String moduleName = MODULE_NAME_EDEFAULT; + protected EList icons; /** * The cached value of the '{@link #getEnterpriseBeans() Enterprise Beans}' containment reference. @@ -661,14 +661,14 @@ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case EjbPackage.EJB_JAR__MODULE_NAME: + return getModuleName(); case EjbPackage.EJB_JAR__DESCRIPTIONS: return getDescriptions(); case EjbPackage.EJB_JAR__DISPLAY_NAMES: return getDisplayNames(); case EjbPackage.EJB_JAR__ICONS: return getIcons(); - case EjbPackage.EJB_JAR__MODULE_NAME: - return getModuleName(); case EjbPackage.EJB_JAR__ENTERPRISE_BEANS: return getEnterpriseBeans(); case EjbPackage.EJB_JAR__INTERCEPTORS: @@ -698,6 +698,9 @@ @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case EjbPackage.EJB_JAR__MODULE_NAME: + setModuleName((String)newValue); + return; case EjbPackage.EJB_JAR__DESCRIPTIONS: getDescriptions().clear(); getDescriptions().addAll((Collection)newValue); @@ -710,9 +713,6 @@ getIcons().clear(); getIcons().addAll((Collection)newValue); return; - case EjbPackage.EJB_JAR__MODULE_NAME: - setModuleName((String)newValue); - return; case EjbPackage.EJB_JAR__ENTERPRISE_BEANS: setEnterpriseBeans((EnterpriseBeans)newValue); return; @@ -749,6 +749,9 @@ @Override public void eUnset(int featureID) { switch (featureID) { + case EjbPackage.EJB_JAR__MODULE_NAME: + setModuleName(MODULE_NAME_EDEFAULT); + return; case EjbPackage.EJB_JAR__DESCRIPTIONS: getDescriptions().clear(); return; @@ -758,9 +761,6 @@ case EjbPackage.EJB_JAR__ICONS: getIcons().clear(); return; - case EjbPackage.EJB_JAR__MODULE_NAME: - setModuleName(MODULE_NAME_EDEFAULT); - return; case EjbPackage.EJB_JAR__ENTERPRISE_BEANS: setEnterpriseBeans((EnterpriseBeans)null); return; @@ -797,14 +797,14 @@ @Override public boolean eIsSet(int featureID) { switch (featureID) { + case EjbPackage.EJB_JAR__MODULE_NAME: + return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName); case EjbPackage.EJB_JAR__DESCRIPTIONS: return descriptions != null && !descriptions.isEmpty(); case EjbPackage.EJB_JAR__DISPLAY_NAMES: return displayNames != null && !displayNames.isEmpty(); case EjbPackage.EJB_JAR__ICONS: return icons != null && !icons.isEmpty(); - case EjbPackage.EJB_JAR__MODULE_NAME: - return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName); case EjbPackage.EJB_JAR__ENTERPRISE_BEANS: return enterpriseBeans != null; case EjbPackage.EJB_JAR__INTERCEPTORS: Index: jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java,v retrieving revision 1.3 diff -u -r1.3 JavaeePackage.java --- jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java 15 Oct 2009 18:52:20 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java 13 Jan 2010 17:57:30 -0000 @@ -32,7 +32,7 @@ * * * - * $Id: JavaeePackage.java,v 1.3 2009/10/15 18:52:20 canderson Exp $ + * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $ * * * @@ -57,7 +57,7 @@ * * * - * $Id: JavaeePackage.java,v 1.3 2009/10/15 18:52:20 canderson Exp $ + * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -1154,13 +1154,22 @@ int MESSAGE_DESTINATION__MAPPED_NAME = 4; /** + * The feature id for the 'Lookup Name' attribute. + * + * + * @generated + * @ordered + */ + int MESSAGE_DESTINATION__LOOKUP_NAME = 5; + + /** * The feature id for the 'Id' attribute. * * * @generated * @ordered */ - int MESSAGE_DESTINATION__ID = 5; + int MESSAGE_DESTINATION__ID = 6; /** * The number of structural features of the 'Message Destination' class. @@ -1169,7 +1178,7 @@ * @generated * @ordered */ - int MESSAGE_DESTINATION_FEATURE_COUNT = 6; + int MESSAGE_DESTINATION_FEATURE_COUNT = 7; /** * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl Message Destination Ref}' class. @@ -1400,22 +1409,13 @@ int PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = 6; /** - * The feature id for the 'Lookup Name' attribute. - * - * - * @generated - * @ordered - */ - int PERSISTENCE_CONTEXT_REF__LOOKUP_NAME = 7; - - /** * The feature id for the 'Id' attribute. * * * @generated * @ordered */ - int PERSISTENCE_CONTEXT_REF__ID = 8; + int PERSISTENCE_CONTEXT_REF__ID = 7; /** * The number of structural features of the 'Persistence Context Ref' class. @@ -1424,7 +1424,7 @@ * @generated * @ordered */ - int PERSISTENCE_CONTEXT_REF_FEATURE_COUNT = 9; + int PERSISTENCE_CONTEXT_REF_FEATURE_COUNT = 8; /** * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl Persistence Unit Ref}' class. @@ -1482,22 +1482,13 @@ int PERSISTENCE_UNIT_REF__INJECTION_TARGETS = 4; /** - * The feature id for the 'Lookup Name' attribute. - * - * - * @generated - * @ordered - */ - int PERSISTENCE_UNIT_REF__LOOKUP_NAME = 5; - - /** * The feature id for the 'Id' attribute. * * * @generated * @ordered */ - int PERSISTENCE_UNIT_REF__ID = 6; + int PERSISTENCE_UNIT_REF__ID = 5; /** * The number of structural features of the 'Persistence Unit Ref' class. @@ -1506,7 +1497,7 @@ * @generated * @ordered */ - int PERSISTENCE_UNIT_REF_FEATURE_COUNT = 7; + int PERSISTENCE_UNIT_REF_FEATURE_COUNT = 6; /** * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl Port Component Ref}' class. @@ -3718,6 +3709,17 @@ EAttribute getMessageDestination_MappedName(); /** + * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getLookupName Lookup Name}'. + * + * + * @return the meta object for the attribute 'Lookup Name'. + * @see org.eclipse.jst.javaee.core.MessageDestination#getLookupName() + * @see #getMessageDestination() + * @generated + */ + EAttribute getMessageDestination_LookupName(); + + /** * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getId Id}'. * * @@ -3979,17 +3981,6 @@ EReference getPersistenceContextRef_InjectionTargets(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName Lookup Name}'. - * - * - * @return the meta object for the attribute 'Lookup Name'. - * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName() - * @see #getPersistenceContextRef() - * @generated - */ - EAttribute getPersistenceContextRef_LookupName(); - - /** * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId Id}'. * * @@ -4066,17 +4057,6 @@ EReference getPersistenceUnitRef_InjectionTargets(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName Lookup Name}'. - * - * - * @return the meta object for the attribute 'Lookup Name'. - * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName() - * @see #getPersistenceUnitRef() - * @generated - */ - EAttribute getPersistenceUnitRef_LookupName(); - - /** * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId Id}'. * * @@ -6124,6 +6104,14 @@ EAttribute MESSAGE_DESTINATION__MAPPED_NAME = eINSTANCE.getMessageDestination_MappedName(); /** + * The meta object literal for the 'Lookup Name' attribute feature. + * + * + * @generated + */ + EAttribute MESSAGE_DESTINATION__LOOKUP_NAME = eINSTANCE.getMessageDestination_LookupName(); + + /** * The meta object literal for the 'Id' attribute feature. * * @@ -6322,14 +6310,6 @@ EReference PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceContextRef_InjectionTargets(); /** - * The meta object literal for the 'Lookup Name' attribute feature. - * - * - * @generated - */ - EAttribute PERSISTENCE_CONTEXT_REF__LOOKUP_NAME = eINSTANCE.getPersistenceContextRef_LookupName(); - - /** * The meta object literal for the 'Id' attribute feature. * * @@ -6388,14 +6368,6 @@ EReference PERSISTENCE_UNIT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceUnitRef_InjectionTargets(); /** - * The meta object literal for the 'Lookup Name' attribute feature. - * - * - * @generated - */ - EAttribute PERSISTENCE_UNIT_REF__LOOKUP_NAME = eINSTANCE.getPersistenceUnitRef_LookupName(); - - /** * The meta object literal for the 'Id' attribute feature. * * Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java,v retrieving revision 1.2 diff -u -r1.2 JcaPackageImpl.java --- jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java 16 Oct 2009 03:33:21 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java 13 Jan 2010 17:57:32 -0000 @@ -631,8 +631,17 @@ * * @generated */ + public EAttribute getConnector_ModuleName() { + return (EAttribute)connectorEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ public EReference getConnector_Descriptions() { - return (EReference)connectorEClass.getEStructuralFeatures().get(0); + return (EReference)connectorEClass.getEStructuralFeatures().get(1); } /** @@ -641,7 +650,7 @@ * @generated */ public EReference getConnector_DisplayNames() { - return (EReference)connectorEClass.getEStructuralFeatures().get(1); + return (EReference)connectorEClass.getEStructuralFeatures().get(2); } /** @@ -650,7 +659,7 @@ * @generated */ public EReference getConnector_Icons() { - return (EReference)connectorEClass.getEStructuralFeatures().get(2); + return (EReference)connectorEClass.getEStructuralFeatures().get(3); } /** @@ -659,7 +668,7 @@ * @generated */ public EAttribute getConnector_VendorName() { - return (EAttribute)connectorEClass.getEStructuralFeatures().get(3); + return (EAttribute)connectorEClass.getEStructuralFeatures().get(4); } /** @@ -668,7 +677,7 @@ * @generated */ public EAttribute getConnector_EisType() { - return (EAttribute)connectorEClass.getEStructuralFeatures().get(4); + return (EAttribute)connectorEClass.getEStructuralFeatures().get(5); } /** @@ -677,7 +686,7 @@ * @generated */ public EAttribute getConnector_ResourceadapterVersion() { - return (EAttribute)connectorEClass.getEStructuralFeatures().get(5); + return (EAttribute)connectorEClass.getEStructuralFeatures().get(6); } /** @@ -686,7 +695,7 @@ * @generated */ public EReference getConnector_License() { - return (EReference)connectorEClass.getEStructuralFeatures().get(6); + return (EReference)connectorEClass.getEStructuralFeatures().get(7); } /** @@ -695,7 +704,7 @@ * @generated */ public EReference getConnector_Resourceadapter() { - return (EReference)connectorEClass.getEStructuralFeatures().get(7); + return (EReference)connectorEClass.getEStructuralFeatures().get(8); } /** @@ -704,7 +713,7 @@ * @generated */ public EAttribute getConnector_RequiredWorkContext() { - return (EAttribute)connectorEClass.getEStructuralFeatures().get(8); + return (EAttribute)connectorEClass.getEStructuralFeatures().get(9); } /** @@ -713,7 +722,7 @@ * @generated */ public EAttribute getConnector_Id() { - return (EAttribute)connectorEClass.getEStructuralFeatures().get(9); + return (EAttribute)connectorEClass.getEStructuralFeatures().get(10); } /** @@ -722,7 +731,7 @@ * @generated */ public EAttribute getConnector_MetadataComplete() { - return (EAttribute)connectorEClass.getEStructuralFeatures().get(10); + return (EAttribute)connectorEClass.getEStructuralFeatures().get(11); } /** @@ -731,7 +740,7 @@ * @generated */ public EAttribute getConnector_Version() { - return (EAttribute)connectorEClass.getEStructuralFeatures().get(11); + return (EAttribute)connectorEClass.getEStructuralFeatures().get(12); } /** @@ -1232,6 +1241,7 @@ createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__ID); connectorEClass = createEClass(CONNECTOR); + createEAttribute(connectorEClass, CONNECTOR__MODULE_NAME); createEReference(connectorEClass, CONNECTOR__DESCRIPTIONS); createEReference(connectorEClass, CONNECTOR__DISPLAY_NAMES); createEReference(connectorEClass, CONNECTOR__ICONS); @@ -1379,12 +1389,13 @@ initEAttribute(getConnectionDefinition_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getConnector_ModuleName(), theXMLTypePackage.getString(), "moduleName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getConnector_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getConnector_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getConnector_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getConnector_VendorName(), theXMLTypePackage.getString(), "vendorName", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getConnector_EisType(), theXMLTypePackage.getString(), "eisType", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getConnector_ResourceadapterVersion(), theXMLTypePackage.getString(), "resourceadapterVersion", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getConnector_VendorName(), theXMLTypePackage.getString(), "vendorName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getConnector_EisType(), theXMLTypePackage.getString(), "eisType", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getConnector_ResourceadapterVersion(), theXMLTypePackage.getString(), "resourceadapterVersion", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getConnector_Resourceadapter(), this.getResourceAdapter(), null, "resourceadapter", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getConnector_RequiredWorkContext(), theJavaeePackage.getFullyQualifiedClassType(), "requiredWorkContext", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -1417,10 +1428,10 @@ initEAttribute(getMessageListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEReference(getOutboundResourceAdapter_ConnectionDefinition(), this.getConnectionDefinition(), null, "connectionDefinition", null, 1, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportType(), "transactionSupport", null, 1, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEReference(getOutboundResourceAdapter_ConnectionDefinition(), this.getConnectionDefinition(), null, "connectionDefinition", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportType(), "transactionSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getOutboundResourceAdapter_AuthenticationMechanism(), this.getAuthenticationMechanism(), null, "authenticationMechanism", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), theJavaeePackage.getTrueFalseType(), "reauthenticationSupport", null, 1, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), theJavaeePackage.getTrueFalseType(), "reauthenticationSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getOutboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(requiredConfigPropertyEClass, RequiredConfigProperty.class, "RequiredConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -1758,6 +1769,14 @@ new String[] { "name", "connectorType", //$NON-NLS-1$ //$NON-NLS-2$ "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); + addAnnotation + (getConnector_ModuleName(), + source, + new String[] { + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$ + "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$ }); addAnnotation (getConnector_Descriptions(), Index: jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java,v retrieving revision 1.2 diff -u -r1.2 ConnectorImpl.java --- jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java 16 Oct 2009 03:33:21 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java 13 Jan 2010 17:57:32 -0000 @@ -45,6 +45,7 @@ *

              * The following features are implemented: *

                + *
              • {@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getModuleName Module Name}
                • *
              • {@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDescriptions Descriptions}
                • *
              • {@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDisplayNames Display Names}
                • *
              • {@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getIcons Icons}
                • @@ -64,6 +65,26 @@ */ public class ConnectorImpl extends EObjectImpl implements Connector { /** + * The default value of the '{@link #getModuleName() Module Name}' attribute. + * + * + * @see #getModuleName() + * @generated + * @ordered + */ + protected static final String MODULE_NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getModuleName() Module Name}' attribute. + * + * + * @see #getModuleName() + * @generated + * @ordered + */ + protected String moduleName = MODULE_NAME_EDEFAULT; + + /** * The cached value of the '{@link #getDescriptions() Descriptions}' containment reference list. * * @@ -285,6 +306,27 @@ * * @generated */ + public String getModuleName() { + return moduleName; + } + + /** + * + * + * @generated + */ + public void setModuleName(String newModuleName) { + String oldModuleName = moduleName; + moduleName = newModuleName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__MODULE_NAME, oldModuleName, moduleName)); + } + + /** + * + * + * @generated + */ public List getDescriptions() { if (descriptions == null) { descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.CONNECTOR__DESCRIPTIONS); @@ -620,6 +662,8 @@ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case JcaPackage.CONNECTOR__MODULE_NAME: + return getModuleName(); case JcaPackage.CONNECTOR__DESCRIPTIONS: return getDescriptions(); case JcaPackage.CONNECTOR__DISPLAY_NAMES: @@ -657,6 +701,9 @@ @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case JcaPackage.CONNECTOR__MODULE_NAME: + setModuleName((String)newValue); + return; case JcaPackage.CONNECTOR__DESCRIPTIONS: getDescriptions().clear(); getDescriptions().addAll((Collection)newValue); @@ -709,6 +756,9 @@ @Override public void eUnset(int featureID) { switch (featureID) { + case JcaPackage.CONNECTOR__MODULE_NAME: + setModuleName(MODULE_NAME_EDEFAULT); + return; case JcaPackage.CONNECTOR__DESCRIPTIONS: getDescriptions().clear(); return; @@ -757,6 +807,8 @@ @Override public boolean eIsSet(int featureID) { switch (featureID) { + case JcaPackage.CONNECTOR__MODULE_NAME: + return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName); case JcaPackage.CONNECTOR__DESCRIPTIONS: return descriptions != null && !descriptions.isEmpty(); case JcaPackage.CONNECTOR__DISPLAY_NAMES: @@ -795,7 +847,9 @@ if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (vendorName: "); //$NON-NLS-1$ + result.append(" (moduleName: "); //$NON-NLS-1$ + result.append(moduleName); + result.append(", vendorName: "); //$NON-NLS-1$ result.append(vendorName); result.append(", eisType: "); //$NON-NLS-1$ result.append(eisType); Index: jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java,v retrieving revision 1.3 diff -u -r1.3 EjbPackage.java --- jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java 15 Oct 2009 18:52:07 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java 13 Jan 2010 17:57:32 -0000 @@ -32,7 +32,7 @@ * * * - * $Id: EjbPackage.java,v 1.3 2009/10/15 18:52:07 canderson Exp $ + * $Id: ejb-jar_3_1.xsd,v 1.3 2009/10/02 06:33:19 ccc Exp $ * * * @@ -40,7 +40,7 @@ * This is the XML Schema for the EJB 3.1 deployment descriptor. * * All EJB deployment descriptors must indicate - * the ejb-jar schema by using the Java EE namespace: + * the schema by using the Java EE namespace: * * http://java.sun.com/xml/ns/javaee * @@ -80,7 +80,7 @@ * * * - * $Id: EjbPackage.java,v 1.3 2009/10/15 18:52:07 canderson Exp $ + * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $ * * * @@ -105,7 +105,7 @@ * * * - * $Id: EjbPackage.java,v 1.3 2009/10/15 18:52:07 canderson Exp $ + * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -692,22 +692,13 @@ int ASYNC_METHOD_TYPE__METHOD_PARAMS = 1; /** - * The feature id for the 'Method Intf' attribute. - * - * - * @generated - * @ordered - */ - int ASYNC_METHOD_TYPE__METHOD_INTF = 2; - - /** * The feature id for the 'Id' attribute. * * * @generated * @ordered */ - int ASYNC_METHOD_TYPE__ID = 3; + int ASYNC_METHOD_TYPE__ID = 2; /** * The number of structural features of the 'Async Method Type' class. @@ -716,7 +707,7 @@ * @generated * @ordered */ - int ASYNC_METHOD_TYPE_FEATURE_COUNT = 4; + int ASYNC_METHOD_TYPE_FEATURE_COUNT = 3; /** * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl CMP Field}' class. @@ -977,40 +968,40 @@ int EJB_JAR = 13; /** - * The feature id for the 'Descriptions' containment reference list. + * The feature id for the 'Module Name' attribute. * * * @generated * @ordered */ - int EJB_JAR__DESCRIPTIONS = 0; + int EJB_JAR__MODULE_NAME = 0; /** - * The feature id for the 'Display Names' containment reference list. + * The feature id for the 'Descriptions' containment reference list. * * * @generated * @ordered */ - int EJB_JAR__DISPLAY_NAMES = 1; + int EJB_JAR__DESCRIPTIONS = 1; /** - * The feature id for the 'Icons' containment reference list. + * The feature id for the 'Display Names' containment reference list. * * * @generated * @ordered */ - int EJB_JAR__ICONS = 2; + int EJB_JAR__DISPLAY_NAMES = 2; /** - * The feature id for the 'Module Name' attribute. + * The feature id for the 'Icons' containment reference list. * * * @generated * @ordered */ - int EJB_JAR__MODULE_NAME = 3; + int EJB_JAR__ICONS = 3; /** * The feature id for the 'Enterprise Beans' containment reference. @@ -4270,17 +4261,6 @@ EReference getAsyncMethodType_MethodParams(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf Method Intf}'. - * - * - * @return the meta object for the attribute 'Method Intf'. - * @see org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf() - * @see #getAsyncMethodType() - * @generated - */ - EAttribute getAsyncMethodType_MethodIntf(); - - /** * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId Id}'. * * @@ -8005,14 +7985,6 @@ EReference ASYNC_METHOD_TYPE__METHOD_PARAMS = eINSTANCE.getAsyncMethodType_MethodParams(); /** - * The meta object literal for the 'Method Intf' attribute feature. - * - * - * @generated - */ - EAttribute ASYNC_METHOD_TYPE__METHOD_INTF = eINSTANCE.getAsyncMethodType_MethodIntf(); - - /** * The meta object literal for the 'Id' attribute feature. * * Index: jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java,v retrieving revision 1.2 diff -u -r1.2 WebappPackage.java --- jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java 16 Oct 2009 03:33:22 -0000 1.2 +++ jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java 13 Jan 2010 17:57:34 -0000 @@ -30,7 +30,7 @@ * * * - * $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $ + * $Id: web-app_3_0.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -78,7 +78,7 @@ * * * - * $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $ + * $Id: web-common_3_0.xsd,v 1.5 2009/10/15 19:08:12 ccc Exp $ * * * @@ -126,7 +126,7 @@ * * * - * $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $ + * $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $ * * * @@ -151,7 +151,7 @@ * * * - * $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $ + * $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $ * * * @@ -320,46 +320,12 @@ * * * - * Copyright 2003-2009 Sun Microsystems, Inc. - * 4150 Network Circle - * Santa Clara, California 95054 - * U.S.A - * All rights reserved. - * - * Sun Microsystems, Inc. has intellectual property rights - * relating to technology described in this document. In - * particular, and without limitation, these intellectual - * property rights may include one or more of the U.S. patents - * listed at http://www.sun.com/patents and one or more - * additional patents or pending patent applications in the - * U.S. and other countries. - * - * This document and the technology which it describes are - * distributed under licenses restricting their use, copying, - * distribution, and decompilation. No part of this document - * may be reproduced in any form by any means without prior - * written authorization of Sun and its licensors, if any. - * - * Third-party software, including font technology, is - * copyrighted and licensed from Sun suppliers. - * - * Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE, - * JavaServer Pages, Enterprise JavaBeans and the Java Coffee - * Cup logo are trademarks or registered trademarks of Sun - * Microsystems, Inc. in the U.S. and other countries. - * - * Federal Acquisitions: Commercial Software - Government Users - * Subject to Standard License Terms and Conditions. - * - * - * - * * This is the XML Schema for the JSP 2.2 deployment descriptor * types. The JSP 2.2 schema contains all the special * structures and datatypes that are necessary to use JSP files * from a web application. * - * The contents of this schema is used by the web-app_3_0.xsd + * The contents of this schema is used by the web-common_3_0.xsd * file to define JSP specific content. * * Index: jee-models/org/eclipse/jst/javaee/application/Application.java =================================================================== RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/Application.java,v retrieving revision 1.3 diff -u -r1.3 Application.java --- jee-models/org/eclipse/jst/javaee/application/Application.java 15 Oct 2009 18:52:18 -0000 1.3 +++ jee-models/org/eclipse/jst/javaee/application/Application.java 13 Jan 2010 17:57:28 -0000 @@ -157,9 +157,11 @@ * * * If initialize-in-order is true, modules must be initialized - * in the order they're listed in this deployment descriptor. - * If not set or set to false, the order of initialization is - * unspecified and may be product-dependent. + * in the order they're listed in this deployment descriptor, + * with the exception of application client modules, which can + * be initialized in any order. + * If initialize-in-order is not set or set to false, the order + * of initialization is unspecified and may be product-dependent. * * @since Java EE 6, Application 6 *