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

(-)jee-models/org/eclipse/jst/javaee/ejb/InterceptorsType.java (-1 / +1 lines)
Lines 24-30 Link Here
24
 * 
24
 * 
25
 * 
25
 * 
26
 *         The interceptorsType element declares one or more interceptor
26
 *         The interceptorsType element declares one or more interceptor
27
 *         classes used by components within this ejb-jar.  The declaration
27
 *         classes used by components within this ejb-jar or .war.  The declaration
28
 *         consists of :
28
 *         consists of :
29
 *         
29
 *         
30
 *         - An optional description.
30
 *         - An optional description.
(-)jee-models/org/eclipse/jst/javaee/ejb/StatefulTimeoutType.java (+4 lines)
Lines 26-31 Link Here
26
 *         a stateful session bean can be idle(not receive any client
26
 *         a stateful session bean can be idle(not receive any client
27
 *         invocations) before it is eligible for removal by the container.
27
 *         invocations) before it is eligible for removal by the container.
28
 *         
28
 *         
29
 *         A timeout value of 0 means the bean is immediately eligible for removal.
30
 *         
31
 *         A timeout value of -1 means the bean will never be removed due to timeout.
32
 *         
29
 *         @since Java EE 6, EJB 3.1
33
 *         @since Java EE 6, EJB 3.1
30
 *       
34
 *       
31
 * <!-- end-model-doc -->
35
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/AccessTimeoutType.java (+4 lines)
Lines 27-32 Link Here
27
 *         a concurrency lock before throwing a timeout exception to the
27
 *         a concurrency lock before throwing a timeout exception to the
28
 *         client.
28
 *         client.
29
 *         
29
 *         
30
 *         A timeout value of 0 means concurrent access is not permitted.
31
 *         
32
 *         A timeout value of -1 means wait indefinitely to acquire a lock.
33
 *         
30
 *         @since Java EE 6, EJB 3.1
34
 *         @since Java EE 6, EJB 3.1
31
 *       
35
 *       
32
 * <!-- end-model-doc -->
36
 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/ejb/AsyncMethodType.java (-60 lines)
Lines 23-32 Link Here
23
 *         The async-methodType element specifies that a session
23
 *         The async-methodType element specifies that a session
24
 *         bean method has asynchronous invocation semantics.
24
 *         bean method has asynchronous invocation semantics.
25
 *         
25
 *         
26
 *         The optional method-intf element constrains the async
27
 *         method behavior to the client views of the given method-intf 
28
 *         type.  This value must be either Remote or Local.  
29
 *         
30
 *         @since Java EE 6, EJB 3.1
26
 *         @since Java EE 6, EJB 3.1
31
 *       
27
 *       
32
 * <!-- end-model-doc -->
28
 * <!-- end-model-doc -->
Lines 36-42 Link Here
36
 * <ul>
32
 * <ul>
37
 *   <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodName <em>Method Name</em>}</li>
33
 *   <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodName <em>Method Name</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodParams <em>Method Params</em>}</li>
34
 *   <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodParams <em>Method Params</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf <em>Method Intf</em>}</li>
40
 *   <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId <em>Id</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId <em>Id</em>}</li>
41
 * </ul>
36
 * </ul>
42
 * </p>
37
 * </p>
Lines 97-157 Link Here
97
	void setMethodParams(MethodParams value);
92
	void setMethodParams(MethodParams value);
98
93
99
	/**
94
	/**
100
	 * Returns the value of the '<em><b>Method Intf</b></em>' attribute.
101
	 * The literals are from the enumeration {@link org.eclipse.jst.javaee.ejb.MethodInterfaceType}.
102
	 * <!-- begin-user-doc -->
103
	 * <p>
104
	 * If the meaning of the '<em>Method Intf</em>' attribute isn't clear,
105
	 * there really should be more of a description here...
106
	 * </p>
107
	 * <!-- end-user-doc -->
108
	 * @return the value of the '<em>Method Intf</em>' attribute.
109
	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
110
	 * @see #isSetMethodIntf()
111
	 * @see #unsetMethodIntf()
112
	 * @see #setMethodIntf(MethodInterfaceType)
113
	 * @see org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage#getAsyncMethodType_MethodIntf()
114
	 * @generated
115
	 */
116
	MethodInterfaceType getMethodIntf();
117
118
	/**
119
	 * Sets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf <em>Method Intf</em>}' attribute.
120
	 * <!-- begin-user-doc -->
121
	 * <!-- end-user-doc -->
122
	 * @param value the new value of the '<em>Method Intf</em>' attribute.
123
	 * @see org.eclipse.jst.javaee.ejb.MethodInterfaceType
124
	 * @see #isSetMethodIntf()
125
	 * @see #unsetMethodIntf()
126
	 * @see #getMethodIntf()
127
	 * @generated
128
	 */
129
	void setMethodIntf(MethodInterfaceType value);
130
131
	/**
132
	 * Unsets the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf <em>Method Intf</em>}' attribute.
133
	 * <!-- begin-user-doc -->
134
	 * <!-- end-user-doc -->
135
	 * @see #isSetMethodIntf()
136
	 * @see #getMethodIntf()
137
	 * @see #setMethodIntf(MethodInterfaceType)
138
	 * @generated
139
	 */
140
	void unsetMethodIntf();
141
142
	/**
143
	 * Returns whether the value of the '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf <em>Method Intf</em>}' attribute is set.
144
	 * <!-- begin-user-doc -->
145
	 * <!-- end-user-doc -->
146
	 * @return whether the value of the '<em>Method Intf</em>' attribute is set.
147
	 * @see #unsetMethodIntf()
148
	 * @see #getMethodIntf()
149
	 * @see #setMethodIntf(MethodInterfaceType)
150
	 * @generated
151
	 */
152
	boolean isSetMethodIntf();
153
154
	/**
155
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
95
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
156
	 * <!-- begin-user-doc -->
96
	 * <!-- begin-user-doc -->
157
	 * <p>
97
	 * <p>
(-)jee-models/org/eclipse/jst/javaee/ejb/EJBJar.java (-2 / +4 lines)
Lines 34-39 Link Here
34
 *         icon file name
34
 *         icon file name
35
 *         - an optional module name. Only applicable to
35
 *         - an optional module name. Only applicable to
36
 *         stand-alone ejb-jars or ejb-jars packaged in an ear.
36
 *         stand-alone ejb-jars or ejb-jars packaged in an ear.
37
 *         Ignored if specified for an ejb-jar.xml within a .war.
38
 *         In that case, standard .war module-name rules apply.
37
 *         - structural information about all included
39
 *         - structural information about all included
38
 *         enterprise beans that is not specified through
40
 *         enterprise beans that is not specified through
39
 *         annotations
41
 *         annotations
Lines 51-60 Link Here
51
 * <p>
53
 * <p>
52
 * The following features are supported:
54
 * The following features are supported:
53
 * <ul>
55
 * <ul>
56
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getModuleName <em>Module Name</em>}</li>
54
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions <em>Descriptions</em>}</li>
57
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDescriptions <em>Descriptions</em>}</li>
55
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames <em>Display Names</em>}</li>
58
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getDisplayNames <em>Display Names</em>}</li>
56
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getIcons <em>Icons</em>}</li>
59
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getIcons <em>Icons</em>}</li>
57
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getModuleName <em>Module Name</em>}</li>
58
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans <em>Enterprise Beans</em>}</li>
60
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getEnterpriseBeans <em>Enterprise Beans</em>}</li>
59
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors <em>Interceptors</em>}</li>
61
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getInterceptors <em>Interceptors</em>}</li>
60
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships <em>Relationships</em>}</li>
62
 *   <li>{@link org.eclipse.jst.javaee.ejb.EJBJar#getRelationships <em>Relationships</em>}</li>
Lines 225-231 Link Here
225
	 * 
227
	 * 
226
	 * 
228
	 * 
227
	 *             Providing an assembly-descriptor in the deployment
229
	 *             Providing an assembly-descriptor in the deployment
228
	 *             descriptor is optional for the ejb-jar file
230
	 *             descriptor is optional for the ejb-jar or .war file
229
	 *             producer.
231
	 *             producer.
230
	 *             
232
	 *             
231
	 *             @since Java EE 5, EJB 3.0
233
	 *             @since Java EE 5, EJB 3.0
(-)jee-models/org/eclipse/jst/javaee/ejb/AssemblyDescriptor.java (-1 / +1 lines)
Lines 40-46 Link Here
40
 *         omitted if the lists represented by them are empty.
40
 *         omitted if the lists represented by them are empty.
41
 *         
41
 *         
42
 *         Providing an assembly-descriptor in the deployment
42
 *         Providing an assembly-descriptor in the deployment
43
 *         descriptor is optional for the ejb-jar file producer.
43
 *         descriptor is optional for the ejb-jar or .war file producer.
44
 *         
44
 *         
45
 *         @since Java EE 5, EJB 3.0
45
 *         @since Java EE 5, EJB 3.0
46
 *       
46
 *       
(-)jee-models/org/eclipse/jst/javaee/ejb/ConcurrencyManagementTypeType.java (-28 / +1 lines)
Lines 31-37 Link Here
31
 *         
31
 *         
32
 *         Bean
32
 *         Bean
33
 *         Container
33
 *         Container
34
 *         NotAllowed
35
 *         
34
 *         
36
 *         Bean managed concurrency can only be specified for a singleton bean.
35
 *         Bean managed concurrency can only be specified for a singleton bean.
37
 *         
36
 *         
Lines 60-76 Link Here
60
	 * @generated
59
	 * @generated
61
	 * @ordered
60
	 * @ordered
62
	 */
61
	 */
63
	CONTAINER(1, "Container", "Container"), //$NON-NLS-1$ //$NON-NLS-2$
62
	CONTAINER(1, "Container", "Container"); //$NON-NLS-1$ //$NON-NLS-2$
64
65
	/**
66
	 * The '<em><b>Not Allowed</b></em>' literal object.
67
	 * <!-- begin-user-doc -->
68
	 * <!-- end-user-doc -->
69
	 * @see #NOT_ALLOWED_VALUE
70
	 * @generated
71
	 * @ordered
72
	 */
73
	NOT_ALLOWED(2, "NotAllowed", "NotAllowed"); //$NON-NLS-1$ //$NON-NLS-2$
74
63
75
	/**
64
	/**
76
	 * The '<em><b>Bean</b></em>' literal value.
65
	 * The '<em><b>Bean</b></em>' literal value.
Lines 101-120 Link Here
101
	public static final int CONTAINER_VALUE = 1;
90
	public static final int CONTAINER_VALUE = 1;
102
91
103
	/**
92
	/**
104
	 * The '<em><b>Not Allowed</b></em>' literal value.
105
	 * <!-- begin-user-doc -->
106
	 * <p>
107
	 * If the meaning of '<em><b>Not Allowed</b></em>' literal object isn't clear,
108
	 * there really should be more of a description here...
109
	 * </p>
110
	 * <!-- end-user-doc -->
111
	 * @see #NOT_ALLOWED
112
	 * @generated
113
	 * @ordered
114
	 */
115
	public static final int NOT_ALLOWED_VALUE = 2;
116
117
	/**
118
	 * An array of all the '<em><b>Concurrency Management Type Type</b></em>' enumerators.
93
	 * An array of all the '<em><b>Concurrency Management Type Type</b></em>' enumerators.
119
	 * <!-- begin-user-doc -->
94
	 * <!-- begin-user-doc -->
120
	 * <!-- end-user-doc -->
95
	 * <!-- end-user-doc -->
Lines 124-130 Link Here
124
		new ConcurrencyManagementTypeType[] {
99
		new ConcurrencyManagementTypeType[] {
125
			BEAN,
100
			BEAN,
126
			CONTAINER,
101
			CONTAINER,
127
			NOT_ALLOWED,
128
		};
102
		};
129
103
130
	/**
104
	/**
Lines 177-183 Link Here
177
		switch (value) {
151
		switch (value) {
178
			case BEAN_VALUE: return BEAN;
152
			case BEAN_VALUE: return BEAN;
179
			case CONTAINER_VALUE: return CONTAINER;
153
			case CONTAINER_VALUE: return CONTAINER;
180
			case NOT_ALLOWED_VALUE: return NOT_ALLOWED;
181
		}
154
		}
182
		return null;
155
		return null;
183
	}
156
	}
(-)jee-models/org/eclipse/jst/javaee/ejb/InterceptorBindingType.java (-5 / +5 lines)
Lines 24-36 Link Here
24
 * 
24
 * 
25
 * <![CDATA[[
25
 * <![CDATA[[
26
 *         The interceptor-bindingType element describes the binding of
26
 *         The interceptor-bindingType element describes the binding of
27
 *         interceptor classes to beans within the ejb-jar.
27
 *         interceptor classes to beans within the ejb-jar or .war.
28
 *         It consists of :
28
 *         It consists of :
29
 *         
29
 *         
30
 *         - An optional description.
30
 *         - An optional description.
31
 *         - The name of an ejb within the ejb-jar or the wildcard value "*",
31
 *         - The name of an ejb within the module or the wildcard value "*",
32
 *         which is used to define interceptors that are bound to all
32
 *         which is used to define interceptors that are bound to all
33
 *         beans in the ejb-jar.
33
 *         beans in the ejb-jar or .war.
34
 *         - A list of interceptor classes that are bound to the contents of
34
 *         - A list of interceptor classes that are bound to the contents of
35
 *         the ejb-name element or a specification of the total ordering
35
 *         the ejb-name element or a specification of the total ordering
36
 *         over the interceptors defined for the given level and above.
36
 *         over the interceptors defined for the given level and above.
Lines 44-50 Link Here
44
 *         of a method-level interceptor.
44
 *         of a method-level interceptor.
45
 *         
45
 *         
46
 *         Interceptors bound to all classes using the wildcard syntax
46
 *         Interceptors bound to all classes using the wildcard syntax
47
 *         "*" are default interceptors for the components in the ejb-jar. 
47
 *         "*" are default interceptors for the components in the ejb-jar or .war. 
48
 *         In addition, interceptors may be bound at the level of the bean
48
 *         In addition, interceptors may be bound at the level of the bean
49
 *         class (class-level interceptors) or business methods (method-level
49
 *         class (class-level interceptors) or business methods (method-level
50
 *         interceptors ).
50
 *         interceptors ).
Lines 64-70 Link Here
64
 *         
64
 *         
65
 *         Specifying the ejb-name as the wildcard value "*" designates
65
 *         Specifying the ejb-name as the wildcard value "*" designates
66
 *         default interceptors (interceptors that apply to all session and
66
 *         default interceptors (interceptors that apply to all session and
67
 *         message-driven beans contained in the ejb-jar).
67
 *         message-driven beans contained in the ejb-jar or .war).
68
 *         
68
 *         
69
 *         2. 
69
 *         2. 
70
 *         <interceptor-binding>
70
 *         <interceptor-binding>
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/DataSourceTypeImpl.java (-1 / +1 lines)
Lines 305-311 Link Here
305
	 * @generated
305
	 * @generated
306
	 * @ordered
306
	 * @ordered
307
	 */
307
	 */
308
	protected static final IsolationLevelType ISOLATION_LEVEL_EDEFAULT = IsolationLevelType.TRANSACTIONNONE;
308
	protected static final IsolationLevelType ISOLATION_LEVEL_EDEFAULT = IsolationLevelType.TRANSACTIONREADUNCOMMITTED;
309
309
310
	/**
310
	/**
311
	 * The cached value of the '{@link #getIsolationLevel() <em>Isolation Level</em>}' attribute.
311
	 * The cached value of the '{@link #getIsolationLevel() <em>Isolation Level</em>}' attribute.
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/MessageDestinationImpl.java (+54 lines)
Lines 46-51 Link Here
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getIcons <em>Icons</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getIcons <em>Icons</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getMessageDestinationName <em>Message Destination Name</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getMessageDestinationName <em>Message Destination Name</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getMappedName <em>Mapped Name</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getMappedName <em>Mapped Name</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getLookupName <em>Lookup Name</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getId <em>Id</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationImpl#getId <em>Id</em>}</li>
50
 * </ul>
51
 * </ul>
51
 * </p>
52
 * </p>
Lines 124-129 Link Here
124
	protected String mappedName = MAPPED_NAME_EDEFAULT;
125
	protected String mappedName = MAPPED_NAME_EDEFAULT;
125
126
126
	/**
127
	/**
128
	 * The default value of the '{@link #getLookupName() <em>Lookup Name</em>}' attribute.
129
	 * <!-- begin-user-doc -->
130
	 * <!-- end-user-doc -->
131
	 * @see #getLookupName()
132
	 * @generated
133
	 * @ordered
134
	 */
135
	protected static final String LOOKUP_NAME_EDEFAULT = null;
136
137
	/**
138
	 * The cached value of the '{@link #getLookupName() <em>Lookup Name</em>}' attribute.
139
	 * <!-- begin-user-doc -->
140
	 * <!-- end-user-doc -->
141
	 * @see #getLookupName()
142
	 * @generated
143
	 * @ordered
144
	 */
145
	protected String lookupName = LOOKUP_NAME_EDEFAULT;
146
147
	/**
127
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
148
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
128
	 * <!-- begin-user-doc -->
149
	 * <!-- begin-user-doc -->
129
	 * <!-- end-user-doc -->
150
	 * <!-- end-user-doc -->
Lines 245-250 Link Here
245
	 * <!-- end-user-doc -->
266
	 * <!-- end-user-doc -->
246
	 * @generated
267
	 * @generated
247
	 */
268
	 */
269
	public String getLookupName() {
270
		return lookupName;
271
	}
272
273
	/**
274
	 * <!-- begin-user-doc -->
275
	 * <!-- end-user-doc -->
276
	 * @generated
277
	 */
278
	public void setLookupName(String newLookupName) {
279
		String oldLookupName = lookupName;
280
		lookupName = newLookupName;
281
		if (eNotificationRequired())
282
			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME, oldLookupName, lookupName));
283
	}
284
285
	/**
286
	 * <!-- begin-user-doc -->
287
	 * <!-- end-user-doc -->
288
	 * @generated
289
	 */
248
	public String getId() {
290
	public String getId() {
249
		return id;
291
		return id;
250
	}
292
	}
Lines 297-302 Link Here
297
				return getMessageDestinationName();
339
				return getMessageDestinationName();
298
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
340
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
299
				return getMappedName();
341
				return getMappedName();
342
			case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME:
343
				return getLookupName();
300
			case JavaeePackage.MESSAGE_DESTINATION__ID:
344
			case JavaeePackage.MESSAGE_DESTINATION__ID:
301
				return getId();
345
				return getId();
302
		}
346
		}
Lines 330-335 Link Here
330
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
374
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
331
				setMappedName((String)newValue);
375
				setMappedName((String)newValue);
332
				return;
376
				return;
377
			case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME:
378
				setLookupName((String)newValue);
379
				return;
333
			case JavaeePackage.MESSAGE_DESTINATION__ID:
380
			case JavaeePackage.MESSAGE_DESTINATION__ID:
334
				setId((String)newValue);
381
				setId((String)newValue);
335
				return;
382
				return;
Lines 360-365 Link Here
360
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
407
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
361
				setMappedName(MAPPED_NAME_EDEFAULT);
408
				setMappedName(MAPPED_NAME_EDEFAULT);
362
				return;
409
				return;
410
			case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME:
411
				setLookupName(LOOKUP_NAME_EDEFAULT);
412
				return;
363
			case JavaeePackage.MESSAGE_DESTINATION__ID:
413
			case JavaeePackage.MESSAGE_DESTINATION__ID:
364
				setId(ID_EDEFAULT);
414
				setId(ID_EDEFAULT);
365
				return;
415
				return;
Lines 385-390 Link Here
385
				return MESSAGE_DESTINATION_NAME_EDEFAULT == null ? messageDestinationName != null : !MESSAGE_DESTINATION_NAME_EDEFAULT.equals(messageDestinationName);
435
				return MESSAGE_DESTINATION_NAME_EDEFAULT == null ? messageDestinationName != null : !MESSAGE_DESTINATION_NAME_EDEFAULT.equals(messageDestinationName);
386
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
436
			case JavaeePackage.MESSAGE_DESTINATION__MAPPED_NAME:
387
				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
437
				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
438
			case JavaeePackage.MESSAGE_DESTINATION__LOOKUP_NAME:
439
				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
388
			case JavaeePackage.MESSAGE_DESTINATION__ID:
440
			case JavaeePackage.MESSAGE_DESTINATION__ID:
389
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
441
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
390
		}
442
		}
Lines 405-410 Link Here
405
		result.append(messageDestinationName);
457
		result.append(messageDestinationName);
406
		result.append(", mappedName: "); //$NON-NLS-1$
458
		result.append(", mappedName: "); //$NON-NLS-1$
407
		result.append(mappedName);
459
		result.append(mappedName);
460
		result.append(", lookupName: "); //$NON-NLS-1$
461
		result.append(lookupName);
408
		result.append(", id: "); //$NON-NLS-1$
462
		result.append(", id: "); //$NON-NLS-1$
409
		result.append(id);
463
		result.append(id);
410
		result.append(')');
464
		result.append(')');
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/ServiceRefImpl.java (-1 / +1 lines)
Lines 748-754 Link Here
748
				setJaxrpcMappingFile((String)newValue);
748
				setJaxrpcMappingFile((String)newValue);
749
				return;
749
				return;
750
			case JavaeePackage.SERVICE_REF__SERVICE_QNAME:
750
			case JavaeePackage.SERVICE_REF__SERVICE_QNAME:
751
				setServiceQname((QName)newValue);
751
				setServiceQname(newValue);
752
				return;
752
				return;
753
			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
753
			case JavaeePackage.SERVICE_REF__PORT_COMPONENT_REFS:
754
				getPortComponentRefs().clear();
754
				getPortComponentRefs().clear();
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java (-42 / +22 lines)
Lines 1465-1471 Link Here
1465
	 * <!-- end-user-doc -->
1465
	 * <!-- end-user-doc -->
1466
	 * @generated
1466
	 * @generated
1467
	 */
1467
	 */
1468
	public EAttribute getMessageDestination_Id() {
1468
	public EAttribute getMessageDestination_LookupName() {
1469
		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(5);
1469
		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(5);
1470
	}
1470
	}
1471
1471
Lines 1474-1479 Link Here
1474
	 * <!-- end-user-doc -->
1474
	 * <!-- end-user-doc -->
1475
	 * @generated
1475
	 * @generated
1476
	 */
1476
	 */
1477
	public EAttribute getMessageDestination_Id() {
1478
		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(6);
1479
	}
1480
1481
	/**
1482
	 * <!-- begin-user-doc -->
1483
	 * <!-- end-user-doc -->
1484
	 * @generated
1485
	 */
1477
	public EClass getMessageDestinationRef() {
1486
	public EClass getMessageDestinationRef() {
1478
		return messageDestinationRefEClass;
1487
		return messageDestinationRefEClass;
1479
	}
1488
	}
Lines 1681-1697 Link Here
1681
	 * <!-- end-user-doc -->
1690
	 * <!-- end-user-doc -->
1682
	 * @generated
1691
	 * @generated
1683
	 */
1692
	 */
1684
	public EAttribute getPersistenceContextRef_LookupName() {
1685
		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(7);
1686
	}
1687
1688
	/**
1689
	 * <!-- begin-user-doc -->
1690
	 * <!-- end-user-doc -->
1691
	 * @generated
1692
	 */
1693
	public EAttribute getPersistenceContextRef_Id() {
1693
	public EAttribute getPersistenceContextRef_Id() {
1694
		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(8);
1694
		return (EAttribute)persistenceContextRefEClass.getEStructuralFeatures().get(7);
1695
	}
1695
	}
1696
1696
1697
	/**
1697
	/**
Lines 1753-1769 Link Here
1753
	 * <!-- end-user-doc -->
1753
	 * <!-- end-user-doc -->
1754
	 * @generated
1754
	 * @generated
1755
	 */
1755
	 */
1756
	public EAttribute getPersistenceUnitRef_LookupName() {
1757
		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(5);
1758
	}
1759
1760
	/**
1761
	 * <!-- begin-user-doc -->
1762
	 * <!-- end-user-doc -->
1763
	 * @generated
1764
	 */
1765
	public EAttribute getPersistenceUnitRef_Id() {
1756
	public EAttribute getPersistenceUnitRef_Id() {
1766
		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(6);
1757
		return (EAttribute)persistenceUnitRefEClass.getEStructuralFeatures().get(5);
1767
	}
1758
	}
1768
1759
1769
	/**
1760
	/**
Lines 2999-3004 Link Here
2999
		createEReference(messageDestinationEClass, MESSAGE_DESTINATION__ICONS);
2990
		createEReference(messageDestinationEClass, MESSAGE_DESTINATION__ICONS);
3000
		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME);
2991
		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MESSAGE_DESTINATION_NAME);
3001
		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MAPPED_NAME);
2992
		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__MAPPED_NAME);
2993
		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__LOOKUP_NAME);
3002
		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__ID);
2994
		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__ID);
3003
2995
3004
		messageDestinationRefEClass = createEClass(MESSAGE_DESTINATION_REF);
2996
		messageDestinationRefEClass = createEClass(MESSAGE_DESTINATION_REF);
Lines 3026-3032 Link Here
3026
		createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES);
3018
		createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__PERSISTENCE_PROPERTIES);
3027
		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__MAPPED_NAME);
3019
		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__MAPPED_NAME);
3028
		createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS);
3020
		createEReference(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS);
3029
		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__LOOKUP_NAME);
3030
		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__ID);
3021
		createEAttribute(persistenceContextRefEClass, PERSISTENCE_CONTEXT_REF__ID);
3031
3022
3032
		persistenceUnitRefEClass = createEClass(PERSISTENCE_UNIT_REF);
3023
		persistenceUnitRefEClass = createEClass(PERSISTENCE_UNIT_REF);
Lines 3035-3041 Link Here
3035
		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME);
3026
		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__PERSISTENCE_UNIT_NAME);
3036
		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__MAPPED_NAME);
3027
		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__MAPPED_NAME);
3037
		createEReference(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__INJECTION_TARGETS);
3028
		createEReference(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__INJECTION_TARGETS);
3038
		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__LOOKUP_NAME);
3039
		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__ID);
3029
		createEAttribute(persistenceUnitRefEClass, PERSISTENCE_UNIT_REF__ID);
3040
3030
3041
		portComponentRefEClass = createEClass(PORT_COMPONENT_REF);
3031
		portComponentRefEClass = createEClass(PORT_COMPONENT_REF);
Lines 3311-3316 Link Here
3311
		initEReference(getMessageDestination_Icons(), this.getIcon(), null, "icons", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3301
		initEReference(getMessageDestination_Icons(), this.getIcon(), null, "icons", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3312
		initEAttribute(getMessageDestination_MessageDestinationName(), theXMLTypePackage.getToken(), "messageDestinationName", null, 1, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3302
		initEAttribute(getMessageDestination_MessageDestinationName(), theXMLTypePackage.getToken(), "messageDestinationName", null, 1, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3313
		initEAttribute(getMessageDestination_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3303
		initEAttribute(getMessageDestination_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3304
		initEAttribute(getMessageDestination_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3314
		initEAttribute(getMessageDestination_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3305
		initEAttribute(getMessageDestination_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3315
3306
3316
		initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3307
		initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
Lines 3338-3344 Link Here
3338
		initEReference(getPersistenceContextRef_PersistenceProperties(), this.getPropertyType(), null, "persistenceProperties", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3329
		initEReference(getPersistenceContextRef_PersistenceProperties(), this.getPropertyType(), null, "persistenceProperties", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3339
		initEAttribute(getPersistenceContextRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3330
		initEAttribute(getPersistenceContextRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3340
		initEReference(getPersistenceContextRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3331
		initEReference(getPersistenceContextRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3341
		initEAttribute(getPersistenceContextRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3342
		initEAttribute(getPersistenceContextRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3332
		initEAttribute(getPersistenceContextRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3343
3333
3344
		initEClass(persistenceUnitRefEClass, PersistenceUnitRef.class, "PersistenceUnitRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3334
		initEClass(persistenceUnitRefEClass, PersistenceUnitRef.class, "PersistenceUnitRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
Lines 3347-3353 Link Here
3347
		initEAttribute(getPersistenceUnitRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3337
		initEAttribute(getPersistenceUnitRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3348
		initEAttribute(getPersistenceUnitRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3338
		initEAttribute(getPersistenceUnitRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3349
		initEReference(getPersistenceUnitRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3339
		initEReference(getPersistenceUnitRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3350
		initEAttribute(getPersistenceUnitRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3351
		initEAttribute(getPersistenceUnitRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3340
		initEAttribute(getPersistenceUnitRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3352
3341
3353
		initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3342
		initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
Lines 3464-3470 Link Here
3464
		addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.NO);
3453
		addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.NO);
3465
3454
3466
		initEEnum(isolationLevelTypeEEnum, IsolationLevelType.class, "IsolationLevelType"); //$NON-NLS-1$
3455
		initEEnum(isolationLevelTypeEEnum, IsolationLevelType.class, "IsolationLevelType"); //$NON-NLS-1$
3467
		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONNONE);
3468
		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADUNCOMMITTED);
3456
		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADUNCOMMITTED);
3469
		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADCOMMITTED);
3457
		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADCOMMITTED);
3470
		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREPEATABLEREAD);
3458
		addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREPEATABLEREAD);
Lines 4334-4339 Link Here
4334
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4322
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4335
			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
4323
			 "name", "mapped-name", //$NON-NLS-1$ //$NON-NLS-2$
4336
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4324
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4325
		   });			
4326
		addAnnotation
4327
		  (getMessageDestination_LookupName(), 
4328
		   source, 
4329
		   new String[] {
4330
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4331
			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
4332
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4337
		   });		
4333
		   });		
4338
		addAnnotation
4334
		addAnnotation
4339
		  (getMessageDestination_Id(), 
4335
		  (getMessageDestination_Id(), 
Lines 4551-4564 Link Here
4551
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4547
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4552
			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
4548
			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
4553
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4549
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4554
		   });			
4555
		addAnnotation
4556
		  (getPersistenceContextRef_LookupName(), 
4557
		   source, 
4558
		   new String[] {
4559
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4560
			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
4561
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4562
		   });		
4550
		   });		
4563
		addAnnotation
4551
		addAnnotation
4564
		  (getPersistenceContextRef_Id(), 
4552
		  (getPersistenceContextRef_Id(), 
Lines 4626-4639 Link Here
4626
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4614
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4627
			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
4615
			 "name", "injection-target", //$NON-NLS-1$ //$NON-NLS-2$
4628
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4616
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4629
		   });			
4630
		addAnnotation
4631
		  (getPersistenceUnitRef_LookupName(), 
4632
		   source, 
4633
		   new String[] {
4634
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4635
			 "name", "lookup-name", //$NON-NLS-1$ //$NON-NLS-2$
4636
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4637
		   });		
4617
		   });		
4638
		addAnnotation
4618
		addAnnotation
4639
		  (getPersistenceUnitRef_Id(), 
4619
		  (getPersistenceUnitRef_Id(), 
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceContextRefImpl.java (-54 lines)
Lines 49-55 Link Here
49
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceProperties <em>Persistence Properties</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getPersistenceProperties <em>Persistence Properties</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getMappedName <em>Mapped Name</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getMappedName <em>Mapped Name</em>}</li>
51
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
51
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
52
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getLookupName <em>Lookup Name</em>}</li>
53
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getId <em>Id</em>}</li>
52
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceContextRefImpl#getId <em>Id</em>}</li>
54
 * </ul>
53
 * </ul>
55
 * </p>
54
 * </p>
Lines 177-202 Link Here
177
	protected EList<InjectionTarget> injectionTargets;
176
	protected EList<InjectionTarget> injectionTargets;
178
177
179
	/**
178
	/**
180
	 * The default value of the '{@link #getLookupName() <em>Lookup Name</em>}' attribute.
181
	 * <!-- begin-user-doc -->
182
	 * <!-- end-user-doc -->
183
	 * @see #getLookupName()
184
	 * @generated
185
	 * @ordered
186
	 */
187
	protected static final String LOOKUP_NAME_EDEFAULT = null;
188
189
	/**
190
	 * The cached value of the '{@link #getLookupName() <em>Lookup Name</em>}' attribute.
191
	 * <!-- begin-user-doc -->
192
	 * <!-- end-user-doc -->
193
	 * @see #getLookupName()
194
	 * @generated
195
	 * @ordered
196
	 */
197
	protected String lookupName = LOOKUP_NAME_EDEFAULT;
198
199
	/**
200
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
179
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
201
	 * <!-- begin-user-doc -->
180
	 * <!-- begin-user-doc -->
202
	 * <!-- end-user-doc -->
181
	 * <!-- end-user-doc -->
Lines 385-411 Link Here
385
	 * <!-- end-user-doc -->
364
	 * <!-- end-user-doc -->
386
	 * @generated
365
	 * @generated
387
	 */
366
	 */
388
	public String getLookupName() {
389
		return lookupName;
390
	}
391
392
	/**
393
	 * <!-- begin-user-doc -->
394
	 * <!-- end-user-doc -->
395
	 * @generated
396
	 */
397
	public void setLookupName(String newLookupName) {
398
		String oldLookupName = lookupName;
399
		lookupName = newLookupName;
400
		if (eNotificationRequired())
401
			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME, oldLookupName, lookupName));
402
	}
403
404
	/**
405
	 * <!-- begin-user-doc -->
406
	 * <!-- end-user-doc -->
407
	 * @generated
408
	 */
409
	public String getId() {
367
	public String getId() {
410
		return id;
368
		return id;
411
	}
369
	}
Lines 462-469 Link Here
462
				return getMappedName();
420
				return getMappedName();
463
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
421
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
464
				return getInjectionTargets();
422
				return getInjectionTargets();
465
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME:
466
				return getLookupName();
467
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
423
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
468
				return getId();
424
				return getId();
469
		}
425
		}
Lines 503-511 Link Here
503
				getInjectionTargets().clear();
459
				getInjectionTargets().clear();
504
				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
460
				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
505
				return;
461
				return;
506
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME:
507
				setLookupName((String)newValue);
508
				return;
509
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
462
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
510
				setId((String)newValue);
463
				setId((String)newValue);
511
				return;
464
				return;
Lines 542-550 Link Here
542
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
495
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
543
				getInjectionTargets().clear();
496
				getInjectionTargets().clear();
544
				return;
497
				return;
545
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME:
546
				setLookupName(LOOKUP_NAME_EDEFAULT);
547
				return;
548
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
498
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
549
				setId(ID_EDEFAULT);
499
				setId(ID_EDEFAULT);
550
				return;
500
				return;
Lines 574-581 Link Here
574
				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
524
				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
575
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
525
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS:
576
				return injectionTargets != null && !injectionTargets.isEmpty();
526
				return injectionTargets != null && !injectionTargets.isEmpty();
577
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__LOOKUP_NAME:
578
				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
579
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
527
			case JavaeePackage.PERSISTENCE_CONTEXT_REF__ID:
580
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
528
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
581
		}
529
		}
Lines 600-607 Link Here
600
		if (persistenceContextTypeESet) result.append(persistenceContextType); else result.append("<unset>"); //$NON-NLS-1$
548
		if (persistenceContextTypeESet) result.append(persistenceContextType); else result.append("<unset>"); //$NON-NLS-1$
601
		result.append(", mappedName: "); //$NON-NLS-1$
549
		result.append(", mappedName: "); //$NON-NLS-1$
602
		result.append(mappedName);
550
		result.append(mappedName);
603
		result.append(", lookupName: "); //$NON-NLS-1$
604
		result.append(lookupName);
605
		result.append(", id: "); //$NON-NLS-1$
551
		result.append(", id: "); //$NON-NLS-1$
606
		result.append(id);
552
		result.append(id);
607
		result.append(')');
553
		result.append(')');
(-)jee-models/org/eclipse/jst/javaee/core/internal/impl/PersistenceUnitRefImpl.java (-54 lines)
Lines 45-51 Link Here
45
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
45
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getMappedName <em>Mapped Name</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getMappedName <em>Mapped Name</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getInjectionTargets <em>Injection Targets</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getLookupName <em>Lookup Name</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getId <em>Id</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl#getId <em>Id</em>}</li>
50
 * </ul>
49
 * </ul>
51
 * </p>
50
 * </p>
Lines 134-159 Link Here
134
	protected EList<InjectionTarget> injectionTargets;
133
	protected EList<InjectionTarget> injectionTargets;
135
134
136
	/**
135
	/**
137
	 * The default value of the '{@link #getLookupName() <em>Lookup Name</em>}' attribute.
138
	 * <!-- begin-user-doc -->
139
	 * <!-- end-user-doc -->
140
	 * @see #getLookupName()
141
	 * @generated
142
	 * @ordered
143
	 */
144
	protected static final String LOOKUP_NAME_EDEFAULT = null;
145
146
	/**
147
	 * The cached value of the '{@link #getLookupName() <em>Lookup Name</em>}' attribute.
148
	 * <!-- begin-user-doc -->
149
	 * <!-- end-user-doc -->
150
	 * @see #getLookupName()
151
	 * @generated
152
	 * @ordered
153
	 */
154
	protected String lookupName = LOOKUP_NAME_EDEFAULT;
155
156
	/**
157
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
136
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
158
	 * <!-- begin-user-doc -->
137
	 * <!-- begin-user-doc -->
159
	 * <!-- end-user-doc -->
138
	 * <!-- end-user-doc -->
Lines 284-310 Link Here
284
	 * <!-- end-user-doc -->
263
	 * <!-- end-user-doc -->
285
	 * @generated
264
	 * @generated
286
	 */
265
	 */
287
	public String getLookupName() {
288
		return lookupName;
289
	}
290
291
	/**
292
	 * <!-- begin-user-doc -->
293
	 * <!-- end-user-doc -->
294
	 * @generated
295
	 */
296
	public void setLookupName(String newLookupName) {
297
		String oldLookupName = lookupName;
298
		lookupName = newLookupName;
299
		if (eNotificationRequired())
300
			eNotify(new ENotificationImpl(this, Notification.SET, JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME, oldLookupName, lookupName));
301
	}
302
303
	/**
304
	 * <!-- begin-user-doc -->
305
	 * <!-- end-user-doc -->
306
	 * @generated
307
	 */
308
	public String getId() {
266
	public String getId() {
309
		return id;
267
		return id;
310
	}
268
	}
Lines 355-362 Link Here
355
				return getMappedName();
313
				return getMappedName();
356
			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
314
			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
357
				return getInjectionTargets();
315
				return getInjectionTargets();
358
			case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME:
359
				return getLookupName();
360
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
316
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
361
				return getId();
317
				return getId();
362
		}
318
		}
Lines 389-397 Link Here
389
				getInjectionTargets().clear();
345
				getInjectionTargets().clear();
390
				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
346
				getInjectionTargets().addAll((Collection<? extends InjectionTarget>)newValue);
391
				return;
347
				return;
392
			case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME:
393
				setLookupName((String)newValue);
394
				return;
395
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
348
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
396
				setId((String)newValue);
349
				setId((String)newValue);
397
				return;
350
				return;
Lines 422-430 Link Here
422
			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
375
			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
423
				getInjectionTargets().clear();
376
				getInjectionTargets().clear();
424
				return;
377
				return;
425
			case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME:
426
				setLookupName(LOOKUP_NAME_EDEFAULT);
427
				return;
428
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
378
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
429
				setId(ID_EDEFAULT);
379
				setId(ID_EDEFAULT);
430
				return;
380
				return;
Lines 450-457 Link Here
450
				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
400
				return MAPPED_NAME_EDEFAULT == null ? mappedName != null : !MAPPED_NAME_EDEFAULT.equals(mappedName);
451
			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
401
			case JavaeePackage.PERSISTENCE_UNIT_REF__INJECTION_TARGETS:
452
				return injectionTargets != null && !injectionTargets.isEmpty();
402
				return injectionTargets != null && !injectionTargets.isEmpty();
453
			case JavaeePackage.PERSISTENCE_UNIT_REF__LOOKUP_NAME:
454
				return LOOKUP_NAME_EDEFAULT == null ? lookupName != null : !LOOKUP_NAME_EDEFAULT.equals(lookupName);
455
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
403
			case JavaeePackage.PERSISTENCE_UNIT_REF__ID:
456
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
404
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
457
		}
405
		}
Lines 474-481 Link Here
474
		result.append(persistenceUnitName);
422
		result.append(persistenceUnitName);
475
		result.append(", mappedName: "); //$NON-NLS-1$
423
		result.append(", mappedName: "); //$NON-NLS-1$
476
		result.append(mappedName);
424
		result.append(mappedName);
477
		result.append(", lookupName: "); //$NON-NLS-1$
478
		result.append(lookupName);
479
		result.append(", id: "); //$NON-NLS-1$
425
		result.append(", id: "); //$NON-NLS-1$
480
		result.append(id);
426
		result.append(id);
481
		result.append(')');
427
		result.append(')');
(-)jee-models/org/eclipse/jst/javaee/jca/SecurityPermission.java (-1 / +1 lines)
Lines 79-85 Link Here
79
	 *             implementation of the security permission
79
	 *             implementation of the security permission
80
	 *             specification:
80
	 *             specification:
81
	 *             
81
	 *             
82
	 *             http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
82
	 *             http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html
83
	 *             
83
	 *             
84
	 *             @since Java EE 6, Connector 1.6
84
	 *             @since Java EE 6, Connector 1.6
85
	 *           
85
	 *           
(-)jee-models/org/eclipse/jst/javaee/jca/Connector.java (+49 lines)
Lines 34-39 Link Here
34
 * <p>
34
 * <p>
35
 * The following features are supported:
35
 * The following features are supported:
36
 * <ul>
36
 * <ul>
37
 *   <li>{@link org.eclipse.jst.javaee.jca.Connector#getModuleName <em>Module Name</em>}</li>
37
 *   <li>{@link org.eclipse.jst.javaee.jca.Connector#getDescriptions <em>Descriptions</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.jca.Connector#getDescriptions <em>Descriptions</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.jca.Connector#getDisplayNames <em>Display Names</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.jca.Connector#getDisplayNames <em>Display Names</em>}</li>
39
 *   <li>{@link org.eclipse.jst.javaee.jca.Connector#getIcons <em>Icons</em>}</li>
40
 *   <li>{@link org.eclipse.jst.javaee.jca.Connector#getIcons <em>Icons</em>}</li>
Lines 55-60 Link Here
55
 */
56
 */
56
public interface Connector extends JavaEEObject {
57
public interface Connector extends JavaEEObject {
57
	/**
58
	/**
59
	 * Returns the value of the '<em><b>Module Name</b></em>' attribute.
60
	 * <!-- begin-user-doc -->
61
	 * <!-- end-user-doc -->
62
	 * <!-- begin-model-doc -->
63
	 * 
64
	 * 
65
	 *             The element module-name specifies the name of the
66
	 *             resource adapter.
67
	 *             
68
	 *             If there is no module-name specified, the module-name
69
	 *             is determined as defined in Section EE.8.1.1 and EE.8.1.2 
70
	 *             of the Java Platform, Enterprise Edition (Java EE) 
71
	 *             Specification, version 6.
72
	 *             
73
	 *             @since Java EE 6, Connector 1.6
74
	 *           
75
	 * <!-- end-model-doc -->
76
	 * @return the value of the '<em>Module Name</em>' attribute.
77
	 * @see #setModuleName(String)
78
	 * @see org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage#getConnector_ModuleName()
79
	 * @generated
80
	 */
81
	String getModuleName();
82
83
	/**
84
	 * Sets the value of the '{@link org.eclipse.jst.javaee.jca.Connector#getModuleName <em>Module Name</em>}' attribute.
85
	 * <!-- begin-user-doc -->
86
	 * <!-- end-user-doc -->
87
	 * @param value the new value of the '<em>Module Name</em>' attribute.
88
	 * @see #getModuleName()
89
	 * @generated
90
	 */
91
	void setModuleName(String value);
92
93
	/**
58
	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
94
	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
59
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
95
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.Description}.
60
	 * <!-- begin-user-doc -->
96
	 * <!-- begin-user-doc -->
Lines 108-113 Link Here
108
	 * 
144
	 * 
109
	 *             The element vendor-name specifies the name of
145
	 *             The element vendor-name specifies the name of
110
	 *             resource adapter provider vendor.
146
	 *             resource adapter provider vendor.
147
	 * 
148
	 *             If there is no vendor-name specified, the application 
149
	 *             server must consider the default "" (empty string) as
150
	 *             the name of the resource adapter provider vendor.
111
	 *             
151
	 *             
112
	 *             @since Java EE 6, Connector 1.6
152
	 *             @since Java EE 6, Connector 1.6
113
	 *           
153
	 *           
Lines 144-149 Link Here
144
	 *             This helps in identifying EIS instances that can be
184
	 *             This helps in identifying EIS instances that can be
145
	 *             used with this resource adapter.
185
	 *             used with this resource adapter.
146
	 *             
186
	 *             
187
	 *             If there is no eis-type specified, the application 
188
	 *             server must consider the default "" (empty string) as
189
	 *             the type of the EIS.
190
	 *             
147
	 *             @since Java EE 6, Connector 1.6
191
	 *             @since Java EE 6, Connector 1.6
148
	 *           
192
	 *           
149
	 * <!-- end-model-doc -->
193
	 * <!-- end-model-doc -->
Lines 175-180 Link Here
175
	 *             of the resource adapter from the resource adapter
219
	 *             of the resource adapter from the resource adapter
176
	 *             provider.
220
	 *             provider.
177
	 *             
221
	 *             
222
	 *             If there is no resourceadapter-version specified, the application 
223
	 *             server must consider the default "" (empty string) as
224
	 *             the version of the resource adapter.
225
	 *             	
226
	 *             
178
	 *             @since Java EE 6, Connector 1.6
227
	 *             @since Java EE 6, Connector 1.6
179
	 *           
228
	 *           
180
	 * <!-- end-model-doc -->
229
	 * <!-- end-model-doc -->
(-)jee-models/org/eclipse/jst/javaee/jca/OutboundResourceAdapter.java (-4 / +23 lines)
Lines 30-40 Link Here
30
 *         provided, one or more authentication mechanisms supported
30
 *         provided, one or more authentication mechanisms supported
31
 *         and additional required security permissions.
31
 *         and additional required security permissions.
32
 *         
32
 *         
33
 *         If any of the outbound resource adapter elements (transaction-support,
34
 *         authentication-mechanism, reauthentication-support) is specified through
35
 *         this element or metadata annotations, and no  connection-definition is 
36
 *         specified as part of this element or through annotations, the 
37
 *         application server must consider this an error and fail deployment. 
38
 *         
33
 *         If there is no authentication-mechanism specified as part of
39
 *         If there is no authentication-mechanism specified as part of
34
 *         resource adapter element then the resource adapter does not
40
 *         this element or metadata annotations, then the resource adapter does 
35
 *         support any standard security authentication mechanisms as
41
 *         not support any standard security authentication mechanisms as 
36
 *         part of security contract. The application server ignores
42
 *         part of security contract. The application server ignores the security 
37
 *         the security part of the system contracts in this case.
43
 *         part of the system contracts in this case.
44
 *         
45
 *         If there is no transaction-support specified as part of this element 
46
 *         or metadata annotation, then the application server must consider that 
47
 *         the resource adapter does not support either the resource manager local 
48
 *         or JTA transactions and must consider the transaction support as 
49
 *         NoTransaction. Note that resource adapters may specify the level of 
50
 *         transaction support to be used at runtime for a ManagedConnectionFactory 
51
 *         through the TransactionSupport interface.
52
 *         
53
 *         If there is no reauthentication-support specified as part of
54
 *         this element or metadata annotation, then the application server must consider 
55
 *         that the resource adapter does not support re-authentication of 
56
 *         ManagedConnections.
38
 *         
57
 *         
39
 *         @since Java EE 6, Connector 1.6
58
 *         @since Java EE 6, Connector 1.6
40
 *       
59
 *       
(-)jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java (-65 / +30 lines)
Lines 32-64 Link Here
32
 *       @(#)web-fragment_3_0.xsds
32
 *       @(#)web-fragment_3_0.xsds
33
 *     
33
 *     
34
 * 
34
 * 
35
 *       <![CDATA[
35
 *       <![CDATA[[
36
 * 
36
 *       This is the XML Schema for the Servlet 3.0 deployment descriptor.
37
 * 	This is the XML Schema for the Servlet 3.0 deployment descriptor.
37
 *       The deployment descriptor must be named "META-INF/web-fragment.xml"
38
 * 	The deployment descriptor must be named "META-INF/web-fragment.xml" in the
38
 *       in the web fragment's jar file.  All Servlet deployment descriptors
39
 * 	web fragment's jar file.  All Servlet deployment descriptors
39
 *       must indicate the web application schema by using the Java EE
40
 * 	must indicate the web fragment schema by using the Java EE
40
 *       namespace:
41
 * 	namespace:
41
 *       
42
 * 
42
 *       http://java.sun.com/xml/ns/javaee 
43
 * 	http://java.sun.com/xml/ns/javaee
43
 *       
44
 * 
44
 *       and by indicating the version of the schema by 
45
 * 	and by indicating the version of the schema by
45
 *       using the version element as shown below: 
46
 * 	using the version element as shown below:
46
 *       
47
 * 
47
 *       <web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
48
 * 	    <web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
48
 *       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
49
 * 	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
49
 *       xsi:schemaLocation="..."
50
 * 	      xsi:schemaLocation="..."
50
 *       version="3.0"> 
51
 * 	      version="3.0">
51
 *       ...
52
 * 	      ...
52
 *       </web-fragment>
53
 * 	    </web-fragment>
53
 *       
54
 * 
54
 *       The instance documents may indicate the published version of
55
 * 	The instance documents may indicate the published version of
55
 *       the schema using the xsi:schemaLocation attribute for Java EE
56
 * 	the schema using the xsi:schemaLocation attribute for Java EE
56
 *       namespace with the following location:
57
 * 	namespace with the following location:
57
 *       
58
 * 
58
 *       http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd
59
 * 	http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd
59
 *       
60
 * 
60
 *       ]]>
61
 * 	]]>
62
 *     
61
 *     
63
 * 
62
 * 
64
 * 
63
 * 
Lines 77-83 Link Here
77
 *     
76
 *     
78
 * 
77
 * 
79
 * 
78
 * 
80
 *       $Id: WebfragmentPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $
79
 *       $Id: web-common_3_0.xsd,v 1.5 2009/10/15 19:08:12 ccc Exp $
81
 *       
80
 *       
82
 *     
81
 *     
83
 * 
82
 * 
Lines 125-131 Link Here
125
 *     
124
 *     
126
 * 
125
 * 
127
 * 
126
 * 
128
 *       $Id: WebfragmentPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $
127
 *       $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
129
 *       
128
 *       
130
 *     
129
 *     
131
 * 
130
 * 
Lines 150-156 Link Here
150
 *     
149
 *     
151
 * 
150
 * 
152
 * 
151
 * 
153
 *       $Id: WebfragmentPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $
152
 *       $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
154
 *       
153
 *       
155
 *     
154
 *     
156
 * 
155
 * 
Lines 319-364 Link Here
319
 *     
318
 *     
320
 * 
319
 * 
321
 * 
320
 * 
322
 *       Copyright 2003-2009 Sun Microsystems, Inc.
323
 *       4150 Network Circle
324
 *       Santa Clara, California 95054
325
 *       U.S.A
326
 *       All rights reserved.
327
 * 
328
 *       Sun Microsystems, Inc. has intellectual property rights
329
 *       relating to technology described in this document. In
330
 *       particular, and without limitation, these intellectual
331
 *       property rights may include one or more of the U.S. patents
332
 *       listed at http://www.sun.com/patents and one or more
333
 *       additional patents or pending patent applications in the
334
 *       U.S. and other countries.
335
 * 
336
 *       This document and the technology which it describes are
337
 *       distributed under licenses restricting their use, copying,
338
 *       distribution, and decompilation. No part of this document
339
 *       may be reproduced in any form by any means without prior
340
 *       written authorization of Sun and its licensors, if any.
341
 * 
342
 *       Third-party software, including font technology, is
343
 *       copyrighted and licensed from Sun suppliers.
344
 * 
345
 *       Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
346
 *       JavaServer Pages, Enterprise JavaBeans and the Java Coffee
347
 *       Cup logo are trademarks or registered trademarks of Sun
348
 *       Microsystems, Inc. in the U.S. and other countries.
349
 * 
350
 *       Federal Acquisitions: Commercial Software - Government Users
351
 *       Subject to Standard License Terms and Conditions.
352
 * 
353
 *     
354
 * 
355
 * 
356
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
321
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
357
 *       types.  The JSP 2.2 schema contains all the special
322
 *       types.  The JSP 2.2 schema contains all the special
358
 *       structures and datatypes that are necessary to use JSP files
323
 *       structures and datatypes that are necessary to use JSP files
359
 *       from a web application.
324
 *       from a web application.
360
 * 
325
 * 
361
 *       The contents of this schema is used by the web-app_3_0.xsd
326
 *       The contents of this schema is used by the web-common_3_0.xsd
362
 *       file to define JSP specific content.
327
 *       file to define JSP specific content.
363
 * 
328
 * 
364
 *     
329
 *     
(-)jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java (-87 / +25 lines)
Lines 32-38 Link Here
32
 * <!-- begin-model-doc -->
32
 * <!-- begin-model-doc -->
33
 * 
33
 * 
34
 * 
34
 * 
35
 *       $Id: WebPackage.java,v 1.4 2009/10/15 18:52:21 canderson Exp $
35
 *       $Id: web-common_3_0.xsd,v 1.5 2009/10/15 19:08:12 ccc Exp $
36
 *       
36
 *       
37
 *     
37
 *     
38
 * 
38
 * 
Lines 80-86 Link Here
80
 *     
80
 *     
81
 * 
81
 * 
82
 * 
82
 * 
83
 *       $Id: WebPackage.java,v 1.4 2009/10/15 18:52:21 canderson Exp $
83
 *       $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
84
 *       
84
 *       
85
 *     
85
 *     
86
 * 
86
 * 
Lines 105-111 Link Here
105
 *     
105
 *     
106
 * 
106
 * 
107
 * 
107
 * 
108
 *       $Id: WebPackage.java,v 1.4 2009/10/15 18:52:21 canderson Exp $
108
 *       $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
109
 *       
109
 *       
110
 *     
110
 *     
111
 * 
111
 * 
Lines 274-319 Link Here
274
 *     
274
 *     
275
 * 
275
 * 
276
 * 
276
 * 
277
 *       Copyright 2003-2009 Sun Microsystems, Inc.
278
 *       4150 Network Circle
279
 *       Santa Clara, California 95054
280
 *       U.S.A
281
 *       All rights reserved.
282
 * 
283
 *       Sun Microsystems, Inc. has intellectual property rights
284
 *       relating to technology described in this document. In
285
 *       particular, and without limitation, these intellectual
286
 *       property rights may include one or more of the U.S. patents
287
 *       listed at http://www.sun.com/patents and one or more
288
 *       additional patents or pending patent applications in the
289
 *       U.S. and other countries.
290
 * 
291
 *       This document and the technology which it describes are
292
 *       distributed under licenses restricting their use, copying,
293
 *       distribution, and decompilation. No part of this document
294
 *       may be reproduced in any form by any means without prior
295
 *       written authorization of Sun and its licensors, if any.
296
 * 
297
 *       Third-party software, including font technology, is
298
 *       copyrighted and licensed from Sun suppliers.
299
 * 
300
 *       Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
301
 *       JavaServer Pages, Enterprise JavaBeans and the Java Coffee
302
 *       Cup logo are trademarks or registered trademarks of Sun
303
 *       Microsystems, Inc. in the U.S. and other countries.
304
 * 
305
 *       Federal Acquisitions: Commercial Software - Government Users
306
 *       Subject to Standard License Terms and Conditions.
307
 * 
308
 *     
309
 * 
310
 * 
311
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
277
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
312
 *       types.  The JSP 2.2 schema contains all the special
278
 *       types.  The JSP 2.2 schema contains all the special
313
 *       structures and datatypes that are necessary to use JSP files
279
 *       structures and datatypes that are necessary to use JSP files
314
 *       from a web application.
280
 *       from a web application.
315
 * 
281
 * 
316
 *       The contents of this schema is used by the web-app_3_0.xsd
282
 *       The contents of this schema is used by the web-common_3_0.xsd
317
 *       file to define JSP specific content.
283
 *       file to define JSP specific content.
318
 * 
284
 * 
319
 *     
285
 *     
Lines 1645-1684 Link Here
1645
	int WEB_APP__GROUP = 0;
1611
	int WEB_APP__GROUP = 0;
1646
1612
1647
	/**
1613
	/**
1648
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
1614
	 * The feature id for the '<em><b>Module Name</b></em>' attribute list.
1649
	 * <!-- begin-user-doc -->
1615
	 * <!-- begin-user-doc -->
1650
	 * <!-- end-user-doc -->
1616
	 * <!-- end-user-doc -->
1651
	 * @generated
1617
	 * @generated
1652
	 * @ordered
1618
	 * @ordered
1653
	 */
1619
	 */
1654
	int WEB_APP__DESCRIPTIONS = 1;
1620
	int WEB_APP__MODULE_NAME = 1;
1655
1621
1656
	/**
1622
	/**
1657
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
1623
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
1658
	 * <!-- begin-user-doc -->
1624
	 * <!-- begin-user-doc -->
1659
	 * <!-- end-user-doc -->
1625
	 * <!-- end-user-doc -->
1660
	 * @generated
1626
	 * @generated
1661
	 * @ordered
1627
	 * @ordered
1662
	 */
1628
	 */
1663
	int WEB_APP__DISPLAY_NAMES = 2;
1629
	int WEB_APP__DESCRIPTIONS = 2;
1664
1630
1665
	/**
1631
	/**
1666
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
1632
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
1667
	 * <!-- begin-user-doc -->
1633
	 * <!-- begin-user-doc -->
1668
	 * <!-- end-user-doc -->
1634
	 * <!-- end-user-doc -->
1669
	 * @generated
1635
	 * @generated
1670
	 * @ordered
1636
	 * @ordered
1671
	 */
1637
	 */
1672
	int WEB_APP__ICONS = 3;
1638
	int WEB_APP__DISPLAY_NAMES = 3;
1673
1639
1674
	/**
1640
	/**
1675
	 * The feature id for the '<em><b>Name</b></em>' attribute list.
1641
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
1676
	 * <!-- begin-user-doc -->
1642
	 * <!-- begin-user-doc -->
1677
	 * <!-- end-user-doc -->
1643
	 * <!-- end-user-doc -->
1678
	 * @generated
1644
	 * @generated
1679
	 * @ordered
1645
	 * @ordered
1680
	 */
1646
	 */
1681
	int WEB_APP__NAME = 4;
1647
	int WEB_APP__ICONS = 4;
1682
1648
1683
	/**
1649
	/**
1684
	 * The feature id for the '<em><b>Distributables</b></em>' containment reference list.
1650
	 * The feature id for the '<em><b>Distributables</b></em>' containment reference list.
Lines 1942-1963 Link Here
1942
	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 33;
1908
	int WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS = 33;
1943
1909
1944
	/**
1910
	/**
1945
	 * The feature id for the '<em><b>Module Name</b></em>' attribute list.
1946
	 * <!-- begin-user-doc -->
1947
	 * <!-- end-user-doc -->
1948
	 * @generated
1949
	 * @ordered
1950
	 */
1951
	int WEB_APP__MODULE_NAME = 34;
1952
1953
	/**
1954
	 * The feature id for the '<em><b>Absolute Ordering</b></em>' containment reference list.
1911
	 * The feature id for the '<em><b>Absolute Ordering</b></em>' containment reference list.
1955
	 * <!-- begin-user-doc -->
1912
	 * <!-- begin-user-doc -->
1956
	 * <!-- end-user-doc -->
1913
	 * <!-- end-user-doc -->
1957
	 * @generated
1914
	 * @generated
1958
	 * @ordered
1915
	 * @ordered
1959
	 */
1916
	 */
1960
	int WEB_APP__ABSOLUTE_ORDERING = 35;
1917
	int WEB_APP__ABSOLUTE_ORDERING = 34;
1961
1918
1962
	/**
1919
	/**
1963
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1920
	 * The feature id for the '<em><b>Id</b></em>' attribute.
Lines 1966-1972 Link Here
1966
	 * @generated
1923
	 * @generated
1967
	 * @ordered
1924
	 * @ordered
1968
	 */
1925
	 */
1969
	int WEB_APP__ID = 36;
1926
	int WEB_APP__ID = 35;
1970
1927
1971
	/**
1928
	/**
1972
	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
1929
	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
Lines 1975-1981 Link Here
1975
	 * @generated
1932
	 * @generated
1976
	 * @ordered
1933
	 * @ordered
1977
	 */
1934
	 */
1978
	int WEB_APP__METADATA_COMPLETE = 37;
1935
	int WEB_APP__METADATA_COMPLETE = 36;
1979
1936
1980
	/**
1937
	/**
1981
	 * The feature id for the '<em><b>Version</b></em>' attribute.
1938
	 * The feature id for the '<em><b>Version</b></em>' attribute.
Lines 1984-1990 Link Here
1984
	 * @generated
1941
	 * @generated
1985
	 * @ordered
1942
	 * @ordered
1986
	 */
1943
	 */
1987
	int WEB_APP__VERSION = 38;
1944
	int WEB_APP__VERSION = 37;
1988
1945
1989
	/**
1946
	/**
1990
	 * The number of structural features of the '<em>App</em>' class.
1947
	 * The number of structural features of the '<em>App</em>' class.
Lines 1993-1999 Link Here
1993
	 * @generated
1950
	 * @generated
1994
	 * @ordered
1951
	 * @ordered
1995
	 */
1952
	 */
1996
	int WEB_APP_FEATURE_COUNT = 39;
1953
	int WEB_APP_FEATURE_COUNT = 38;
1997
1954
1998
	/**
1955
	/**
1999
	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl <em>App Deployment Descriptor</em>}' class.
1956
	 * The meta object id for the '{@link org.eclipse.jst.javaee.web.internal.impl.WebAppDeploymentDescriptorImpl <em>App Deployment Descriptor</em>}' class.
Lines 2070-2109 Link Here
2070
	int WEB_FRAGMENT__GROUP = 0;
2027
	int WEB_FRAGMENT__GROUP = 0;
2071
2028
2072
	/**
2029
	/**
2073
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
2030
	 * The feature id for the '<em><b>Name</b></em>' attribute list.
2074
	 * <!-- begin-user-doc -->
2031
	 * <!-- begin-user-doc -->
2075
	 * <!-- end-user-doc -->
2032
	 * <!-- end-user-doc -->
2076
	 * @generated
2033
	 * @generated
2077
	 * @ordered
2034
	 * @ordered
2078
	 */
2035
	 */
2079
	int WEB_FRAGMENT__DESCRIPTIONS = 1;
2036
	int WEB_FRAGMENT__NAME = 1;
2080
2037
2081
	/**
2038
	/**
2082
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
2039
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
2083
	 * <!-- begin-user-doc -->
2040
	 * <!-- begin-user-doc -->
2084
	 * <!-- end-user-doc -->
2041
	 * <!-- end-user-doc -->
2085
	 * @generated
2042
	 * @generated
2086
	 * @ordered
2043
	 * @ordered
2087
	 */
2044
	 */
2088
	int WEB_FRAGMENT__DISPLAY_NAMES = 2;
2045
	int WEB_FRAGMENT__DESCRIPTIONS = 2;
2089
2046
2090
	/**
2047
	/**
2091
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
2048
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
2092
	 * <!-- begin-user-doc -->
2049
	 * <!-- begin-user-doc -->
2093
	 * <!-- end-user-doc -->
2050
	 * <!-- end-user-doc -->
2094
	 * @generated
2051
	 * @generated
2095
	 * @ordered
2052
	 * @ordered
2096
	 */
2053
	 */
2097
	int WEB_FRAGMENT__ICONS = 3;
2054
	int WEB_FRAGMENT__DISPLAY_NAMES = 3;
2098
2055
2099
	/**
2056
	/**
2100
	 * The feature id for the '<em><b>Name</b></em>' attribute list.
2057
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
2101
	 * <!-- begin-user-doc -->
2058
	 * <!-- begin-user-doc -->
2102
	 * <!-- end-user-doc -->
2059
	 * <!-- end-user-doc -->
2103
	 * @generated
2060
	 * @generated
2104
	 * @ordered
2061
	 * @ordered
2105
	 */
2062
	 */
2106
	int WEB_FRAGMENT__NAME = 4;
2063
	int WEB_FRAGMENT__ICONS = 4;
2107
2064
2108
	/**
2065
	/**
2109
	 * The feature id for the '<em><b>Distributables</b></em>' containment reference list.
2066
	 * The feature id for the '<em><b>Distributables</b></em>' containment reference list.
Lines 4006-4022 Link Here
4006
	EReference getWebApp_Icons();
3963
	EReference getWebApp_Icons();
4007
3964
4008
	/**
3965
	/**
4009
	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.javaee.web.WebApp#getName <em>Name</em>}'.
4010
	 * <!-- begin-user-doc -->
4011
	 * <!-- end-user-doc -->
4012
	 * @return the meta object for the attribute list '<em>Name</em>'.
4013
	 * @see org.eclipse.jst.javaee.web.WebApp#getName()
4014
	 * @see #getWebApp()
4015
	 * @generated
4016
	 */
4017
	EAttribute getWebApp_Name();
4018
4019
	/**
4020
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDistributables <em>Distributables</em>}'.
3966
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.web.WebApp#getDistributables <em>Distributables</em>}'.
4021
	 * <!-- begin-user-doc -->
3967
	 * <!-- begin-user-doc -->
4022
	 * <!-- end-user-doc -->
3968
	 * <!-- end-user-doc -->
Lines 6207-6220 Link Here
6207
		EReference WEB_APP__ICONS = eINSTANCE.getWebApp_Icons();
6153
		EReference WEB_APP__ICONS = eINSTANCE.getWebApp_Icons();
6208
6154
6209
		/**
6155
		/**
6210
		 * The meta object literal for the '<em><b>Name</b></em>' attribute list feature.
6211
		 * <!-- begin-user-doc -->
6212
		 * <!-- end-user-doc -->
6213
		 * @generated
6214
		 */
6215
		EAttribute WEB_APP__NAME = eINSTANCE.getWebApp_Name();
6216
6217
		/**
6218
		 * The meta object literal for the '<em><b>Distributables</b></em>' containment reference list feature.
6156
		 * The meta object literal for the '<em><b>Distributables</b></em>' containment reference list feature.
6219
		 * <!-- begin-user-doc -->
6157
		 * <!-- begin-user-doc -->
6220
		 * <!-- end-user-doc -->
6158
		 * <!-- end-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java (-16 / +44 lines)
Lines 32-38 Link Here
32
 * <!-- begin-model-doc -->
32
 * <!-- begin-model-doc -->
33
 * 
33
 * 
34
 * 
34
 * 
35
 *       $Id: JcaPackage.java,v 1.3 2009/11/24 19:57:55 canderson Exp $
35
 *       $Id: connector_1_6.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
36
 *       
36
 *       
37
 *     
37
 *     
38
 * 
38
 * 
Lines 81-87 Link Here
81
 *     
81
 *     
82
 * 
82
 * 
83
 * 
83
 * 
84
 *       $Id: JcaPackage.java,v 1.3 2009/11/24 19:57:55 canderson Exp $
84
 *       $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
85
 *       
85
 *       
86
 *     
86
 *     
87
 * 
87
 * 
Lines 106-112 Link Here
106
 *     
106
 *     
107
 * 
107
 * 
108
 * 
108
 * 
109
 *       $Id: JcaPackage.java,v 1.3 2009/11/24 19:57:55 canderson Exp $
109
 *       $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
110
 *       
110
 *       
111
 *     
111
 *     
112
 * 
112
 * 
Lines 656-668 Link Here
656
	int CONNECTOR = 5;
656
	int CONNECTOR = 5;
657
657
658
	/**
658
	/**
659
	 * The feature id for the '<em><b>Module Name</b></em>' attribute.
660
	 * <!-- begin-user-doc -->
661
	 * <!-- end-user-doc -->
662
	 * @generated
663
	 * @ordered
664
	 */
665
	int CONNECTOR__MODULE_NAME = 0;
666
667
	/**
659
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
668
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
660
	 * <!-- begin-user-doc -->
669
	 * <!-- begin-user-doc -->
661
	 * <!-- end-user-doc -->
670
	 * <!-- end-user-doc -->
662
	 * @generated
671
	 * @generated
663
	 * @ordered
672
	 * @ordered
664
	 */
673
	 */
665
	int CONNECTOR__DESCRIPTIONS = 0;
674
	int CONNECTOR__DESCRIPTIONS = 1;
666
675
667
	/**
676
	/**
668
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
677
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
Lines 671-677 Link Here
671
	 * @generated
680
	 * @generated
672
	 * @ordered
681
	 * @ordered
673
	 */
682
	 */
674
	int CONNECTOR__DISPLAY_NAMES = 1;
683
	int CONNECTOR__DISPLAY_NAMES = 2;
675
684
676
	/**
685
	/**
677
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
686
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
Lines 680-686 Link Here
680
	 * @generated
689
	 * @generated
681
	 * @ordered
690
	 * @ordered
682
	 */
691
	 */
683
	int CONNECTOR__ICONS = 2;
692
	int CONNECTOR__ICONS = 3;
684
693
685
	/**
694
	/**
686
	 * The feature id for the '<em><b>Vendor Name</b></em>' attribute.
695
	 * The feature id for the '<em><b>Vendor Name</b></em>' attribute.
Lines 689-695 Link Here
689
	 * @generated
698
	 * @generated
690
	 * @ordered
699
	 * @ordered
691
	 */
700
	 */
692
	int CONNECTOR__VENDOR_NAME = 3;
701
	int CONNECTOR__VENDOR_NAME = 4;
693
702
694
	/**
703
	/**
695
	 * The feature id for the '<em><b>Eis Type</b></em>' attribute.
704
	 * The feature id for the '<em><b>Eis Type</b></em>' attribute.
Lines 698-704 Link Here
698
	 * @generated
707
	 * @generated
699
	 * @ordered
708
	 * @ordered
700
	 */
709
	 */
701
	int CONNECTOR__EIS_TYPE = 4;
710
	int CONNECTOR__EIS_TYPE = 5;
702
711
703
	/**
712
	/**
704
	 * The feature id for the '<em><b>Resourceadapter Version</b></em>' attribute.
713
	 * The feature id for the '<em><b>Resourceadapter Version</b></em>' attribute.
Lines 707-713 Link Here
707
	 * @generated
716
	 * @generated
708
	 * @ordered
717
	 * @ordered
709
	 */
718
	 */
710
	int CONNECTOR__RESOURCEADAPTER_VERSION = 5;
719
	int CONNECTOR__RESOURCEADAPTER_VERSION = 6;
711
720
712
	/**
721
	/**
713
	 * The feature id for the '<em><b>License</b></em>' containment reference.
722
	 * The feature id for the '<em><b>License</b></em>' containment reference.
Lines 716-722 Link Here
716
	 * @generated
725
	 * @generated
717
	 * @ordered
726
	 * @ordered
718
	 */
727
	 */
719
	int CONNECTOR__LICENSE = 6;
728
	int CONNECTOR__LICENSE = 7;
720
729
721
	/**
730
	/**
722
	 * The feature id for the '<em><b>Resourceadapter</b></em>' containment reference.
731
	 * The feature id for the '<em><b>Resourceadapter</b></em>' containment reference.
Lines 725-731 Link Here
725
	 * @generated
734
	 * @generated
726
	 * @ordered
735
	 * @ordered
727
	 */
736
	 */
728
	int CONNECTOR__RESOURCEADAPTER = 7;
737
	int CONNECTOR__RESOURCEADAPTER = 8;
729
738
730
	/**
739
	/**
731
	 * The feature id for the '<em><b>Required Work Context</b></em>' attribute list.
740
	 * The feature id for the '<em><b>Required Work Context</b></em>' attribute list.
Lines 734-740 Link Here
734
	 * @generated
743
	 * @generated
735
	 * @ordered
744
	 * @ordered
736
	 */
745
	 */
737
	int CONNECTOR__REQUIRED_WORK_CONTEXT = 8;
746
	int CONNECTOR__REQUIRED_WORK_CONTEXT = 9;
738
747
739
	/**
748
	/**
740
	 * The feature id for the '<em><b>Id</b></em>' attribute.
749
	 * The feature id for the '<em><b>Id</b></em>' attribute.
Lines 743-749 Link Here
743
	 * @generated
752
	 * @generated
744
	 * @ordered
753
	 * @ordered
745
	 */
754
	 */
746
	int CONNECTOR__ID = 9;
755
	int CONNECTOR__ID = 10;
747
756
748
	/**
757
	/**
749
	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
758
	 * The feature id for the '<em><b>Metadata Complete</b></em>' attribute.
Lines 752-758 Link Here
752
	 * @generated
761
	 * @generated
753
	 * @ordered
762
	 * @ordered
754
	 */
763
	 */
755
	int CONNECTOR__METADATA_COMPLETE = 10;
764
	int CONNECTOR__METADATA_COMPLETE = 11;
756
765
757
	/**
766
	/**
758
	 * The feature id for the '<em><b>Version</b></em>' attribute.
767
	 * The feature id for the '<em><b>Version</b></em>' attribute.
Lines 761-767 Link Here
761
	 * @generated
770
	 * @generated
762
	 * @ordered
771
	 * @ordered
763
	 */
772
	 */
764
	int CONNECTOR__VERSION = 11;
773
	int CONNECTOR__VERSION = 12;
765
774
766
	/**
775
	/**
767
	 * The number of structural features of the '<em>Connector</em>' class.
776
	 * The number of structural features of the '<em>Connector</em>' class.
Lines 770-776 Link Here
770
	 * @generated
779
	 * @generated
771
	 * @ordered
780
	 * @ordered
772
	 */
781
	 */
773
	int CONNECTOR_FEATURE_COUNT = 12;
782
	int CONNECTOR_FEATURE_COUNT = 13;
774
783
775
	/**
784
	/**
776
	 * The meta object id for the '{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorDeploymentDescriptorImpl <em>Connector Deployment Descriptor</em>}' class.
785
	 * The meta object id for the '{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorDeploymentDescriptorImpl <em>Connector Deployment Descriptor</em>}' class.
Lines 1660-1665 Link Here
1660
	EClass getConnector();
1669
	EClass getConnector();
1661
1670
1662
	/**
1671
	/**
1672
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.jca.Connector#getModuleName <em>Module Name</em>}'.
1673
	 * <!-- begin-user-doc -->
1674
	 * <!-- end-user-doc -->
1675
	 * @return the meta object for the attribute '<em>Module Name</em>'.
1676
	 * @see org.eclipse.jst.javaee.jca.Connector#getModuleName()
1677
	 * @see #getConnector()
1678
	 * @generated
1679
	 */
1680
	EAttribute getConnector_ModuleName();
1681
1682
	/**
1663
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jca.Connector#getDescriptions <em>Descriptions</em>}'.
1683
	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.javaee.jca.Connector#getDescriptions <em>Descriptions</em>}'.
1664
	 * <!-- begin-user-doc -->
1684
	 * <!-- begin-user-doc -->
1665
	 * <!-- end-user-doc -->
1685
	 * <!-- end-user-doc -->
Lines 2602-2607 Link Here
2602
		EClass CONNECTOR = eINSTANCE.getConnector();
2622
		EClass CONNECTOR = eINSTANCE.getConnector();
2603
2623
2604
		/**
2624
		/**
2625
		 * The meta object literal for the '<em><b>Module Name</b></em>' attribute feature.
2626
		 * <!-- begin-user-doc -->
2627
		 * <!-- end-user-doc -->
2628
		 * @generated
2629
		 */
2630
		EAttribute CONNECTOR__MODULE_NAME = eINSTANCE.getConnector_ModuleName();
2631
2632
		/**
2605
		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
2633
		 * The meta object literal for the '<em><b>Descriptions</b></em>' containment reference list feature.
2606
		 * <!-- begin-user-doc -->
2634
		 * <!-- begin-user-doc -->
2607
		 * <!-- end-user-doc -->
2635
		 * <!-- end-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/core/IsolationLevelType.java (-36 / +14 lines)
Lines 24-32 Link Here
24
 * <!-- begin-model-doc -->
24
 * <!-- begin-model-doc -->
25
 * 
25
 * 
26
 * 
26
 * 
27
 *         public enum isolation-level-type { TRANSACTION_NONE,
27
 *         	The following transaction isolation levels are allowed
28
 *         TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED,
28
 *         	(see documentation for the java.sql.Connection interface):
29
 *         TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE };
29
 *         TRANSACTION_READ_UNCOMMITTED
30
 *         TRANSACTION_READ_COMMITTED
31
 *         TRANSACTION_REPEATABLE_READ
32
 *         TRANSACTION_SERIALIZABLE
30
 *         
33
 *         
31
 *         @since Java EE 6
34
 *         @since Java EE 6
32
 *       
35
 *       
Lines 35-49 Link Here
35
 * @generated
38
 * @generated
36
 */
39
 */
37
public enum IsolationLevelType implements Enumerator {
40
public enum IsolationLevelType implements Enumerator {
38
	/**
39
	 * The '<em><b>TRANSACTIONNONE</b></em>' literal object.
40
	 * <!-- begin-user-doc -->
41
	 * <!-- end-user-doc -->
42
	 * @see #TRANSACTIONNONE_VALUE
43
	 * @generated
44
	 * @ordered
45
	 */
46
	TRANSACTIONNONE(0, "TRANSACTIONNONE", "TRANSACTION_NONE"), //$NON-NLS-1$ //$NON-NLS-2$
47
41
48
	/**
42
	/**
49
	 * The '<em><b>TRANSACTIONREADUNCOMMITTED</b></em>' literal object.
43
	 * The '<em><b>TRANSACTIONREADUNCOMMITTED</b></em>' literal object.
Lines 53-59 Link Here
53
	 * @generated
47
	 * @generated
54
	 * @ordered
48
	 * @ordered
55
	 */
49
	 */
56
	TRANSACTIONREADUNCOMMITTED(1, "TRANSACTIONREADUNCOMMITTED", "TRANSACTION_READ_UNCOMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$
50
	TRANSACTIONREADUNCOMMITTED(0, "TRANSACTIONREADUNCOMMITTED", "TRANSACTION_READ_UNCOMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$
57
51
58
	/**
52
	/**
59
	 * The '<em><b>TRANSACTIONREADCOMMITTED</b></em>' literal object.
53
	 * The '<em><b>TRANSACTIONREADCOMMITTED</b></em>' literal object.
Lines 63-69 Link Here
63
	 * @generated
57
	 * @generated
64
	 * @ordered
58
	 * @ordered
65
	 */
59
	 */
66
	TRANSACTIONREADCOMMITTED(2, "TRANSACTIONREADCOMMITTED", "TRANSACTION_READ_COMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$
60
	TRANSACTIONREADCOMMITTED(1, "TRANSACTIONREADCOMMITTED", "TRANSACTION_READ_COMMITTED"), //$NON-NLS-1$ //$NON-NLS-2$
67
61
68
	/**
62
	/**
69
	 * The '<em><b>TRANSACTIONREPEATABLEREAD</b></em>' literal object.
63
	 * The '<em><b>TRANSACTIONREPEATABLEREAD</b></em>' literal object.
Lines 73-79 Link Here
73
	 * @generated
67
	 * @generated
74
	 * @ordered
68
	 * @ordered
75
	 */
69
	 */
76
	TRANSACTIONREPEATABLEREAD(3, "TRANSACTIONREPEATABLEREAD", "TRANSACTION_REPEATABLE_READ"), //$NON-NLS-1$ //$NON-NLS-2$
70
	TRANSACTIONREPEATABLEREAD(2, "TRANSACTIONREPEATABLEREAD", "TRANSACTION_REPEATABLE_READ"), //$NON-NLS-1$ //$NON-NLS-2$
77
71
78
	/**
72
	/**
79
	 * The '<em><b>TRANSACTIONSERIALIZABLE</b></em>' literal object.
73
	 * The '<em><b>TRANSACTIONSERIALIZABLE</b></em>' literal object.
Lines 83-103 Link Here
83
	 * @generated
77
	 * @generated
84
	 * @ordered
78
	 * @ordered
85
	 */
79
	 */
86
	TRANSACTIONSERIALIZABLE(4, "TRANSACTIONSERIALIZABLE", "TRANSACTION_SERIALIZABLE"); //$NON-NLS-1$ //$NON-NLS-2$
80
	TRANSACTIONSERIALIZABLE(3, "TRANSACTIONSERIALIZABLE", "TRANSACTION_SERIALIZABLE"); //$NON-NLS-1$ //$NON-NLS-2$
87
88
	/**
89
	 * The '<em><b>TRANSACTIONNONE</b></em>' literal value.
90
	 * <!-- begin-user-doc -->
91
	 * <p>
92
	 * If the meaning of '<em><b>TRANSACTIONNONE</b></em>' literal object isn't clear,
93
	 * there really should be more of a description here...
94
	 * </p>
95
	 * <!-- end-user-doc -->
96
	 * @see #TRANSACTIONNONE
97
	 * @generated
98
	 * @ordered
99
	 */
100
	public static final int TRANSACTIONNONE_VALUE = 0;
101
81
102
	/**
82
	/**
103
	 * The '<em><b>TRANSACTIONREADUNCOMMITTED</b></em>' literal value.
83
	 * The '<em><b>TRANSACTIONREADUNCOMMITTED</b></em>' literal value.
Lines 111-117 Link Here
111
	 * @generated
91
	 * @generated
112
	 * @ordered
92
	 * @ordered
113
	 */
93
	 */
114
	public static final int TRANSACTIONREADUNCOMMITTED_VALUE = 1;
94
	public static final int TRANSACTIONREADUNCOMMITTED_VALUE = 0;
115
95
116
	/**
96
	/**
117
	 * The '<em><b>TRANSACTIONREADCOMMITTED</b></em>' literal value.
97
	 * The '<em><b>TRANSACTIONREADCOMMITTED</b></em>' literal value.
Lines 125-131 Link Here
125
	 * @generated
105
	 * @generated
126
	 * @ordered
106
	 * @ordered
127
	 */
107
	 */
128
	public static final int TRANSACTIONREADCOMMITTED_VALUE = 2;
108
	public static final int TRANSACTIONREADCOMMITTED_VALUE = 1;
129
109
130
	/**
110
	/**
131
	 * The '<em><b>TRANSACTIONREPEATABLEREAD</b></em>' literal value.
111
	 * The '<em><b>TRANSACTIONREPEATABLEREAD</b></em>' literal value.
Lines 139-145 Link Here
139
	 * @generated
119
	 * @generated
140
	 * @ordered
120
	 * @ordered
141
	 */
121
	 */
142
	public static final int TRANSACTIONREPEATABLEREAD_VALUE = 3;
122
	public static final int TRANSACTIONREPEATABLEREAD_VALUE = 2;
143
123
144
	/**
124
	/**
145
	 * The '<em><b>TRANSACTIONSERIALIZABLE</b></em>' literal value.
125
	 * The '<em><b>TRANSACTIONSERIALIZABLE</b></em>' literal value.
Lines 153-159 Link Here
153
	 * @generated
133
	 * @generated
154
	 * @ordered
134
	 * @ordered
155
	 */
135
	 */
156
	public static final int TRANSACTIONSERIALIZABLE_VALUE = 4;
136
	public static final int TRANSACTIONSERIALIZABLE_VALUE = 3;
157
137
158
	/**
138
	/**
159
	 * An array of all the '<em><b>Isolation Level Type</b></em>' enumerators.
139
	 * An array of all the '<em><b>Isolation Level Type</b></em>' enumerators.
Lines 163-169 Link Here
163
	 */
143
	 */
164
	private static final IsolationLevelType[] VALUES_ARRAY =
144
	private static final IsolationLevelType[] VALUES_ARRAY =
165
		new IsolationLevelType[] {
145
		new IsolationLevelType[] {
166
			TRANSACTIONNONE,
167
			TRANSACTIONREADUNCOMMITTED,
146
			TRANSACTIONREADUNCOMMITTED,
168
			TRANSACTIONREADCOMMITTED,
147
			TRANSACTIONREADCOMMITTED,
169
			TRANSACTIONREPEATABLEREAD,
148
			TRANSACTIONREPEATABLEREAD,
Lines 218-224 Link Here
218
	 */
197
	 */
219
	public static IsolationLevelType get(int value) {
198
	public static IsolationLevelType get(int value) {
220
		switch (value) {
199
		switch (value) {
221
			case TRANSACTIONNONE_VALUE: return TRANSACTIONNONE;
222
			case TRANSACTIONREADUNCOMMITTED_VALUE: return TRANSACTIONREADUNCOMMITTED;
200
			case TRANSACTIONREADUNCOMMITTED_VALUE: return TRANSACTIONREADUNCOMMITTED;
223
			case TRANSACTIONREADCOMMITTED_VALUE: return TRANSACTIONREADCOMMITTED;
201
			case TRANSACTIONREADCOMMITTED_VALUE: return TRANSACTIONREADCOMMITTED;
224
			case TRANSACTIONREPEATABLEREAD_VALUE: return TRANSACTIONREPEATABLEREAD;
202
			case TRANSACTIONREPEATABLEREAD_VALUE: return TRANSACTIONREPEATABLEREAD;
(-)jee-models/org/eclipse/jst/javaee/core/PersistenceUnitRef.java (-30 lines)
Lines 58-64 Link Here
58
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
58
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getPersistenceUnitName <em>Persistence Unit Name</em>}</li>
59
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName <em>Mapped Name</em>}</li>
59
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getMappedName <em>Mapped Name</em>}</li>
60
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getInjectionTargets <em>Injection Targets</em>}</li>
60
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getInjectionTargets <em>Injection Targets</em>}</li>
61
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName <em>Lookup Name</em>}</li>
62
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId <em>Id</em>}</li>
61
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId <em>Id</em>}</li>
63
 * </ul>
62
 * </ul>
64
 * </p>
63
 * </p>
Lines 215-249 Link Here
215
	List<InjectionTarget> getInjectionTargets();
214
	List<InjectionTarget> getInjectionTargets();
216
215
217
	/**
216
	/**
218
	 * Returns the value of the '<em><b>Lookup Name</b></em>' attribute.
219
	 * <!-- begin-user-doc -->
220
	 * <!-- end-user-doc -->
221
	 * <!-- begin-model-doc -->
222
	 * 
223
	 * 
224
	 *             The JNDI name to be looked up to resolve a resource reference.
225
	 *             
226
	 *             @since Java EE 6
227
	 *           
228
	 * <!-- end-model-doc -->
229
	 * @return the value of the '<em>Lookup Name</em>' attribute.
230
	 * @see #setLookupName(String)
231
	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceUnitRef_LookupName()
232
	 * @generated
233
	 */
234
	String getLookupName();
235
236
	/**
237
	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName <em>Lookup Name</em>}' attribute.
238
	 * <!-- begin-user-doc -->
239
	 * <!-- end-user-doc -->
240
	 * @param value the new value of the '<em>Lookup Name</em>' attribute.
241
	 * @see #getLookupName()
242
	 * @generated
243
	 */
244
	void setLookupName(String value);
245
246
	/**
247
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
217
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
248
	 * <!-- begin-user-doc -->
218
	 * <!-- begin-user-doc -->
249
	 * <p>
219
	 * <p>
(-)jee-models/org/eclipse/jst/javaee/core/DataSourceType.java (-1 / +1 lines)
Lines 334-340 Link Here
334
	 * <!-- begin-model-doc -->
334
	 * <!-- begin-model-doc -->
335
	 * 
335
	 * 
336
	 * 
336
	 * 
337
	 *             JDBC DataSource Propertry.  This may be a vendor-specific
337
	 *             JDBC DataSource property.  This may be a vendor-specific
338
	 *             property or a less commonly used DataSource property.
338
	 *             property or a less commonly used DataSource property.
339
	 *             
339
	 *             
340
	 *             @since Java EE 6
340
	 *             @since Java EE 6
(-)jee-models/org/eclipse/jst/javaee/core/MessageDestination.java (-3 / +34 lines)
Lines 33-38 Link Here
33
 *         among message destination names within the same 
33
 *         among message destination names within the same 
34
 *         Deployment File. 
34
 *         Deployment File. 
35
 *         - an optional mapped name
35
 *         - an optional mapped name
36
 *         - an optional lookup name
36
 *         
37
 *         
37
 *         Example: 
38
 *         Example: 
38
 *         
39
 *         
Lines 54-59 Link Here
54
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getIcons <em>Icons</em>}</li>
55
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getIcons <em>Icons</em>}</li>
55
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getMessageDestinationName <em>Message Destination Name</em>}</li>
56
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getMessageDestinationName <em>Message Destination Name</em>}</li>
56
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getMappedName <em>Mapped Name</em>}</li>
57
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getMappedName <em>Mapped Name</em>}</li>
58
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getLookupName <em>Lookup Name</em>}</li>
57
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getId <em>Id</em>}</li>
59
 *   <li>{@link org.eclipse.jst.javaee.core.MessageDestination#getId <em>Id</em>}</li>
58
 * </ul>
60
 * </ul>
59
 * </p>
61
 * </p>
Lines 151-159 Link Here
151
	 *             should be mapped to.  Each message-destination-ref
153
	 *             should be mapped to.  Each message-destination-ref
152
	 *             element that references this message destination will
154
	 *             element that references this message destination will
153
	 *             define a name in the namespace of the referencing
155
	 *             define a name in the namespace of the referencing
154
	 *             component.  (It's a name in the JNDI java:comp/env
156
	 *             component or in one of the other predefined namespaces. 
155
	 *             namespace.)  Many application servers provide a way to
157
	 *             Many application servers provide a way to map these
156
	 *             map these local names to names of resources known to the
158
	 *             local names to names of resources known to the
157
	 *             application server.  This mapped name is often a global
159
	 *             application server.  This mapped name is often a global
158
	 *             JNDI name, but may be a name of any form.  Each of the
160
	 *             JNDI name, but may be a name of any form.  Each of the
159
	 *             local names should be mapped to this same global name.
161
	 *             local names should be mapped to this same global name.
Lines 185-190 Link Here
185
	void setMappedName(String value);
187
	void setMappedName(String value);
186
188
187
	/**
189
	/**
190
	 * Returns the value of the '<em><b>Lookup Name</b></em>' attribute.
191
	 * <!-- begin-user-doc -->
192
	 * <!-- end-user-doc -->
193
	 * <!-- begin-model-doc -->
194
	 * 
195
	 * 
196
	 *             The JNDI name to be looked up to resolve the message destination.
197
	 *             
198
	 *             @since Java EE 6
199
	 *           
200
	 * <!-- end-model-doc -->
201
	 * @return the value of the '<em>Lookup Name</em>' attribute.
202
	 * @see #setLookupName(String)
203
	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getMessageDestination_LookupName()
204
	 * @generated
205
	 */
206
	String getLookupName();
207
208
	/**
209
	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.MessageDestination#getLookupName <em>Lookup Name</em>}' attribute.
210
	 * <!-- begin-user-doc -->
211
	 * <!-- end-user-doc -->
212
	 * @param value the new value of the '<em>Lookup Name</em>' attribute.
213
	 * @see #getLookupName()
214
	 * @generated
215
	 */
216
	void setLookupName(String value);
217
218
	/**
188
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
219
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
189
	 * <!-- begin-user-doc -->
220
	 * <!-- begin-user-doc -->
190
	 * <p>
221
	 * <p>
(-)jee-models/org/eclipse/jst/javaee/core/MessageDestinationRef.java (-4 / +1 lines)
Lines 104-113 Link Here
104
	 *             The message-destination-ref-name element specifies
104
	 *             The message-destination-ref-name element specifies
105
	 *             the name of a message destination reference; its
105
	 *             the name of a message destination reference; its
106
	 *             value is the environment entry name used in
106
	 *             value is the environment entry name used in
107
	 *             Deployment Component code.  The name is a JNDI name
107
	 *             Deployment Component code.
108
	 *             relative to the java:comp/env context and must be
109
	 *             unique within an ejb-jar (for enterprise beans) or a
110
	 *             Deployment File (for others).
111
	 *             
108
	 *             
112
	 *             @since Java EE 5
109
	 *             @since Java EE 5
113
	 *           
110
	 *           
(-)jee-models/org/eclipse/jst/javaee/core/PersistenceContextRef.java (-30 lines)
Lines 65-71 Link Here
65
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceProperties <em>Persistence Properties</em>}</li>
65
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getPersistenceProperties <em>Persistence Properties</em>}</li>
66
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName <em>Mapped Name</em>}</li>
66
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getMappedName <em>Mapped Name</em>}</li>
67
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getInjectionTargets <em>Injection Targets</em>}</li>
67
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getInjectionTargets <em>Injection Targets</em>}</li>
68
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName <em>Lookup Name</em>}</li>
69
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId <em>Id</em>}</li>
68
 *   <li>{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId <em>Id</em>}</li>
70
 * </ul>
69
 * </ul>
71
 * </p>
70
 * </p>
Lines 302-336 Link Here
302
	List<InjectionTarget> getInjectionTargets();
301
	List<InjectionTarget> getInjectionTargets();
303
302
304
	/**
303
	/**
305
	 * Returns the value of the '<em><b>Lookup Name</b></em>' attribute.
306
	 * <!-- begin-user-doc -->
307
	 * <!-- end-user-doc -->
308
	 * <!-- begin-model-doc -->
309
	 * 
310
	 * 
311
	 *             The JNDI name to be looked up to resolve a resource reference.
312
	 *             
313
	 *             @since Java EE 6
314
	 *           
315
	 * <!-- end-model-doc -->
316
	 * @return the value of the '<em>Lookup Name</em>' attribute.
317
	 * @see #setLookupName(String)
318
	 * @see org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage#getPersistenceContextRef_LookupName()
319
	 * @generated
320
	 */
321
	String getLookupName();
322
323
	/**
324
	 * Sets the value of the '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName <em>Lookup Name</em>}' attribute.
325
	 * <!-- begin-user-doc -->
326
	 * <!-- end-user-doc -->
327
	 * @param value the new value of the '<em>Lookup Name</em>' attribute.
328
	 * @see #getLookupName()
329
	 * @generated
330
	 */
331
	void setLookupName(String value);
332
333
	/**
334
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
304
	 * Returns the value of the '<em><b>Id</b></em>' attribute.
335
	 * <!-- begin-user-doc -->
305
	 * <!-- begin-user-doc -->
336
	 * <p>
306
	 * <p>
(-)jee-models/org/eclipse/jst/javaee/web/MultipartConfigType.java (-6 / +31 lines)
Lines 18-29 Link Here
18
 * <!-- begin-model-doc -->
18
 * <!-- begin-model-doc -->
19
 * 
19
 * 
20
 * 
20
 * 
21
 *         This element contains a sequence of "name" elements, each of which
21
 *         This element specifies configuration information related to the
22
 *         refers to an application configuration resource by the "name"
22
 *         handling of multipart/form-data requests.
23
 *         declared on its web.xml fragment.  This element can also contain
24
 *         a single "others" element which specifies that this document comes
25
 *         before or after other documents within the application.
26
 *         See section 8.2.2 of the specification for details.
27
 *         
23
 *         
28
 *         @since Java EE 6, Web 3.0
24
 *         @since Java EE 6, Web 3.0
29
 *       
25
 *       
Lines 52-57 Link Here
52
	 * there really should be more of a description here...
48
	 * there really should be more of a description here...
53
	 * </p>
49
	 * </p>
54
	 * <!-- end-user-doc -->
50
	 * <!-- end-user-doc -->
51
	 * <!-- begin-model-doc -->
52
	 * 
53
	 * 
54
	 *             The directory location where uploaded files will be stored
55
	 *             
56
	 *           
57
	 * <!-- end-model-doc -->
55
	 * @return the value of the '<em>Location</em>' attribute.
58
	 * @return the value of the '<em>Location</em>' attribute.
56
	 * @see #setLocation(String)
59
	 * @see #setLocation(String)
57
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_Location()
60
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_Location()
Lines 77-82 Link Here
77
	 * there really should be more of a description here...
80
	 * there really should be more of a description here...
78
	 * </p>
81
	 * </p>
79
	 * <!-- end-user-doc -->
82
	 * <!-- end-user-doc -->
83
	 * <!-- begin-model-doc -->
84
	 * 
85
	 * 
86
	 *             The maximum size limit of uploaded files
87
	 *             
88
	 *           
89
	 * <!-- end-model-doc -->
80
	 * @return the value of the '<em>Max File Size</em>' attribute.
90
	 * @return the value of the '<em>Max File Size</em>' attribute.
81
	 * @see #isSetMaxFileSize()
91
	 * @see #isSetMaxFileSize()
82
	 * @see #unsetMaxFileSize()
92
	 * @see #unsetMaxFileSize()
Lines 129-134 Link Here
129
	 * there really should be more of a description here...
139
	 * there really should be more of a description here...
130
	 * </p>
140
	 * </p>
131
	 * <!-- end-user-doc -->
141
	 * <!-- end-user-doc -->
142
	 * <!-- begin-model-doc -->
143
	 * 
144
	 * 
145
	 *             The maximum size limit of multipart/form-data requests
146
	 *             
147
	 *           
148
	 * <!-- end-model-doc -->
132
	 * @return the value of the '<em>Max Request Size</em>' attribute.
149
	 * @return the value of the '<em>Max Request Size</em>' attribute.
133
	 * @see #isSetMaxRequestSize()
150
	 * @see #isSetMaxRequestSize()
134
	 * @see #unsetMaxRequestSize()
151
	 * @see #unsetMaxRequestSize()
Lines 181-186 Link Here
181
	 * there really should be more of a description here...
198
	 * there really should be more of a description here...
182
	 * </p>
199
	 * </p>
183
	 * <!-- end-user-doc -->
200
	 * <!-- end-user-doc -->
201
	 * <!-- begin-model-doc -->
202
	 * 
203
	 * 
204
	 *             The size threshold after which an uploaded file will be
205
	 *             written to disk
206
	 *             
207
	 *           
208
	 * <!-- end-model-doc -->
184
	 * @return the value of the '<em>File Size Threshold</em>' attribute.
209
	 * @return the value of the '<em>File Size Threshold</em>' attribute.
185
	 * @see #setFileSizeThreshold(BigInteger)
210
	 * @see #setFileSizeThreshold(BigInteger)
186
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_FileSizeThreshold()
211
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getMultipartConfigType_FileSizeThreshold()
(-)jee-models/org/eclipse/jst/javaee/web/WebApp.java (-18 / +1 lines)
Lines 45-54 Link Here
45
 * The following features are supported:
45
 * The following features are supported:
46
 * <ul>
46
 * <ul>
47
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getGroup <em>Group</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getGroup <em>Group</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getModuleName <em>Module Name</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDescriptions <em>Descriptions</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDescriptions <em>Descriptions</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDisplayNames <em>Display Names</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDisplayNames <em>Display Names</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getIcons <em>Icons</em>}</li>
51
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getIcons <em>Icons</em>}</li>
51
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getName <em>Name</em>}</li>
52
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDistributables <em>Distributables</em>}</li>
52
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDistributables <em>Distributables</em>}</li>
53
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getContextParams <em>Context Params</em>}</li>
53
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getContextParams <em>Context Params</em>}</li>
54
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getFilters <em>Filters</em>}</li>
54
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getFilters <em>Filters</em>}</li>
Lines 78-84 Link Here
78
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDataSource <em>Data Source</em>}</li>
78
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getDataSource <em>Data Source</em>}</li>
79
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations <em>Message Destinations</em>}</li>
79
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getMessageDestinations <em>Message Destinations</em>}</li>
80
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
80
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
81
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getModuleName <em>Module Name</em>}</li>
82
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
81
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
83
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}</li>
82
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#getId <em>Id</em>}</li>
84
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}</li>
83
 *   <li>{@link org.eclipse.jst.javaee.web.WebApp#isMetadataComplete <em>Metadata Complete</em>}</li>
Lines 152-173 Link Here
152
	List<Icon> getIcons();
151
	List<Icon> getIcons();
153
152
154
	/**
153
	/**
155
	 * Returns the value of the '<em><b>Name</b></em>' attribute list.
156
	 * The list contents are of type {@link java.lang.String}.
157
	 * <!-- begin-user-doc -->
158
	 * <!-- end-user-doc -->
159
	 * <!-- begin-model-doc -->
160
	 * 
161
	 *             @since Java EE 6, Web 3.0
162
	 *           
163
	 * <!-- end-model-doc -->
164
	 * @return the value of the '<em>Name</em>' attribute list.
165
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebApp_Name()
166
	 * @generated
167
	 */
168
	List<String> getName();
169
170
	/**
171
	 * Returns the value of the '<em><b>Distributables</b></em>' containment reference list.
154
	 * Returns the value of the '<em><b>Distributables</b></em>' containment reference list.
172
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EmptyType}.
155
	 * The list contents are of type {@link org.eclipse.jst.javaee.core.EmptyType}.
173
	 * <!-- begin-user-doc -->
156
	 * <!-- begin-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/web/WebFragment.java (-6 / +1 lines)
Lines 48-57 Link Here
48
 * The following features are supported:
48
 * The following features are supported:
49
 * <ul>
49
 * <ul>
50
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getGroup <em>Group</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getGroup <em>Group</em>}</li>
51
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getName <em>Name</em>}</li>
51
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDescriptions <em>Descriptions</em>}</li>
52
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDescriptions <em>Descriptions</em>}</li>
52
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDisplayNames <em>Display Names</em>}</li>
53
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDisplayNames <em>Display Names</em>}</li>
53
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getIcons <em>Icons</em>}</li>
54
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getIcons <em>Icons</em>}</li>
54
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getName <em>Name</em>}</li>
55
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDistributables <em>Distributables</em>}</li>
55
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getDistributables <em>Distributables</em>}</li>
56
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getContextParams <em>Context Params</em>}</li>
56
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getContextParams <em>Context Params</em>}</li>
57
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getFilters <em>Filters</em>}</li>
57
 *   <li>{@link org.eclipse.jst.javaee.web.WebFragment#getFilters <em>Filters</em>}</li>
Lines 158-168 Link Here
158
	 * The list contents are of type {@link java.lang.String}.
158
	 * The list contents are of type {@link java.lang.String}.
159
	 * <!-- begin-user-doc -->
159
	 * <!-- begin-user-doc -->
160
	 * <!-- end-user-doc -->
160
	 * <!-- end-user-doc -->
161
	 * <!-- begin-model-doc -->
162
	 * 
163
	 *             @since Java EE 6, Web 3.0
164
	 *           
165
	 * <!-- end-model-doc -->
166
	 * @return the value of the '<em>Name</em>' attribute list.
161
	 * @return the value of the '<em>Name</em>' attribute list.
167
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Name()
162
	 * @see org.eclipse.jst.javaee.web.internal.metadata.WebPackage#getWebFragment_Name()
168
	 * @generated
163
	 * @generated
(-)jee-models/org/eclipse/jst/javaee/jsp/internal/metadata/JspPackage.java (-37 / +3 lines)
Lines 34-79 Link Here
34
 *     
34
 *     
35
 * 
35
 * 
36
 * 
36
 * 
37
 *       Copyright 2003-2009 Sun Microsystems, Inc.
38
 *       4150 Network Circle
39
 *       Santa Clara, California 95054
40
 *       U.S.A
41
 *       All rights reserved.
42
 * 
43
 *       Sun Microsystems, Inc. has intellectual property rights
44
 *       relating to technology described in this document. In
45
 *       particular, and without limitation, these intellectual
46
 *       property rights may include one or more of the U.S. patents
47
 *       listed at http://www.sun.com/patents and one or more
48
 *       additional patents or pending patent applications in the
49
 *       U.S. and other countries.
50
 * 
51
 *       This document and the technology which it describes are
52
 *       distributed under licenses restricting their use, copying,
53
 *       distribution, and decompilation. No part of this document
54
 *       may be reproduced in any form by any means without prior
55
 *       written authorization of Sun and its licensors, if any.
56
 * 
57
 *       Third-party software, including font technology, is
58
 *       copyrighted and licensed from Sun suppliers.
59
 * 
60
 *       Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
61
 *       JavaServer Pages, Enterprise JavaBeans and the Java Coffee
62
 *       Cup logo are trademarks or registered trademarks of Sun
63
 *       Microsystems, Inc. in the U.S. and other countries.
64
 * 
65
 *       Federal Acquisitions: Commercial Software - Government Users
66
 *       Subject to Standard License Terms and Conditions.
67
 * 
68
 *     
69
 * 
70
 * 
71
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
37
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
72
 *       types.  The JSP 2.2 schema contains all the special
38
 *       types.  The JSP 2.2 schema contains all the special
73
 *       structures and datatypes that are necessary to use JSP files
39
 *       structures and datatypes that are necessary to use JSP files
74
 *       from a web application.
40
 *       from a web application.
75
 * 
41
 * 
76
 *       The contents of this schema is used by the web-app_3_0.xsd
42
 *       The contents of this schema is used by the web-common_3_0.xsd
77
 *       file to define JSP specific content.
43
 *       file to define JSP specific content.
78
 * 
44
 * 
79
 *     
45
 *     
Lines 94-100 Link Here
94
 *     
60
 *     
95
 * 
61
 * 
96
 * 
62
 * 
97
 *       $Id: JspPackage.java,v 1.3 2009/10/15 18:52:17 canderson Exp $
63
 *       $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
98
 *       
64
 *       
99
 *     
65
 *     
100
 * 
66
 * 
Lines 119-125 Link Here
119
 *     
85
 *     
120
 * 
86
 * 
121
 * 
87
 * 
122
 *       $Id: JspPackage.java,v 1.3 2009/10/15 18:52:17 canderson Exp $
88
 *       $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
123
 *       
89
 *       
124
 *     
90
 *     
125
 * 
91
 * 
(-)jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java (-33 / +12 lines)
Lines 71-80 Link Here
71
 * The following features are implemented:
71
 * The following features are implemented:
72
 * <ul>
72
 * <ul>
73
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getGroup <em>Group</em>}</li>
73
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getGroup <em>Group</em>}</li>
74
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getModuleName <em>Module Name</em>}</li>
74
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDescriptions <em>Descriptions</em>}</li>
75
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDescriptions <em>Descriptions</em>}</li>
75
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDisplayNames <em>Display Names</em>}</li>
76
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDisplayNames <em>Display Names</em>}</li>
76
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getIcons <em>Icons</em>}</li>
77
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getIcons <em>Icons</em>}</li>
77
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getName <em>Name</em>}</li>
78
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDistributables <em>Distributables</em>}</li>
78
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDistributables <em>Distributables</em>}</li>
79
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getContextParams <em>Context Params</em>}</li>
79
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getContextParams <em>Context Params</em>}</li>
80
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getFilters <em>Filters</em>}</li>
80
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getFilters <em>Filters</em>}</li>
Lines 104-110 Link Here
104
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDataSource <em>Data Source</em>}</li>
104
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getDataSource <em>Data Source</em>}</li>
105
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations <em>Message Destinations</em>}</li>
105
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getMessageDestinations <em>Message Destinations</em>}</li>
106
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
106
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getLocalEncodingMappingsLists <em>Local Encoding Mappings Lists</em>}</li>
107
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getModuleName <em>Module Name</em>}</li>
108
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
107
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getAbsoluteOrdering <em>Absolute Ordering</em>}</li>
109
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId <em>Id</em>}</li>
108
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#getId <em>Id</em>}</li>
110
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
109
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebAppImpl#isMetadataComplete <em>Metadata Complete</em>}</li>
Lines 266-280 Link Here
266
	 * <!-- end-user-doc -->
265
	 * <!-- end-user-doc -->
267
	 * @generated
266
	 * @generated
268
	 */
267
	 */
269
	public List<String> getName() {
270
		return getGroup().list(WebPackage.Literals.WEB_APP__NAME);
271
	}
272
273
	/**
274
	 * <!-- begin-user-doc -->
275
	 * <!-- end-user-doc -->
276
	 * @generated
277
	 */
278
	public List<EmptyType> getDistributables() {
268
	public List<EmptyType> getDistributables() {
279
		return getGroup().list(WebPackage.Literals.WEB_APP__DISTRIBUTABLES);
269
		return getGroup().list(WebPackage.Literals.WEB_APP__DISTRIBUTABLES);
280
	}
270
	}
Lines 753-766 Link Here
753
			case WebPackage.WEB_APP__GROUP:
743
			case WebPackage.WEB_APP__GROUP:
754
				if (coreType) return getGroup();
744
				if (coreType) return getGroup();
755
				return ((FeatureMap.Internal)getGroup()).getWrapper();
745
				return ((FeatureMap.Internal)getGroup()).getWrapper();
746
			case WebPackage.WEB_APP__MODULE_NAME:
747
				return getModuleName();
756
			case WebPackage.WEB_APP__DESCRIPTIONS:
748
			case WebPackage.WEB_APP__DESCRIPTIONS:
757
				return getDescriptions();
749
				return getDescriptions();
758
			case WebPackage.WEB_APP__DISPLAY_NAMES:
750
			case WebPackage.WEB_APP__DISPLAY_NAMES:
759
				return getDisplayNames();
751
				return getDisplayNames();
760
			case WebPackage.WEB_APP__ICONS:
752
			case WebPackage.WEB_APP__ICONS:
761
				return getIcons();
753
				return getIcons();
762
			case WebPackage.WEB_APP__NAME:
763
				return getName();
764
			case WebPackage.WEB_APP__DISTRIBUTABLES:
754
			case WebPackage.WEB_APP__DISTRIBUTABLES:
765
				return getDistributables();
755
				return getDistributables();
766
			case WebPackage.WEB_APP__CONTEXT_PARAMS:
756
			case WebPackage.WEB_APP__CONTEXT_PARAMS:
Lines 819-826 Link Here
819
				return getMessageDestinations();
809
				return getMessageDestinations();
820
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
810
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
821
				return getLocalEncodingMappingsLists();
811
				return getLocalEncodingMappingsLists();
822
			case WebPackage.WEB_APP__MODULE_NAME:
823
				return getModuleName();
824
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
812
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
825
				return getAbsoluteOrdering();
813
				return getAbsoluteOrdering();
826
			case WebPackage.WEB_APP__ID:
814
			case WebPackage.WEB_APP__ID:
Lines 845-850 Link Here
845
			case WebPackage.WEB_APP__GROUP:
833
			case WebPackage.WEB_APP__GROUP:
846
				((FeatureMap.Internal)getGroup()).set(newValue);
834
				((FeatureMap.Internal)getGroup()).set(newValue);
847
				return;
835
				return;
836
			case WebPackage.WEB_APP__MODULE_NAME:
837
				getModuleName().clear();
838
				getModuleName().addAll((Collection<? extends String>)newValue);
839
				return;
848
			case WebPackage.WEB_APP__DESCRIPTIONS:
840
			case WebPackage.WEB_APP__DESCRIPTIONS:
849
				getDescriptions().clear();
841
				getDescriptions().clear();
850
				getDescriptions().addAll((Collection<? extends Description>)newValue);
842
				getDescriptions().addAll((Collection<? extends Description>)newValue);
Lines 857-866 Link Here
857
				getIcons().clear();
849
				getIcons().clear();
858
				getIcons().addAll((Collection<? extends Icon>)newValue);
850
				getIcons().addAll((Collection<? extends Icon>)newValue);
859
				return;
851
				return;
860
			case WebPackage.WEB_APP__NAME:
861
				getName().clear();
862
				getName().addAll((Collection<? extends String>)newValue);
863
				return;
864
			case WebPackage.WEB_APP__DISTRIBUTABLES:
852
			case WebPackage.WEB_APP__DISTRIBUTABLES:
865
				getDistributables().clear();
853
				getDistributables().clear();
866
				getDistributables().addAll((Collection<? extends EmptyType>)newValue);
854
				getDistributables().addAll((Collection<? extends EmptyType>)newValue);
Lines 977-986 Link Here
977
				getLocalEncodingMappingsLists().clear();
965
				getLocalEncodingMappingsLists().clear();
978
				getLocalEncodingMappingsLists().addAll((Collection<? extends LocaleEncodingMappingList>)newValue);
966
				getLocalEncodingMappingsLists().addAll((Collection<? extends LocaleEncodingMappingList>)newValue);
979
				return;
967
				return;
980
			case WebPackage.WEB_APP__MODULE_NAME:
981
				getModuleName().clear();
982
				getModuleName().addAll((Collection<? extends String>)newValue);
983
				return;
984
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
968
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
985
				getAbsoluteOrdering().clear();
969
				getAbsoluteOrdering().clear();
986
				getAbsoluteOrdering().addAll((Collection<? extends AbsoluteOrderingType>)newValue);
970
				getAbsoluteOrdering().addAll((Collection<? extends AbsoluteOrderingType>)newValue);
Lines 1009-1014 Link Here
1009
			case WebPackage.WEB_APP__GROUP:
993
			case WebPackage.WEB_APP__GROUP:
1010
				getGroup().clear();
994
				getGroup().clear();
1011
				return;
995
				return;
996
			case WebPackage.WEB_APP__MODULE_NAME:
997
				getModuleName().clear();
998
				return;
1012
			case WebPackage.WEB_APP__DESCRIPTIONS:
999
			case WebPackage.WEB_APP__DESCRIPTIONS:
1013
				getDescriptions().clear();
1000
				getDescriptions().clear();
1014
				return;
1001
				return;
Lines 1018-1026 Link Here
1018
			case WebPackage.WEB_APP__ICONS:
1005
			case WebPackage.WEB_APP__ICONS:
1019
				getIcons().clear();
1006
				getIcons().clear();
1020
				return;
1007
				return;
1021
			case WebPackage.WEB_APP__NAME:
1022
				getName().clear();
1023
				return;
1024
			case WebPackage.WEB_APP__DISTRIBUTABLES:
1008
			case WebPackage.WEB_APP__DISTRIBUTABLES:
1025
				getDistributables().clear();
1009
				getDistributables().clear();
1026
				return;
1010
				return;
Lines 1108-1116 Link Here
1108
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1092
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1109
				getLocalEncodingMappingsLists().clear();
1093
				getLocalEncodingMappingsLists().clear();
1110
				return;
1094
				return;
1111
			case WebPackage.WEB_APP__MODULE_NAME:
1112
				getModuleName().clear();
1113
				return;
1114
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1095
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1115
				getAbsoluteOrdering().clear();
1096
				getAbsoluteOrdering().clear();
1116
				return;
1097
				return;
Lines 1137-1150 Link Here
1137
		switch (featureID) {
1118
		switch (featureID) {
1138
			case WebPackage.WEB_APP__GROUP:
1119
			case WebPackage.WEB_APP__GROUP:
1139
				return group != null && !group.isEmpty();
1120
				return group != null && !group.isEmpty();
1121
			case WebPackage.WEB_APP__MODULE_NAME:
1122
				return !getModuleName().isEmpty();
1140
			case WebPackage.WEB_APP__DESCRIPTIONS:
1123
			case WebPackage.WEB_APP__DESCRIPTIONS:
1141
				return !getDescriptions().isEmpty();
1124
				return !getDescriptions().isEmpty();
1142
			case WebPackage.WEB_APP__DISPLAY_NAMES:
1125
			case WebPackage.WEB_APP__DISPLAY_NAMES:
1143
				return !getDisplayNames().isEmpty();
1126
				return !getDisplayNames().isEmpty();
1144
			case WebPackage.WEB_APP__ICONS:
1127
			case WebPackage.WEB_APP__ICONS:
1145
				return !getIcons().isEmpty();
1128
				return !getIcons().isEmpty();
1146
			case WebPackage.WEB_APP__NAME:
1147
				return !getName().isEmpty();
1148
			case WebPackage.WEB_APP__DISTRIBUTABLES:
1129
			case WebPackage.WEB_APP__DISTRIBUTABLES:
1149
				return !getDistributables().isEmpty();
1130
				return !getDistributables().isEmpty();
1150
			case WebPackage.WEB_APP__CONTEXT_PARAMS:
1131
			case WebPackage.WEB_APP__CONTEXT_PARAMS:
Lines 1203-1210 Link Here
1203
				return !getMessageDestinations().isEmpty();
1184
				return !getMessageDestinations().isEmpty();
1204
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1185
			case WebPackage.WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS:
1205
				return !getLocalEncodingMappingsLists().isEmpty();
1186
				return !getLocalEncodingMappingsLists().isEmpty();
1206
			case WebPackage.WEB_APP__MODULE_NAME:
1207
				return !getModuleName().isEmpty();
1208
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1187
			case WebPackage.WEB_APP__ABSOLUTE_ORDERING:
1209
				return !getAbsoluteOrdering().isEmpty();
1188
				return !getAbsoluteOrdering().isEmpty();
1210
			case WebPackage.WEB_APP__ID:
1189
			case WebPackage.WEB_APP__ID:
(-)jee-models/org/eclipse/jst/javaee/web/internal/impl/WebFragmentImpl.java (-12 / +12 lines)
Lines 69-78 Link Here
69
 * The following features are implemented:
69
 * The following features are implemented:
70
 * <ul>
70
 * <ul>
71
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getGroup <em>Group</em>}</li>
71
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getGroup <em>Group</em>}</li>
72
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getName <em>Name</em>}</li>
72
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDescriptions <em>Descriptions</em>}</li>
73
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDescriptions <em>Descriptions</em>}</li>
73
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDisplayNames <em>Display Names</em>}</li>
74
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDisplayNames <em>Display Names</em>}</li>
74
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getIcons <em>Icons</em>}</li>
75
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getIcons <em>Icons</em>}</li>
75
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getName <em>Name</em>}</li>
76
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDistributables <em>Distributables</em>}</li>
76
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getDistributables <em>Distributables</em>}</li>
77
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getContextParams <em>Context Params</em>}</li>
77
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getContextParams <em>Context Params</em>}</li>
78
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getFilters <em>Filters</em>}</li>
78
 *   <li>{@link org.eclipse.jst.javaee.web.internal.impl.WebFragmentImpl#getFilters <em>Filters</em>}</li>
Lines 741-754 Link Here
741
			case WebPackage.WEB_FRAGMENT__GROUP:
741
			case WebPackage.WEB_FRAGMENT__GROUP:
742
				if (coreType) return getGroup();
742
				if (coreType) return getGroup();
743
				return ((FeatureMap.Internal)getGroup()).getWrapper();
743
				return ((FeatureMap.Internal)getGroup()).getWrapper();
744
			case WebPackage.WEB_FRAGMENT__NAME:
745
				return getName();
744
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
746
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
745
				return getDescriptions();
747
				return getDescriptions();
746
			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
748
			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
747
				return getDisplayNames();
749
				return getDisplayNames();
748
			case WebPackage.WEB_FRAGMENT__ICONS:
750
			case WebPackage.WEB_FRAGMENT__ICONS:
749
				return getIcons();
751
				return getIcons();
750
			case WebPackage.WEB_FRAGMENT__NAME:
751
				return getName();
752
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
752
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
753
				return getDistributables();
753
				return getDistributables();
754
			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
754
			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
Lines 831-836 Link Here
831
			case WebPackage.WEB_FRAGMENT__GROUP:
831
			case WebPackage.WEB_FRAGMENT__GROUP:
832
				((FeatureMap.Internal)getGroup()).set(newValue);
832
				((FeatureMap.Internal)getGroup()).set(newValue);
833
				return;
833
				return;
834
			case WebPackage.WEB_FRAGMENT__NAME:
835
				getName().clear();
836
				getName().addAll((Collection<? extends String>)newValue);
837
				return;
834
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
838
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
835
				getDescriptions().clear();
839
				getDescriptions().clear();
836
				getDescriptions().addAll((Collection<? extends Description>)newValue);
840
				getDescriptions().addAll((Collection<? extends Description>)newValue);
Lines 843-852 Link Here
843
				getIcons().clear();
847
				getIcons().clear();
844
				getIcons().addAll((Collection<? extends Icon>)newValue);
848
				getIcons().addAll((Collection<? extends Icon>)newValue);
845
				return;
849
				return;
846
			case WebPackage.WEB_FRAGMENT__NAME:
847
				getName().clear();
848
				getName().addAll((Collection<? extends String>)newValue);
849
				return;
850
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
850
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
851
				getDistributables().clear();
851
				getDistributables().clear();
852
				getDistributables().addAll((Collection<? extends EmptyType>)newValue);
852
				getDistributables().addAll((Collection<? extends EmptyType>)newValue);
Lines 991-996 Link Here
991
			case WebPackage.WEB_FRAGMENT__GROUP:
991
			case WebPackage.WEB_FRAGMENT__GROUP:
992
				getGroup().clear();
992
				getGroup().clear();
993
				return;
993
				return;
994
			case WebPackage.WEB_FRAGMENT__NAME:
995
				getName().clear();
996
				return;
994
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
997
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
995
				getDescriptions().clear();
998
				getDescriptions().clear();
996
				return;
999
				return;
Lines 1000-1008 Link Here
1000
			case WebPackage.WEB_FRAGMENT__ICONS:
1003
			case WebPackage.WEB_FRAGMENT__ICONS:
1001
				getIcons().clear();
1004
				getIcons().clear();
1002
				return;
1005
				return;
1003
			case WebPackage.WEB_FRAGMENT__NAME:
1004
				getName().clear();
1005
				return;
1006
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
1006
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
1007
				getDistributables().clear();
1007
				getDistributables().clear();
1008
				return;
1008
				return;
Lines 1116-1129 Link Here
1116
		switch (featureID) {
1116
		switch (featureID) {
1117
			case WebPackage.WEB_FRAGMENT__GROUP:
1117
			case WebPackage.WEB_FRAGMENT__GROUP:
1118
				return group != null && !group.isEmpty();
1118
				return group != null && !group.isEmpty();
1119
			case WebPackage.WEB_FRAGMENT__NAME:
1120
				return !getName().isEmpty();
1119
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
1121
			case WebPackage.WEB_FRAGMENT__DESCRIPTIONS:
1120
				return !getDescriptions().isEmpty();
1122
				return !getDescriptions().isEmpty();
1121
			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
1123
			case WebPackage.WEB_FRAGMENT__DISPLAY_NAMES:
1122
				return !getDisplayNames().isEmpty();
1124
				return !getDisplayNames().isEmpty();
1123
			case WebPackage.WEB_FRAGMENT__ICONS:
1125
			case WebPackage.WEB_FRAGMENT__ICONS:
1124
				return !getIcons().isEmpty();
1126
				return !getIcons().isEmpty();
1125
			case WebPackage.WEB_FRAGMENT__NAME:
1126
				return !getName().isEmpty();
1127
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
1127
			case WebPackage.WEB_FRAGMENT__DISTRIBUTABLES:
1128
				return !getDistributables().isEmpty();
1128
				return !getDistributables().isEmpty();
1129
			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
1129
			case WebPackage.WEB_FRAGMENT__CONTEXT_PARAMS:
(-)jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java (-59 / +39 lines)
Lines 1590-1604 Link Here
1590
	 * @generated
1590
	 * @generated
1591
	 */
1591
	 */
1592
	public EReference getWebApp_Descriptions() {
1592
	public EReference getWebApp_Descriptions() {
1593
		return (EReference)webAppEClass.getEStructuralFeatures().get(1);
1594
	}
1595
1596
	/**
1597
	 * <!-- begin-user-doc -->
1598
	 * <!-- end-user-doc -->
1599
	 * @generated
1600
	 */
1601
	public EReference getWebApp_DisplayNames() {
1602
		return (EReference)webAppEClass.getEStructuralFeatures().get(2);
1593
		return (EReference)webAppEClass.getEStructuralFeatures().get(2);
1603
	}
1594
	}
1604
1595
Lines 1607-1613 Link Here
1607
	 * <!-- end-user-doc -->
1598
	 * <!-- end-user-doc -->
1608
	 * @generated
1599
	 * @generated
1609
	 */
1600
	 */
1610
	public EReference getWebApp_Icons() {
1601
	public EReference getWebApp_DisplayNames() {
1611
		return (EReference)webAppEClass.getEStructuralFeatures().get(3);
1602
		return (EReference)webAppEClass.getEStructuralFeatures().get(3);
1612
	}
1603
	}
1613
1604
Lines 1616-1623 Link Here
1616
	 * <!-- end-user-doc -->
1607
	 * <!-- end-user-doc -->
1617
	 * @generated
1608
	 * @generated
1618
	 */
1609
	 */
1619
	public EAttribute getWebApp_Name() {
1610
	public EReference getWebApp_Icons() {
1620
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(4);
1611
		return (EReference)webAppEClass.getEStructuralFeatures().get(4);
1621
	}
1612
	}
1622
1613
1623
	/**
1614
	/**
Lines 1887-1893 Link Here
1887
	 * @generated
1878
	 * @generated
1888
	 */
1879
	 */
1889
	public EAttribute getWebApp_ModuleName() {
1880
	public EAttribute getWebApp_ModuleName() {
1890
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(34);
1881
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(1);
1891
	}
1882
	}
1892
1883
1893
	/**
1884
	/**
Lines 1896-1902 Link Here
1896
	 * @generated
1887
	 * @generated
1897
	 */
1888
	 */
1898
	public EReference getWebApp_AbsoluteOrdering() {
1889
	public EReference getWebApp_AbsoluteOrdering() {
1899
		return (EReference)webAppEClass.getEStructuralFeatures().get(35);
1890
		return (EReference)webAppEClass.getEStructuralFeatures().get(34);
1900
	}
1891
	}
1901
1892
1902
	/**
1893
	/**
Lines 1905-1911 Link Here
1905
	 * @generated
1896
	 * @generated
1906
	 */
1897
	 */
1907
	public EAttribute getWebApp_Id() {
1898
	public EAttribute getWebApp_Id() {
1908
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(36);
1899
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(35);
1909
	}
1900
	}
1910
1901
1911
	/**
1902
	/**
Lines 1914-1920 Link Here
1914
	 * @generated
1905
	 * @generated
1915
	 */
1906
	 */
1916
	public EAttribute getWebApp_MetadataComplete() {
1907
	public EAttribute getWebApp_MetadataComplete() {
1917
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(37);
1908
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(36);
1918
	}
1909
	}
1919
1910
1920
	/**
1911
	/**
Lines 1923-1929 Link Here
1923
	 * @generated
1914
	 * @generated
1924
	 */
1915
	 */
1925
	public EAttribute getWebApp_Version() {
1916
	public EAttribute getWebApp_Version() {
1926
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(38);
1917
		return (EAttribute)webAppEClass.getEStructuralFeatures().get(37);
1927
	}
1918
	}
1928
1919
1929
	/**
1920
	/**
Lines 1995-2001 Link Here
1995
	 * @generated
1986
	 * @generated
1996
	 */
1987
	 */
1997
	public EReference getWebFragment_Descriptions() {
1988
	public EReference getWebFragment_Descriptions() {
1998
		return (EReference)webFragmentEClass.getEStructuralFeatures().get(1);
1989
		return (EReference)webFragmentEClass.getEStructuralFeatures().get(2);
1999
	}
1990
	}
2000
1991
2001
	/**
1992
	/**
Lines 2004-2010 Link Here
2004
	 * @generated
1995
	 * @generated
2005
	 */
1996
	 */
2006
	public EReference getWebFragment_DisplayNames() {
1997
	public EReference getWebFragment_DisplayNames() {
2007
		return (EReference)webFragmentEClass.getEStructuralFeatures().get(2);
1998
		return (EReference)webFragmentEClass.getEStructuralFeatures().get(3);
2008
	}
1999
	}
2009
2000
2010
	/**
2001
	/**
Lines 2013-2019 Link Here
2013
	 * @generated
2004
	 * @generated
2014
	 */
2005
	 */
2015
	public EReference getWebFragment_Icons() {
2006
	public EReference getWebFragment_Icons() {
2016
		return (EReference)webFragmentEClass.getEStructuralFeatures().get(3);
2007
		return (EReference)webFragmentEClass.getEStructuralFeatures().get(4);
2017
	}
2008
	}
2018
2009
2019
	/**
2010
	/**
Lines 2022-2028 Link Here
2022
	 * @generated
2013
	 * @generated
2023
	 */
2014
	 */
2024
	public EAttribute getWebFragment_Name() {
2015
	public EAttribute getWebFragment_Name() {
2025
		return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(4);
2016
		return (EAttribute)webFragmentEClass.getEStructuralFeatures().get(1);
2026
	}
2017
	}
2027
2018
2028
	/**
2019
	/**
Lines 2768-2777 Link Here
2768
2759
2769
		webAppEClass = createEClass(WEB_APP);
2760
		webAppEClass = createEClass(WEB_APP);
2770
		createEAttribute(webAppEClass, WEB_APP__GROUP);
2761
		createEAttribute(webAppEClass, WEB_APP__GROUP);
2762
		createEAttribute(webAppEClass, WEB_APP__MODULE_NAME);
2771
		createEReference(webAppEClass, WEB_APP__DESCRIPTIONS);
2763
		createEReference(webAppEClass, WEB_APP__DESCRIPTIONS);
2772
		createEReference(webAppEClass, WEB_APP__DISPLAY_NAMES);
2764
		createEReference(webAppEClass, WEB_APP__DISPLAY_NAMES);
2773
		createEReference(webAppEClass, WEB_APP__ICONS);
2765
		createEReference(webAppEClass, WEB_APP__ICONS);
2774
		createEAttribute(webAppEClass, WEB_APP__NAME);
2775
		createEReference(webAppEClass, WEB_APP__DISTRIBUTABLES);
2766
		createEReference(webAppEClass, WEB_APP__DISTRIBUTABLES);
2776
		createEReference(webAppEClass, WEB_APP__CONTEXT_PARAMS);
2767
		createEReference(webAppEClass, WEB_APP__CONTEXT_PARAMS);
2777
		createEReference(webAppEClass, WEB_APP__FILTERS);
2768
		createEReference(webAppEClass, WEB_APP__FILTERS);
Lines 2801-2807 Link Here
2801
		createEReference(webAppEClass, WEB_APP__DATA_SOURCE);
2792
		createEReference(webAppEClass, WEB_APP__DATA_SOURCE);
2802
		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
2793
		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
2803
		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
2794
		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPINGS_LISTS);
2804
		createEAttribute(webAppEClass, WEB_APP__MODULE_NAME);
2805
		createEReference(webAppEClass, WEB_APP__ABSOLUTE_ORDERING);
2795
		createEReference(webAppEClass, WEB_APP__ABSOLUTE_ORDERING);
2806
		createEAttribute(webAppEClass, WEB_APP__ID);
2796
		createEAttribute(webAppEClass, WEB_APP__ID);
2807
		createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE);
2797
		createEAttribute(webAppEClass, WEB_APP__METADATA_COMPLETE);
Lines 2815-2824 Link Here
2815
2805
2816
		webFragmentEClass = createEClass(WEB_FRAGMENT);
2806
		webFragmentEClass = createEClass(WEB_FRAGMENT);
2817
		createEAttribute(webFragmentEClass, WEB_FRAGMENT__GROUP);
2807
		createEAttribute(webFragmentEClass, WEB_FRAGMENT__GROUP);
2808
		createEAttribute(webFragmentEClass, WEB_FRAGMENT__NAME);
2818
		createEReference(webFragmentEClass, WEB_FRAGMENT__DESCRIPTIONS);
2809
		createEReference(webFragmentEClass, WEB_FRAGMENT__DESCRIPTIONS);
2819
		createEReference(webFragmentEClass, WEB_FRAGMENT__DISPLAY_NAMES);
2810
		createEReference(webFragmentEClass, WEB_FRAGMENT__DISPLAY_NAMES);
2820
		createEReference(webFragmentEClass, WEB_FRAGMENT__ICONS);
2811
		createEReference(webFragmentEClass, WEB_FRAGMENT__ICONS);
2821
		createEAttribute(webFragmentEClass, WEB_FRAGMENT__NAME);
2822
		createEReference(webFragmentEClass, WEB_FRAGMENT__DISTRIBUTABLES);
2812
		createEReference(webFragmentEClass, WEB_FRAGMENT__DISTRIBUTABLES);
2823
		createEReference(webFragmentEClass, WEB_FRAGMENT__CONTEXT_PARAMS);
2813
		createEReference(webFragmentEClass, WEB_FRAGMENT__CONTEXT_PARAMS);
2824
		createEReference(webFragmentEClass, WEB_FRAGMENT__FILTERS);
2814
		createEReference(webFragmentEClass, WEB_FRAGMENT__FILTERS);
Lines 2969-2975 Link Here
2969
		initEReference(getFilter_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2959
		initEReference(getFilter_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2970
		initEReference(getFilter_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2960
		initEReference(getFilter_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2971
		initEAttribute(getFilter_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2961
		initEAttribute(getFilter_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2972
		initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2962
		initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2973
		initEAttribute(getFilter_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2963
		initEAttribute(getFilter_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2974
		initEReference(getFilter_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2964
		initEReference(getFilter_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2975
		initEAttribute(getFilter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2965
		initEAttribute(getFilter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 3065-3074 Link Here
3065
3055
3066
		initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3056
		initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3067
		initEAttribute(getWebApp_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3057
		initEAttribute(getWebApp_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3058
		initEAttribute(getWebApp_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3068
		initEReference(getWebApp_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3059
		initEReference(getWebApp_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3069
		initEReference(getWebApp_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3060
		initEReference(getWebApp_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3070
		initEReference(getWebApp_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3061
		initEReference(getWebApp_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3071
		initEAttribute(getWebApp_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3072
		initEReference(getWebApp_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3062
		initEReference(getWebApp_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3073
		initEReference(getWebApp_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3063
		initEReference(getWebApp_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3074
		initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3064
		initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 3098-3104 Link Here
3098
		initEReference(getWebApp_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3088
		initEReference(getWebApp_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3099
		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$
3089
		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$
3100
		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$
3090
		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$
3101
		initEAttribute(getWebApp_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3102
		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$
3091
		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$
3103
		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$
3092
		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$
3104
		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$
3093
		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 3112-3121 Link Here
3112
3101
3113
		initEClass(webFragmentEClass, WebFragment.class, "WebFragment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3102
		initEClass(webFragmentEClass, WebFragment.class, "WebFragment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
3114
		initEAttribute(getWebFragment_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3103
		initEAttribute(getWebFragment_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3104
		initEAttribute(getWebFragment_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3115
		initEReference(getWebFragment_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3105
		initEReference(getWebFragment_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3116
		initEReference(getWebFragment_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3106
		initEReference(getWebFragment_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3117
		initEReference(getWebFragment_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3107
		initEReference(getWebFragment_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3118
		initEAttribute(getWebFragment_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3119
		initEReference(getWebFragment_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3108
		initEReference(getWebFragment_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3120
		initEReference(getWebFragment_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3109
		initEReference(getWebFragment_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3121
		initEReference(getWebFragment_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
3110
		initEReference(getWebFragment_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 3802-3808 Link Here
3802
		   new String[] {
3791
		   new String[] {
3803
			 "name", "multipart-configType", //$NON-NLS-1$ //$NON-NLS-2$
3792
			 "name", "multipart-configType", //$NON-NLS-1$ //$NON-NLS-2$
3804
			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
3793
			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
3805
		   });		
3794
		   });			
3806
		addAnnotation
3795
		addAnnotation
3807
		  (getMultipartConfigType_Location(), 
3796
		  (getMultipartConfigType_Location(), 
3808
		   source, 
3797
		   source, 
Lines 3810-3816 Link Here
3810
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
3799
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
3811
			 "name", "location", //$NON-NLS-1$ //$NON-NLS-2$
3800
			 "name", "location", //$NON-NLS-1$ //$NON-NLS-2$
3812
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
3801
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
3813
		   });		
3802
		   });			
3814
		addAnnotation
3803
		addAnnotation
3815
		  (getMultipartConfigType_MaxFileSize(), 
3804
		  (getMultipartConfigType_MaxFileSize(), 
3816
		   source, 
3805
		   source, 
Lines 3818-3824 Link Here
3818
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
3807
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
3819
			 "name", "max-file-size", //$NON-NLS-1$ //$NON-NLS-2$
3808
			 "name", "max-file-size", //$NON-NLS-1$ //$NON-NLS-2$
3820
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
3809
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
3821
		   });		
3810
		   });			
3822
		addAnnotation
3811
		addAnnotation
3823
		  (getMultipartConfigType_MaxRequestSize(), 
3812
		  (getMultipartConfigType_MaxRequestSize(), 
3824
		   source, 
3813
		   source, 
Lines 3826-3832 Link Here
3826
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
3815
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
3827
			 "name", "max-request-size", //$NON-NLS-1$ //$NON-NLS-2$
3816
			 "name", "max-request-size", //$NON-NLS-1$ //$NON-NLS-2$
3828
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
3817
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
3829
		   });		
3818
		   });			
3830
		addAnnotation
3819
		addAnnotation
3831
		  (getMultipartConfigType_FileSizeThreshold(), 
3820
		  (getMultipartConfigType_FileSizeThreshold(), 
3832
		   source, 
3821
		   source, 
Lines 4232-4237 Link Here
4232
		   new String[] {
4221
		   new String[] {
4233
			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
4222
			 "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
4234
			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
4223
			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
4224
		   });			
4225
		addAnnotation
4226
		  (getWebApp_ModuleName(), 
4227
		   source, 
4228
		   new String[] {
4229
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4230
			 "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$
4231
			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
4232
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4235
		   });		
4233
		   });		
4236
		addAnnotation
4234
		addAnnotation
4237
		  (getWebApp_Descriptions(), 
4235
		  (getWebApp_Descriptions(), 
Lines 4259-4273 Link Here
4259
			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
4257
			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
4260
			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
4258
			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
4261
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4259
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4262
		   });			
4263
		addAnnotation
4264
		  (getWebApp_Name(), 
4265
		   source, 
4266
		   new String[] {
4267
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4268
			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
4269
			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
4270
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4271
		   });		
4260
		   });		
4272
		addAnnotation
4261
		addAnnotation
4273
		  (getWebApp_Distributables(), 
4262
		  (getWebApp_Distributables(), 
Lines 4531-4545 Link Here
4531
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4520
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4532
		   });			
4521
		   });			
4533
		addAnnotation
4522
		addAnnotation
4534
		  (getWebApp_ModuleName(), 
4535
		   source, 
4536
		   new String[] {
4537
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4538
			 "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$
4539
			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
4540
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4541
		   });			
4542
		addAnnotation
4543
		  (getWebApp_AbsoluteOrdering(), 
4523
		  (getWebApp_AbsoluteOrdering(), 
4544
		   source, 
4524
		   source, 
4545
		   new String[] {
4525
		   new String[] {
Lines 4633-4638 Link Here
4633
			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
4613
			 "name", "group:0" //$NON-NLS-1$ //$NON-NLS-2$
4634
		   });		
4614
		   });		
4635
		addAnnotation
4615
		addAnnotation
4616
		  (getWebFragment_Name(), 
4617
		   source, 
4618
		   new String[] {
4619
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4620
			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
4621
			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
4622
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4623
		   });		
4624
		addAnnotation
4636
		  (getWebFragment_Descriptions(), 
4625
		  (getWebFragment_Descriptions(), 
4637
		   source, 
4626
		   source, 
4638
		   new String[] {
4627
		   new String[] {
Lines 4658-4672 Link Here
4658
			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
4647
			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
4659
			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
4648
			 "namespace", "http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$ //$NON-NLS-2$
4660
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4649
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4661
		   });			
4662
		addAnnotation
4663
		  (getWebFragment_Name(), 
4664
		   source, 
4665
		   new String[] {
4666
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
4667
			 "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
4668
			 "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
4669
			 "group", "#group:0" //$NON-NLS-1$ //$NON-NLS-2$
4670
		   });		
4650
		   });		
4671
		addAnnotation
4651
		addAnnotation
4672
		  (getWebFragment_Distributables(), 
4652
		  (getWebFragment_Distributables(), 
(-)jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java (-37 / +17 lines)
Lines 977-993 Link Here
977
	 * <!-- end-user-doc -->
977
	 * <!-- end-user-doc -->
978
	 * @generated
978
	 * @generated
979
	 */
979
	 */
980
	public EAttribute getAsyncMethodType_MethodIntf() {
981
		return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(2);
982
	}
983
984
	/**
985
	 * <!-- begin-user-doc -->
986
	 * <!-- end-user-doc -->
987
	 * @generated
988
	 */
989
	public EAttribute getAsyncMethodType_Id() {
980
	public EAttribute getAsyncMethodType_Id() {
990
		return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(3);
981
		return (EAttribute)asyncMethodTypeEClass.getEStructuralFeatures().get(2);
991
	}
982
	}
992
983
993
	/**
984
	/**
Lines 1203-1209 Link Here
1203
	 * @generated
1194
	 * @generated
1204
	 */
1195
	 */
1205
	public EReference getEJBJar_Descriptions() {
1196
	public EReference getEJBJar_Descriptions() {
1206
		return (EReference)ejbJarEClass.getEStructuralFeatures().get(0);
1197
		return (EReference)ejbJarEClass.getEStructuralFeatures().get(1);
1207
	}
1198
	}
1208
1199
1209
	/**
1200
	/**
Lines 1212-1218 Link Here
1212
	 * @generated
1203
	 * @generated
1213
	 */
1204
	 */
1214
	public EReference getEJBJar_DisplayNames() {
1205
	public EReference getEJBJar_DisplayNames() {
1215
		return (EReference)ejbJarEClass.getEStructuralFeatures().get(1);
1206
		return (EReference)ejbJarEClass.getEStructuralFeatures().get(2);
1216
	}
1207
	}
1217
1208
1218
	/**
1209
	/**
Lines 1221-1227 Link Here
1221
	 * @generated
1212
	 * @generated
1222
	 */
1213
	 */
1223
	public EReference getEJBJar_Icons() {
1214
	public EReference getEJBJar_Icons() {
1224
		return (EReference)ejbJarEClass.getEStructuralFeatures().get(2);
1215
		return (EReference)ejbJarEClass.getEStructuralFeatures().get(3);
1225
	}
1216
	}
1226
1217
1227
	/**
1218
	/**
Lines 1230-1236 Link Here
1230
	 * @generated
1221
	 * @generated
1231
	 */
1222
	 */
1232
	public EAttribute getEJBJar_ModuleName() {
1223
	public EAttribute getEJBJar_ModuleName() {
1233
		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(3);
1224
		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(0);
1234
	}
1225
	}
1235
1226
1236
	/**
1227
	/**
Lines 3886-3892 Link Here
3886
		asyncMethodTypeEClass = createEClass(ASYNC_METHOD_TYPE);
3877
		asyncMethodTypeEClass = createEClass(ASYNC_METHOD_TYPE);
3887
		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_NAME);
3878
		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_NAME);
3888
		createEReference(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_PARAMS);
3879
		createEReference(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_PARAMS);
3889
		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__METHOD_INTF);
3890
		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__ID);
3880
		createEAttribute(asyncMethodTypeEClass, ASYNC_METHOD_TYPE__ID);
3891
3881
3892
		cmpFieldEClass = createEClass(CMP_FIELD);
3882
		cmpFieldEClass = createEClass(CMP_FIELD);
Lines 3917-3926 Link Here
3917
		createEAttribute(dependsOnTypeEClass, DEPENDS_ON_TYPE__ID);
3907
		createEAttribute(dependsOnTypeEClass, DEPENDS_ON_TYPE__ID);
3918
3908
3919
		ejbJarEClass = createEClass(EJB_JAR);
3909
		ejbJarEClass = createEClass(EJB_JAR);
3910
		createEAttribute(ejbJarEClass, EJB_JAR__MODULE_NAME);
3920
		createEReference(ejbJarEClass, EJB_JAR__DESCRIPTIONS);
3911
		createEReference(ejbJarEClass, EJB_JAR__DESCRIPTIONS);
3921
		createEReference(ejbJarEClass, EJB_JAR__DISPLAY_NAMES);
3912
		createEReference(ejbJarEClass, EJB_JAR__DISPLAY_NAMES);
3922
		createEReference(ejbJarEClass, EJB_JAR__ICONS);
3913
		createEReference(ejbJarEClass, EJB_JAR__ICONS);
3923
		createEAttribute(ejbJarEClass, EJB_JAR__MODULE_NAME);
3924
		createEReference(ejbJarEClass, EJB_JAR__ENTERPRISE_BEANS);
3914
		createEReference(ejbJarEClass, EJB_JAR__ENTERPRISE_BEANS);
3925
		createEReference(ejbJarEClass, EJB_JAR__INTERCEPTORS);
3915
		createEReference(ejbJarEClass, EJB_JAR__INTERCEPTORS);
3926
		createEReference(ejbJarEClass, EJB_JAR__RELATIONSHIPS);
3916
		createEReference(ejbJarEClass, EJB_JAR__RELATIONSHIPS);
Lines 4275-4281 Link Here
4275
4265
4276
		// Initialize classes and features; add operations and parameters
4266
		// Initialize classes and features; add operations and parameters
4277
		initEClass(accessTimeoutTypeEClass, AccessTimeoutType.class, "AccessTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4267
		initEClass(accessTimeoutTypeEClass, AccessTimeoutType.class, "AccessTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4278
		initEAttribute(getAccessTimeoutType_Timeout(), theXMLTypePackage.getPositiveInteger(), "timeout", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4268
		initEAttribute(getAccessTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4279
		initEAttribute(getAccessTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4269
		initEAttribute(getAccessTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4280
		initEAttribute(getAccessTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4270
		initEAttribute(getAccessTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4281
4271
Lines 4316-4322 Link Here
4316
		initEClass(asyncMethodTypeEClass, AsyncMethodType.class, "AsyncMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4306
		initEClass(asyncMethodTypeEClass, AsyncMethodType.class, "AsyncMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4317
		initEAttribute(getAsyncMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4307
		initEAttribute(getAsyncMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4318
		initEReference(getAsyncMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4308
		initEReference(getAsyncMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4319
		initEAttribute(getAsyncMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4320
		initEAttribute(getAsyncMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4309
		initEAttribute(getAsyncMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4321
4310
4322
		initEClass(cmpFieldEClass, CMPField.class, "CMPField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4311
		initEClass(cmpFieldEClass, CMPField.class, "CMPField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
Lines 4347-4356 Link Here
4347
		initEAttribute(getDependsOnType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4336
		initEAttribute(getDependsOnType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4348
4337
4349
		initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4338
		initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4339
		initEAttribute(getEJBJar_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4350
		initEReference(getEJBJar_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4340
		initEReference(getEJBJar_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4351
		initEReference(getEJBJar_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4341
		initEReference(getEJBJar_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4352
		initEReference(getEJBJar_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4342
		initEReference(getEJBJar_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4353
		initEAttribute(getEJBJar_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4354
		initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBeans(), null, "enterpriseBeans", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4343
		initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBeans(), null, "enterpriseBeans", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4355
		initEReference(getEJBJar_Interceptors(), this.getInterceptorsType(), null, "interceptors", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4344
		initEReference(getEJBJar_Interceptors(), this.getInterceptorsType(), null, "interceptors", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4356
		initEReference(getEJBJar_Relationships(), this.getRelationships(), null, "relationships", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4345
		initEReference(getEJBJar_Relationships(), this.getRelationships(), null, "relationships", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 4613-4619 Link Here
4613
		initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4602
		initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4614
4603
4615
		initEClass(statefulTimeoutTypeEClass, StatefulTimeoutType.class, "StatefulTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4604
		initEClass(statefulTimeoutTypeEClass, StatefulTimeoutType.class, "StatefulTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
4616
		initEAttribute(getStatefulTimeoutType_Timeout(), theXMLTypePackage.getPositiveInteger(), "timeout", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4605
		initEAttribute(getStatefulTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4617
		initEAttribute(getStatefulTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4606
		initEAttribute(getStatefulTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4618
		initEAttribute(getStatefulTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4607
		initEAttribute(getStatefulTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
4619
4608
Lines 4650-4656 Link Here
4650
		initEEnum(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeType"); //$NON-NLS-1$
4639
		initEEnum(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeType"); //$NON-NLS-1$
4651
		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.BEAN);
4640
		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.BEAN);
4652
		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.CONTAINER);
4641
		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.CONTAINER);
4653
		addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.NOT_ALLOWED);
4654
4642
4655
		initEEnum(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.class, "ConcurrentLockTypeType"); //$NON-NLS-1$
4643
		initEEnum(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.class, "ConcurrentLockTypeType"); //$NON-NLS-1$
4656
		addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.READ);
4644
		addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.READ);
Lines 5004-5017 Link Here
5004
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
4992
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5005
		   });		
4993
		   });		
5006
		addAnnotation
4994
		addAnnotation
5007
		  (getAsyncMethodType_MethodIntf(), 
5008
		   source, 
5009
		   new String[] {
5010
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
5011
			 "name", "method-intf", //$NON-NLS-1$ //$NON-NLS-2$
5012
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5013
		   });		
5014
		addAnnotation
5015
		  (getAsyncMethodType_Id(), 
4995
		  (getAsyncMethodType_Id(), 
5016
		   source, 
4996
		   source, 
5017
		   new String[] {
4997
		   new String[] {
Lines 5249-5254 Link Here
5249
		   new String[] {
5229
		   new String[] {
5250
			 "name", "ejb-jarType", //$NON-NLS-1$ //$NON-NLS-2$
5230
			 "name", "ejb-jarType", //$NON-NLS-1$ //$NON-NLS-2$
5251
			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
5231
			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
5232
		   });			
5233
		addAnnotation
5234
		  (getEJBJar_ModuleName(), 
5235
		   source, 
5236
		   new String[] {
5237
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
5238
			 "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$
5239
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5252
		   });		
5240
		   });		
5253
		addAnnotation
5241
		addAnnotation
5254
		  (getEJBJar_Descriptions(), 
5242
		  (getEJBJar_Descriptions(), 
Lines 5273-5286 Link Here
5273
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
5261
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
5274
			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
5262
			 "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
5275
			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
5263
			 "namespace", "http://java.sun.com/xml/ns/javaee" //$NON-NLS-1$ //$NON-NLS-2$
5276
		   });			
5277
		addAnnotation
5278
		  (getEJBJar_ModuleName(), 
5279
		   source, 
5280
		   new String[] {
5281
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
5282
			 "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$
5283
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
5284
		   });		
5264
		   });		
5285
		addAnnotation
5265
		addAnnotation
5286
		  (getEJBJar_EnterpriseBeans(), 
5266
		  (getEJBJar_EnterpriseBeans(), 
(-)jee-models/org/eclipse/jst/javaee/ejb/internal/impl/AsyncMethodTypeImpl.java (-89 lines)
Lines 20-26 Link Here
20
import org.eclipse.emf.ecore.impl.EObjectImpl;
20
import org.eclipse.emf.ecore.impl.EObjectImpl;
21
21
22
import org.eclipse.jst.javaee.ejb.AsyncMethodType;
22
import org.eclipse.jst.javaee.ejb.AsyncMethodType;
23
import org.eclipse.jst.javaee.ejb.MethodInterfaceType;
24
import org.eclipse.jst.javaee.ejb.MethodParams;
23
import org.eclipse.jst.javaee.ejb.MethodParams;
25
24
26
import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
25
import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
Lines 34-40 Link Here
34
 * <ul>
33
 * <ul>
35
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodName <em>Method Name</em>}</li>
34
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodName <em>Method Name</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodParams <em>Method Params</em>}</li>
35
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodParams <em>Method Params</em>}</li>
37
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getMethodIntf <em>Method Intf</em>}</li>
38
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getId <em>Id</em>}</li>
36
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.AsyncMethodTypeImpl#getId <em>Id</em>}</li>
39
 * </ul>
37
 * </ul>
40
 * </p>
38
 * </p>
Lines 73-107 Link Here
73
	protected MethodParams methodParams;
71
	protected MethodParams methodParams;
74
72
75
	/**
73
	/**
76
	 * The default value of the '{@link #getMethodIntf() <em>Method Intf</em>}' attribute.
77
	 * <!-- begin-user-doc -->
78
	 * <!-- end-user-doc -->
79
	 * @see #getMethodIntf()
80
	 * @generated
81
	 * @ordered
82
	 */
83
	protected static final MethodInterfaceType METHOD_INTF_EDEFAULT = MethodInterfaceType.HOME_LITERAL;
84
85
	/**
86
	 * The cached value of the '{@link #getMethodIntf() <em>Method Intf</em>}' attribute.
87
	 * <!-- begin-user-doc -->
88
	 * <!-- end-user-doc -->
89
	 * @see #getMethodIntf()
90
	 * @generated
91
	 * @ordered
92
	 */
93
	protected MethodInterfaceType methodIntf = METHOD_INTF_EDEFAULT;
94
95
	/**
96
	 * This is true if the Method Intf attribute has been set.
97
	 * <!-- begin-user-doc -->
98
	 * <!-- end-user-doc -->
99
	 * @generated
100
	 * @ordered
101
	 */
102
	protected boolean methodIntfESet;
103
104
	/**
105
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
74
	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
106
	 * <!-- begin-user-doc -->
75
	 * <!-- begin-user-doc -->
107
	 * <!-- end-user-doc -->
76
	 * <!-- end-user-doc -->
Lines 209-260 Link Here
209
	 * <!-- end-user-doc -->
178
	 * <!-- end-user-doc -->
210
	 * @generated
179
	 * @generated
211
	 */
180
	 */
212
	public MethodInterfaceType getMethodIntf() {
213
		return methodIntf;
214
	}
215
216
	/**
217
	 * <!-- begin-user-doc -->
218
	 * <!-- end-user-doc -->
219
	 * @generated
220
	 */
221
	public void setMethodIntf(MethodInterfaceType newMethodIntf) {
222
		MethodInterfaceType oldMethodIntf = methodIntf;
223
		methodIntf = newMethodIntf == null ? METHOD_INTF_EDEFAULT : newMethodIntf;
224
		boolean oldMethodIntfESet = methodIntfESet;
225
		methodIntfESet = true;
226
		if (eNotificationRequired())
227
			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF, oldMethodIntf, methodIntf, !oldMethodIntfESet));
228
	}
229
230
	/**
231
	 * <!-- begin-user-doc -->
232
	 * <!-- end-user-doc -->
233
	 * @generated
234
	 */
235
	public void unsetMethodIntf() {
236
		MethodInterfaceType oldMethodIntf = methodIntf;
237
		boolean oldMethodIntfESet = methodIntfESet;
238
		methodIntf = METHOD_INTF_EDEFAULT;
239
		methodIntfESet = false;
240
		if (eNotificationRequired())
241
			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF, oldMethodIntf, METHOD_INTF_EDEFAULT, oldMethodIntfESet));
242
	}
243
244
	/**
245
	 * <!-- begin-user-doc -->
246
	 * <!-- end-user-doc -->
247
	 * @generated
248
	 */
249
	public boolean isSetMethodIntf() {
250
		return methodIntfESet;
251
	}
252
253
	/**
254
	 * <!-- begin-user-doc -->
255
	 * <!-- end-user-doc -->
256
	 * @generated
257
	 */
258
	public String getId() {
181
	public String getId() {
259
		return id;
182
		return id;
260
	}
183
	}
Lines 297-304 Link Here
297
				return getMethodName();
220
				return getMethodName();
298
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
221
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
299
				return getMethodParams();
222
				return getMethodParams();
300
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
301
				return getMethodIntf();
302
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
223
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
303
				return getId();
224
				return getId();
304
		}
225
		}
Lines 319-327 Link Here
319
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
240
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
320
				setMethodParams((MethodParams)newValue);
241
				setMethodParams((MethodParams)newValue);
321
				return;
242
				return;
322
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
323
				setMethodIntf((MethodInterfaceType)newValue);
324
				return;
325
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
243
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
326
				setId((String)newValue);
244
				setId((String)newValue);
327
				return;
245
				return;
Lines 343-351 Link Here
343
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
261
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
344
				setMethodParams((MethodParams)null);
262
				setMethodParams((MethodParams)null);
345
				return;
263
				return;
346
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
347
				unsetMethodIntf();
348
				return;
349
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
264
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
350
				setId(ID_EDEFAULT);
265
				setId(ID_EDEFAULT);
351
				return;
266
				return;
Lines 365-372 Link Here
365
				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
280
				return METHOD_NAME_EDEFAULT == null ? methodName != null : !METHOD_NAME_EDEFAULT.equals(methodName);
366
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
281
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_PARAMS:
367
				return methodParams != null;
282
				return methodParams != null;
368
			case EjbPackage.ASYNC_METHOD_TYPE__METHOD_INTF:
369
				return isSetMethodIntf();
370
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
283
			case EjbPackage.ASYNC_METHOD_TYPE__ID:
371
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
284
				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
372
		}
285
		}
Lines 385-392 Link Here
385
		StringBuffer result = new StringBuffer(super.toString());
298
		StringBuffer result = new StringBuffer(super.toString());
386
		result.append(" (methodName: "); //$NON-NLS-1$
299
		result.append(" (methodName: "); //$NON-NLS-1$
387
		result.append(methodName);
300
		result.append(methodName);
388
		result.append(", methodIntf: "); //$NON-NLS-1$
389
		if (methodIntfESet) result.append(methodIntf); else result.append("<unset>"); //$NON-NLS-1$
390
		result.append(", id: "); //$NON-NLS-1$
301
		result.append(", id: "); //$NON-NLS-1$
391
		result.append(id);
302
		result.append(id);
392
		result.append(')');
303
		result.append(')');
(-)jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EJBJarImpl.java (-26 / +26 lines)
Lines 39-48 Link Here
39
 * <p>
39
 * <p>
40
 * The following features are implemented:
40
 * The following features are implemented:
41
 * <ul>
41
 * <ul>
42
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getModuleName <em>Module Name</em>}</li>
42
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDescriptions <em>Descriptions</em>}</li>
43
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDescriptions <em>Descriptions</em>}</li>
43
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDisplayNames <em>Display Names</em>}</li>
44
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getDisplayNames <em>Display Names</em>}</li>
44
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getIcons <em>Icons</em>}</li>
45
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getIcons <em>Icons</em>}</li>
45
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getModuleName <em>Module Name</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getEnterpriseBeans <em>Enterprise Beans</em>}</li>
46
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getEnterpriseBeans <em>Enterprise Beans</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getInterceptors <em>Interceptors</em>}</li>
47
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getInterceptors <em>Interceptors</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getRelationships <em>Relationships</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.ejb.internal.impl.EJBJarImpl#getRelationships <em>Relationships</em>}</li>
Lines 58-111 Link Here
58
 */
58
 */
59
public class EJBJarImpl extends EObjectImpl implements EJBJar {
59
public class EJBJarImpl extends EObjectImpl implements EJBJar {
60
	/**
60
	/**
61
	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
61
	 * The default value of the '{@link #getModuleName() <em>Module Name</em>}' attribute.
62
	 * <!-- begin-user-doc -->
62
	 * <!-- begin-user-doc -->
63
	 * <!-- end-user-doc -->
63
	 * <!-- end-user-doc -->
64
	 * @see #getDescriptions()
64
	 * @see #getModuleName()
65
	 * @generated
65
	 * @generated
66
	 * @ordered
66
	 * @ordered
67
	 */
67
	 */
68
	protected EList<Description> descriptions;
68
	protected static final String MODULE_NAME_EDEFAULT = null;
69
69
70
	/**
70
	/**
71
	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
71
	 * The cached value of the '{@link #getModuleName() <em>Module Name</em>}' attribute.
72
	 * <!-- begin-user-doc -->
72
	 * <!-- begin-user-doc -->
73
	 * <!-- end-user-doc -->
73
	 * <!-- end-user-doc -->
74
	 * @see #getDisplayNames()
74
	 * @see #getModuleName()
75
	 * @generated
75
	 * @generated
76
	 * @ordered
76
	 * @ordered
77
	 */
77
	 */
78
	protected EList<DisplayName> displayNames;
78
	protected String moduleName = MODULE_NAME_EDEFAULT;
79
79
80
	/**
80
	/**
81
	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
81
	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
82
	 * <!-- begin-user-doc -->
82
	 * <!-- begin-user-doc -->
83
	 * <!-- end-user-doc -->
83
	 * <!-- end-user-doc -->
84
	 * @see #getIcons()
84
	 * @see #getDescriptions()
85
	 * @generated
85
	 * @generated
86
	 * @ordered
86
	 * @ordered
87
	 */
87
	 */
88
	protected EList<Icon> icons;
88
	protected EList<Description> descriptions;
89
89
90
	/**
90
	/**
91
	 * The default value of the '{@link #getModuleName() <em>Module Name</em>}' attribute.
91
	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
92
	 * <!-- begin-user-doc -->
92
	 * <!-- begin-user-doc -->
93
	 * <!-- end-user-doc -->
93
	 * <!-- end-user-doc -->
94
	 * @see #getModuleName()
94
	 * @see #getDisplayNames()
95
	 * @generated
95
	 * @generated
96
	 * @ordered
96
	 * @ordered
97
	 */
97
	 */
98
	protected static final String MODULE_NAME_EDEFAULT = null;
98
	protected EList<DisplayName> displayNames;
99
99
100
	/**
100
	/**
101
	 * The cached value of the '{@link #getModuleName() <em>Module Name</em>}' attribute.
101
	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
102
	 * <!-- begin-user-doc -->
102
	 * <!-- begin-user-doc -->
103
	 * <!-- end-user-doc -->
103
	 * <!-- end-user-doc -->
104
	 * @see #getModuleName()
104
	 * @see #getIcons()
105
	 * @generated
105
	 * @generated
106
	 * @ordered
106
	 * @ordered
107
	 */
107
	 */
108
	protected String moduleName = MODULE_NAME_EDEFAULT;
108
	protected EList<Icon> icons;
109
109
110
	/**
110
	/**
111
	 * The cached value of the '{@link #getEnterpriseBeans() <em>Enterprise Beans</em>}' containment reference.
111
	 * The cached value of the '{@link #getEnterpriseBeans() <em>Enterprise Beans</em>}' containment reference.
Lines 661-674 Link Here
661
	@Override
661
	@Override
662
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
662
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
663
		switch (featureID) {
663
		switch (featureID) {
664
			case EjbPackage.EJB_JAR__MODULE_NAME:
665
				return getModuleName();
664
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
666
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
665
				return getDescriptions();
667
				return getDescriptions();
666
			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
668
			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
667
				return getDisplayNames();
669
				return getDisplayNames();
668
			case EjbPackage.EJB_JAR__ICONS:
670
			case EjbPackage.EJB_JAR__ICONS:
669
				return getIcons();
671
				return getIcons();
670
			case EjbPackage.EJB_JAR__MODULE_NAME:
671
				return getModuleName();
672
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
672
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
673
				return getEnterpriseBeans();
673
				return getEnterpriseBeans();
674
			case EjbPackage.EJB_JAR__INTERCEPTORS:
674
			case EjbPackage.EJB_JAR__INTERCEPTORS:
Lines 698-703 Link Here
698
	@Override
698
	@Override
699
	public void eSet(int featureID, Object newValue) {
699
	public void eSet(int featureID, Object newValue) {
700
		switch (featureID) {
700
		switch (featureID) {
701
			case EjbPackage.EJB_JAR__MODULE_NAME:
702
				setModuleName((String)newValue);
703
				return;
701
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
704
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
702
				getDescriptions().clear();
705
				getDescriptions().clear();
703
				getDescriptions().addAll((Collection<? extends Description>)newValue);
706
				getDescriptions().addAll((Collection<? extends Description>)newValue);
Lines 710-718 Link Here
710
				getIcons().clear();
713
				getIcons().clear();
711
				getIcons().addAll((Collection<? extends Icon>)newValue);
714
				getIcons().addAll((Collection<? extends Icon>)newValue);
712
				return;
715
				return;
713
			case EjbPackage.EJB_JAR__MODULE_NAME:
714
				setModuleName((String)newValue);
715
				return;
716
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
716
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
717
				setEnterpriseBeans((EnterpriseBeans)newValue);
717
				setEnterpriseBeans((EnterpriseBeans)newValue);
718
				return;
718
				return;
Lines 749-754 Link Here
749
	@Override
749
	@Override
750
	public void eUnset(int featureID) {
750
	public void eUnset(int featureID) {
751
		switch (featureID) {
751
		switch (featureID) {
752
			case EjbPackage.EJB_JAR__MODULE_NAME:
753
				setModuleName(MODULE_NAME_EDEFAULT);
754
				return;
752
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
755
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
753
				getDescriptions().clear();
756
				getDescriptions().clear();
754
				return;
757
				return;
Lines 758-766 Link Here
758
			case EjbPackage.EJB_JAR__ICONS:
761
			case EjbPackage.EJB_JAR__ICONS:
759
				getIcons().clear();
762
				getIcons().clear();
760
				return;
763
				return;
761
			case EjbPackage.EJB_JAR__MODULE_NAME:
762
				setModuleName(MODULE_NAME_EDEFAULT);
763
				return;
764
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
764
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
765
				setEnterpriseBeans((EnterpriseBeans)null);
765
				setEnterpriseBeans((EnterpriseBeans)null);
766
				return;
766
				return;
Lines 797-810 Link Here
797
	@Override
797
	@Override
798
	public boolean eIsSet(int featureID) {
798
	public boolean eIsSet(int featureID) {
799
		switch (featureID) {
799
		switch (featureID) {
800
			case EjbPackage.EJB_JAR__MODULE_NAME:
801
				return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName);
800
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
802
			case EjbPackage.EJB_JAR__DESCRIPTIONS:
801
				return descriptions != null && !descriptions.isEmpty();
803
				return descriptions != null && !descriptions.isEmpty();
802
			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
804
			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
803
				return displayNames != null && !displayNames.isEmpty();
805
				return displayNames != null && !displayNames.isEmpty();
804
			case EjbPackage.EJB_JAR__ICONS:
806
			case EjbPackage.EJB_JAR__ICONS:
805
				return icons != null && !icons.isEmpty();
807
				return icons != null && !icons.isEmpty();
806
			case EjbPackage.EJB_JAR__MODULE_NAME:
807
				return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName);
808
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
808
			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
809
				return enterpriseBeans != null;
809
				return enterpriseBeans != null;
810
			case EjbPackage.EJB_JAR__INTERCEPTORS:
810
			case EjbPackage.EJB_JAR__INTERCEPTORS:
(-)jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java (-64 / +36 lines)
Lines 32-38 Link Here
32
 * <!-- begin-model-doc -->
32
 * <!-- begin-model-doc -->
33
 * 
33
 * 
34
 * 
34
 * 
35
 *       $Id: JavaeePackage.java,v 1.3 2009/10/15 18:52:20 canderson Exp $
35
 *       $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
36
 *       
36
 *       
37
 *     
37
 *     
38
 * 
38
 * 
Lines 57-63 Link Here
57
 *     
57
 *     
58
 * 
58
 * 
59
 * 
59
 * 
60
 *       $Id: JavaeePackage.java,v 1.3 2009/10/15 18:52:20 canderson Exp $
60
 *       $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
61
 *       
61
 *       
62
 *     
62
 *     
63
 * 
63
 * 
Lines 1154-1166 Link Here
1154
	int MESSAGE_DESTINATION__MAPPED_NAME = 4;
1154
	int MESSAGE_DESTINATION__MAPPED_NAME = 4;
1155
1155
1156
	/**
1156
	/**
1157
	 * The feature id for the '<em><b>Lookup Name</b></em>' attribute.
1158
	 * <!-- begin-user-doc -->
1159
	 * <!-- end-user-doc -->
1160
	 * @generated
1161
	 * @ordered
1162
	 */
1163
	int MESSAGE_DESTINATION__LOOKUP_NAME = 5;
1164
1165
	/**
1157
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1166
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1158
	 * <!-- begin-user-doc -->
1167
	 * <!-- begin-user-doc -->
1159
	 * <!-- end-user-doc -->
1168
	 * <!-- end-user-doc -->
1160
	 * @generated
1169
	 * @generated
1161
	 * @ordered
1170
	 * @ordered
1162
	 */
1171
	 */
1163
	int MESSAGE_DESTINATION__ID = 5;
1172
	int MESSAGE_DESTINATION__ID = 6;
1164
1173
1165
	/**
1174
	/**
1166
	 * The number of structural features of the '<em>Message Destination</em>' class.
1175
	 * The number of structural features of the '<em>Message Destination</em>' class.
Lines 1169-1175 Link Here
1169
	 * @generated
1178
	 * @generated
1170
	 * @ordered
1179
	 * @ordered
1171
	 */
1180
	 */
1172
	int MESSAGE_DESTINATION_FEATURE_COUNT = 6;
1181
	int MESSAGE_DESTINATION_FEATURE_COUNT = 7;
1173
1182
1174
	/**
1183
	/**
1175
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl <em>Message Destination Ref</em>}' class.
1184
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.MessageDestinationRefImpl <em>Message Destination Ref</em>}' class.
Lines 1400-1421 Link Here
1400
	int PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = 6;
1409
	int PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = 6;
1401
1410
1402
	/**
1411
	/**
1403
	 * The feature id for the '<em><b>Lookup Name</b></em>' attribute.
1404
	 * <!-- begin-user-doc -->
1405
	 * <!-- end-user-doc -->
1406
	 * @generated
1407
	 * @ordered
1408
	 */
1409
	int PERSISTENCE_CONTEXT_REF__LOOKUP_NAME = 7;
1410
1411
	/**
1412
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1412
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1413
	 * <!-- begin-user-doc -->
1413
	 * <!-- begin-user-doc -->
1414
	 * <!-- end-user-doc -->
1414
	 * <!-- end-user-doc -->
1415
	 * @generated
1415
	 * @generated
1416
	 * @ordered
1416
	 * @ordered
1417
	 */
1417
	 */
1418
	int PERSISTENCE_CONTEXT_REF__ID = 8;
1418
	int PERSISTENCE_CONTEXT_REF__ID = 7;
1419
1419
1420
	/**
1420
	/**
1421
	 * The number of structural features of the '<em>Persistence Context Ref</em>' class.
1421
	 * The number of structural features of the '<em>Persistence Context Ref</em>' class.
Lines 1424-1430 Link Here
1424
	 * @generated
1424
	 * @generated
1425
	 * @ordered
1425
	 * @ordered
1426
	 */
1426
	 */
1427
	int PERSISTENCE_CONTEXT_REF_FEATURE_COUNT = 9;
1427
	int PERSISTENCE_CONTEXT_REF_FEATURE_COUNT = 8;
1428
1428
1429
	/**
1429
	/**
1430
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl <em>Persistence Unit Ref</em>}' class.
1430
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PersistenceUnitRefImpl <em>Persistence Unit Ref</em>}' class.
Lines 1482-1503 Link Here
1482
	int PERSISTENCE_UNIT_REF__INJECTION_TARGETS = 4;
1482
	int PERSISTENCE_UNIT_REF__INJECTION_TARGETS = 4;
1483
1483
1484
	/**
1484
	/**
1485
	 * The feature id for the '<em><b>Lookup Name</b></em>' attribute.
1486
	 * <!-- begin-user-doc -->
1487
	 * <!-- end-user-doc -->
1488
	 * @generated
1489
	 * @ordered
1490
	 */
1491
	int PERSISTENCE_UNIT_REF__LOOKUP_NAME = 5;
1492
1493
	/**
1494
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1485
	 * The feature id for the '<em><b>Id</b></em>' attribute.
1495
	 * <!-- begin-user-doc -->
1486
	 * <!-- begin-user-doc -->
1496
	 * <!-- end-user-doc -->
1487
	 * <!-- end-user-doc -->
1497
	 * @generated
1488
	 * @generated
1498
	 * @ordered
1489
	 * @ordered
1499
	 */
1490
	 */
1500
	int PERSISTENCE_UNIT_REF__ID = 6;
1491
	int PERSISTENCE_UNIT_REF__ID = 5;
1501
1492
1502
	/**
1493
	/**
1503
	 * The number of structural features of the '<em>Persistence Unit Ref</em>' class.
1494
	 * The number of structural features of the '<em>Persistence Unit Ref</em>' class.
Lines 1506-1512 Link Here
1506
	 * @generated
1497
	 * @generated
1507
	 * @ordered
1498
	 * @ordered
1508
	 */
1499
	 */
1509
	int PERSISTENCE_UNIT_REF_FEATURE_COUNT = 7;
1500
	int PERSISTENCE_UNIT_REF_FEATURE_COUNT = 6;
1510
1501
1511
	/**
1502
	/**
1512
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl <em>Port Component Ref</em>}' class.
1503
	 * The meta object id for the '{@link org.eclipse.jst.javaee.core.internal.impl.PortComponentRefImpl <em>Port Component Ref</em>}' class.
Lines 3718-3723 Link Here
3718
	EAttribute getMessageDestination_MappedName();
3709
	EAttribute getMessageDestination_MappedName();
3719
3710
3720
	/**
3711
	/**
3712
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getLookupName <em>Lookup Name</em>}'.
3713
	 * <!-- begin-user-doc -->
3714
	 * <!-- end-user-doc -->
3715
	 * @return the meta object for the attribute '<em>Lookup Name</em>'.
3716
	 * @see org.eclipse.jst.javaee.core.MessageDestination#getLookupName()
3717
	 * @see #getMessageDestination()
3718
	 * @generated
3719
	 */
3720
	EAttribute getMessageDestination_LookupName();
3721
3722
	/**
3721
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getId <em>Id</em>}'.
3723
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.MessageDestination#getId <em>Id</em>}'.
3722
	 * <!-- begin-user-doc -->
3724
	 * <!-- begin-user-doc -->
3723
	 * <!-- end-user-doc -->
3725
	 * <!-- end-user-doc -->
Lines 3979-3995 Link Here
3979
	EReference getPersistenceContextRef_InjectionTargets();
3981
	EReference getPersistenceContextRef_InjectionTargets();
3980
3982
3981
	/**
3983
	/**
3982
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName <em>Lookup Name</em>}'.
3983
	 * <!-- begin-user-doc -->
3984
	 * <!-- end-user-doc -->
3985
	 * @return the meta object for the attribute '<em>Lookup Name</em>'.
3986
	 * @see org.eclipse.jst.javaee.core.PersistenceContextRef#getLookupName()
3987
	 * @see #getPersistenceContextRef()
3988
	 * @generated
3989
	 */
3990
	EAttribute getPersistenceContextRef_LookupName();
3991
3992
	/**
3993
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId <em>Id</em>}'.
3984
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceContextRef#getId <em>Id</em>}'.
3994
	 * <!-- begin-user-doc -->
3985
	 * <!-- begin-user-doc -->
3995
	 * <!-- end-user-doc -->
3986
	 * <!-- end-user-doc -->
Lines 4066-4082 Link Here
4066
	EReference getPersistenceUnitRef_InjectionTargets();
4057
	EReference getPersistenceUnitRef_InjectionTargets();
4067
4058
4068
	/**
4059
	/**
4069
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName <em>Lookup Name</em>}'.
4070
	 * <!-- begin-user-doc -->
4071
	 * <!-- end-user-doc -->
4072
	 * @return the meta object for the attribute '<em>Lookup Name</em>'.
4073
	 * @see org.eclipse.jst.javaee.core.PersistenceUnitRef#getLookupName()
4074
	 * @see #getPersistenceUnitRef()
4075
	 * @generated
4076
	 */
4077
	EAttribute getPersistenceUnitRef_LookupName();
4078
4079
	/**
4080
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId <em>Id</em>}'.
4060
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.core.PersistenceUnitRef#getId <em>Id</em>}'.
4081
	 * <!-- begin-user-doc -->
4061
	 * <!-- begin-user-doc -->
4082
	 * <!-- end-user-doc -->
4062
	 * <!-- end-user-doc -->
Lines 6124-6129 Link Here
6124
		EAttribute MESSAGE_DESTINATION__MAPPED_NAME = eINSTANCE.getMessageDestination_MappedName();
6104
		EAttribute MESSAGE_DESTINATION__MAPPED_NAME = eINSTANCE.getMessageDestination_MappedName();
6125
6105
6126
		/**
6106
		/**
6107
		 * The meta object literal for the '<em><b>Lookup Name</b></em>' attribute feature.
6108
		 * <!-- begin-user-doc -->
6109
		 * <!-- end-user-doc -->
6110
		 * @generated
6111
		 */
6112
		EAttribute MESSAGE_DESTINATION__LOOKUP_NAME = eINSTANCE.getMessageDestination_LookupName();
6113
6114
		/**
6127
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
6115
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
6128
		 * <!-- begin-user-doc -->
6116
		 * <!-- begin-user-doc -->
6129
		 * <!-- end-user-doc -->
6117
		 * <!-- end-user-doc -->
Lines 6322-6335 Link Here
6322
		EReference PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceContextRef_InjectionTargets();
6310
		EReference PERSISTENCE_CONTEXT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceContextRef_InjectionTargets();
6323
6311
6324
		/**
6312
		/**
6325
		 * The meta object literal for the '<em><b>Lookup Name</b></em>' attribute feature.
6326
		 * <!-- begin-user-doc -->
6327
		 * <!-- end-user-doc -->
6328
		 * @generated
6329
		 */
6330
		EAttribute PERSISTENCE_CONTEXT_REF__LOOKUP_NAME = eINSTANCE.getPersistenceContextRef_LookupName();
6331
6332
		/**
6333
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
6313
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
6334
		 * <!-- begin-user-doc -->
6314
		 * <!-- begin-user-doc -->
6335
		 * <!-- end-user-doc -->
6315
		 * <!-- end-user-doc -->
Lines 6388-6401 Link Here
6388
		EReference PERSISTENCE_UNIT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceUnitRef_InjectionTargets();
6368
		EReference PERSISTENCE_UNIT_REF__INJECTION_TARGETS = eINSTANCE.getPersistenceUnitRef_InjectionTargets();
6389
6369
6390
		/**
6370
		/**
6391
		 * The meta object literal for the '<em><b>Lookup Name</b></em>' attribute feature.
6392
		 * <!-- begin-user-doc -->
6393
		 * <!-- end-user-doc -->
6394
		 * @generated
6395
		 */
6396
		EAttribute PERSISTENCE_UNIT_REF__LOOKUP_NAME = eINSTANCE.getPersistenceUnitRef_LookupName();
6397
6398
		/**
6399
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
6371
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
6400
		 * <!-- begin-user-doc -->
6372
		 * <!-- begin-user-doc -->
6401
		 * <!-- end-user-doc -->
6373
		 * <!-- end-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java (-18 / +37 lines)
Lines 631-638 Link Here
631
	 * <!-- end-user-doc -->
631
	 * <!-- end-user-doc -->
632
	 * @generated
632
	 * @generated
633
	 */
633
	 */
634
	public EAttribute getConnector_ModuleName() {
635
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(0);
636
	}
637
638
	/**
639
	 * <!-- begin-user-doc -->
640
	 * <!-- end-user-doc -->
641
	 * @generated
642
	 */
634
	public EReference getConnector_Descriptions() {
643
	public EReference getConnector_Descriptions() {
635
		return (EReference)connectorEClass.getEStructuralFeatures().get(0);
644
		return (EReference)connectorEClass.getEStructuralFeatures().get(1);
636
	}
645
	}
637
646
638
	/**
647
	/**
Lines 641-647 Link Here
641
	 * @generated
650
	 * @generated
642
	 */
651
	 */
643
	public EReference getConnector_DisplayNames() {
652
	public EReference getConnector_DisplayNames() {
644
		return (EReference)connectorEClass.getEStructuralFeatures().get(1);
653
		return (EReference)connectorEClass.getEStructuralFeatures().get(2);
645
	}
654
	}
646
655
647
	/**
656
	/**
Lines 650-656 Link Here
650
	 * @generated
659
	 * @generated
651
	 */
660
	 */
652
	public EReference getConnector_Icons() {
661
	public EReference getConnector_Icons() {
653
		return (EReference)connectorEClass.getEStructuralFeatures().get(2);
662
		return (EReference)connectorEClass.getEStructuralFeatures().get(3);
654
	}
663
	}
655
664
656
	/**
665
	/**
Lines 659-665 Link Here
659
	 * @generated
668
	 * @generated
660
	 */
669
	 */
661
	public EAttribute getConnector_VendorName() {
670
	public EAttribute getConnector_VendorName() {
662
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(3);
671
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(4);
663
	}
672
	}
664
673
665
	/**
674
	/**
Lines 668-674 Link Here
668
	 * @generated
677
	 * @generated
669
	 */
678
	 */
670
	public EAttribute getConnector_EisType() {
679
	public EAttribute getConnector_EisType() {
671
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(4);
680
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(5);
672
	}
681
	}
673
682
674
	/**
683
	/**
Lines 677-683 Link Here
677
	 * @generated
686
	 * @generated
678
	 */
687
	 */
679
	public EAttribute getConnector_ResourceadapterVersion() {
688
	public EAttribute getConnector_ResourceadapterVersion() {
680
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(5);
689
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(6);
681
	}
690
	}
682
691
683
	/**
692
	/**
Lines 686-692 Link Here
686
	 * @generated
695
	 * @generated
687
	 */
696
	 */
688
	public EReference getConnector_License() {
697
	public EReference getConnector_License() {
689
		return (EReference)connectorEClass.getEStructuralFeatures().get(6);
698
		return (EReference)connectorEClass.getEStructuralFeatures().get(7);
690
	}
699
	}
691
700
692
	/**
701
	/**
Lines 695-701 Link Here
695
	 * @generated
704
	 * @generated
696
	 */
705
	 */
697
	public EReference getConnector_Resourceadapter() {
706
	public EReference getConnector_Resourceadapter() {
698
		return (EReference)connectorEClass.getEStructuralFeatures().get(7);
707
		return (EReference)connectorEClass.getEStructuralFeatures().get(8);
699
	}
708
	}
700
709
701
	/**
710
	/**
Lines 704-710 Link Here
704
	 * @generated
713
	 * @generated
705
	 */
714
	 */
706
	public EAttribute getConnector_RequiredWorkContext() {
715
	public EAttribute getConnector_RequiredWorkContext() {
707
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(8);
716
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(9);
708
	}
717
	}
709
718
710
	/**
719
	/**
Lines 713-719 Link Here
713
	 * @generated
722
	 * @generated
714
	 */
723
	 */
715
	public EAttribute getConnector_Id() {
724
	public EAttribute getConnector_Id() {
716
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(9);
725
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(10);
717
	}
726
	}
718
727
719
	/**
728
	/**
Lines 722-728 Link Here
722
	 * @generated
731
	 * @generated
723
	 */
732
	 */
724
	public EAttribute getConnector_MetadataComplete() {
733
	public EAttribute getConnector_MetadataComplete() {
725
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(10);
734
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(11);
726
	}
735
	}
727
736
728
	/**
737
	/**
Lines 731-737 Link Here
731
	 * @generated
740
	 * @generated
732
	 */
741
	 */
733
	public EAttribute getConnector_Version() {
742
	public EAttribute getConnector_Version() {
734
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(11);
743
		return (EAttribute)connectorEClass.getEStructuralFeatures().get(12);
735
	}
744
	}
736
745
737
	/**
746
	/**
Lines 1232-1237 Link Here
1232
		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__ID);
1241
		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__ID);
1233
1242
1234
		connectorEClass = createEClass(CONNECTOR);
1243
		connectorEClass = createEClass(CONNECTOR);
1244
		createEAttribute(connectorEClass, CONNECTOR__MODULE_NAME);
1235
		createEReference(connectorEClass, CONNECTOR__DESCRIPTIONS);
1245
		createEReference(connectorEClass, CONNECTOR__DESCRIPTIONS);
1236
		createEReference(connectorEClass, CONNECTOR__DISPLAY_NAMES);
1246
		createEReference(connectorEClass, CONNECTOR__DISPLAY_NAMES);
1237
		createEReference(connectorEClass, CONNECTOR__ICONS);
1247
		createEReference(connectorEClass, CONNECTOR__ICONS);
Lines 1379-1390 Link Here
1379
		initEAttribute(getConnectionDefinition_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1389
		initEAttribute(getConnectionDefinition_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1380
1390
1381
		initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
1391
		initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
1392
		initEAttribute(getConnector_ModuleName(), theXMLTypePackage.getString(), "moduleName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1382
		initEReference(getConnector_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1393
		initEReference(getConnector_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1383
		initEReference(getConnector_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1394
		initEReference(getConnector_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1384
		initEReference(getConnector_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1395
		initEReference(getConnector_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1385
		initEAttribute(getConnector_VendorName(), theXMLTypePackage.getString(), "vendorName", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1396
		initEAttribute(getConnector_VendorName(), theXMLTypePackage.getString(), "vendorName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1386
		initEAttribute(getConnector_EisType(), theXMLTypePackage.getString(), "eisType", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1397
		initEAttribute(getConnector_EisType(), theXMLTypePackage.getString(), "eisType", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1387
		initEAttribute(getConnector_ResourceadapterVersion(), theXMLTypePackage.getString(), "resourceadapterVersion", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1398
		initEAttribute(getConnector_ResourceadapterVersion(), theXMLTypePackage.getString(), "resourceadapterVersion", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1388
		initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1399
		initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1389
		initEReference(getConnector_Resourceadapter(), this.getResourceAdapter(), null, "resourceadapter", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1400
		initEReference(getConnector_Resourceadapter(), this.getResourceAdapter(), null, "resourceadapter", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1390
		initEAttribute(getConnector_RequiredWorkContext(), theJavaeePackage.getFullyQualifiedClassType(), "requiredWorkContext", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1401
		initEAttribute(getConnector_RequiredWorkContext(), theJavaeePackage.getFullyQualifiedClassType(), "requiredWorkContext", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
Lines 1417-1426 Link Here
1417
		initEAttribute(getMessageListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1428
		initEAttribute(getMessageListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1418
1429
1419
		initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
1430
		initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
1420
		initEReference(getOutboundResourceAdapter_ConnectionDefinition(), this.getConnectionDefinition(), null, "connectionDefinition", null, 1, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1431
		initEReference(getOutboundResourceAdapter_ConnectionDefinition(), this.getConnectionDefinition(), null, "connectionDefinition", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1421
		initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportType(), "transactionSupport", null, 1, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1432
		initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportType(), "transactionSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1422
		initEReference(getOutboundResourceAdapter_AuthenticationMechanism(), this.getAuthenticationMechanism(), null, "authenticationMechanism", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1433
		initEReference(getOutboundResourceAdapter_AuthenticationMechanism(), this.getAuthenticationMechanism(), null, "authenticationMechanism", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1423
		initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), theJavaeePackage.getTrueFalseType(), "reauthenticationSupport", null, 1, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1434
		initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), theJavaeePackage.getTrueFalseType(), "reauthenticationSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1424
		initEAttribute(getOutboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1435
		initEAttribute(getOutboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
1425
1436
1426
		initEClass(requiredConfigPropertyEClass, RequiredConfigProperty.class, "RequiredConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
1437
		initEClass(requiredConfigPropertyEClass, RequiredConfigProperty.class, "RequiredConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
Lines 1758-1763 Link Here
1758
		   new String[] {
1769
		   new String[] {
1759
			 "name", "connectorType", //$NON-NLS-1$ //$NON-NLS-2$
1770
			 "name", "connectorType", //$NON-NLS-1$ //$NON-NLS-2$
1760
			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
1771
			 "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
1772
		   });			
1773
		addAnnotation
1774
		  (getConnector_ModuleName(), 
1775
		   source, 
1776
		   new String[] {
1777
			 "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
1778
			 "name", "module-name", //$NON-NLS-1$ //$NON-NLS-2$
1779
			 "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
1761
		   });		
1780
		   });		
1762
		addAnnotation
1781
		addAnnotation
1763
		  (getConnector_Descriptions(), 
1782
		  (getConnector_Descriptions(), 
(-)jee-models/org/eclipse/jst/javaee/jca/internal/impl/ConnectorImpl.java (-1 / +55 lines)
Lines 45-50 Link Here
45
 * <p>
45
 * <p>
46
 * The following features are implemented:
46
 * The following features are implemented:
47
 * <ul>
47
 * <ul>
48
 *   <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getModuleName <em>Module Name</em>}</li>
48
 *   <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDescriptions <em>Descriptions</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDescriptions <em>Descriptions</em>}</li>
49
 *   <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDisplayNames <em>Display Names</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getDisplayNames <em>Display Names</em>}</li>
50
 *   <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getIcons <em>Icons</em>}</li>
51
 *   <li>{@link org.eclipse.jst.javaee.jca.internal.impl.ConnectorImpl#getIcons <em>Icons</em>}</li>
Lines 64-69 Link Here
64
 */
65
 */
65
public class ConnectorImpl extends EObjectImpl implements Connector {
66
public class ConnectorImpl extends EObjectImpl implements Connector {
66
	/**
67
	/**
68
	 * The default value of the '{@link #getModuleName() <em>Module Name</em>}' attribute.
69
	 * <!-- begin-user-doc -->
70
	 * <!-- end-user-doc -->
71
	 * @see #getModuleName()
72
	 * @generated
73
	 * @ordered
74
	 */
75
	protected static final String MODULE_NAME_EDEFAULT = null;
76
77
	/**
78
	 * The cached value of the '{@link #getModuleName() <em>Module Name</em>}' attribute.
79
	 * <!-- begin-user-doc -->
80
	 * <!-- end-user-doc -->
81
	 * @see #getModuleName()
82
	 * @generated
83
	 * @ordered
84
	 */
85
	protected String moduleName = MODULE_NAME_EDEFAULT;
86
87
	/**
67
	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
88
	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
68
	 * <!-- begin-user-doc -->
89
	 * <!-- begin-user-doc -->
69
	 * <!-- end-user-doc -->
90
	 * <!-- end-user-doc -->
Lines 285-290 Link Here
285
	 * <!-- end-user-doc -->
306
	 * <!-- end-user-doc -->
286
	 * @generated
307
	 * @generated
287
	 */
308
	 */
309
	public String getModuleName() {
310
		return moduleName;
311
	}
312
313
	/**
314
	 * <!-- begin-user-doc -->
315
	 * <!-- end-user-doc -->
316
	 * @generated
317
	 */
318
	public void setModuleName(String newModuleName) {
319
		String oldModuleName = moduleName;
320
		moduleName = newModuleName;
321
		if (eNotificationRequired())
322
			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__MODULE_NAME, oldModuleName, moduleName));
323
	}
324
325
	/**
326
	 * <!-- begin-user-doc -->
327
	 * <!-- end-user-doc -->
328
	 * @generated
329
	 */
288
	public List<Description> getDescriptions() {
330
	public List<Description> getDescriptions() {
289
		if (descriptions == null) {
331
		if (descriptions == null) {
290
			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.CONNECTOR__DESCRIPTIONS);
332
			descriptions = new EObjectContainmentEList<Description>(Description.class, this, JcaPackage.CONNECTOR__DESCRIPTIONS);
Lines 620-625 Link Here
620
	@Override
662
	@Override
621
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
663
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
622
		switch (featureID) {
664
		switch (featureID) {
665
			case JcaPackage.CONNECTOR__MODULE_NAME:
666
				return getModuleName();
623
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
667
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
624
				return getDescriptions();
668
				return getDescriptions();
625
			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
669
			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
Lines 657-662 Link Here
657
	@Override
701
	@Override
658
	public void eSet(int featureID, Object newValue) {
702
	public void eSet(int featureID, Object newValue) {
659
		switch (featureID) {
703
		switch (featureID) {
704
			case JcaPackage.CONNECTOR__MODULE_NAME:
705
				setModuleName((String)newValue);
706
				return;
660
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
707
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
661
				getDescriptions().clear();
708
				getDescriptions().clear();
662
				getDescriptions().addAll((Collection<? extends Description>)newValue);
709
				getDescriptions().addAll((Collection<? extends Description>)newValue);
Lines 709-714 Link Here
709
	@Override
756
	@Override
710
	public void eUnset(int featureID) {
757
	public void eUnset(int featureID) {
711
		switch (featureID) {
758
		switch (featureID) {
759
			case JcaPackage.CONNECTOR__MODULE_NAME:
760
				setModuleName(MODULE_NAME_EDEFAULT);
761
				return;
712
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
762
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
713
				getDescriptions().clear();
763
				getDescriptions().clear();
714
				return;
764
				return;
Lines 757-762 Link Here
757
	@Override
807
	@Override
758
	public boolean eIsSet(int featureID) {
808
	public boolean eIsSet(int featureID) {
759
		switch (featureID) {
809
		switch (featureID) {
810
			case JcaPackage.CONNECTOR__MODULE_NAME:
811
				return MODULE_NAME_EDEFAULT == null ? moduleName != null : !MODULE_NAME_EDEFAULT.equals(moduleName);
760
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
812
			case JcaPackage.CONNECTOR__DESCRIPTIONS:
761
				return descriptions != null && !descriptions.isEmpty();
813
				return descriptions != null && !descriptions.isEmpty();
762
			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
814
			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
Lines 795-801 Link Here
795
		if (eIsProxy()) return super.toString();
847
		if (eIsProxy()) return super.toString();
796
848
797
		StringBuffer result = new StringBuffer(super.toString());
849
		StringBuffer result = new StringBuffer(super.toString());
798
		result.append(" (vendorName: "); //$NON-NLS-1$
850
		result.append(" (moduleName: "); //$NON-NLS-1$
851
		result.append(moduleName);
852
		result.append(", vendorName: "); //$NON-NLS-1$
799
		result.append(vendorName);
853
		result.append(vendorName);
800
		result.append(", eisType: "); //$NON-NLS-1$
854
		result.append(", eisType: "); //$NON-NLS-1$
801
		result.append(eisType);
855
		result.append(eisType);
(-)jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java (-42 / +14 lines)
Lines 32-38 Link Here
32
 * <!-- begin-model-doc -->
32
 * <!-- begin-model-doc -->
33
 * 
33
 * 
34
 * 
34
 * 
35
 *       $Id: EjbPackage.java,v 1.3 2009/10/15 18:52:07 canderson Exp $
35
 *       $Id: ejb-jar_3_1.xsd,v 1.3 2009/10/02 06:33:19 ccc Exp $
36
 *       
36
 *       
37
 *     
37
 *     
38
 * 
38
 * 
Lines 40-46 Link Here
40
 *       This is the XML Schema for the EJB 3.1 deployment descriptor.
40
 *       This is the XML Schema for the EJB 3.1 deployment descriptor.
41
 *       
41
 *       
42
 *       All EJB deployment descriptors must indicate
42
 *       All EJB deployment descriptors must indicate
43
 *       the ejb-jar schema by using the Java EE namespace:
43
 *       the schema by using the Java EE namespace:
44
 *       
44
 *       
45
 *       http://java.sun.com/xml/ns/javaee
45
 *       http://java.sun.com/xml/ns/javaee
46
 *       
46
 *       
Lines 80-86 Link Here
80
 *     
80
 *     
81
 * 
81
 * 
82
 * 
82
 * 
83
 *       $Id: EjbPackage.java,v 1.3 2009/10/15 18:52:07 canderson Exp $
83
 *       $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
84
 *       
84
 *       
85
 *     
85
 *     
86
 * 
86
 * 
Lines 105-111 Link Here
105
 *     
105
 *     
106
 * 
106
 * 
107
 * 
107
 * 
108
 *       $Id: EjbPackage.java,v 1.3 2009/10/15 18:52:07 canderson Exp $
108
 *       $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
109
 *       
109
 *       
110
 *     
110
 *     
111
 * 
111
 * 
Lines 692-713 Link Here
692
	int ASYNC_METHOD_TYPE__METHOD_PARAMS = 1;
692
	int ASYNC_METHOD_TYPE__METHOD_PARAMS = 1;
693
693
694
	/**
694
	/**
695
	 * The feature id for the '<em><b>Method Intf</b></em>' attribute.
696
	 * <!-- begin-user-doc -->
697
	 * <!-- end-user-doc -->
698
	 * @generated
699
	 * @ordered
700
	 */
701
	int ASYNC_METHOD_TYPE__METHOD_INTF = 2;
702
703
	/**
704
	 * The feature id for the '<em><b>Id</b></em>' attribute.
695
	 * The feature id for the '<em><b>Id</b></em>' attribute.
705
	 * <!-- begin-user-doc -->
696
	 * <!-- begin-user-doc -->
706
	 * <!-- end-user-doc -->
697
	 * <!-- end-user-doc -->
707
	 * @generated
698
	 * @generated
708
	 * @ordered
699
	 * @ordered
709
	 */
700
	 */
710
	int ASYNC_METHOD_TYPE__ID = 3;
701
	int ASYNC_METHOD_TYPE__ID = 2;
711
702
712
	/**
703
	/**
713
	 * The number of structural features of the '<em>Async Method Type</em>' class.
704
	 * The number of structural features of the '<em>Async Method Type</em>' class.
Lines 716-722 Link Here
716
	 * @generated
707
	 * @generated
717
	 * @ordered
708
	 * @ordered
718
	 */
709
	 */
719
	int ASYNC_METHOD_TYPE_FEATURE_COUNT = 4;
710
	int ASYNC_METHOD_TYPE_FEATURE_COUNT = 3;
720
711
721
	/**
712
	/**
722
	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl <em>CMP Field</em>}' class.
713
	 * The meta object id for the '{@link org.eclipse.jst.javaee.ejb.internal.impl.CMPFieldImpl <em>CMP Field</em>}' class.
Lines 977-1016 Link Here
977
	int EJB_JAR = 13;
968
	int EJB_JAR = 13;
978
969
979
	/**
970
	/**
980
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
971
	 * The feature id for the '<em><b>Module Name</b></em>' attribute.
981
	 * <!-- begin-user-doc -->
972
	 * <!-- begin-user-doc -->
982
	 * <!-- end-user-doc -->
973
	 * <!-- end-user-doc -->
983
	 * @generated
974
	 * @generated
984
	 * @ordered
975
	 * @ordered
985
	 */
976
	 */
986
	int EJB_JAR__DESCRIPTIONS = 0;
977
	int EJB_JAR__MODULE_NAME = 0;
987
978
988
	/**
979
	/**
989
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
980
	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
990
	 * <!-- begin-user-doc -->
981
	 * <!-- begin-user-doc -->
991
	 * <!-- end-user-doc -->
982
	 * <!-- end-user-doc -->
992
	 * @generated
983
	 * @generated
993
	 * @ordered
984
	 * @ordered
994
	 */
985
	 */
995
	int EJB_JAR__DISPLAY_NAMES = 1;
986
	int EJB_JAR__DESCRIPTIONS = 1;
996
987
997
	/**
988
	/**
998
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
989
	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
999
	 * <!-- begin-user-doc -->
990
	 * <!-- begin-user-doc -->
1000
	 * <!-- end-user-doc -->
991
	 * <!-- end-user-doc -->
1001
	 * @generated
992
	 * @generated
1002
	 * @ordered
993
	 * @ordered
1003
	 */
994
	 */
1004
	int EJB_JAR__ICONS = 2;
995
	int EJB_JAR__DISPLAY_NAMES = 2;
1005
996
1006
	/**
997
	/**
1007
	 * The feature id for the '<em><b>Module Name</b></em>' attribute.
998
	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
1008
	 * <!-- begin-user-doc -->
999
	 * <!-- begin-user-doc -->
1009
	 * <!-- end-user-doc -->
1000
	 * <!-- end-user-doc -->
1010
	 * @generated
1001
	 * @generated
1011
	 * @ordered
1002
	 * @ordered
1012
	 */
1003
	 */
1013
	int EJB_JAR__MODULE_NAME = 3;
1004
	int EJB_JAR__ICONS = 3;
1014
1005
1015
	/**
1006
	/**
1016
	 * The feature id for the '<em><b>Enterprise Beans</b></em>' containment reference.
1007
	 * The feature id for the '<em><b>Enterprise Beans</b></em>' containment reference.
Lines 4270-4286 Link Here
4270
	EReference getAsyncMethodType_MethodParams();
4261
	EReference getAsyncMethodType_MethodParams();
4271
4262
4272
	/**
4263
	/**
4273
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf <em>Method Intf</em>}'.
4274
	 * <!-- begin-user-doc -->
4275
	 * <!-- end-user-doc -->
4276
	 * @return the meta object for the attribute '<em>Method Intf</em>'.
4277
	 * @see org.eclipse.jst.javaee.ejb.AsyncMethodType#getMethodIntf()
4278
	 * @see #getAsyncMethodType()
4279
	 * @generated
4280
	 */
4281
	EAttribute getAsyncMethodType_MethodIntf();
4282
4283
	/**
4284
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId <em>Id</em>}'.
4264
	 * Returns the meta object for the attribute '{@link org.eclipse.jst.javaee.ejb.AsyncMethodType#getId <em>Id</em>}'.
4285
	 * <!-- begin-user-doc -->
4265
	 * <!-- begin-user-doc -->
4286
	 * <!-- end-user-doc -->
4266
	 * <!-- end-user-doc -->
Lines 8005-8018 Link Here
8005
		EReference ASYNC_METHOD_TYPE__METHOD_PARAMS = eINSTANCE.getAsyncMethodType_MethodParams();
7985
		EReference ASYNC_METHOD_TYPE__METHOD_PARAMS = eINSTANCE.getAsyncMethodType_MethodParams();
8006
7986
8007
		/**
7987
		/**
8008
		 * The meta object literal for the '<em><b>Method Intf</b></em>' attribute feature.
8009
		 * <!-- begin-user-doc -->
8010
		 * <!-- end-user-doc -->
8011
		 * @generated
8012
		 */
8013
		EAttribute ASYNC_METHOD_TYPE__METHOD_INTF = eINSTANCE.getAsyncMethodType_MethodIntf();
8014
8015
		/**
8016
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
7988
		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
8017
		 * <!-- begin-user-doc -->
7989
		 * <!-- begin-user-doc -->
8018
		 * <!-- end-user-doc -->
7990
		 * <!-- end-user-doc -->
(-)jee-models/org/eclipse/jst/javaee/webapp/internal/metadata/WebappPackage.java (-39 / +5 lines)
Lines 30-36 Link Here
30
 * <!-- begin-model-doc -->
30
 * <!-- begin-model-doc -->
31
 * 
31
 * 
32
 * 
32
 * 
33
 *       $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $
33
 *       $Id: web-app_3_0.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
34
 *       
34
 *       
35
 *     
35
 *     
36
 * 
36
 * 
Lines 78-84 Link Here
78
 *     
78
 *     
79
 * 
79
 * 
80
 * 
80
 * 
81
 *       $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $
81
 *       $Id: web-common_3_0.xsd,v 1.5 2009/10/15 19:08:12 ccc Exp $
82
 *       
82
 *       
83
 *     
83
 *     
84
 * 
84
 * 
Lines 126-132 Link Here
126
 *     
126
 *     
127
 * 
127
 * 
128
 * 
128
 * 
129
 *       $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $
129
 *       $Id: javaee_6.xsd,v 1.3 2009/10/02 06:33:20 ccc Exp $
130
 *       
130
 *       
131
 *     
131
 *     
132
 * 
132
 * 
Lines 151-157 Link Here
151
 *     
151
 *     
152
 * 
152
 * 
153
 * 
153
 * 
154
 *       $Id: WebappPackage.java,v 1.2 2009/10/16 03:33:22 canderson Exp $
154
 *       $Id: javaee_web_services_client_1_3.xsd,v 1.2 2009/09/29 20:31:42 ccc Exp $
155
 *       
155
 *       
156
 *     
156
 *     
157
 * 
157
 * 
Lines 320-365 Link Here
320
 *     
320
 *     
321
 * 
321
 * 
322
 * 
322
 * 
323
 *       Copyright 2003-2009 Sun Microsystems, Inc.
324
 *       4150 Network Circle
325
 *       Santa Clara, California 95054
326
 *       U.S.A
327
 *       All rights reserved.
328
 * 
329
 *       Sun Microsystems, Inc. has intellectual property rights
330
 *       relating to technology described in this document. In
331
 *       particular, and without limitation, these intellectual
332
 *       property rights may include one or more of the U.S. patents
333
 *       listed at http://www.sun.com/patents and one or more
334
 *       additional patents or pending patent applications in the
335
 *       U.S. and other countries.
336
 * 
337
 *       This document and the technology which it describes are
338
 *       distributed under licenses restricting their use, copying,
339
 *       distribution, and decompilation. No part of this document
340
 *       may be reproduced in any form by any means without prior
341
 *       written authorization of Sun and its licensors, if any.
342
 * 
343
 *       Third-party software, including font technology, is
344
 *       copyrighted and licensed from Sun suppliers.
345
 * 
346
 *       Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
347
 *       JavaServer Pages, Enterprise JavaBeans and the Java Coffee
348
 *       Cup logo are trademarks or registered trademarks of Sun
349
 *       Microsystems, Inc. in the U.S. and other countries.
350
 * 
351
 *       Federal Acquisitions: Commercial Software - Government Users
352
 *       Subject to Standard License Terms and Conditions.
353
 * 
354
 *     
355
 * 
356
 * 
357
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
323
 *       This is the XML Schema for the JSP 2.2 deployment descriptor
358
 *       types.  The JSP 2.2 schema contains all the special
324
 *       types.  The JSP 2.2 schema contains all the special
359
 *       structures and datatypes that are necessary to use JSP files
325
 *       structures and datatypes that are necessary to use JSP files
360
 *       from a web application.
326
 *       from a web application.
361
 * 
327
 * 
362
 *       The contents of this schema is used by the web-app_3_0.xsd
328
 *       The contents of this schema is used by the web-common_3_0.xsd
363
 *       file to define JSP specific content.
329
 *       file to define JSP specific content.
364
 * 
330
 * 
365
 *     
331
 *     
(-)jee-models/org/eclipse/jst/javaee/application/Application.java (-3 / +5 lines)
Lines 157-165 Link Here
157
	 * 
157
	 * 
158
	 * 
158
	 * 
159
	 *             If initialize-in-order is true, modules must be initialized
159
	 *             If initialize-in-order is true, modules must be initialized
160
	 *             in the order they're listed in this deployment descriptor.
160
	 *             in the order they're listed in this deployment descriptor,
161
	 *             If not set or set to false, the order of initialization is
161
	 *             with the exception of application client modules, which can
162
	 *             unspecified and may be product-dependent.
162
	 *             be initialized in any order.
163
	 *             If initialize-in-order is not set or set to false, the order
164
	 *             of initialization is unspecified and may be product-dependent.
163
	 *             
165
	 *             
164
	 *             @since Java EE 6, Application 6
166
	 *             @since Java EE 6, Application 6
165
	 *           
167
	 *           

Return to bug 299598