View | Details | Raw Unified | Return to bug 408354
Collapse All | Expand All

(-)jee-models/org/eclipse/jst/javaee/core/ConnectionFactoryResourceType.java (-12 / +12 lines)
Lines 33-39 Link Here
33
 * <ul>
33
 * <ul>
34
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getDescription <em>Description</em>}</li>
34
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getDescription <em>Description</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getName <em>Name</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getName <em>Name</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName <em>Class Name</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName <em>Interface Name</em>}</li>
37
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getResourceAdapter <em>Resource Adapter</em>}</li>
37
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getResourceAdapter <em>Resource Adapter</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getMaxPoolSize <em>Max Pool Size</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getMaxPoolSize <em>Max Pool Size</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getMinPoolSize <em>Min Pool Size</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getMinPoolSize <em>Min Pool Size</em>}</li>
Lines 106-138 Link Here
106
	void setName(String value);
106
	void setName(String value);
107
107
108
	/**
108
	/**
109
	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
109
	 * Returns the value of the '<em><b>Interface Name</b></em>' attribute.
110
	 * <!-- begin-user-doc -->
110
	 * <!-- begin-user-doc -->
111
	 * <!-- end-user-doc -->
111
	 * <!-- end-user-doc -->
112
	 * <!-- begin-model-doc -->
112
	 * <!-- begin-model-doc -->
113
	 * 
113
	 * 
114
	 * 
114
	 * 
115
	 *             The fully qualified domain name of the connection factory 
115
	 *             The fully qualified class name of the connection factory 
116
	 *             interface class. 
116
	 *             interface.  
117
	 *             
117
	 *             
118
	 *           
118
	 *           
119
	 * <!-- end-model-doc -->
119
	 * <!-- end-model-doc -->
120
	 * @return the value of the '<em>Class Name</em>' attribute.
120
	 * @return the value of the '<em>Interface Name</em>' attribute.
121
	 * @see #setClassName(String)
121
	 * @see #setInterfaceName(String)
122
	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getConnectionFactoryResourceType_ClassName()
122
	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getConnectionFactoryResourceType_InterfaceName()
123
	 * @generated
123
	 * @generated
124
	 */
124
	 */
125
	String getClassName();
125
	String getInterfaceName();
126
126
127
	/**
127
	/**
128
	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName <em>Class Name</em>}' attribute.
128
	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName <em>Interface Name</em>}' attribute.
129
	 * <!-- begin-user-doc -->
129
	 * <!-- begin-user-doc -->
130
	 * <!-- end-user-doc -->
130
	 * <!-- end-user-doc -->
131
	 * @param value the new value of the '<em>Class Name</em>' attribute.
131
	 * @param value the new value of the '<em>Interface Name</em>' attribute.
132
	 * @see #getClassName()
132
	 * @see #getInterfaceName()
133
	 * @generated
133
	 * @generated
134
	 */
134
	 */
135
	void setClassName(String value);
135
	void setInterfaceName(String value);
136
136
137
	/**
137
	/**
138
	 * Returns the value of the '<em><b>Resource Adapter</b></em>' attribute.
138
	 * Returns the value of the '<em><b>Resource Adapter</b></em>' attribute.
(-)jee-models/org/eclipse/jst/javaee/core/JmsConnectionFactoryType.java (-2 / +39 lines)
Lines 33-38 Link Here
33
 * <ul>
33
 * <ul>
34
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getDescription <em>Description</em>}</li>
34
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getDescription <em>Description</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getName <em>Name</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getName <em>Name</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName <em>Interface Name</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getClassName <em>Class Name</em>}</li>
37
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getClassName <em>Class Name</em>}</li>
37
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getResourceAdapter <em>Resource Adapter</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getResourceAdapter <em>Resource Adapter</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getUser <em>User</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getUser <em>User</em>}</li>
Lines 109-121 Link Here
109
	void setName(String value);
110
	void setName(String value);
110
111
111
	/**
112
	/**
113
	 * Returns the value of the '<em><b>Interface Name</b></em>' attribute.
114
	 * <!-- begin-user-doc -->
115
	 * <!-- end-user-doc -->
116
	 * <!-- begin-model-doc -->
117
	 * 
118
	 * 
119
	 *             Fully-qualified name of the JMS connection factory
120
	 *             interface.  Permitted values are javax.jms.ConnectionFactory,
121
	 *             javax.jms.QueueConnectionFactory, or 
122
	 *             javax.jms.TopicConnectionFactory.  If not specified,
123
	 *             javax.jms.ConnectionFactory will be used.
124
	 *             
125
	 *           
126
	 * <!-- end-model-doc -->
127
	 * @return the value of the '<em>Interface Name</em>' attribute.
128
	 * @see #setInterfaceName(String)
129
	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getJmsConnectionFactoryType_InterfaceName()
130
	 * @generated
131
	 */
132
	String getInterfaceName();
133
134
	/**
135
	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName <em>Interface Name</em>}' attribute.
136
	 * <!-- begin-user-doc -->
137
	 * <!-- end-user-doc -->
138
	 * @param value the new value of the '<em>Interface Name</em>' attribute.
139
	 * @see #getInterfaceName()
140
	 * @generated
141
	 */
142
	void setInterfaceName(String value);
143
144
	/**
112
	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
145
	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
113
	 * <!-- begin-user-doc -->
146
	 * <!-- begin-user-doc -->
114
	 * <!-- end-user-doc -->
147
	 * <!-- end-user-doc -->
115
	 * <!-- begin-model-doc -->
148
	 * <!-- begin-model-doc -->
116
	 * 
149
	 * 
117
	 * 
150
	 * 
118
	 *             javax.jms.ConnectionFactory, javax.jms.QueueConnectionFactory, or javax.jms.TopicConnectionFactory
151
	 *             Fully-qualified name of the JMS connection factory
152
	 *             implementation class.  Ignored if a resource adapter  
153
	 *             is used.
119
	 *             
154
	 *             
120
	 *           
155
	 *           
121
	 * <!-- end-model-doc -->
156
	 * <!-- end-model-doc -->
Lines 143-149 Link Here
143
	 * <!-- begin-model-doc -->
178
	 * <!-- begin-model-doc -->
144
	 * 
179
	 * 
145
	 * 
180
	 * 
146
	 *             Resource adapter name.
181
	 *             Resource adapter name.  If not specified, the application
182
	 *             server will define the default behavior, which may or may
183
	 *             not involve the use of a resource adapter.
147
	 *             
184
	 *             
148
	 *           
185
	 *           
149
	 * <!-- end-model-doc -->
186
	 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/core/JmsDestinationType.java (-2 / +37 lines)
Lines 31-36 Link Here
31
 * <ul>
31
 * <ul>
32
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getDescription <em>Description</em>}</li>
32
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getDescription <em>Description</em>}</li>
33
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getName <em>Name</em>}</li>
33
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getName <em>Name</em>}</li>
34
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName <em>Interface Name</em>}</li>
34
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getClassName <em>Class Name</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getClassName <em>Class Name</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getResourceAdapter <em>Resource Adapter</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getResourceAdapter <em>Resource Adapter</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getDestinationName <em>Destination Name</em>}</li>
37
 *   <li>{@link org.eclipse.jst.javaee.core.JmsDestinationType#getDestinationName <em>Destination Name</em>}</li>
Lines 102-114 Link Here
102
	void setName(String value);
103
	void setName(String value);
103
104
104
	/**
105
	/**
106
	 * Returns the value of the '<em><b>Interface Name</b></em>' attribute.
107
	 * <!-- begin-user-doc -->
108
	 * <!-- end-user-doc -->
109
	 * <!-- begin-model-doc -->
110
	 * 
111
	 * 
112
	 *             Fully-qualified name of the JMS destination interface.
113
	 *             Permitted values are javax.jms.Queue and javax.jms.Topic
114
	 *             
115
	 *           
116
	 * <!-- end-model-doc -->
117
	 * @return the value of the '<em>Interface Name</em>' attribute.
118
	 * @see #setInterfaceName(String)
119
	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getJmsDestinationType_InterfaceName()
120
	 * @generated
121
	 */
122
	String getInterfaceName();
123
124
	/**
125
	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName <em>Interface Name</em>}' attribute.
126
	 * <!-- begin-user-doc -->
127
	 * <!-- end-user-doc -->
128
	 * @param value the new value of the '<em>Interface Name</em>' attribute.
129
	 * @see #getInterfaceName()
130
	 * @generated
131
	 */
132
	void setInterfaceName(String value);
133
134
	/**
105
	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
135
	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
106
	 * <!-- begin-user-doc -->
136
	 * <!-- begin-user-doc -->
107
	 * <!-- end-user-doc -->
137
	 * <!-- end-user-doc -->
108
	 * <!-- begin-model-doc -->
138
	 * <!-- begin-model-doc -->
109
	 * 
139
	 * 
110
	 * 
140
	 * 
111
	 *             javax.jms.Queue or javax.jms.Topic
141
	 *             Fully-qualified name of the JMS destination implementation
142
	 *             class.  Ignored if a resource adapter is used unless the
143
	 *             resource adapter defines more than one destination implementation
144
	 *             class for the specified interface.
112
	 *             
145
	 *             
113
	 *           
146
	 *           
114
	 * <!-- end-model-doc -->
147
	 * <!-- end-model-doc -->
Lines 136-142 Link Here
136
	 * <!-- begin-model-doc -->
169
	 * <!-- begin-model-doc -->
137
	 * 
170
	 * 
138
	 * 
171
	 * 
139
	 *             Resource adapter name.
172
	 *             Resource adapter name.  If not specified, the application
173
	 *             server will define the default behavior, which may or may
174
	 *             not involve the use of a resource adapter.
140
	 *             
175
	 *             
141
	 *           
176
	 *           
142
	 * <!-- end-model-doc -->
177
	 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/ConnectionFactoryResourceTypeImpl.java (-23 / +23 lines)
Lines 37-43 Link Here
37
 * <ul>
37
 * <ul>
38
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getDescription <em>Description</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getDescription <em>Description</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getName <em>Name</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getName <em>Name</em>}</li>
40
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getClassName <em>Class Name</em>}</li>
40
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getInterfaceName <em>Interface Name</em>}</li>
41
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
41
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
42
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getMaxPoolSize <em>Max Pool Size</em>}</li>
42
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getMaxPoolSize <em>Max Pool Size</em>}</li>
43
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getMinPoolSize <em>Min Pool Size</em>}</li>
43
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.ConnectionFactoryResourceTypeImpl#getMinPoolSize <em>Min Pool Size</em>}</li>
Lines 81-104 Link Here
81
	protected String name = NAME_EDEFAULT;
81
	protected String name = NAME_EDEFAULT;
82
82
83
	/**
83
	/**
84
	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
84
	 * The default value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
85
	 * <!-- begin-user-doc -->
85
	 * <!-- begin-user-doc -->
86
	 * <!-- end-user-doc -->
86
	 * <!-- end-user-doc -->
87
	 * @see #getClassName()
87
	 * @see #getInterfaceName()
88
	 * @generated
88
	 * @generated
89
	 * @ordered
89
	 * @ordered
90
	 */
90
	 */
91
	protected static final String CLASS_NAME_EDEFAULT = null;
91
	protected static final String INTERFACE_NAME_EDEFAULT = null;
92
92
93
	/**
93
	/**
94
	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
94
	 * The cached value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
95
	 * <!-- begin-user-doc -->
95
	 * <!-- begin-user-doc -->
96
	 * <!-- end-user-doc -->
96
	 * <!-- end-user-doc -->
97
	 * @see #getClassName()
97
	 * @see #getInterfaceName()
98
	 * @generated
98
	 * @generated
99
	 * @ordered
99
	 * @ordered
100
	 */
100
	 */
101
	protected String className = CLASS_NAME_EDEFAULT;
101
	protected String interfaceName = INTERFACE_NAME_EDEFAULT;
102
102
103
	/**
103
	/**
104
	 * The default value of the '{@link #getResourceAdapter() <em>Resource Adapter</em>}' attribute.
104
	 * The default value of the '{@link #getResourceAdapter() <em>Resource Adapter</em>}' attribute.
Lines 307-314 Link Here
307
	 * <!-- end-user-doc -->
307
	 * <!-- end-user-doc -->
308
	 * @generated
308
	 * @generated
309
	 */
309
	 */
310
	public String getClassName() {
310
	public String getInterfaceName() {
311
		return className;
311
		return interfaceName;
312
	}
312
	}
313
313
314
	/**
314
	/**
Lines 316-326 Link Here
316
	 * <!-- end-user-doc -->
316
	 * <!-- end-user-doc -->
317
	 * @generated
317
	 * @generated
318
	 */
318
	 */
319
	public void setClassName(String newClassName) {
319
	public void setInterfaceName(String newInterfaceName) {
320
		String oldClassName = className;
320
		String oldInterfaceName = interfaceName;
321
		className = newClassName;
321
		interfaceName = newInterfaceName;
322
		if (eNotificationRequired())
322
		if (eNotificationRequired())
323
			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME, oldClassName, className));
323
			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME, oldInterfaceName, interfaceName));
324
	}
324
	}
325
325
326
	/**
326
	/**
Lines 493-500 Link Here
493
				return getDescription();
493
				return getDescription();
494
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
494
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
495
				return getName();
495
				return getName();
496
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
496
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
497
				return getClassName();
497
				return getInterfaceName();
498
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
498
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
499
				return getResourceAdapter();
499
				return getResourceAdapter();
500
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE:
500
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE:
Lines 526-533 Link Here
526
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
526
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
527
				setName((String)newValue);
527
				setName((String)newValue);
528
				return;
528
				return;
529
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
529
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
530
				setClassName((String)newValue);
530
				setInterfaceName((String)newValue);
531
				return;
531
				return;
532
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
532
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
533
				setResourceAdapter((String)newValue);
533
				setResourceAdapter((String)newValue);
Lines 566-573 Link Here
566
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
566
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
567
				setName(NAME_EDEFAULT);
567
				setName(NAME_EDEFAULT);
568
				return;
568
				return;
569
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
569
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
570
				setClassName(CLASS_NAME_EDEFAULT);
570
				setInterfaceName(INTERFACE_NAME_EDEFAULT);
571
				return;
571
				return;
572
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
572
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
573
				setResourceAdapter(RESOURCE_ADAPTER_EDEFAULT);
573
				setResourceAdapter(RESOURCE_ADAPTER_EDEFAULT);
Lines 603-610 Link Here
603
				return description != null;
603
				return description != null;
604
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
604
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__NAME:
605
				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
605
				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
606
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME:
606
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME:
607
				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
607
				return INTERFACE_NAME_EDEFAULT == null ? interfaceName != null : !INTERFACE_NAME_EDEFAULT.equals(interfaceName);
608
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
608
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER:
609
				return RESOURCE_ADAPTER_EDEFAULT == null ? resourceAdapter != null : !RESOURCE_ADAPTER_EDEFAULT.equals(resourceAdapter);
609
				return RESOURCE_ADAPTER_EDEFAULT == null ? resourceAdapter != null : !RESOURCE_ADAPTER_EDEFAULT.equals(resourceAdapter);
610
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE:
610
			case JavaeePackage.CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE:
Lines 633-640 Link Here
633
		StringBuffer result = new StringBuffer(super.toString());
633
		StringBuffer result = new StringBuffer(super.toString());
634
		result.append(" (name: "); //$NON-NLS-1$
634
		result.append(" (name: "); //$NON-NLS-1$
635
		result.append(name);
635
		result.append(name);
636
		result.append(", className: "); //$NON-NLS-1$
636
		result.append(", interfaceName: "); //$NON-NLS-1$
637
		result.append(className);
637
		result.append(interfaceName);
638
		result.append(", resourceAdapter: "); //$NON-NLS-1$
638
		result.append(", resourceAdapter: "); //$NON-NLS-1$
639
		result.append(resourceAdapter);
639
		result.append(resourceAdapter);
640
		result.append(", maxPoolSize: "); //$NON-NLS-1$
640
		result.append(", maxPoolSize: "); //$NON-NLS-1$
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java (-28 / +66 lines)
Lines 843-849 Link Here
843
	 * <!-- end-user-doc -->
843
	 * <!-- end-user-doc -->
844
	 * @generated
844
	 * @generated
845
	 */
845
	 */
846
	public EAttribute getConnectionFactoryResourceType_ClassName() {
846
	public EAttribute getConnectionFactoryResourceType_InterfaceName() {
847
		return (EAttribute)connectionFactoryResourceTypeEClass.getEStructuralFeatures().get(2);
847
		return (EAttribute)connectionFactoryResourceTypeEClass.getEStructuralFeatures().get(2);
848
	}
848
	}
849
849
Lines 1536-1542 Link Here
1536
	 * <!-- end-user-doc -->
1536
	 * <!-- end-user-doc -->
1537
	 * @generated
1537
	 * @generated
1538
	 */
1538
	 */
1539
	public EAttribute getJmsConnectionFactoryType_ClassName() {
1539
	public EAttribute getJmsConnectionFactoryType_InterfaceName() {
1540
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(2);
1540
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(2);
1541
	}
1541
	}
1542
1542
Lines 1545-1551 Link Here
1545
	 * <!-- end-user-doc -->
1545
	 * <!-- end-user-doc -->
1546
	 * @generated
1546
	 * @generated
1547
	 */
1547
	 */
1548
	public EAttribute getJmsConnectionFactoryType_ResourceAdapter() {
1548
	public EAttribute getJmsConnectionFactoryType_ClassName() {
1549
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(3);
1549
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(3);
1550
	}
1550
	}
1551
1551
Lines 1554-1560 Link Here
1554
	 * <!-- end-user-doc -->
1554
	 * <!-- end-user-doc -->
1555
	 * @generated
1555
	 * @generated
1556
	 */
1556
	 */
1557
	public EAttribute getJmsConnectionFactoryType_User() {
1557
	public EAttribute getJmsConnectionFactoryType_ResourceAdapter() {
1558
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(4);
1558
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(4);
1559
	}
1559
	}
1560
1560
Lines 1563-1569 Link Here
1563
	 * <!-- end-user-doc -->
1563
	 * <!-- end-user-doc -->
1564
	 * @generated
1564
	 * @generated
1565
	 */
1565
	 */
1566
	public EAttribute getJmsConnectionFactoryType_Password() {
1566
	public EAttribute getJmsConnectionFactoryType_User() {
1567
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(5);
1567
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(5);
1568
	}
1568
	}
1569
1569
Lines 1572-1578 Link Here
1572
	 * <!-- end-user-doc -->
1572
	 * <!-- end-user-doc -->
1573
	 * @generated
1573
	 * @generated
1574
	 */
1574
	 */
1575
	public EAttribute getJmsConnectionFactoryType_ClientId() {
1575
	public EAttribute getJmsConnectionFactoryType_Password() {
1576
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(6);
1576
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(6);
1577
	}
1577
	}
1578
1578
Lines 1581-1588 Link Here
1581
	 * <!-- end-user-doc -->
1581
	 * <!-- end-user-doc -->
1582
	 * @generated
1582
	 * @generated
1583
	 */
1583
	 */
1584
	public EAttribute getJmsConnectionFactoryType_ClientId() {
1585
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(7);
1586
	}
1587
1588
	/**
1589
	 * <!-- begin-user-doc -->
1590
	 * <!-- end-user-doc -->
1591
	 * @generated
1592
	 */
1584
	public EReference getJmsConnectionFactoryType_Property() {
1593
	public EReference getJmsConnectionFactoryType_Property() {
1585
		return (EReference)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(7);
1594
		return (EReference)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(8);
1586
	}
1595
	}
1587
1596
1588
	/**
1597
	/**
Lines 1591-1605 Link Here
1591
	 * @generated
1600
	 * @generated
1592
	 */
1601
	 */
1593
	public EAttribute getJmsConnectionFactoryType_Transactional() {
1602
	public EAttribute getJmsConnectionFactoryType_Transactional() {
1594
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(8);
1595
	}
1596
1597
	/**
1598
	 * <!-- begin-user-doc -->
1599
	 * <!-- end-user-doc -->
1600
	 * @generated
1601
	 */
1602
	public EAttribute getJmsConnectionFactoryType_MaxPoolSize() {
1603
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(9);
1603
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(9);
1604
	}
1604
	}
1605
1605
Lines 1608-1614 Link Here
1608
	 * <!-- end-user-doc -->
1608
	 * <!-- end-user-doc -->
1609
	 * @generated
1609
	 * @generated
1610
	 */
1610
	 */
1611
	public EAttribute getJmsConnectionFactoryType_MinPoolSize() {
1611
	public EAttribute getJmsConnectionFactoryType_MaxPoolSize() {
1612
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(10);
1612
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(10);
1613
	}
1613
	}
1614
1614
Lines 1617-1624 Link Here
1617
	 * <!-- end-user-doc -->
1617
	 * <!-- end-user-doc -->
1618
	 * @generated
1618
	 * @generated
1619
	 */
1619
	 */
1620
	public EAttribute getJmsConnectionFactoryType_Id() {
1620
	public EAttribute getJmsConnectionFactoryType_MinPoolSize() {
1621
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(11);
1621
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(11);
1622
	}
1623
1624
	/**
1625
	 * <!-- begin-user-doc -->
1626
	 * <!-- end-user-doc -->
1627
	 * @generated
1628
	 */
1629
	public EAttribute getJmsConnectionFactoryType_Id() {
1630
		return (EAttribute)jmsConnectionFactoryTypeEClass.getEStructuralFeatures().get(12);
1622
	}
1631
	}
1623
1632
1624
	/**
1633
	/**
Lines 1653-1659 Link Here
1653
	 * <!-- end-user-doc -->
1662
	 * <!-- end-user-doc -->
1654
	 * @generated
1663
	 * @generated
1655
	 */
1664
	 */
1656
	public EAttribute getJmsDestinationType_ClassName() {
1665
	public EAttribute getJmsDestinationType_InterfaceName() {
1657
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(2);
1666
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(2);
1658
	}
1667
	}
1659
1668
Lines 1662-1668 Link Here
1662
	 * <!-- end-user-doc -->
1671
	 * <!-- end-user-doc -->
1663
	 * @generated
1672
	 * @generated
1664
	 */
1673
	 */
1665
	public EAttribute getJmsDestinationType_ResourceAdapter() {
1674
	public EAttribute getJmsDestinationType_ClassName() {
1666
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(3);
1675
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(3);
1667
	}
1676
	}
1668
1677
Lines 1671-1677 Link Here
1671
	 * <!-- end-user-doc -->
1680
	 * <!-- end-user-doc -->
1672
	 * @generated
1681
	 * @generated
1673
	 */
1682
	 */
1674
	public EAttribute getJmsDestinationType_DestinationName() {
1683
	public EAttribute getJmsDestinationType_ResourceAdapter() {
1675
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(4);
1684
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(4);
1676
	}
1685
	}
1677
1686
Lines 1680-1687 Link Here
1680
	 * <!-- end-user-doc -->
1689
	 * <!-- end-user-doc -->
1681
	 * @generated
1690
	 * @generated
1682
	 */
1691
	 */
1692
	public EAttribute getJmsDestinationType_DestinationName() {
1693
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(5);
1694
	}
1695
1696
	/**
1697
	 * <!-- begin-user-doc -->
1698
	 * <!-- end-user-doc -->
1699
	 * @generated
1700
	 */
1683
	public EReference getJmsDestinationType_Property() {
1701
	public EReference getJmsDestinationType_Property() {
1684
		return (EReference)jmsDestinationTypeEClass.getEStructuralFeatures().get(5);
1702
		return (EReference)jmsDestinationTypeEClass.getEStructuralFeatures().get(6);
1685
	}
1703
	}
1686
1704
1687
	/**
1705
	/**
Lines 1690-1696 Link Here
1690
	 * @generated
1708
	 * @generated
1691
	 */
1709
	 */
1692
	public EAttribute getJmsDestinationType_Id() {
1710
	public EAttribute getJmsDestinationType_Id() {
1693
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(6);
1711
		return (EAttribute)jmsDestinationTypeEClass.getEStructuralFeatures().get(7);
1694
	}
1712
	}
1695
1713
1696
	/**
1714
	/**
Lines 3439-3445 Link Here
3439
		connectionFactoryResourceTypeEClass = createEClass(CONNECTION_FACTORY_RESOURCE_TYPE);
3457
		connectionFactoryResourceTypeEClass = createEClass(CONNECTION_FACTORY_RESOURCE_TYPE);
3440
		createEReference(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__DESCRIPTION);
3458
		createEReference(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__DESCRIPTION);
3441
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__NAME);
3459
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__NAME);
3442
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME);
3460
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME);
3443
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER);
3461
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__RESOURCE_ADAPTER);
3444
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE);
3462
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__MAX_POOL_SIZE);
3445
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__MIN_POOL_SIZE);
3463
		createEAttribute(connectionFactoryResourceTypeEClass, CONNECTION_FACTORY_RESOURCE_TYPE__MIN_POOL_SIZE);
Lines 3526-3531 Link Here
3526
		jmsConnectionFactoryTypeEClass = createEClass(JMS_CONNECTION_FACTORY_TYPE);
3544
		jmsConnectionFactoryTypeEClass = createEClass(JMS_CONNECTION_FACTORY_TYPE);
3527
		createEReference(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__DESCRIPTION);
3545
		createEReference(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__DESCRIPTION);
3528
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__NAME);
3546
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__NAME);
3547
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME);
3529
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME);
3548
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME);
3530
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER);
3549
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER);
3531
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__USER);
3550
		createEAttribute(jmsConnectionFactoryTypeEClass, JMS_CONNECTION_FACTORY_TYPE__USER);
Lines 3540-3545 Link Here
3540
		jmsDestinationTypeEClass = createEClass(JMS_DESTINATION_TYPE);
3559
		jmsDestinationTypeEClass = createEClass(JMS_DESTINATION_TYPE);
3541
		createEReference(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__DESCRIPTION);
3560
		createEReference(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__DESCRIPTION);
3542
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__NAME);
3561
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__NAME);
3562
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__INTERFACE_NAME);
3543
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__CLASS_NAME);
3563
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__CLASS_NAME);
3544
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__RESOURCE_ADAPTER);
3564
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__RESOURCE_ADAPTER);
3545
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__DESTINATION_NAME);
3565
		createEAttribute(jmsDestinationTypeEClass, JMS_DESTINATION_TYPE__DESTINATION_NAME);
Lines 3820-3826 Link Here
3820
		initEClass(connectionFactoryResourceTypeEClass, ConnectionFactoryResourceType.class, "ConnectionFactoryResourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3840
		initEClass(connectionFactoryResourceTypeEClass, ConnectionFactoryResourceType.class, "ConnectionFactoryResourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3821
		initEReference(getConnectionFactoryResourceType_Description(), this.getDescription(), null, "description", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3841
		initEReference(getConnectionFactoryResourceType_Description(), this.getDescription(), null, "description", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3822
		initEAttribute(getConnectionFactoryResourceType_Name(), this.getJNDIName(), "name", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3842
		initEAttribute(getConnectionFactoryResourceType_Name(), this.getJNDIName(), "name", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3823
		initEAttribute(getConnectionFactoryResourceType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3843
		initEAttribute(getConnectionFactoryResourceType_InterfaceName(), this.getFullyQualifiedClassType(), "interfaceName", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3824
		initEAttribute(getConnectionFactoryResourceType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3844
		initEAttribute(getConnectionFactoryResourceType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 1, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3825
		initEAttribute(getConnectionFactoryResourceType_MaxPoolSize(), theXMLTypePackage.getInteger(), "maxPoolSize", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3845
		initEAttribute(getConnectionFactoryResourceType_MaxPoolSize(), theXMLTypePackage.getInteger(), "maxPoolSize", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3826
		initEAttribute(getConnectionFactoryResourceType_MinPoolSize(), theXMLTypePackage.getInteger(), "minPoolSize", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3846
		initEAttribute(getConnectionFactoryResourceType_MinPoolSize(), theXMLTypePackage.getInteger(), "minPoolSize", null, 0, 1, ConnectionFactoryResourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 3907-3912 Link Here
3907
		initEClass(jmsConnectionFactoryTypeEClass, JmsConnectionFactoryType.class, "JmsConnectionFactoryType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3927
		initEClass(jmsConnectionFactoryTypeEClass, JmsConnectionFactoryType.class, "JmsConnectionFactoryType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3908
		initEReference(getJmsConnectionFactoryType_Description(), this.getDescription(), null, "description", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3928
		initEReference(getJmsConnectionFactoryType_Description(), this.getDescription(), null, "description", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3909
		initEAttribute(getJmsConnectionFactoryType_Name(), this.getJNDIName(), "name", null, 1, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3929
		initEAttribute(getJmsConnectionFactoryType_Name(), this.getJNDIName(), "name", null, 1, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3930
		initEAttribute(getJmsConnectionFactoryType_InterfaceName(), this.getFullyQualifiedClassType(), "interfaceName", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3910
		initEAttribute(getJmsConnectionFactoryType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3931
		initEAttribute(getJmsConnectionFactoryType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3911
		initEAttribute(getJmsConnectionFactoryType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3932
		initEAttribute(getJmsConnectionFactoryType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3912
		initEAttribute(getJmsConnectionFactoryType_User(), theXMLTypePackage.getToken(), "user", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3933
		initEAttribute(getJmsConnectionFactoryType_User(), theXMLTypePackage.getToken(), "user", null, 0, 1, JmsConnectionFactoryType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 3921-3926 Link Here
3921
		initEClass(jmsDestinationTypeEClass, JmsDestinationType.class, "JmsDestinationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3942
		initEClass(jmsDestinationTypeEClass, JmsDestinationType.class, "JmsDestinationType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3922
		initEReference(getJmsDestinationType_Description(), this.getDescription(), null, "description", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3943
		initEReference(getJmsDestinationType_Description(), this.getDescription(), null, "description", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3923
		initEAttribute(getJmsDestinationType_Name(), this.getJNDIName(), "name", null, 1, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3944
		initEAttribute(getJmsDestinationType_Name(), this.getJNDIName(), "name", null, 1, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3945
		initEAttribute(getJmsDestinationType_InterfaceName(), this.getFullyQualifiedClassType(), "interfaceName", null, 1, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3924
		initEAttribute(getJmsDestinationType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3946
		initEAttribute(getJmsDestinationType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3925
		initEAttribute(getJmsDestinationType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3947
		initEAttribute(getJmsDestinationType_ResourceAdapter(), theXMLTypePackage.getToken(), "resourceAdapter", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3926
		initEAttribute(getJmsDestinationType_DestinationName(), theXMLTypePackage.getToken(), "destinationName", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3948
		initEAttribute(getJmsDestinationType_DestinationName(), theXMLTypePackage.getToken(), "destinationName", null, 0, 1, JmsDestinationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 4182-4188 Link Here
4182
4204
4183
		// Create annotations
4205
		// Create annotations
4184
		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
4206
		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
4185
			createExtendedMetaDataAnnotations();
4207
		createExtendedMetaDataAnnotations();
4186
		}finally{
4208
		}finally{
4187
			if( hasLock )
4209
			if( hasLock )
4188
				J2EEInit.releaseInitializePackageContentsLock();
4210
				J2EEInit.releaseInitializePackageContentsLock();
Lines 4327-4337 Link Here
4327
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4349
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4328
		   });			
4350
		   });			
4329
		addAnnotation
4351
		addAnnotation
4330
		  (getConnectionFactoryResourceType_ClassName(), 
4352
		  (getConnectionFactoryResourceType_InterfaceName(), 
4331
		   source, 
4353
		   source, 
4332
		   new String[] {
4354
		   new String[] {
4333
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4355
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4334
			 "name", "class-name", //$NON-NLS-1$ //$NON-NLS-2$
4356
			 "name", "interface-name", //$NON-NLS-1$ //$NON-NLS-2$
4335
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4357
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4336
		   });			
4358
		   });			
4337
		addAnnotation
4359
		addAnnotation
Lines 5026-5031 Link Here
5026
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5048
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5027
		   });			
5049
		   });			
5028
		addAnnotation
5050
		addAnnotation
5051
		  (getJmsConnectionFactoryType_InterfaceName(), 
5052
		   source, 
5053
		   new String[] {
5054
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
5055
			 "name", "interface-name", //$NON-NLS-1$ //$NON-NLS-2$
5056
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5057
		   });			
5058
		addAnnotation
5029
		  (getJmsConnectionFactoryType_ClassName(), 
5059
		  (getJmsConnectionFactoryType_ClassName(), 
5030
		   source, 
5060
		   source, 
5031
		   new String[] {
5061
		   new String[] {
Lines 5128-5133 Link Here
5128
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5158
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5129
		   });			
5159
		   });			
5130
		addAnnotation
5160
		addAnnotation
5161
		  (getJmsDestinationType_InterfaceName(), 
5162
		   source, 
5163
		   new String[] {
5164
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
5165
			 "name", "interface-name", //$NON-NLS-1$ //$NON-NLS-2$
5166
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5167
		   });			
5168
		addAnnotation
5131
		  (getJmsDestinationType_ClassName(), 
5169
		  (getJmsDestinationType_ClassName(), 
5132
		   source, 
5170
		   source, 
5133
		   new String[] {
5171
		   new String[] {
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsConnectionFactoryTypeImpl.java (+54 lines)
Lines 44-49 Link Here
44
 * <ul>
44
 * <ul>
45
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getDescription <em>Description</em>}</li>
45
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getDescription <em>Description</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getName <em>Name</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getName <em>Name</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getInterfaceName <em>Interface Name</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getClassName <em>Class Name</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getClassName <em>Class Name</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getUser <em>User</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsConnectionFactoryTypeImpl#getUser <em>User</em>}</li>
Lines 89-94 Link Here
89
	 * @ordered
90
	 * @ordered
90
	 */
91
	 */
91
	protected String name = NAME_EDEFAULT;
92
	protected String name = NAME_EDEFAULT;
93
94
	/**
95
	 * The default value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
96
	 * <!-- begin-user-doc -->
97
	 * <!-- end-user-doc -->
98
	 * @see #getInterfaceName()
99
	 * @generated
100
	 * @ordered
101
	 */
102
	protected static final String INTERFACE_NAME_EDEFAULT = null;
103
104
	/**
105
	 * The cached value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
106
	 * <!-- begin-user-doc -->
107
	 * <!-- end-user-doc -->
108
	 * @see #getInterfaceName()
109
	 * @generated
110
	 * @ordered
111
	 */
112
	protected String interfaceName = INTERFACE_NAME_EDEFAULT;
92
113
93
	/**
114
	/**
94
	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
115
	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
Lines 377-382 Link Here
377
	 * <!-- end-user-doc -->
398
	 * <!-- end-user-doc -->
378
	 * @generated
399
	 * @generated
379
	 */
400
	 */
401
	public String getInterfaceName() {
402
		return interfaceName;
403
	}
404
405
	/**
406
	 * <!-- begin-user-doc -->
407
	 * <!-- end-user-doc -->
408
	 * @generated
409
	 */
410
	public void setInterfaceName(String newInterfaceName) {
411
		String oldInterfaceName = interfaceName;
412
		interfaceName = newInterfaceName;
413
		if (eNotificationRequired())
414
			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME, oldInterfaceName, interfaceName));
415
	}
416
417
	/**
418
	 * <!-- begin-user-doc -->
419
	 * <!-- end-user-doc -->
420
	 * @generated
421
	 */
380
	public String getClassName() {
422
	public String getClassName() {
381
		return className;
423
		return className;
382
	}
424
	}
Lines 626-631 Link Here
626
				return getDescription();
668
				return getDescription();
627
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
669
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
628
				return getName();
670
				return getName();
671
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
672
				return getInterfaceName();
629
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
673
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
630
				return getClassName();
674
				return getClassName();
631
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER:
675
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER:
Lines 664-669 Link Here
664
				return;
708
				return;
665
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
709
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
666
				setName((String)newValue);
710
				setName((String)newValue);
711
				return;
712
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
713
				setInterfaceName((String)newValue);
667
				return;
714
				return;
668
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
715
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
669
				setClassName((String)newValue);
716
				setClassName((String)newValue);
Lines 714-719 Link Here
714
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
761
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
715
				setName(NAME_EDEFAULT);
762
				setName(NAME_EDEFAULT);
716
				return;
763
				return;
764
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
765
				setInterfaceName(INTERFACE_NAME_EDEFAULT);
766
				return;
717
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
767
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
718
				setClassName(CLASS_NAME_EDEFAULT);
768
				setClassName(CLASS_NAME_EDEFAULT);
719
				return;
769
				return;
Lines 760-765 Link Here
760
				return description != null;
810
				return description != null;
761
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
811
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__NAME:
762
				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
812
				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
813
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME:
814
				return INTERFACE_NAME_EDEFAULT == null ? interfaceName != null : !INTERFACE_NAME_EDEFAULT.equals(interfaceName);
763
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
815
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME:
764
				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
816
				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
765
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER:
817
			case JavaeePackage.JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER:
Lines 796-801 Link Here
796
		StringBuffer result = new StringBuffer(super.toString());
848
		StringBuffer result = new StringBuffer(super.toString());
797
		result.append(" (name: "); //$NON-NLS-1$
849
		result.append(" (name: "); //$NON-NLS-1$
798
		result.append(name);
850
		result.append(name);
851
		result.append(", interfaceName: "); //$NON-NLS-1$
852
		result.append(interfaceName);
799
		result.append(", className: "); //$NON-NLS-1$
853
		result.append(", className: "); //$NON-NLS-1$
800
		result.append(className);
854
		result.append(className);
801
		result.append(", resourceAdapter: "); //$NON-NLS-1$
855
		result.append(", resourceAdapter: "); //$NON-NLS-1$
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/JmsDestinationTypeImpl.java (+54 lines)
Lines 42-47 Link Here
42
 * <ul>
42
 * <ul>
43
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getDescription <em>Description</em>}</li>
43
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getDescription <em>Description</em>}</li>
44
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getName <em>Name</em>}</li>
44
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getName <em>Name</em>}</li>
45
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getInterfaceName <em>Interface Name</em>}</li>
45
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getClassName <em>Class Name</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getClassName <em>Class Name</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getResourceAdapter <em>Resource Adapter</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getDestinationName <em>Destination Name</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl#getDestinationName <em>Destination Name</em>}</li>
Lines 82-87 Link Here
82
	 * @ordered
83
	 * @ordered
83
	 */
84
	 */
84
	protected String name = NAME_EDEFAULT;
85
	protected String name = NAME_EDEFAULT;
86
87
	/**
88
	 * The default value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
89
	 * <!-- begin-user-doc -->
90
	 * <!-- end-user-doc -->
91
	 * @see #getInterfaceName()
92
	 * @generated
93
	 * @ordered
94
	 */
95
	protected static final String INTERFACE_NAME_EDEFAULT = null;
96
97
	/**
98
	 * The cached value of the '{@link #getInterfaceName() <em>Interface Name</em>}' attribute.
99
	 * <!-- begin-user-doc -->
100
	 * <!-- end-user-doc -->
101
	 * @see #getInterfaceName()
102
	 * @generated
103
	 * @ordered
104
	 */
105
	protected String interfaceName = INTERFACE_NAME_EDEFAULT;
85
106
86
	/**
107
	/**
87
	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
108
	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
Lines 261-266 Link Here
261
	 * <!-- end-user-doc -->
282
	 * <!-- end-user-doc -->
262
	 * @generated
283
	 * @generated
263
	 */
284
	 */
285
	public String getInterfaceName() {
286
		return interfaceName;
287
	}
288
289
	/**
290
	 * <!-- begin-user-doc -->
291
	 * <!-- end-user-doc -->
292
	 * @generated
293
	 */
294
	public void setInterfaceName(String newInterfaceName) {
295
		String oldInterfaceName = interfaceName;
296
		interfaceName = newInterfaceName;
297
		if (eNotificationRequired())
298
			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME, oldInterfaceName, interfaceName));
299
	}
300
301
	/**
302
	 * <!-- begin-user-doc -->
303
	 * <!-- end-user-doc -->
304
	 * @generated
305
	 */
264
	public String getClassName() {
306
	public String getClassName() {
265
		return className;
307
		return className;
266
	}
308
	}
Lines 380-385 Link Here
380
				return getDescription();
422
				return getDescription();
381
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
423
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
382
				return getName();
424
				return getName();
425
			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
426
				return getInterfaceName();
383
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
427
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
384
				return getClassName();
428
				return getClassName();
385
			case JavaeePackage.JMS_DESTINATION_TYPE__RESOURCE_ADAPTER:
429
			case JavaeePackage.JMS_DESTINATION_TYPE__RESOURCE_ADAPTER:
Lines 408-413 Link Here
408
				return;
452
				return;
409
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
453
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
410
				setName((String)newValue);
454
				setName((String)newValue);
455
				return;
456
			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
457
				setInterfaceName((String)newValue);
411
				return;
458
				return;
412
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
459
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
413
				setClassName((String)newValue);
460
				setClassName((String)newValue);
Lines 443-448 Link Here
443
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
490
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
444
				setName(NAME_EDEFAULT);
491
				setName(NAME_EDEFAULT);
445
				return;
492
				return;
493
			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
494
				setInterfaceName(INTERFACE_NAME_EDEFAULT);
495
				return;
446
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
496
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
447
				setClassName(CLASS_NAME_EDEFAULT);
497
				setClassName(CLASS_NAME_EDEFAULT);
448
				return;
498
				return;
Lines 474-479 Link Here
474
				return description != null;
524
				return description != null;
475
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
525
			case JavaeePackage.JMS_DESTINATION_TYPE__NAME:
476
				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
526
				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
527
			case JavaeePackage.JMS_DESTINATION_TYPE__INTERFACE_NAME:
528
				return INTERFACE_NAME_EDEFAULT == null ? interfaceName != null : !INTERFACE_NAME_EDEFAULT.equals(interfaceName);
477
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
529
			case JavaeePackage.JMS_DESTINATION_TYPE__CLASS_NAME:
478
				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
530
				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
479
			case JavaeePackage.JMS_DESTINATION_TYPE__RESOURCE_ADAPTER:
531
			case JavaeePackage.JMS_DESTINATION_TYPE__RESOURCE_ADAPTER:
Lines 500-505 Link Here
500
		StringBuffer result = new StringBuffer(super.toString());
552
		StringBuffer result = new StringBuffer(super.toString());
501
		result.append(" (name: "); //$NON-NLS-1$
553
		result.append(" (name: "); //$NON-NLS-1$
502
		result.append(name);
554
		result.append(name);
555
		result.append(", interfaceName: "); //$NON-NLS-1$
556
		result.append(interfaceName);
503
		result.append(", className: "); //$NON-NLS-1$
557
		result.append(", className: "); //$NON-NLS-1$
504
		result.append(className);
558
		result.append(className);
505
		result.append(", resourceAdapter: "); //$NON-NLS-1$
559
		result.append(", resourceAdapter: "); //$NON-NLS-1$
(-)jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java (-25 / +81 lines)
Lines 416-428 Link Here
416
	int CONNECTION_FACTORY_RESOURCE_TYPE__NAME = 1;
416
	int CONNECTION_FACTORY_RESOURCE_TYPE__NAME = 1;
417
417
418
	/**
418
	/**
419
	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
419
	 * The feature id for the '<em><b>Interface Name</b></em>' attribute.
420
	 * <!-- begin-user-doc -->
420
	 * <!-- begin-user-doc -->
421
	 * <!-- end-user-doc -->
421
	 * <!-- end-user-doc -->
422
	 * @generated
422
	 * @generated
423
	 * @ordered
423
	 * @ordered
424
	 */
424
	 */
425
	int CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME = 2;
425
	int CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME = 2;
426
426
427
	/**
427
	/**
428
	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
428
	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
Lines 1209-1221 Link Here
1209
	int JMS_CONNECTION_FACTORY_TYPE__NAME = 1;
1209
	int JMS_CONNECTION_FACTORY_TYPE__NAME = 1;
1210
1210
1211
	/**
1211
	/**
1212
	 * The feature id for the '<em><b>Interface Name</b></em>' attribute.
1213
	 * <!-- begin-user-doc -->
1214
	 * <!-- end-user-doc -->
1215
	 * @generated
1216
	 * @ordered
1217
	 */
1218
	int JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME = 2;
1219
1220
	/**
1212
	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
1221
	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
1213
	 * <!-- begin-user-doc -->
1222
	 * <!-- begin-user-doc -->
1214
	 * <!-- end-user-doc -->
1223
	 * <!-- end-user-doc -->
1215
	 * @generated
1224
	 * @generated
1216
	 * @ordered
1225
	 * @ordered
1217
	 */
1226
	 */
1218
	int JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME = 2;
1227
	int JMS_CONNECTION_FACTORY_TYPE__CLASS_NAME = 3;
1219
1228
1220
	/**
1229
	/**
1221
	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
1230
	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
Lines 1224-1230 Link Here
1224
	 * @generated
1233
	 * @generated
1225
	 * @ordered
1234
	 * @ordered
1226
	 */
1235
	 */
1227
	int JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER = 3;
1236
	int JMS_CONNECTION_FACTORY_TYPE__RESOURCE_ADAPTER = 4;
1228
1237
1229
	/**
1238
	/**
1230
	 * The feature id for the '<em><b>User</b></em>' attribute.
1239
	 * The feature id for the '<em><b>User</b></em>' attribute.
Lines 1233-1239 Link Here
1233
	 * @generated
1242
	 * @generated
1234
	 * @ordered
1243
	 * @ordered
1235
	 */
1244
	 */
1236
	int JMS_CONNECTION_FACTORY_TYPE__USER = 4;
1245
	int JMS_CONNECTION_FACTORY_TYPE__USER = 5;
1237
1246
1238
	/**
1247
	/**
1239
	 * The feature id for the '<em><b>Password</b></em>' attribute.
1248
	 * The feature id for the '<em><b>Password</b></em>' attribute.
Lines 1242-1248 Link Here
1242
	 * @generated
1251
	 * @generated
1243
	 * @ordered
1252
	 * @ordered
1244
	 */
1253
	 */
1245
	int JMS_CONNECTION_FACTORY_TYPE__PASSWORD = 5;
1254
	int JMS_CONNECTION_FACTORY_TYPE__PASSWORD = 6;
1246
1255
1247
	/**
1256
	/**
1248
	 * The feature id for the '<em><b>Client Id</b></em>' attribute.
1257
	 * The feature id for the '<em><b>Client Id</b></em>' attribute.
Lines 1251-1257 Link Here
1251
	 * @generated
1260
	 * @generated
1252
	 * @ordered
1261
	 * @ordered
1253
	 */
1262
	 */
1254
	int JMS_CONNECTION_FACTORY_TYPE__CLIENT_ID = 6;
1263
	int JMS_CONNECTION_FACTORY_TYPE__CLIENT_ID = 7;
1255
1264
1256
	/**
1265
	/**
1257
	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
1266
	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
Lines 1260-1266 Link Here
1260
	 * @generated
1269
	 * @generated
1261
	 * @ordered
1270
	 * @ordered
1262
	 */
1271
	 */
1263
	int JMS_CONNECTION_FACTORY_TYPE__PROPERTY = 7;
1272
	int JMS_CONNECTION_FACTORY_TYPE__PROPERTY = 8;
1264
1273
1265
	/**
1274
	/**
1266
	 * The feature id for the '<em><b>Transactional</b></em>' attribute.
1275
	 * The feature id for the '<em><b>Transactional</b></em>' attribute.
Lines 1269-1275 Link Here
1269
	 * @generated
1278
	 * @generated
1270
	 * @ordered
1279
	 * @ordered
1271
	 */
1280
	 */
1272
	int JMS_CONNECTION_FACTORY_TYPE__TRANSACTIONAL = 8;
1281
	int JMS_CONNECTION_FACTORY_TYPE__TRANSACTIONAL = 9;
1273
1282
1274
	/**
1283
	/**
1275
	 * The feature id for the '<em><b>Max Pool Size</b></em>' attribute.
1284
	 * The feature id for the '<em><b>Max Pool Size</b></em>' attribute.
Lines 1278-1284 Link Here
1278
	 * @generated
1287
	 * @generated
1279
	 * @ordered
1288
	 * @ordered
1280
	 */
1289
	 */
1281
	int JMS_CONNECTION_FACTORY_TYPE__MAX_POOL_SIZE = 9;
1290
	int JMS_CONNECTION_FACTORY_TYPE__MAX_POOL_SIZE = 10;
1282
1291
1283
	/**
1292
	/**
1284
	 * The feature id for the '<em><b>Min Pool Size</b></em>' attribute.
1293
	 * The feature id for the '<em><b>Min Pool Size</b></em>' attribute.
Lines 1287-1293 Link Here
1287
	 * @generated
1296
	 * @generated
1288
	 * @ordered
1297
	 * @ordered
1289
	 */
1298
	 */
1290
	int JMS_CONNECTION_FACTORY_TYPE__MIN_POOL_SIZE = 10;
1299
	int JMS_CONNECTION_FACTORY_TYPE__MIN_POOL_SIZE = 11;
1291
1300
1292
	/**
1301
	/**
1293
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1302
	 * The feature id for the '<em><b>Id</b></em>' attribute.
Lines 1296-1302 Link Here
1296
	 * @generated
1305
	 * @generated
1297
	 * @ordered
1306
	 * @ordered
1298
	 */
1307
	 */
1299
	int JMS_CONNECTION_FACTORY_TYPE__ID = 11;
1308
	int JMS_CONNECTION_FACTORY_TYPE__ID = 12;
1300
1309
1301
	/**
1310
	/**
1302
	 * The number of structural features of the '<em>Jms Connection Factory Type</em>' class.
1311
	 * The number of structural features of the '<em>Jms Connection Factory Type</em>' class.
Lines 1305-1311 Link Here
1305
	 * @generated
1314
	 * @generated
1306
	 * @ordered
1315
	 * @ordered
1307
	 */
1316
	 */
1308
	int JMS_CONNECTION_FACTORY_TYPE_FEATURE_COUNT = 12;
1317
	int JMS_CONNECTION_FACTORY_TYPE_FEATURE_COUNT = 13;
1309
1318
1310
	/**
1319
	/**
1311
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl <em>Jms Destination Type</em>}' class.
1320
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.JmsDestinationTypeImpl <em>Jms Destination Type</em>}' class.
Lines 1336-1348 Link Here
1336
	int JMS_DESTINATION_TYPE__NAME = 1;
1345
	int JMS_DESTINATION_TYPE__NAME = 1;
1337
1346
1338
	/**
1347
	/**
1348
	 * The feature id for the '<em><b>Interface Name</b></em>' attribute.
1349
	 * <!-- begin-user-doc -->
1350
	 * <!-- end-user-doc -->
1351
	 * @generated
1352
	 * @ordered
1353
	 */
1354
	int JMS_DESTINATION_TYPE__INTERFACE_NAME = 2;
1355
1356
	/**
1339
	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
1357
	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
1340
	 * <!-- begin-user-doc -->
1358
	 * <!-- begin-user-doc -->
1341
	 * <!-- end-user-doc -->
1359
	 * <!-- end-user-doc -->
1342
	 * @generated
1360
	 * @generated
1343
	 * @ordered
1361
	 * @ordered
1344
	 */
1362
	 */
1345
	int JMS_DESTINATION_TYPE__CLASS_NAME = 2;
1363
	int JMS_DESTINATION_TYPE__CLASS_NAME = 3;
1346
1364
1347
	/**
1365
	/**
1348
	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
1366
	 * The feature id for the '<em><b>Resource Adapter</b></em>' attribute.
Lines 1351-1357 Link Here
1351
	 * @generated
1369
	 * @generated
1352
	 * @ordered
1370
	 * @ordered
1353
	 */
1371
	 */
1354
	int JMS_DESTINATION_TYPE__RESOURCE_ADAPTER = 3;
1372
	int JMS_DESTINATION_TYPE__RESOURCE_ADAPTER = 4;
1355
1373
1356
	/**
1374
	/**
1357
	 * The feature id for the '<em><b>Destination Name</b></em>' attribute.
1375
	 * The feature id for the '<em><b>Destination Name</b></em>' attribute.
Lines 1360-1366 Link Here
1360
	 * @generated
1378
	 * @generated
1361
	 * @ordered
1379
	 * @ordered
1362
	 */
1380
	 */
1363
	int JMS_DESTINATION_TYPE__DESTINATION_NAME = 4;
1381
	int JMS_DESTINATION_TYPE__DESTINATION_NAME = 5;
1364
1382
1365
	/**
1383
	/**
1366
	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
1384
	 * The feature id for the '<em><b>Property</b></em>' containment reference list.
Lines 1369-1375 Link Here
1369
	 * @generated
1387
	 * @generated
1370
	 * @ordered
1388
	 * @ordered
1371
	 */
1389
	 */
1372
	int JMS_DESTINATION_TYPE__PROPERTY = 5;
1390
	int JMS_DESTINATION_TYPE__PROPERTY = 6;
1373
1391
1374
	/**
1392
	/**
1375
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1393
	 * The feature id for the '<em><b>Id</b></em>' attribute.
Lines 1378-1384 Link Here
1378
	 * @generated
1396
	 * @generated
1379
	 * @ordered
1397
	 * @ordered
1380
	 */
1398
	 */
1381
	int JMS_DESTINATION_TYPE__ID = 6;
1399
	int JMS_DESTINATION_TYPE__ID = 7;
1382
1400
1383
	/**
1401
	/**
1384
	 * The number of structural features of the '<em>Jms Destination Type</em>' class.
1402
	 * The number of structural features of the '<em>Jms Destination Type</em>' class.
Lines 1387-1393 Link Here
1387
	 * @generated
1405
	 * @generated
1388
	 * @ordered
1406
	 * @ordered
1389
	 */
1407
	 */
1390
	int JMS_DESTINATION_TYPE_FEATURE_COUNT = 7;
1408
	int JMS_DESTINATION_TYPE_FEATURE_COUNT = 8;
1391
1409
1392
	/**
1410
	/**
1393
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl <em>Lifecycle Callback</em>}' class.
1411
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.LifecycleCallbackImpl <em>Lifecycle Callback</em>}' class.
Lines 3506-3520 Link Here
3506
	EAttribute getConnectionFactoryResourceType_Name();
3524
	EAttribute getConnectionFactoryResourceType_Name();
3507
3525
3508
	/**
3526
	/**
3509
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName <em>Class Name</em>}'.
3527
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName <em>Interface Name</em>}'.
3510
	 * <!-- begin-user-doc -->
3528
	 * <!-- begin-user-doc -->
3511
	 * <!-- end-user-doc -->
3529
	 * <!-- end-user-doc -->
3512
	 * @return the meta object for the attribute '<em>Class Name</em>'.
3530
	 * @return the meta object for the attribute '<em>Interface Name</em>'.
3513
	 * @see org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getClassName()
3531
	 * @see org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getInterfaceName()
3514
	 * @see #getConnectionFactoryResourceType()
3532
	 * @see #getConnectionFactoryResourceType()
3515
	 * @generated
3533
	 * @generated
3516
	 */
3534
	 */
3517
	EAttribute getConnectionFactoryResourceType_ClassName();
3535
	EAttribute getConnectionFactoryResourceType_InterfaceName();
3518
3536
3519
	/**
3537
	/**
3520
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getResourceAdapter <em>Resource Adapter</em>}'.
3538
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.ConnectionFactoryResourceType#getResourceAdapter <em>Resource Adapter</em>}'.
Lines 4343-4348 Link Here
4343
	EAttribute getJmsConnectionFactoryType_Name();
4361
	EAttribute getJmsConnectionFactoryType_Name();
4344
4362
4345
	/**
4363
	/**
4364
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName <em>Interface Name</em>}'.
4365
	 * <!-- begin-user-doc -->
4366
	 * <!-- end-user-doc -->
4367
	 * @return the meta object for the attribute '<em>Interface Name</em>'.
4368
	 * @see org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getInterfaceName()
4369
	 * @see #getJmsConnectionFactoryType()
4370
	 * @generated
4371
	 */
4372
	EAttribute getJmsConnectionFactoryType_InterfaceName();
4373
4374
	/**
4346
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getClassName <em>Class Name</em>}'.
4375
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsConnectionFactoryType#getClassName <em>Class Name</em>}'.
4347
	 * <!-- begin-user-doc -->
4376
	 * <!-- begin-user-doc -->
4348
	 * <!-- end-user-doc -->
4377
	 * <!-- end-user-doc -->
Lines 4483-4488 Link Here
4483
	 * @generated
4512
	 * @generated
4484
	 */
4513
	 */
4485
	EAttribute getJmsDestinationType_Name();
4514
	EAttribute getJmsDestinationType_Name();
4515
4516
	/**
4517
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName <em>Interface Name</em>}'.
4518
	 * <!-- begin-user-doc -->
4519
	 * <!-- end-user-doc -->
4520
	 * @return the meta object for the attribute '<em>Interface Name</em>'.
4521
	 * @see org.eclipse.jst.javaee.core.JmsDestinationType#getInterfaceName()
4522
	 * @see #getJmsDestinationType()
4523
	 * @generated
4524
	 */
4525
	EAttribute getJmsDestinationType_InterfaceName();
4486
4526
4487
	/**
4527
	/**
4488
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsDestinationType#getClassName <em>Class Name</em>}'.
4528
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.JmsDestinationType#getClassName <em>Class Name</em>}'.
Lines 6702-6713 Link Here
6702
		EAttribute CONNECTION_FACTORY_RESOURCE_TYPE__NAME = eINSTANCE.getConnectionFactoryResourceType_Name();
6742
		EAttribute CONNECTION_FACTORY_RESOURCE_TYPE__NAME = eINSTANCE.getConnectionFactoryResourceType_Name();
6703
6743
6704
		/**
6744
		/**
6705
		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
6745
		 * The meta object literal for the '<em><b>Interface Name</b></em>' attribute feature.
6706
		 * <!-- begin-user-doc -->
6746
		 * <!-- begin-user-doc -->
6707
		 * <!-- end-user-doc -->
6747
		 * <!-- end-user-doc -->
6708
		 * @generated
6748
		 * @generated
6709
		 */
6749
		 */
6710
		EAttribute CONNECTION_FACTORY_RESOURCE_TYPE__CLASS_NAME = eINSTANCE.getConnectionFactoryResourceType_ClassName();
6750
		EAttribute CONNECTION_FACTORY_RESOURCE_TYPE__INTERFACE_NAME = eINSTANCE.getConnectionFactoryResourceType_InterfaceName();
6711
6751
6712
		/**
6752
		/**
6713
		 * The meta object literal for the '<em><b>Resource Adapter</b></em>' attribute feature.
6753
		 * The meta object literal for the '<em><b>Resource Adapter</b></em>' attribute feature.
Lines 7338-7343 Link Here
7338
		EAttribute JMS_CONNECTION_FACTORY_TYPE__NAME = eINSTANCE.getJmsConnectionFactoryType_Name();
7378
		EAttribute JMS_CONNECTION_FACTORY_TYPE__NAME = eINSTANCE.getJmsConnectionFactoryType_Name();
7339
7379
7340
		/**
7380
		/**
7381
		 * The meta object literal for the '<em><b>Interface Name</b></em>' attribute feature.
7382
		 * <!-- begin-user-doc -->
7383
		 * <!-- end-user-doc -->
7384
		 * @generated
7385
		 */
7386
		EAttribute JMS_CONNECTION_FACTORY_TYPE__INTERFACE_NAME = eINSTANCE.getJmsConnectionFactoryType_InterfaceName();
7387
7388
		/**
7341
		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
7389
		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
7342
		 * <!-- begin-user-doc -->
7390
		 * <!-- begin-user-doc -->
7343
		 * <!-- end-user-doc -->
7391
		 * <!-- end-user-doc -->
Lines 7444-7449 Link Here
7444
		EAttribute JMS_DESTINATION_TYPE__NAME = eINSTANCE.getJmsDestinationType_Name();
7492
		EAttribute JMS_DESTINATION_TYPE__NAME = eINSTANCE.getJmsDestinationType_Name();
7445
7493
7446
		/**
7494
		/**
7495
		 * The meta object literal for the '<em><b>Interface Name</b></em>' attribute feature.
7496
		 * <!-- begin-user-doc -->
7497
		 * <!-- end-user-doc -->
7498
		 * @generated
7499
		 */
7500
		EAttribute JMS_DESTINATION_TYPE__INTERFACE_NAME = eINSTANCE.getJmsDestinationType_InterfaceName();
7501
7502
		/**
7447
		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
7503
		 * The meta object literal for the '<em><b>Class Name</b></em>' attribute feature.
7448
		 * <!-- begin-user-doc -->
7504
		 * <!-- begin-user-doc -->
7449
		 * <!-- end-user-doc -->
7505
		 * <!-- end-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/CMPField.java (+2 lines)
Lines 81-86 Link Here
81
	 *             cmp-version 1.x must denote a public field of the
81
	 *             cmp-version 1.x must denote a public field of the
82
	 *             enterprise bean class or one of its superclasses.
82
	 *             enterprise bean class or one of its superclasses.
83
	 *             
83
	 *             
84
	 *             Support for entity beans is optional as of EJB 3.2.
85
	 *             
84
	 *             @since Java EE 5, EJB 3.0
86
	 *             @since Java EE 5, EJB 3.0
85
	 *           
87
	 *           
86
	 * <!-- end-model-doc -->
88
	 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/CMRField.java (+4 lines)
Lines 32-37 Link Here
32
 *         used only for collection-valued cmr-fields. It specifies the
32
 *         used only for collection-valued cmr-fields. It specifies the
33
 *         type of the collection that is used.
33
 *         type of the collection that is used.
34
 *         
34
 *         
35
 *         Support for entity beans is optional as of EJB 3.2.
36
 *         
35
 *         @since Java EE 5, EJB 3.0
37
 *         @since Java EE 5, EJB 3.0
36
 *       
38
 *       
37
 * <!-- end-model-doc -->
39
 * <!-- end-model-doc -->
Lines 81-86 Link Here
81
	 *             specified by cmr-field-name in which the first
83
	 *             specified by cmr-field-name in which the first
82
	 *             letter is uppercased, prefixed by "get" or "set".
84
	 *             letter is uppercased, prefixed by "get" or "set".
83
	 *             
85
	 *             
86
	 *             Support for entity beans is optional as of EJB 3.2.
87
	 *             
84
	 *             @since Java EE 5, EJB 3.0
88
	 *             @since Java EE 5, EJB 3.0
85
	 *           
89
	 *           
86
	 * <!-- end-model-doc -->
90
	 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/CmpVersionType.java (+2 lines)
Lines 33-38 Link Here
33
 *         1.x
33
 *         1.x
34
 *         2.x
34
 *         2.x
35
 *         
35
 *         
36
 *         Support for entity beans is optional as of EJB 3.2.
37
 *         
36
 *         @since Java EE 5, EJB 3.0
38
 *         @since Java EE 5, EJB 3.0
37
 *       
39
 *       
38
 * <!-- end-model-doc -->
40
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/EJBRelation.java (+2 lines)
Lines 32-37 Link Here
32
 *         relationship, if specified, is unique within the ejb-jar
32
 *         relationship, if specified, is unique within the ejb-jar
33
 *         file.
33
 *         file.
34
 *         
34
 *         
35
 *         Support for entity beans is optional as of EJB 3.2.
36
 *         
35
 *         @since Java EE 5, EJB 3.0
37
 *         @since Java EE 5, EJB 3.0
36
 *       
38
 *       
37
 * <!-- end-model-doc -->
39
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/EJBRelationshipRole.java (+3 lines)
Lines 61-66 Link Here
61
 *         </ejb-relationship-role>
61
 *         </ejb-relationship-role>
62
 *         </ejb-relation>
62
 *         </ejb-relation>
63
 *         
63
 *         
64
 *         Support for entity beans is optional as of EJB 3.2.
64
 * 
65
 * 
65
 *         @since Java EE 5, EJB 3.0
66
 *         @since Java EE 5, EJB 3.0
66
 *       
67
 *       
Lines 202-207 Link Here
202
	 *             which the other ejb-relationship-role
203
	 *             which the other ejb-relationship-role
203
	 *             element specifies a multiplicity of One.
204
	 *             element specifies a multiplicity of One.
204
	 *             
205
	 *             
206
	 *             Support for entity beans is optional as of EJB 3.2.
207
	 *             
205
	 *             @since Java EE 5, EJB 3.0
208
	 *             @since Java EE 5, EJB 3.0
206
	 *           
209
	 *           
207
	 * <!-- end-model-doc -->
210
	 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/EntityBean.java (-1 / +9 lines)
Lines 42-47 Link Here
42
 * <!-- begin-model-doc -->
42
 * <!-- begin-model-doc -->
43
 * 
43
 * 
44
 * 
44
 * 
45
 *         Support for entity beans is optional as of EJB 3.2.
46
 * 
45
 *         The entity-beanType declares an entity bean. The declaration
47
 *         The entity-beanType declares an entity bean. The declaration
46
 *         consists of:
48
 *         consists of:
47
 *         
49
 *         
Lines 475-480 Link Here
475
	 *             deferred to deployment time, the prim-key-class 
477
	 *             deferred to deployment time, the prim-key-class 
476
	 *             element should specify java.lang.Object.
478
	 *             element should specify java.lang.Object.
477
	 *             
479
	 *             
480
	 *             Support for entity beans is optional as of EJB 3.2.
481
	 *             
478
	 *             @since Java EE 5, EJB 3.0
482
	 *             @since Java EE 5, EJB 3.0
479
	 *           
483
	 *           
480
	 * <!-- end-model-doc -->
484
	 * <!-- end-model-doc -->
Lines 623-629 Link Here
623
	 *             
627
	 *             
624
	 *             For example, the abstract-schema-name for an entity 
628
	 *             For example, the abstract-schema-name for an entity 
625
	 *             bean whose local interface is 
629
	 *             bean whose local interface is 
626
	 *             com.acme.commerce.Order might be Order. 
630
	 *             com.acme.commerce.Order might be Order.
631
	 *             
632
	 *             Support for entity beans is optional as of EJB 3.2.
627
	 *             
633
	 *             
628
	 *             @since Java EE 5, EJB 3.0
634
	 *             @since Java EE 5, EJB 3.0
629
	 *           
635
	 *           
Lines 682-687 Link Here
682
	 *             their names must correspond to the field names of
688
	 *             their names must correspond to the field names of
683
	 *             the entity bean class that comprise the key.
689
	 *             the entity bean class that comprise the key.
684
	 *             
690
	 *             
691
	 *             Support for entity beans is optional as of EJB 3.2.
692
	 *             
685
	 *             @since Java EE 5, EJB 3.0
693
	 *             @since Java EE 5, EJB 3.0
686
	 *           
694
	 *           
687
	 * <!-- end-model-doc -->
695
	 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java (-1 / +7 lines)
Lines 52-58 Link Here
52
 *         The binding of interceptors to classes is additive.  If interceptors
52
 *         The binding of interceptors to classes is additive.  If interceptors
53
 *         are bound at the class-level and/or default-level as well as the
53
 *         are bound at the class-level and/or default-level as well as the
54
 *         method-level, both class-level and/or default-level as well as
54
 *         method-level, both class-level and/or default-level as well as
55
 *         method-level will apply. 
55
 *         method-level will apply.
56
 *         
57
 *         The method-name element may be used to bind a constructor-level 
58
 *         interceptor using the unqualified name of the bean class as the value; 
59
 *         the optional method-params elements identify the constructor if a bean 
60
 *         class has a constructor annotated with the Inject annotation in addition 
61
 *         to a no-arg constructor. 
56
 *         
62
 *         
57
 *         There are four possible styles of the interceptor element syntax :
63
 *         There are four possible styles of the interceptor element syntax :
58
 *         
64
 *         
(-)jee-models/org/eclipse/jst/javaee/ejb/InterceptorType.java (+16 lines)
Lines 66-71 Link Here
66
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass <em>Interceptor Class</em>}</li>
66
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getInterceptorClass <em>Interceptor Class</em>}</li>
67
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes <em>Around Invokes</em>}</li>
67
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundInvokes <em>Around Invokes</em>}</li>
68
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundTimeouts <em>Around Timeouts</em>}</li>
68
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundTimeouts <em>Around Timeouts</em>}</li>
69
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundConstruct <em>Around Construct</em>}</li>
69
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}</li>
70
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}</li>
70
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs <em>Ejb Refs</em>}</li>
71
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbRefs <em>Ejb Refs</em>}</li>
71
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
72
 *   <li>{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
Lines 165-170 Link Here
165
	List<AroundTimeoutType> getAroundTimeouts();
166
	List<AroundTimeoutType> getAroundTimeouts();
166
167
167
	/**
168
	/**
169
	 * Returns the value of the '<em><b>Around Construct</b></em>' containment reference list.
170
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.LifecycleCallback}.
171
	 * <!-- begin-user-doc -->
172
	 * <p>
173
	 * If the meaning of the '<em>Around Construct</em>' containment reference list isn't clear,
174
	 * there really should be more of a description here...
175
	 * </p>
176
	 * <!-- end-user-doc -->
177
	 * @return the value of the '<em>Around Construct</em>' containment reference list.
178
	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getInterceptorType_AroundConstruct()
179
	 * @generated
180
	 */
181
	List<LifecycleCallback> getAroundConstruct();
182
183
	/**
168
	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
184
	 * Returns the value of the '<em><b>Env Entries</b></em>' containment reference list.
169
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
185
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EnvEntry}.
170
	 * <!-- begin-user-doc -->
186
	 * <!-- begin-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/MethodInterfaceType.java (-2 / +14 lines)
Lines 46-53 Link Here
46
 *         MessageEndpoint refers to the methods of a message-driven bean's
46
 *         MessageEndpoint refers to the methods of a message-driven bean's
47
 *         message-listener interface.
47
 *         message-listener interface.
48
 *         
48
 *         
49
 *         LifecycleCallback refers to the lifecycle callback methods of 
49
 *         LifecycleCallback refers to the PostConstruct and PreDestroy
50
 *         a singleton or stateful session bean.
50
 *         lifecycle callback methods of a singleton session bean and
51
 *         to the PostConstruct, PreDestroy, PrePassivate, and PostActivate
52
 *         lifecycle callback methods of a stateful session bean.
51
 *         
53
 *         
52
 *         The method-intf element must be one of the following:
54
 *         The method-intf element must be one of the following:
53
 *         
55
 *         
Lines 117-122 Link Here
117
	 * The '<em><b>Timer</b></em>' literal object.
119
	 * The '<em><b>Timer</b></em>' literal object.
118
	 * <!-- begin-user-doc -->
120
	 * <!-- begin-user-doc -->
119
	 * <!-- end-user-doc -->
121
	 * <!-- end-user-doc -->
122
	 * <!-- begin-model-doc -->
123
	 * 
124
	 *               @since Java EE 6, EJB 3.1
125
	 *             
126
	 * <!-- end-model-doc -->
120
	 * @see #TIMER
127
	 * @see #TIMER
121
	 * @generated
128
	 * @generated
122
	 * @ordered
129
	 * @ordered
Lines 126-131 Link Here
126
	 * The '<em><b>Message Endpoint</b></em>' literal object.
133
	 * The '<em><b>Message Endpoint</b></em>' literal object.
127
	 * <!-- begin-user-doc -->
134
	 * <!-- begin-user-doc -->
128
	 * <!-- end-user-doc -->
135
	 * <!-- end-user-doc -->
136
	 * <!-- begin-model-doc -->
137
	 * 
138
	 *               @since Java EE 6, EJB 3.1
139
	 *             
140
	 * <!-- end-model-doc -->
129
	 * @see #MESSAGE_ENDPOINT
141
	 * @see #MESSAGE_ENDPOINT
130
	 * @generated
142
	 * @generated
131
	 * @ordered
143
	 * @ordered
(-)jee-models/org/eclipse/jst/javaee/ejb/MethodPermission.java (-6 / +12 lines)
Lines 31-42 Link Here
31
 *         indicator to state that the method is unchecked for
31
 *         indicator to state that the method is unchecked for
32
 *         authorization, and a list of method elements.
32
 *         authorization, and a list of method elements.
33
 *         
33
 *         
34
 *         The security roles used in the method-permissionType
34
 *         Except as noted below the security roles used in the
35
 *         must be defined in the security-role elements of the
35
 *         method-permissionType must be defined in the security-role
36
 *         deployment descriptor, and the methods must be methods
36
 *         elements of the deployment descriptor, and the methods
37
 *         defined in the enterprise bean's no-interface view, 
37
 *         must be methods defined in the enterprise bean's no-interface
38
 *         business, home, component and/or web service endpoint 
38
 *         view, business, home, component and/or web service endpoint
39
 *         interfaces.
39
 *         interfaces. 
40
 *         
41
 *         If the role name "**" is included in the list of allowed 
42
 *         roles, and the application has not defined in its deployment 
43
 *         descriptor an application security role with this name, 
44
 *         then the list of allowed roles includes every and any 
45
 *         authenticated user.
40
 *         
46
 *         
41
 *         @since Java EE 5, EJB 3.0
47
 *         @since Java EE 5, EJB 3.0
42
 *       
48
 *       
(-)jee-models/org/eclipse/jst/javaee/ejb/MethodType.java (-4 / +8 lines)
Lines 66-75 Link Here
66
 *         timeout callback methods
66
 *         timeout callback methods
67
 *         message-driven bean message listener method
67
 *         message-driven bean message listener method
68
 *         
68
 *         
69
 *         This style may be used for stateful session bean lifecycle 
69
 *         This style may also be used in combination with the 
70
 *         callback methods to specify their transaction attributes, 
70
 *         method-intf element that contains LifecycleCallback as 
71
 *         if used with the method-intf element that contains 
71
 *         the value to specify transaction attributes of a stateful 
72
 *         LifecycleCallback as the value.
72
 *         session bean PostConstruct, PreDestroy, PrePassivate, 
73
 *         and PostActivate lifecycle callback methods or to override 
74
 *         transaction attributes of a singleton session bean 
75
 *         PostConstruct and PreDestroy lifecycle callback methods.
73
 *         
76
 *         
74
 *         2.
77
 *         2.
75
 *         <method>
78
 *         <method>
Lines 84-89 Link Here
84
 *         name.
87
 *         name.
85
 *         
88
 *         
86
 *         This style may be used to refer to stateful session bean
89
 *         This style may be used to refer to stateful session bean
90
 *         PostConstruct, PreDestroy, PrePassivate, and PostActivate 
87
 *         lifecycle callback methods to specify their transaction
91
 *         lifecycle callback methods to specify their transaction
88
 *         attributes if any of the following is true:
92
 *         attributes if any of the following is true:
89
 *         there is only one method with this name in the specified 
93
 *         there is only one method with this name in the specified 
(-)jee-models/org/eclipse/jst/javaee/ejb/MultiplicityType.java (+2 lines)
Lines 32-37 Link Here
32
 *         One
32
 *         One
33
 *         Many
33
 *         Many
34
 *         
34
 *         
35
 *         Support for entity beans is optional as of EJB 3.2.
36
 *         
35
 *         @since Java EE 5, EJB 3.0
37
 *         @since Java EE 5, EJB 3.0
36
 *       
38
 *       
37
 * <!-- end-model-doc -->
39
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/PersistenceType.java (+2 lines)
Lines 32-37 Link Here
32
 *         Bean
32
 *         Bean
33
 *         Container
33
 *         Container
34
 *         
34
 *         
35
 *         Support for entity beans is optional as of EJB 3.2.
36
 *         
35
 *         @since Java EE 5, EJB 3.0
37
 *         @since Java EE 5, EJB 3.0
36
 *       
38
 *       
37
 * <!-- end-model-doc -->
39
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/QueryMethod.java (+1 lines)
Lines 45-50 Link Here
45
 *         </ejb-ql>
45
 *         </ejb-ql>
46
 *         </query>
46
 *         </query>
47
 *         
47
 *         
48
 *         Support for entity beans is optional as of EJB 3.2.
48
 * 
49
 * 
49
 *         @since Java EE 5, EJB 3.0
50
 *         @since Java EE 5, EJB 3.0
50
 *       
51
 *       
(-)jee-models/org/eclipse/jst/javaee/ejb/RelationshipRoleSourceType.java (+2 lines)
Lines 29-34 Link Here
29
 *         relationship-role-source elements to uniquely identify an
29
 *         relationship-role-source elements to uniquely identify an
30
 *         entity bean.
30
 *         entity bean.
31
 *         
31
 *         
32
 *         Support for entity beans is optional as of EJB 3.2.
33
 *         
32
 *         @since Java EE 5, EJB 3.0
34
 *         @since Java EE 5, EJB 3.0
33
 *       
35
 *       
34
 * <!-- end-model-doc -->
36
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/Relationships.java (+2 lines)
Lines 29-34 Link Here
29
 *         description; and a list of ejb-relation elements, which
29
 *         description; and a list of ejb-relation elements, which
30
 *         specify the container managed relationships.
30
 *         specify the container managed relationships.
31
 *         
31
 *         
32
 *         Support for entity beans is optional as of EJB 3.2.
33
 *         
32
 *         @since Java EE 5, EJB 3.0
34
 *         @since Java EE 5, EJB 3.0
33
 *       
35
 *       
34
 * <!-- end-model-doc -->
36
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java (-20 / +39 lines)
Lines 2094-2100 Link Here
2094
	 * <!-- end-user-doc -->
2094
	 * <!-- end-user-doc -->
2095
	 * @generated
2095
	 * @generated
2096
	 */
2096
	 */
2097
	public EReference getInterceptorType_EnvEntries() {
2097
	public EReference getInterceptorType_AroundConstruct() {
2098
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(4);
2098
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(4);
2099
	}
2099
	}
2100
2100
Lines 2103-2109 Link Here
2103
	 * <!-- end-user-doc -->
2103
	 * <!-- end-user-doc -->
2104
	 * @generated
2104
	 * @generated
2105
	 */
2105
	 */
2106
	public EReference getInterceptorType_EjbRefs() {
2106
	public EReference getInterceptorType_EnvEntries() {
2107
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(5);
2107
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(5);
2108
	}
2108
	}
2109
2109
Lines 2112-2118 Link Here
2112
	 * <!-- end-user-doc -->
2112
	 * <!-- end-user-doc -->
2113
	 * @generated
2113
	 * @generated
2114
	 */
2114
	 */
2115
	public EReference getInterceptorType_EjbLocalRefs() {
2115
	public EReference getInterceptorType_EjbRefs() {
2116
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(6);
2116
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(6);
2117
	}
2117
	}
2118
2118
Lines 2121-2127 Link Here
2121
	 * <!-- end-user-doc -->
2121
	 * <!-- end-user-doc -->
2122
	 * @generated
2122
	 * @generated
2123
	 */
2123
	 */
2124
	public EReference getInterceptorType_ServiceRefs() {
2124
	public EReference getInterceptorType_EjbLocalRefs() {
2125
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(7);
2125
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(7);
2126
	}
2126
	}
2127
2127
Lines 2130-2136 Link Here
2130
	 * <!-- end-user-doc -->
2130
	 * <!-- end-user-doc -->
2131
	 * @generated
2131
	 * @generated
2132
	 */
2132
	 */
2133
	public EReference getInterceptorType_ResourceRefs() {
2133
	public EReference getInterceptorType_ServiceRefs() {
2134
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(8);
2134
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(8);
2135
	}
2135
	}
2136
2136
Lines 2139-2145 Link Here
2139
	 * <!-- end-user-doc -->
2139
	 * <!-- end-user-doc -->
2140
	 * @generated
2140
	 * @generated
2141
	 */
2141
	 */
2142
	public EReference getInterceptorType_ResourceEnvRefs() {
2142
	public EReference getInterceptorType_ResourceRefs() {
2143
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(9);
2143
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(9);
2144
	}
2144
	}
2145
2145
Lines 2148-2154 Link Here
2148
	 * <!-- end-user-doc -->
2148
	 * <!-- end-user-doc -->
2149
	 * @generated
2149
	 * @generated
2150
	 */
2150
	 */
2151
	public EReference getInterceptorType_MessageDestinationRefs() {
2151
	public EReference getInterceptorType_ResourceEnvRefs() {
2152
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(10);
2152
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(10);
2153
	}
2153
	}
2154
2154
Lines 2157-2163 Link Here
2157
	 * <!-- end-user-doc -->
2157
	 * <!-- end-user-doc -->
2158
	 * @generated
2158
	 * @generated
2159
	 */
2159
	 */
2160
	public EReference getInterceptorType_PersistenceContextRefs() {
2160
	public EReference getInterceptorType_MessageDestinationRefs() {
2161
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(11);
2161
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(11);
2162
	}
2162
	}
2163
2163
Lines 2166-2172 Link Here
2166
	 * <!-- end-user-doc -->
2166
	 * <!-- end-user-doc -->
2167
	 * @generated
2167
	 * @generated
2168
	 */
2168
	 */
2169
	public EReference getInterceptorType_PersistenceUnitRefs() {
2169
	public EReference getInterceptorType_PersistenceContextRefs() {
2170
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(12);
2170
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(12);
2171
	}
2171
	}
2172
2172
Lines 2175-2181 Link Here
2175
	 * <!-- end-user-doc -->
2175
	 * <!-- end-user-doc -->
2176
	 * @generated
2176
	 * @generated
2177
	 */
2177
	 */
2178
	public EReference getInterceptorType_PostConstructs() {
2178
	public EReference getInterceptorType_PersistenceUnitRefs() {
2179
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(13);
2179
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(13);
2180
	}
2180
	}
2181
2181
Lines 2184-2190 Link Here
2184
	 * <!-- end-user-doc -->
2184
	 * <!-- end-user-doc -->
2185
	 * @generated
2185
	 * @generated
2186
	 */
2186
	 */
2187
	public EReference getInterceptorType_PreDestroys() {
2187
	public EReference getInterceptorType_PostConstructs() {
2188
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(14);
2188
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(14);
2189
	}
2189
	}
2190
2190
Lines 2193-2199 Link Here
2193
	 * <!-- end-user-doc -->
2193
	 * <!-- end-user-doc -->
2194
	 * @generated
2194
	 * @generated
2195
	 */
2195
	 */
2196
	public EReference getInterceptorType_DataSource() {
2196
	public EReference getInterceptorType_PreDestroys() {
2197
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(15);
2197
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(15);
2198
	}
2198
	}
2199
2199
Lines 2202-2208 Link Here
2202
	 * <!-- end-user-doc -->
2202
	 * <!-- end-user-doc -->
2203
	 * @generated
2203
	 * @generated
2204
	 */
2204
	 */
2205
	public EReference getInterceptorType_JmsConnectionFactory() {
2205
	public EReference getInterceptorType_DataSource() {
2206
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(16);
2206
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(16);
2207
	}
2207
	}
2208
2208
Lines 2211-2217 Link Here
2211
	 * <!-- end-user-doc -->
2211
	 * <!-- end-user-doc -->
2212
	 * @generated
2212
	 * @generated
2213
	 */
2213
	 */
2214
	public EReference getInterceptorType_JmsDestination() {
2214
	public EReference getInterceptorType_JmsConnectionFactory() {
2215
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(17);
2215
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(17);
2216
	}
2216
	}
2217
2217
Lines 2220-2226 Link Here
2220
	 * <!-- end-user-doc -->
2220
	 * <!-- end-user-doc -->
2221
	 * @generated
2221
	 * @generated
2222
	 */
2222
	 */
2223
	public EReference getInterceptorType_MailSession() {
2223
	public EReference getInterceptorType_JmsDestination() {
2224
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(18);
2224
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(18);
2225
	}
2225
	}
2226
2226
Lines 2229-2235 Link Here
2229
	 * <!-- end-user-doc -->
2229
	 * <!-- end-user-doc -->
2230
	 * @generated
2230
	 * @generated
2231
	 */
2231
	 */
2232
	public EReference getInterceptorType_ConnectionFactory() {
2232
	public EReference getInterceptorType_MailSession() {
2233
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(19);
2233
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(19);
2234
	}
2234
	}
2235
2235
Lines 2238-2244 Link Here
2238
	 * <!-- end-user-doc -->
2238
	 * <!-- end-user-doc -->
2239
	 * @generated
2239
	 * @generated
2240
	 */
2240
	 */
2241
	public EReference getInterceptorType_AdministeredObject() {
2241
	public EReference getInterceptorType_ConnectionFactory() {
2242
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(20);
2242
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(20);
2243
	}
2243
	}
2244
2244
Lines 2247-2253 Link Here
2247
	 * <!-- end-user-doc -->
2247
	 * <!-- end-user-doc -->
2248
	 * @generated
2248
	 * @generated
2249
	 */
2249
	 */
2250
	public EReference getInterceptorType_PostActivates() {
2250
	public EReference getInterceptorType_AdministeredObject() {
2251
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(21);
2251
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(21);
2252
	}
2252
	}
2253
2253
Lines 2256-2262 Link Here
2256
	 * <!-- end-user-doc -->
2256
	 * <!-- end-user-doc -->
2257
	 * @generated
2257
	 * @generated
2258
	 */
2258
	 */
2259
	public EReference getInterceptorType_PrePassivates() {
2259
	public EReference getInterceptorType_PostActivates() {
2260
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(22);
2260
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(22);
2261
	}
2261
	}
2262
2262
Lines 2265-2272 Link Here
2265
	 * <!-- end-user-doc -->
2265
	 * <!-- end-user-doc -->
2266
	 * @generated
2266
	 * @generated
2267
	 */
2267
	 */
2268
	public EReference getInterceptorType_PrePassivates() {
2269
		return (EReference)interceptorTypeEClass.getEStructuralFeatures().get(23);
2270
	}
2271
2272
	/**
2273
	 * <!-- begin-user-doc -->
2274
	 * <!-- end-user-doc -->
2275
	 * @generated
2276
	 */
2268
	public EAttribute getInterceptorType_Id() {
2277
	public EAttribute getInterceptorType_Id() {
2269
		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(23);
2278
		return (EAttribute)interceptorTypeEClass.getEStructuralFeatures().get(24);
2270
	}
2279
	}
2271
2280
2272
	/**
2281
	/**
Lines 4176-4181 Link Here
4176
		createEAttribute(interceptorTypeEClass, INTERCEPTOR_TYPE__INTERCEPTOR_CLASS);
4185
		createEAttribute(interceptorTypeEClass, INTERCEPTOR_TYPE__INTERCEPTOR_CLASS);
4177
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_INVOKES);
4186
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_INVOKES);
4178
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_TIMEOUTS);
4187
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_TIMEOUTS);
4188
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__AROUND_CONSTRUCT);
4179
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__ENV_ENTRIES);
4189
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__ENV_ENTRIES);
4180
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_REFS);
4190
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_REFS);
4181
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
4191
		createEReference(interceptorTypeEClass, INTERCEPTOR_TYPE__EJB_LOCAL_REFS);
Lines 4634-4639 Link Here
4634
		initEAttribute(getInterceptorType_InterceptorClass(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClass", null, 1, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4644
		initEAttribute(getInterceptorType_InterceptorClass(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClass", null, 1, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4635
		initEReference(getInterceptorType_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4645
		initEReference(getInterceptorType_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4636
		initEReference(getInterceptorType_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4646
		initEReference(getInterceptorType_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4647
		initEReference(getInterceptorType_AroundConstruct(), theJavaeePackage.getLifecycleCallback(), null, "aroundConstruct", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4637
		initEReference(getInterceptorType_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4648
		initEReference(getInterceptorType_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4638
		initEReference(getInterceptorType_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4649
		initEReference(getInterceptorType_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4639
		initEReference(getInterceptorType_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4650
		initEReference(getInterceptorType_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 6255-6260 Link Here
6255
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
6266
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
6256
		   });		
6267
		   });		
6257
		addAnnotation
6268
		addAnnotation
6269
		  (getInterceptorType_AroundConstruct(), 
6270
		   source, 
6271
		   new String[] {
6272
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
6273
			 "name", "around-construct", //$NON-NLS-1$ //$NON-NLS-2$
6274
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
6275
		   });		
6276
		addAnnotation
6258
		  (getInterceptorType_EnvEntries(), 
6277
		  (getInterceptorType_EnvEntries(), 
6259
		   source, 
6278
		   source, 
6260
		   new String[] {
6279
		   new String[] {
(-)jee-models/org/eclipse/jst/javaee/ejb/internal/impl/InterceptorTypeImpl.java (+36 lines)
Lines 62-67 Link Here
62
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getInterceptorClass <em>Interceptor Class</em>}</li>
62
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getInterceptorClass <em>Interceptor Class</em>}</li>
63
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundInvokes <em>Around Invokes</em>}</li>
63
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundInvokes <em>Around Invokes</em>}</li>
64
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundTimeouts <em>Around Timeouts</em>}</li>
64
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundTimeouts <em>Around Timeouts</em>}</li>
65
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getAroundConstruct <em>Around Construct</em>}</li>
65
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEnvEntries <em>Env Entries</em>}</li>
66
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEnvEntries <em>Env Entries</em>}</li>
66
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbRefs <em>Ejb Refs</em>}</li>
67
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbRefs <em>Ejb Refs</em>}</li>
67
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
68
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.InterceptorTypeImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
Lines 137-142 Link Here
137
	 * @ordered
138
	 * @ordered
138
	 */
139
	 */
139
	protected EList<AroundTimeoutType> aroundTimeouts;
140
	protected EList<AroundTimeoutType> aroundTimeouts;
141
142
	/**
143
	 * The cached value of the '{@link #getAroundConstruct() <em>Around Construct</em>}' containment reference list.
144
	 * <!-- begin-user-doc -->
145
	 * <!-- end-user-doc -->
146
	 * @see #getAroundConstruct()
147
	 * @generated
148
	 * @ordered
149
	 */
150
	protected EList<LifecycleCallback> aroundConstruct;
140
151
141
	/**
152
	/**
142
	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
153
	 * The cached value of the '{@link #getEnvEntries() <em>Env Entries</em>}' containment reference list.
Lines 429-434 Link Here
429
	 * <!-- end-user-doc -->
440
	 * <!-- end-user-doc -->
430
	 * @generated
441
	 * @generated
431
	 */
442
	 */
443
	public List<LifecycleCallback> getAroundConstruct() {
444
		if (aroundConstruct == null) {
445
			aroundConstruct = new EObjectContainmentEList<LifecycleCallback>(LifecycleCallback.class, this, EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT);
446
		}
447
		return aroundConstruct;
448
	}
449
450
	/**
451
	 * <!-- begin-user-doc -->
452
	 * <!-- end-user-doc -->
453
	 * @generated
454
	 */
432
	public List<EnvEntry> getEnvEntries() {
455
	public List<EnvEntry> getEnvEntries() {
433
		if (envEntries == null) {
456
		if (envEntries == null) {
434
			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES);
457
			envEntries = new EObjectContainmentEList<EnvEntry>(EnvEntry.class, this, EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES);
Lines 687-692 Link Here
687
				return ((InternalEList<?>)getAroundInvokes()).basicRemove(otherEnd, msgs);
710
				return ((InternalEList<?>)getAroundInvokes()).basicRemove(otherEnd, msgs);
688
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
711
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
689
				return ((InternalEList<?>)getAroundTimeouts()).basicRemove(otherEnd, msgs);
712
				return ((InternalEList<?>)getAroundTimeouts()).basicRemove(otherEnd, msgs);
713
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
714
				return ((InternalEList<?>)getAroundConstruct()).basicRemove(otherEnd, msgs);
690
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
715
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
691
				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
716
				return ((InternalEList<?>)getEnvEntries()).basicRemove(otherEnd, msgs);
692
			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
717
			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
Lines 745-750 Link Here
745
				return getAroundInvokes();
770
				return getAroundInvokes();
746
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
771
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
747
				return getAroundTimeouts();
772
				return getAroundTimeouts();
773
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
774
				return getAroundConstruct();
748
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
775
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
749
				return getEnvEntries();
776
				return getEnvEntries();
750
			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
777
			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
Lines 812-817 Link Here
812
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
839
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
813
				getAroundTimeouts().clear();
840
				getAroundTimeouts().clear();
814
				getAroundTimeouts().addAll((Collection<? extends AroundTimeoutType>)newValue);
841
				getAroundTimeouts().addAll((Collection<? extends AroundTimeoutType>)newValue);
842
				return;
843
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
844
				getAroundConstruct().clear();
845
				getAroundConstruct().addAll((Collection<? extends LifecycleCallback>)newValue);
815
				return;
846
				return;
816
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
847
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
817
				getEnvEntries().clear();
848
				getEnvEntries().clear();
Lines 916-921 Link Here
916
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
947
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
917
				getAroundTimeouts().clear();
948
				getAroundTimeouts().clear();
918
				return;
949
				return;
950
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
951
				getAroundConstruct().clear();
952
				return;
919
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
953
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
920
				getEnvEntries().clear();
954
				getEnvEntries().clear();
921
				return;
955
				return;
Lines 996-1001 Link Here
996
				return aroundInvokes != null && !aroundInvokes.isEmpty();
1030
				return aroundInvokes != null && !aroundInvokes.isEmpty();
997
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
1031
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_TIMEOUTS:
998
				return aroundTimeouts != null && !aroundTimeouts.isEmpty();
1032
				return aroundTimeouts != null && !aroundTimeouts.isEmpty();
1033
			case EjbPackage.INTERCEPTOR_TYPE__AROUND_CONSTRUCT:
1034
				return aroundConstruct != null && !aroundConstruct.isEmpty();
999
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
1035
			case EjbPackage.INTERCEPTOR_TYPE__ENV_ENTRIES:
1000
				return envEntries != null && !envEntries.isEmpty();
1036
				return envEntries != null && !envEntries.isEmpty();
1001
			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
1037
			case EjbPackage.INTERCEPTOR_TYPE__EJB_REFS:
(-)jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java (-21 / +49 lines)
Lines 2017-2029 Link Here
2017
	int INTERCEPTOR_TYPE__AROUND_TIMEOUTS = 3;
2017
	int INTERCEPTOR_TYPE__AROUND_TIMEOUTS = 3;
2018
2018
2019
	/**
2019
	/**
2020
	 * The feature id for the '<em><b>Around Construct</b></em>' containment reference list.
2021
	 * <!-- begin-user-doc -->
2022
	 * <!-- end-user-doc -->
2023
	 * @generated
2024
	 * @ordered
2025
	 */
2026
	int INTERCEPTOR_TYPE__AROUND_CONSTRUCT = 4;
2027
2028
	/**
2020
	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
2029
	 * The feature id for the '<em><b>Env Entries</b></em>' containment reference list.
2021
	 * <!-- begin-user-doc -->
2030
	 * <!-- begin-user-doc -->
2022
	 * <!-- end-user-doc -->
2031
	 * <!-- end-user-doc -->
2023
	 * @generated
2032
	 * @generated
2024
	 * @ordered
2033
	 * @ordered
2025
	 */
2034
	 */
2026
	int INTERCEPTOR_TYPE__ENV_ENTRIES = 4;
2035
	int INTERCEPTOR_TYPE__ENV_ENTRIES = 5;
2027
2036
2028
	/**
2037
	/**
2029
	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
2038
	 * The feature id for the '<em><b>Ejb Refs</b></em>' containment reference list.
Lines 2032-2038 Link Here
2032
	 * @generated
2041
	 * @generated
2033
	 * @ordered
2042
	 * @ordered
2034
	 */
2043
	 */
2035
	int INTERCEPTOR_TYPE__EJB_REFS = 5;
2044
	int INTERCEPTOR_TYPE__EJB_REFS = 6;
2036
2045
2037
	/**
2046
	/**
2038
	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
2047
	 * The feature id for the '<em><b>Ejb Local Refs</b></em>' containment reference list.
Lines 2041-2047 Link Here
2041
	 * @generated
2050
	 * @generated
2042
	 * @ordered
2051
	 * @ordered
2043
	 */
2052
	 */
2044
	int INTERCEPTOR_TYPE__EJB_LOCAL_REFS = 6;
2053
	int INTERCEPTOR_TYPE__EJB_LOCAL_REFS = 7;
2045
2054
2046
	/**
2055
	/**
2047
	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
2056
	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
Lines 2050-2056 Link Here
2050
	 * @generated
2059
	 * @generated
2051
	 * @ordered
2060
	 * @ordered
2052
	 */
2061
	 */
2053
	int INTERCEPTOR_TYPE__SERVICE_REFS = 7;
2062
	int INTERCEPTOR_TYPE__SERVICE_REFS = 8;
2054
2063
2055
	/**
2064
	/**
2056
	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
2065
	 * The feature id for the '<em><b>Resource Refs</b></em>' containment reference list.
Lines 2059-2065 Link Here
2059
	 * @generated
2068
	 * @generated
2060
	 * @ordered
2069
	 * @ordered
2061
	 */
2070
	 */
2062
	int INTERCEPTOR_TYPE__RESOURCE_REFS = 8;
2071
	int INTERCEPTOR_TYPE__RESOURCE_REFS = 9;
2063
2072
2064
	/**
2073
	/**
2065
	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
2074
	 * The feature id for the '<em><b>Resource Env Refs</b></em>' containment reference list.
Lines 2068-2074 Link Here
2068
	 * @generated
2077
	 * @generated
2069
	 * @ordered
2078
	 * @ordered
2070
	 */
2079
	 */
2071
	int INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = 9;
2080
	int INTERCEPTOR_TYPE__RESOURCE_ENV_REFS = 10;
2072
2081
2073
	/**
2082
	/**
2074
	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
2083
	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
Lines 2077-2083 Link Here
2077
	 * @generated
2086
	 * @generated
2078
	 * @ordered
2087
	 * @ordered
2079
	 */
2088
	 */
2080
	int INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = 10;
2089
	int INTERCEPTOR_TYPE__MESSAGE_DESTINATION_REFS = 11;
2081
2090
2082
	/**
2091
	/**
2083
	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
2092
	 * The feature id for the '<em><b>Persistence Context Refs</b></em>' containment reference list.
Lines 2086-2092 Link Here
2086
	 * @generated
2095
	 * @generated
2087
	 * @ordered
2096
	 * @ordered
2088
	 */
2097
	 */
2089
	int INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = 11;
2098
	int INTERCEPTOR_TYPE__PERSISTENCE_CONTEXT_REFS = 12;
2090
2099
2091
	/**
2100
	/**
2092
	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
2101
	 * The feature id for the '<em><b>Persistence Unit Refs</b></em>' containment reference list.
Lines 2095-2101 Link Here
2095
	 * @generated
2104
	 * @generated
2096
	 * @ordered
2105
	 * @ordered
2097
	 */
2106
	 */
2098
	int INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = 12;
2107
	int INTERCEPTOR_TYPE__PERSISTENCE_UNIT_REFS = 13;
2099
2108
2100
	/**
2109
	/**
2101
	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
2110
	 * The feature id for the '<em><b>Post Constructs</b></em>' containment reference list.
Lines 2104-2110 Link Here
2104
	 * @generated
2113
	 * @generated
2105
	 * @ordered
2114
	 * @ordered
2106
	 */
2115
	 */
2107
	int INTERCEPTOR_TYPE__POST_CONSTRUCTS = 13;
2116
	int INTERCEPTOR_TYPE__POST_CONSTRUCTS = 14;
2108
2117
2109
	/**
2118
	/**
2110
	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
2119
	 * The feature id for the '<em><b>Pre Destroys</b></em>' containment reference list.
Lines 2113-2119 Link Here
2113
	 * @generated
2122
	 * @generated
2114
	 * @ordered
2123
	 * @ordered
2115
	 */
2124
	 */
2116
	int INTERCEPTOR_TYPE__PRE_DESTROYS = 14;
2125
	int INTERCEPTOR_TYPE__PRE_DESTROYS = 15;
2117
2126
2118
	/**
2127
	/**
2119
	 * The feature id for the '<em><b>Data Source</b></em>' containment reference list.
2128
	 * The feature id for the '<em><b>Data Source</b></em>' containment reference list.
Lines 2122-2128 Link Here
2122
	 * @generated
2131
	 * @generated
2123
	 * @ordered
2132
	 * @ordered
2124
	 */
2133
	 */
2125
	int INTERCEPTOR_TYPE__DATA_SOURCE = 15;
2134
	int INTERCEPTOR_TYPE__DATA_SOURCE = 16;
2126
2135
2127
	/**
2136
	/**
2128
	 * The feature id for the '<em><b>Jms Connection Factory</b></em>' containment reference list.
2137
	 * The feature id for the '<em><b>Jms Connection Factory</b></em>' containment reference list.
Lines 2131-2137 Link Here
2131
	 * @generated
2140
	 * @generated
2132
	 * @ordered
2141
	 * @ordered
2133
	 */
2142
	 */
2134
	int INTERCEPTOR_TYPE__JMS_CONNECTION_FACTORY = 16;
2143
	int INTERCEPTOR_TYPE__JMS_CONNECTION_FACTORY = 17;
2135
2144
2136
	/**
2145
	/**
2137
	 * The feature id for the '<em><b>Jms Destination</b></em>' containment reference list.
2146
	 * The feature id for the '<em><b>Jms Destination</b></em>' containment reference list.
Lines 2140-2146 Link Here
2140
	 * @generated
2149
	 * @generated
2141
	 * @ordered
2150
	 * @ordered
2142
	 */
2151
	 */
2143
	int INTERCEPTOR_TYPE__JMS_DESTINATION = 17;
2152
	int INTERCEPTOR_TYPE__JMS_DESTINATION = 18;
2144
2153
2145
	/**
2154
	/**
2146
	 * The feature id for the '<em><b>Mail Session</b></em>' containment reference list.
2155
	 * The feature id for the '<em><b>Mail Session</b></em>' containment reference list.
Lines 2149-2155 Link Here
2149
	 * @generated
2158
	 * @generated
2150
	 * @ordered
2159
	 * @ordered
2151
	 */
2160
	 */
2152
	int INTERCEPTOR_TYPE__MAIL_SESSION = 18;
2161
	int INTERCEPTOR_TYPE__MAIL_SESSION = 19;
2153
2162
2154
	/**
2163
	/**
2155
	 * The feature id for the '<em><b>Connection Factory</b></em>' containment reference list.
2164
	 * The feature id for the '<em><b>Connection Factory</b></em>' containment reference list.
Lines 2158-2164 Link Here
2158
	 * @generated
2167
	 * @generated
2159
	 * @ordered
2168
	 * @ordered
2160
	 */
2169
	 */
2161
	int INTERCEPTOR_TYPE__CONNECTION_FACTORY = 19;
2170
	int INTERCEPTOR_TYPE__CONNECTION_FACTORY = 20;
2162
2171
2163
	/**
2172
	/**
2164
	 * The feature id for the '<em><b>Administered Object</b></em>' containment reference list.
2173
	 * The feature id for the '<em><b>Administered Object</b></em>' containment reference list.
Lines 2167-2173 Link Here
2167
	 * @generated
2176
	 * @generated
2168
	 * @ordered
2177
	 * @ordered
2169
	 */
2178
	 */
2170
	int INTERCEPTOR_TYPE__ADMINISTERED_OBJECT = 20;
2179
	int INTERCEPTOR_TYPE__ADMINISTERED_OBJECT = 21;
2171
2180
2172
	/**
2181
	/**
2173
	 * The feature id for the '<em><b>Post Activates</b></em>' containment reference list.
2182
	 * The feature id for the '<em><b>Post Activates</b></em>' containment reference list.
Lines 2176-2182 Link Here
2176
	 * @generated
2185
	 * @generated
2177
	 * @ordered
2186
	 * @ordered
2178
	 */
2187
	 */
2179
	int INTERCEPTOR_TYPE__POST_ACTIVATES = 21;
2188
	int INTERCEPTOR_TYPE__POST_ACTIVATES = 22;
2180
2189
2181
	/**
2190
	/**
2182
	 * The feature id for the '<em><b>Pre Passivates</b></em>' containment reference list.
2191
	 * The feature id for the '<em><b>Pre Passivates</b></em>' containment reference list.
Lines 2185-2191 Link Here
2185
	 * @generated
2194
	 * @generated
2186
	 * @ordered
2195
	 * @ordered
2187
	 */
2196
	 */
2188
	int INTERCEPTOR_TYPE__PRE_PASSIVATES = 22;
2197
	int INTERCEPTOR_TYPE__PRE_PASSIVATES = 23;
2189
2198
2190
	/**
2199
	/**
2191
	 * The feature id for the '<em><b>Id</b></em>' attribute.
2200
	 * The feature id for the '<em><b>Id</b></em>' attribute.
Lines 2194-2200 Link Here
2194
	 * @generated
2203
	 * @generated
2195
	 * @ordered
2204
	 * @ordered
2196
	 */
2205
	 */
2197
	int INTERCEPTOR_TYPE__ID = 23;
2206
	int INTERCEPTOR_TYPE__ID = 24;
2198
2207
2199
	/**
2208
	/**
2200
	 * The number of structural features of the '<em>Interceptor Type</em>' class.
2209
	 * The number of structural features of the '<em>Interceptor Type</em>' class.
Lines 2203-2209 Link Here
2203
	 * @generated
2212
	 * @generated
2204
	 * @ordered
2213
	 * @ordered
2205
	 */
2214
	 */
2206
	int INTERCEPTOR_TYPE_FEATURE_COUNT = 24;
2215
	int INTERCEPTOR_TYPE_FEATURE_COUNT = 25;
2207
2216
2208
	/**
2217
	/**
2209
	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl <em>Message Driven Bean</em>}' class.
2218
	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.MessageDrivenBeanImpl <em>Message Driven Bean</em>}' class.
Lines 5844-5849 Link Here
5844
	EReference getInterceptorType_AroundTimeouts();
5853
	EReference getInterceptorType_AroundTimeouts();
5845
5854
5846
	/**
5855
	/**
5856
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getAroundConstruct <em>Around Construct</em>}'.
5857
	 * <!-- begin-user-doc -->
5858
	 * <!-- end-user-doc -->
5859
	 * @return the meta object for the containment reference list '<em>Around Construct</em>'.
5860
	 * @see org.eclipse.jst.javaee.ejb.InterceptorType#getAroundConstruct()
5861
	 * @see #getInterceptorType()
5862
	 * @generated
5863
	 */
5864
	EReference getInterceptorType_AroundConstruct();
5865
5866
	/**
5847
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}'.
5867
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.ejb.InterceptorType#getEnvEntries <em>Env Entries</em>}'.
5848
	 * <!-- begin-user-doc -->
5868
	 * <!-- begin-user-doc -->
5849
	 * <!-- end-user-doc -->
5869
	 * <!-- end-user-doc -->
Lines 9466-9471 Link Here
9466
		EReference INTERCEPTOR_TYPE__AROUND_TIMEOUTS = eINSTANCE.getInterceptorType_AroundTimeouts();
9486
		EReference INTERCEPTOR_TYPE__AROUND_TIMEOUTS = eINSTANCE.getInterceptorType_AroundTimeouts();
9467
9487
9468
		/**
9488
		/**
9489
		 * The meta object literal for the '<em><b>Around Construct</b></em>' containment reference list feature.
9490
		 * <!-- begin-user-doc -->
9491
		 * <!-- end-user-doc -->
9492
		 * @generated
9493
		 */
9494
		EReference INTERCEPTOR_TYPE__AROUND_CONSTRUCT = eINSTANCE.getInterceptorType_AroundConstruct();
9495
9496
		/**
9469
		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
9497
		 * The meta object literal for the '<em><b>Env Entries</b></em>' containment reference list feature.
9470
		 * <!-- begin-user-doc -->
9498
		 * <!-- begin-user-doc -->
9471
		 * <!-- end-user-doc -->
9499
		 * <!-- end-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/web/CookieConfigType.java (-3 / +6 lines)
Lines 232-240 Link Here
232
	 * 
232
	 * 
233
	 * 
233
	 * 
234
	 *             Specifies whether any session tracking cookies created 
234
	 *             Specifies whether any session tracking cookies created 
235
	 *             by this web application will be marked as secure
235
	 *             by this web application will be marked as secure.
236
	 *             even if the request that initiated the corresponding session
236
	 *             When true, all session tracking cookies must be marked
237
	 *             is using plain HTTP instead of HTTPS
237
	 *             as secure independent of the nature of the request that
238
	 *             initiated the corresponding session.
239
	 *             When false, the session cookie should only be marked secure
240
	 *             if the request that initiated the session was secure.
238
	 *             
241
	 *             
239
	 *             @since Java EE 6, Web 3.0
242
	 *             @since Java EE 6, Web 3.0
240
	 *           
243
	 *           
(-)jee-models/org/eclipse/jst/javaee/web/WebApp.java (+24 lines)
Lines 85-90 Link Here
85
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAdministeredObject <em>Administered Object</em>}</li>
85
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAdministeredObject <em>Administered Object</em>}</li>
86
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations <em>Message Destinations</em>}</li>
86
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations <em>Message Destinations</em>}</li>
87
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
87
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
88
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDenyUncoveredHttpMethods <em>Deny Uncovered Http Methods</em>}</li>
88
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
89
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
89
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}</li>
90
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}</li>
90
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}</li>
91
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}</li>
Lines 697-702 Link Here
697
	List<LocaleEncodingMappingList> getLocalEncodingMappingsLists();
698
	List<LocaleEncodingMappingList> getLocalEncodingMappingsLists();
698
699
699
	/**
700
	/**
701
	 * Returns the value of the '<em><b>Deny Uncovered Http Methods</b></em>' containment reference list.
702
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EmptyType}.
703
	 * <!-- begin-user-doc -->
704
	 * <!-- end-user-doc -->
705
	 * <!-- begin-model-doc -->
706
	 * 
707
	 * 
708
	 *             When specified, this element causes uncovered http methods
709
	 *             to be denied. For every url-pattern that is the target of a 
710
	 *             security-constrant, this element causes all HTTP methods that
711
	 *             are NOT covered (by a security constraint) at the url-pattern
712
	 *             to be denied.
713
	 *             
714
	 *             @since Java EE 7, Web 3.1
715
	 *           
716
	 * <!-- end-model-doc -->
717
	 * @return the value of the '<em>Deny Uncovered Http Methods</em>' containment reference list.
718
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_DenyUncoveredHttpMethods()
719
	 * @generated
720
	 */
721
	List<EmptyType> getDenyUncoveredHttpMethods();
722
723
	/**
700
	 * Returns the value of the '<em><b>Absolute Ordering</b></em>' containment reference list.
724
	 * Returns the value of the '<em><b>Absolute Ordering</b></em>' containment reference list.
701
	 * The list contents are of type {@link org.eclipse.jst.javaee.web.AbsoluteOrderingType}.
725
	 * The list contents are of type {@link org.eclipse.jst.javaee.web.AbsoluteOrderingType}.
702
	 * <!-- begin-user-doc -->
726
	 * <!-- begin-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java (+23 lines)
Lines 114-119 Link Here
114
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAdministeredObject <em>Administered Object</em>}</li>
114
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAdministeredObject <em>Administered Object</em>}</li>
115
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations <em>Message Destinations</em>}</li>
115
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations <em>Message Destinations</em>}</li>
116
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
116
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
117
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDenyUncoveredHttpMethods <em>Deny Uncovered Http Methods</em>}</li>
117
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
118
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
118
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId <em>Id</em>}</li>
119
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId <em>Id</em>}</li>
119
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
120
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
Lines 581-586 Link Here
581
	 * <!-- end-user-doc -->
582
	 * <!-- end-user-doc -->
582
	 * @generated
583
	 * @generated
583
	 */
584
	 */
585
	public List<EmptyType> getDenyUncoveredHttpMethods() {
586
		return getGroup().list(WebPackage.Literals.WEB_APP__DENY_UNCOVERED_HTTP_METHODS);
587
	}
588
589
	/**
590
	 * <!-- begin-user-doc -->
591
	 * <!-- end-user-doc -->
592
	 * @generated
593
	 */
584
	public List<String> getModuleName() {
594
	public List<String> getModuleName() {
585
		return getGroup().list(WebPackage.Literals.WEB_APP__MODULE_NAME);
595
		return getGroup().list(WebPackage.Literals.WEB_APP__MODULE_NAME);
586
	}
596
	}
Lines 791-796 Link Here
791
				return ((InternalEList<?>)getMessageDestinations()).basicRemove(otherEnd, msgs);
801
				return ((InternalEList<?>)getMessageDestinations()).basicRemove(otherEnd, msgs);
792
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
802
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
793
				return ((InternalEList<?>)getLocalEncodingMappingsLists()).basicRemove(otherEnd, msgs);
803
				return ((InternalEList<?>)getLocalEncodingMappingsLists()).basicRemove(otherEnd, msgs);
804
			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
805
				return ((InternalEList<?>)getDenyUncoveredHttpMethods()).basicRemove(otherEnd, msgs);
794
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
806
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
795
				return ((InternalEList<?>)getAbsoluteOrdering()).basicRemove(otherEnd, msgs);
807
				return ((InternalEList<?>)getAbsoluteOrdering()).basicRemove(otherEnd, msgs);
796
		}
808
		}
Lines 884-889 Link Here
884
				return getMessageDestinations();
896
				return getMessageDestinations();
885
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
897
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
886
				return getLocalEncodingMappingsLists();
898
				return getLocalEncodingMappingsLists();
899
			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
900
				return getDenyUncoveredHttpMethods();
887
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
901
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
888
				return getAbsoluteOrdering();
902
				return getAbsoluteOrdering();
889
			case WebPackage.WEB_APP__ID:
903
			case WebPackage.WEB_APP__ID:
Lines 1060-1065 Link Here
1060
				getLocalEncodingMappingsLists().clear();
1074
				getLocalEncodingMappingsLists().clear();
1061
				getLocalEncodingMappingsLists().addAll((Collection<? extends LocaleEncodingMappingList>)newValue);
1075
				getLocalEncodingMappingsLists().addAll((Collection<? extends LocaleEncodingMappingList>)newValue);
1062
				return;
1076
				return;
1077
			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
1078
				getDenyUncoveredHttpMethods().clear();
1079
				getDenyUncoveredHttpMethods().addAll((Collection<? extends EmptyType>)newValue);
1080
				return;
1063
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1081
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1064
				getAbsoluteOrdering().clear();
1082
				getAbsoluteOrdering().clear();
1065
				getAbsoluteOrdering().addAll((Collection<? extends AbsoluteOrderingType>)newValue);
1083
				getAbsoluteOrdering().addAll((Collection<? extends AbsoluteOrderingType>)newValue);
Lines 1202-1207 Link Here
1202
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1220
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1203
				getLocalEncodingMappingsLists().clear();
1221
				getLocalEncodingMappingsLists().clear();
1204
				return;
1222
				return;
1223
			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
1224
				getDenyUncoveredHttpMethods().clear();
1225
				return;
1205
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1226
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1206
				getAbsoluteOrdering().clear();
1227
				getAbsoluteOrdering().clear();
1207
				return;
1228
				return;
Lines 1304-1309 Link Here
1304
				return !getMessageDestinations().isEmpty();
1325
				return !getMessageDestinations().isEmpty();
1305
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1326
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1306
				return !getLocalEncodingMappingsLists().isEmpty();
1327
				return !getLocalEncodingMappingsLists().isEmpty();
1328
			case WebPackage.WEB_APP__DENY_UNCOVERED_HTTP_METHODS:
1329
				return !getDenyUncoveredHttpMethods().isEmpty();
1307
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1330
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1308
				return !getAbsoluteOrdering().isEmpty();
1331
				return !getAbsoluteOrdering().isEmpty();
1309
			case WebPackage.WEB_APP__ID:
1332
			case WebPackage.WEB_APP__ID:
(-)jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java (-11 / +31 lines)
Lines 1871-1876 Link Here
1871
	 * <!-- end-user-doc -->
1871
	 * <!-- end-user-doc -->
1872
	 * @generated
1872
	 * @generated
1873
	 */
1873
	 */
1874
	public EReference getWebApp_DenyUncoveredHttpMethods() {
1875
		return (EReference)webAppEClass.getEStructuralFeatures().get(39);
1876
	}
1877
1878
	/**
1879
	 * <!-- begin-user-doc -->
1880
	 * <!-- end-user-doc -->
1881
	 * @generated
1882
	 */
1874
	public EAttribute getWebApp_ModuleName() {
1883
	public EAttribute getWebApp_ModuleName() {
1875
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(1);
1884
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(1);
1876
	}
1885
	}
Lines 1881-1887 Link Here
1881
	 * @generated
1890
	 * @generated
1882
	 */
1891
	 */
1883
	public EReference getWebApp_AbsoluteOrdering() {
1892
	public EReference getWebApp_AbsoluteOrdering() {
1884
		return (EReference)webAppEClass.getEStructuralFeatures().get(39);
1893
		return (EReference)webAppEClass.getEStructuralFeatures().get(40);
1885
	}
1894
	}
1886
1895
1887
	/**
1896
	/**
Lines 1890-1904 Link Here
1890
	 * @generated
1899
	 * @generated
1891
	 */
1900
	 */
1892
	public EAttribute getWebApp_Id() {
1901
	public EAttribute getWebApp_Id() {
1893
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(40);
1894
	}
1895
1896
	/**
1897
	 * <!-- begin-user-doc -->
1898
	 * <!-- end-user-doc -->
1899
	 * @generated
1900
	 */
1901
	public EAttribute getWebApp_MetadataComplete() {
1902
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(41);
1902
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(41);
1903
	}
1903
	}
1904
1904
Lines 1907-1914 Link Here
1907
	 * <!-- end-user-doc -->
1907
	 * <!-- end-user-doc -->
1908
	 * @generated
1908
	 * @generated
1909
	 */
1909
	 */
1910
	public EAttribute getWebApp_Version() {
1910
	public EAttribute getWebApp_MetadataComplete() {
1911
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(42);
1911
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(42);
1912
	}
1913
1914
	/**
1915
	 * <!-- begin-user-doc -->
1916
	 * <!-- end-user-doc -->
1917
	 * @generated
1918
	 */
1919
	public EAttribute getWebApp_Version() {
1920
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(43);
1912
	}
1921
	}
1913
1922
1914
	/**
1923
	/**
Lines 2836-2841 Link Here
2836
		createEReference(webAppEClass, WEB_APP__ADMINISTERED_OBJECT);
2845
		createEReference(webAppEClass, WEB_APP__ADMINISTERED_OBJECT);
2837
		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
2846
		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
2838
		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
2847
		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
2848
		createEReference(webAppEClass, WEB_APP__DENY_UNCOVERED_HTTP_METHODS);
2839
		createEReference(webAppEClass, WEB_APP__ABSOLUTE_ORDERING);
2849
		createEReference(webAppEClass, WEB_APP__ABSOLUTE_ORDERING);
2840
		createEAttribute(webAppEClass, WEB_APP__ID);
2850
		createEAttribute(webAppEClass, WEB_APP__ID);
2841
		createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE);
2851
		createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE);
Lines 3150-3155 Link Here
3150
		initEReference(getWebApp_AdministeredObject(), theJavaeePackage.getAdministeredObjectType(), null, "administeredObject", 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$
3160
		initEReference(getWebApp_AdministeredObject(), theJavaeePackage.getAdministeredObjectType(), null, "administeredObject", 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$
3151
		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$
3161
		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$
3152
		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$
3162
		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$
3163
		initEReference(getWebApp_DenyUncoveredHttpMethods(), theJavaeePackage.getEmptyType(), null, "denyUncoveredHttpMethods", 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$
3153
		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$
3164
		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$
3154
		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$
3165
		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$
3155
		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$
3166
		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$
Lines 4637-4642 Link Here
4637
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4648
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4638
		   });			
4649
		   });			
4639
		addAnnotation
4650
		addAnnotation
4651
		  (getWebApp_DenyUncoveredHttpMethods(), 
4652
		   source, 
4653
		   new String[] {
4654
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4655
			 "name", "deny-uncovered-http-methods", //$NON-NLS-1$ //$NON-NLS-2$
4656
			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
4657
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4658
		   });			
4659
		addAnnotation
4640
		  (getWebApp_AbsoluteOrdering(), 
4660
		  (getWebApp_AbsoluteOrdering(), 
4641
		   source, 
4661
		   source, 
4642
		   new String[] {
4662
		   new String[] {
(-)jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java (-5 / +33 lines)
Lines 1956-1968 Link Here
1956
	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 38;
1956
	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 38;
1957
1957
1958
	/**
1958
	/**
1959
	 * The feature id for the '<em><b>Deny Uncovered Http Methods</b></em>' containment reference list.
1960
	 * <!-- begin-user-doc -->
1961
	 * <!-- end-user-doc -->
1962
	 * @generated
1963
	 * @ordered
1964
	 */
1965
	int WEB_APP__DENY_UNCOVERED_HTTP_METHODS = 39;
1966
1967
	/**
1959
	 * The feature id for the '<em><b>Absolute Ordering</b></em>' containment reference list.
1968
	 * The feature id for the '<em><b>Absolute Ordering</b></em>' containment reference list.
1960
	 * <!-- begin-user-doc -->
1969
	 * <!-- begin-user-doc -->
1961
	 * <!-- end-user-doc -->
1970
	 * <!-- end-user-doc -->
1962
	 * @generated
1971
	 * @generated
1963
	 * @ordered
1972
	 * @ordered
1964
	 */
1973
	 */
1965
	int WEB_APP__ABSOLUTE_ORDERING = 39;
1974
	int WEB_APP__ABSOLUTE_ORDERING = 40;
1966
1975
1967
	/**
1976
	/**
1968
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1977
	 * The feature id for the '<em><b>Id</b></em>' attribute.
Lines 1971-1977 Link Here
1971
	 * @generated
1980
	 * @generated
1972
	 * @ordered
1981
	 * @ordered
1973
	 */
1982
	 */
1974
	int WEB_APP__ID = 40;
1983
	int WEB_APP__ID = 41;
1975
1984
1976
	/**
1985
	/**
1977
	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
1986
	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
Lines 1980-1986 Link Here
1980
	 * @generated
1989
	 * @generated
1981
	 * @ordered
1990
	 * @ordered
1982
	 */
1991
	 */
1983
	int WEB_APP__METADATA_COMPLETE = 41;
1992
	int WEB_APP__METADATA_COMPLETE = 42;
1984
1993
1985
	/**
1994
	/**
1986
	 * The feature id for the '<em><b>Version</b></em>' attribute.
1995
	 * The feature id for the '<em><b>Version</b></em>' attribute.
Lines 1989-1995 Link Here
1989
	 * @generated
1998
	 * @generated
1990
	 * @ordered
1999
	 * @ordered
1991
	 */
2000
	 */
1992
	int WEB_APP__VERSION = 42;
2001
	int WEB_APP__VERSION = 43;
1993
2002
1994
	/**
2003
	/**
1995
	 * The number of structural features of the '<em>App</em>' class.
2004
	 * The number of structural features of the '<em>App</em>' class.
Lines 1998-2004 Link Here
1998
	 * @generated
2007
	 * @generated
1999
	 * @ordered
2008
	 * @ordered
2000
	 */
2009
	 */
2001
	int WEB_APP_FEATURE_COUNT = 43;
2010
	int WEB_APP_FEATURE_COUNT = 44;
2002
2011
2003
	/**
2012
	/**
2004
	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl <em>App Deployment Descriptor</em>}' class.
2013
	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl <em>App Deployment Descriptor</em>}' class.
Lines 4430-4435 Link Here
4430
	EReference getWebApp_LocalEncodingMappingsLists();
4439
	EReference getWebApp_LocalEncodingMappingsLists();
4431
4440
4432
	/**
4441
	/**
4442
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDenyUncoveredHttpMethods <em>Deny Uncovered Http Methods</em>}'.
4443
	 * <!-- begin-user-doc -->
4444
	 * <!-- end-user-doc -->
4445
	 * @return the meta object for the containment reference list '<em>Deny Uncovered Http Methods</em>'.
4446
	 * @see org.eclipse.jst.javaee.web.WebApp#getDenyUncoveredHttpMethods()
4447
	 * @see #getWebApp()
4448
	 * @generated
4449
	 */
4450
	EReference getWebApp_DenyUncoveredHttpMethods();
4451
4452
	/**
4433
	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getModuleName <em>Module Name</em>}'.
4453
	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getModuleName <em>Module Name</em>}'.
4434
	 * <!-- begin-user-doc -->
4454
	 * <!-- begin-user-doc -->
4435
	 * <!-- end-user-doc -->
4455
	 * <!-- end-user-doc -->
Lines 6628-6633 Link Here
6628
		EReference WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = eINSTANCE.getWebApp_LocalEncodingMappingsLists();
6648
		EReference WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = eINSTANCE.getWebApp_LocalEncodingMappingsLists();
6629
6649
6630
		/**
6650
		/**
6651
		 * The meta object literal for the '<em><b>Deny Uncovered Http Methods</b></em>' containment reference list feature.
6652
		 * <!-- begin-user-doc -->
6653
		 * <!-- end-user-doc -->
6654
		 * @generated
6655
		 */
6656
		EReference WEB_APP__DENY_UNCOVERED_HTTP_METHODS = eINSTANCE.getWebApp_DenyUncoveredHttpMethods();
6657
6658
		/**
6631
		 * The meta object literal for the '<em><b>Module Name</b></em>' attribute list feature.
6659
		 * The meta object literal for the '<em><b>Module Name</b></em>' attribute list feature.
6632
		 * <!-- begin-user-doc -->
6660
		 * <!-- begin-user-doc -->
6633
		 * <!-- end-user-doc -->
6661
		 * <!-- end-user-doc -->

Return to bug 408354