Attachment #227762 for bug #399524

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 179-184 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java (+14 lines)
179	version = J2EEVersionConstants.JEE_5_0_ID;	179	version = J2EEVersionConstants.JEE_5_0_ID;
180	} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) {	180	} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) {
181	version = J2EEVersionConstants.JEE_6_0_ID;	181	version = J2EEVersionConstants.JEE_6_0_ID;
		182	} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_7)) {
		183	version = J2EEVersionConstants.JEE_7_0_ID;
182	}	184	}
183	}	185	}
184	break;	186	break;
Lines 198-203 Link Here
198	version = J2EEVersionConstants.JEE_5_0_ID;	200	version = J2EEVersionConstants.JEE_5_0_ID;
199	} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) {	201	} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) {
200	version = J2EEVersionConstants.JEE_6_0_ID;	202	version = J2EEVersionConstants.JEE_6_0_ID;
		203	} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_7)) {
		204	version = J2EEVersionConstants.JEE_7_0_ID;
201	}	205	}
202	}	206	}
203	break;	207	break;
Lines 215-220 Link Here
215	version = J2EEVersionConstants.EJB_3_0_ID;	219	version = J2EEVersionConstants.EJB_3_0_ID;
216	} else if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_3_1)) {	220	} else if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_3_1)) {
217	version = J2EEVersionConstants.EJB_3_1_ID;	221	version = J2EEVersionConstants.EJB_3_1_ID;
		222	} else if (schemaName.equals(J2EEConstants.EJBJAR_SCHEMA_3_2)) {
		223	version = J2EEVersionConstants.EJB_3_2_ID;
218	}	224	}
219	}	225	}
220	break;	226	break;
Lines 245-250 Link Here
245	version = J2EEVersionConstants.WEB_2_5_ID;	251	version = J2EEVersionConstants.WEB_2_5_ID;
246	} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) {	252	} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) {
247	version = J2EEVersionConstants.WEB_3_0_ID;	253	version = J2EEVersionConstants.WEB_3_0_ID;
		254	} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_1)) {
		255	version = J2EEVersionConstants.WEB_3_1_ID;
248	}	256	}
249	}	257	}
250	break;	258	break;
Lines 314-319 Link Here
314	case J2EEVersionConstants.EJB_3_1_ID:	322	case J2EEVersionConstants.EJB_3_1_ID:
315	javaEEVersion = J2EEConstants.JEE_6_0_ID;	323	javaEEVersion = J2EEConstants.JEE_6_0_ID;
316	break;	324	break;
		325	case J2EEVersionConstants.EJB_3_2_ID:
		326	javaEEVersion = J2EEConstants.JEE_7_0_ID;
		327	break;
317	}	328	}
318	break;	329	break;
319	case CONNECTOR_TYPE:	330	case CONNECTOR_TYPE:
Lines 346-351 Link Here
346	case J2EEVersionConstants.WEB_3_0_ID:	357	case J2EEVersionConstants.WEB_3_0_ID:
347	javaEEVersion = J2EEVersionConstants.JEE_6_0_ID;	358	javaEEVersion = J2EEVersionConstants.JEE_6_0_ID;
348	break;	359	break;
		360	case J2EEVersionConstants.WEB_3_1_ID:
		361	javaEEVersion = J2EEVersionConstants.JEE_7_0_ID;
		362	break;
349	}	363	}
350	break;	364	break;
351	case WEBSERVICES_TYPE:	365	case WEBSERVICES_TYPE:

Lines 300-305 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java (-4 / +20 lines)
300	version = J2EEVersionConstants.JEE_5_0_ID;	300	version = J2EEVersionConstants.JEE_5_0_ID;
301	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {	301	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {
302	version = J2EEVersionConstants.JEE_6_0_ID;	302	version = J2EEVersionConstants.JEE_6_0_ID;
		303	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_7_0_TEXT)) {
		304	version = J2EEVersionConstants.JEE_7_0_ID;
303	}	305	}
304	} else if (isEJBJarFile(fileURI)) {	306	} else if (isEJBJarFile(fileURI)) {
305	if (null == versionAttr) {	307	if (null == versionAttr) {
Lines 314-319 Link Here
314	version = J2EEVersionConstants.EJB_3_0_ID;	316	version = J2EEVersionConstants.EJB_3_0_ID;
315	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) {	317	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) {
316	version = J2EEVersionConstants.EJB_3_1_ID;	318	version = J2EEVersionConstants.EJB_3_1_ID;
		319	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_2_TEXT)) {
		320	version = J2EEVersionConstants.EJB_3_2_ID;
317	}	321	}
318	} else if (isApplicationClientFile(fileURI)) {	322	} else if (isApplicationClientFile(fileURI)) {
319	if (null == versionAttr) {	323	if (null == versionAttr) {
Lines 328-333 Link Here
328	version = J2EEVersionConstants.JEE_5_0_ID;	332	version = J2EEVersionConstants.JEE_5_0_ID;
329	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {	333	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {
330	version = J2EEVersionConstants.JEE_6_0_ID;	334	version = J2EEVersionConstants.JEE_6_0_ID;
		335	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_7_0_TEXT)) {
		336	version = J2EEVersionConstants.JEE_7_0_ID;
331	}	337	}
332	} else if (isWARFile(fileURI)) {	338	} else if (isWARFile(fileURI)) {
333	if (null == versionAttr) {	339	if (null == versionAttr) {
Lines 342-347 Link Here
342	version = J2EEVersionConstants.WEB_2_5_ID;	348	version = J2EEVersionConstants.WEB_2_5_ID;
343	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {	349	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {
344	version = J2EEVersionConstants.WEB_3_0_ID;	350	version = J2EEVersionConstants.WEB_3_0_ID;
		351	} else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) {
		352	version = J2EEVersionConstants.WEB_3_1_ID;
345	}	353	}
346	} else if (isRARFile(fileURI)) {	354	} else if (isRARFile(fileURI)) {
347	if (null == versionAttr) {	355	if (null == versionAttr) {
Lines 363-369 Link Here
363	private static int lookupVersion(String fileURI, String schemaName) {	371	private static int lookupVersion(String fileURI, String schemaName) {
364	int version = -1;	372	int version = -1;
365	if (isEARFile(fileURI)) {	373	if (isEARFile(fileURI)) {
366	if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) {	374	if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_7)) {
		375	version = J2EEVersionConstants.JEE_7_0_ID;
		376	} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_6)) {
367	version = J2EEVersionConstants.JEE_6_0_ID;	377	version = J2EEVersionConstants.JEE_6_0_ID;
368	} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_5)) {	378	} else if (schemaName.equals(J2EEConstants.APPLICATION_SCHEMA_5)) {
369	version = J2EEVersionConstants.JEE_5_0_ID;	379	version = J2EEVersionConstants.JEE_5_0_ID;
Lines 371-377 Link Here
371	version = J2EEVersionConstants.J2EE_1_4_ID;	381	version = J2EEVersionConstants.J2EE_1_4_ID;
372	}	382	}
373	} else if (isEJBJarFile(fileURI)) {	383	} else if (isEJBJarFile(fileURI)) {
374	if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_1_NS)) != -1) {	384	if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_2_NS)) != -1) {
		385	version = J2EEVersionConstants.EJB_3_2_ID;
		386	} else if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_1_NS)) != -1) {
375	version = J2EEVersionConstants.EJB_3_1_ID;	387	version = J2EEVersionConstants.EJB_3_1_ID;
376	} else if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_0_NS)) != -1) {	388	} else if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_0_NS)) != -1) {
377	version = J2EEVersionConstants.EJB_3_0_ID;	389	version = J2EEVersionConstants.EJB_3_0_ID;
Lines 379-385 Link Here
379	version = J2EEVersionConstants.EJB_2_1_ID;	391	version = J2EEVersionConstants.EJB_2_1_ID;
380	}	392	}
381	} else if (isApplicationClientFile(fileURI)) {	393	} else if (isApplicationClientFile(fileURI)) {
382	if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) {	394	if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_7)) {
		395	version = J2EEVersionConstants.JEE_7_0_ID;
		396	} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_6)) {
383	version = J2EEVersionConstants.JEE_6_0_ID;	397	version = J2EEVersionConstants.JEE_6_0_ID;
384	} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_5)) {	398	} else if (schemaName.equals(J2EEConstants.APP_CLIENT_SCHEMA_5)) {
385	version = J2EEVersionConstants.JEE_5_0_ID;	399	version = J2EEVersionConstants.JEE_5_0_ID;
Lines 387-393 Link Here
387	version = J2EEVersionConstants.J2EE_1_4_ID;	401	version = J2EEVersionConstants.J2EE_1_4_ID;
388	}	402	}
389	} else if (isWARFile(fileURI)) {	403	} else if (isWARFile(fileURI)) {
390	if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) {	404	if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_1)) {
		405	version = J2EEVersionConstants.WEB_3_1_ID;
		406	} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_3_0)) {
391	version = J2EEVersionConstants.WEB_3_0_ID;	407	version = J2EEVersionConstants.WEB_3_0_ID;
392	} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_2_5)) {	408	} else if (schemaName.equals(J2EEConstants.WEBAPP_SCHEMA_2_5)) {
393	version = J2EEVersionConstants.WEB_2_5_ID;	409	version = J2EEVersionConstants.WEB_2_5_ID;

Lines 157-162 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java (+10 lines)
157	return J2EEVersionConstants.JEE_5_0_ID;	157	return J2EEVersionConstants.JEE_5_0_ID;
158	case J2EEVersionConstants.EJB_3_1_ID :	158	case J2EEVersionConstants.EJB_3_1_ID :
159	return J2EEVersionConstants.JEE_6_0_ID;	159	return J2EEVersionConstants.JEE_6_0_ID;
		160	case J2EEVersionConstants.EJB_3_2_ID :
		161	return J2EEVersionConstants.JEE_7_0_ID;
160	default :	162	default :
161	return J2EEVersionConstants.J2EE_1_4_ID;	163	return J2EEVersionConstants.J2EE_1_4_ID;
162	}	164	}
Lines 180-185 Link Here
180	public void setModuleVersionID(int id) {	182	public void setModuleVersionID(int id) {
181	super.setVersionID(id);	183	super.setVersionID(id);
182	switch (id) {	184	switch (id) {
		185	case (EJB_3_2_ID) :
		186	super.setDoctypeValues(null, null);
		187	primSetVersionID(EJB_3_2_ID);
		188	break;
183	case (EJB_3_1_ID) :	189	case (EJB_3_1_ID) :
184	super.setDoctypeValues(null, null);	190	super.setDoctypeValues(null, null);
185	primSetVersionID(EJB_3_1_ID);	191	primSetVersionID(EJB_3_1_ID);
Lines 210-215 Link Here
210	@Override	216	@Override
211	public void setJ2EEVersionID(int id) {	217	public void setJ2EEVersionID(int id) {
212	switch (id) {	218	switch (id) {
		219	case (JEE_7_0_ID) :
		220	primSetDoctypeValues(null, null);
		221	primSetVersionID(EJB_3_2_ID);
		222	break;
213	case (JEE_6_0_ID) :	223	case (JEE_6_0_ID) :
214	primSetDoctypeValues(null, null);	224	primSetDoctypeValues(null, null);
215	primSetVersionID(EJB_3_1_ID);	225	primSetVersionID(EJB_3_1_ID);

Lines 52-58 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java (-9 / +24 lines)
52	String APP_CLIENT_ALT_SYSTEMID_1_3 = "http://java.sun.com/dtd/application-client_1.3.dtd"; //$NON-NLS-1$	52	String APP_CLIENT_ALT_SYSTEMID_1_3 = "http://java.sun.com/dtd/application-client_1.3.dtd"; //$NON-NLS-1$
53	String APP_CLIENT_SCHEMA_1_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";//$NON-NLS-1$	53	String APP_CLIENT_SCHEMA_1_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";//$NON-NLS-1$
54	String APP_CLIENT_SCHEMA_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$	54	String APP_CLIENT_SCHEMA_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$
55	String APP_CLIENT_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ // EJB3	55	String APP_CLIENT_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$
		56	String APP_CLIENT_SCHEMA_7 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$
56		57
57	//Application constants	58	//Application constants
58	/** "Application_ID" */	59	/** "Application_ID" */
Lines 78-83 Link Here
78	String APPLICATION_SCHEMA_1_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";//$NON-NLS-1$	79	String APPLICATION_SCHEMA_1_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";//$NON-NLS-1$
79	String APPLICATION_SCHEMA_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$	80	String APPLICATION_SCHEMA_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$
80	String APPLICATION_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$	81	String APPLICATION_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$
		82	String APPLICATION_SCHEMA_7 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$
81		83
82	//EJB Jar Constants	84	//EJB Jar Constants
83	/** "ejb-jar_ID" */	85	/** "ejb-jar_ID" */
Lines 103-108 Link Here
103	String EJBJAR_SCHEMA_3_0_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$	105	String EJBJAR_SCHEMA_3_0_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$
104	String EJBJAR_SCHEMA_3_1 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$	106	String EJBJAR_SCHEMA_3_1 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$
105	String EJBJAR_SCHEMA_3_1_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$	107	String EJBJAR_SCHEMA_3_1_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$
		108	String EJBJAR_SCHEMA_3_2 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$
		109	String EJBJAR_SCHEMA_3_2_NS = "http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$
106		110
107	// EAR constants	111	// EAR constants
108		112
Lines 116-121 Link Here
116	URI WEBFRAGMENT_DD_URI_OBJ = URI.createURI(WEBFRAGMENT_DD_URI);	120	URI WEBFRAGMENT_DD_URI_OBJ = URI.createURI(WEBFRAGMENT_DD_URI);
117	String WEBFRAGMENT_DD_SHORT_NAME = "web-fragment.xml"; //$NON-NLS-1$	121	String WEBFRAGMENT_DD_SHORT_NAME = "web-fragment.xml"; //$NON-NLS-1$
118	String WEBFRAGMENT_SCHEMA_3_0 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; //$NON-NLS-1$	122	String WEBFRAGMENT_SCHEMA_3_0 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; //$NON-NLS-1$
		123	String WEBFRAGMENT_SCHEMA_3_1 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_0.xsd"; //$NON-NLS-1$
119		124
120	//Web app Constants	125	//Web app Constants
121	/** "WebApp_ID" */	126	/** "WebApp_ID" */
Lines 138-143 Link Here
138	String WEBAPP_SCHEMA_2_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";//$NON-NLS-1$	143	String WEBAPP_SCHEMA_2_4 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";//$NON-NLS-1$
139	String WEBAPP_SCHEMA_2_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";//$NON-NLS-1$	144	String WEBAPP_SCHEMA_2_5 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";//$NON-NLS-1$
140	String WEBAPP_SCHEMA_3_0 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";//$NON-NLS-1$	145	String WEBAPP_SCHEMA_3_0 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";//$NON-NLS-1$
		146	String WEBAPP_SCHEMA_3_1 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";//$NON-NLS-1$
141	/** "WEB-INF/ejb-jar.xml" */	147	/** "WEB-INF/ejb-jar.xml" */
142	String EJBJAR_IN_WAR_DD_URI = "WEB-INF/ejb-jar.xml"; //$NON-NLS-1$	148	String EJBJAR_IN_WAR_DD_URI = "WEB-INF/ejb-jar.xml"; //$NON-NLS-1$
143	//J2C Resource Adapter Constants	149	//J2C Resource Adapter Constants
Lines 156-161 Link Here
156	String CONNECTOR_ALT_SYSTEMID_1_0 = "http://java.sun.com/dtd/connector_1.0.dtd"; //$NON-NLS-1$	162	String CONNECTOR_ALT_SYSTEMID_1_0 = "http://java.sun.com/dtd/connector_1.0.dtd"; //$NON-NLS-1$
157	String CONNECTOR_SCHEMA_1_5 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";//$NON-NLS-1$	163	String CONNECTOR_SCHEMA_1_5 = "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";//$NON-NLS-1$
158	String CONNECTOR_SCHEMA_1_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/connector_1_6.xsd";//$NON-NLS-1$	164	String CONNECTOR_SCHEMA_1_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/connector_1_6.xsd";//$NON-NLS-1$
		165	String CONNECTOR_SCHEMA_1_7 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd";//$NON-NLS-1$
159	//Web Services Constants	166	//Web Services Constants
160	/** Doc type for webservices deployment descriptors */	167	/** Doc type for webservices deployment descriptors */
161	String WEB_SERVICES_CLIENT_DOCTYPE = "webservicesclient"; //$NON-NLS-1$	168	String WEB_SERVICES_CLIENT_DOCTYPE = "webservicesclient"; //$NON-NLS-1$
Lines 186-191 Link Here
186	String WEBSERVICE_SCHEMA_LOC_SUN_1_2 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd";//$NON-NLS-1$	193	String WEBSERVICE_SCHEMA_LOC_SUN_1_2 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd";//$NON-NLS-1$
187	String WEBSERVICE_SCHEMA_1_3 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$	194	String WEBSERVICE_SCHEMA_1_3 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$
188	String WEBSERVICE_SCHEMA_LOC_SUN_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$	195	String WEBSERVICE_SCHEMA_LOC_SUN_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$
		196	String WEBSERVICE_SCHEMA_1_4 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd";//$NON-NLS-1$
		197	String WEBSERVICE_SCHEMA_LOC_1_4 = "http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd";//$NON-NLS-1$
189		198
190	//Miscellaneous constants	199	//Miscellaneous constants
191	/** "UTF-8" */	200	/** "UTF-8" */
Lines 202-224 Link Here
202	String JAVAEE_5_XSD_SHORT_NAME = "javaee_5.xsd"; //$NON-NLS-1$ //EJB3	211	String JAVAEE_5_XSD_SHORT_NAME = "javaee_5.xsd"; //$NON-NLS-1$ //EJB3
203	String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$	212	String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
204	String APPLICATION_SCHEMA_LOC_1_4 = "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"; //$NON-NLS-1$	213	String APPLICATION_SCHEMA_LOC_1_4 = "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"; //$NON-NLS-1$
205	String APPLICATION_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$ // EJB3	214	String APPLICATION_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application_5.xsd"; //$NON-NLS-1$
206	String APPLICATION_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$ // EAR6	215	String APPLICATION_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$
		216	String APPLICATION_SCHEMA_LOC_7 = "http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$
207	String APP_CLIENT_SCHEMA_LOC_1_4 = "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"; //$NON-NLS-1$	217	String APP_CLIENT_SCHEMA_LOC_1_4 = "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"; //$NON-NLS-1$
208	String APP_CLIENT_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$ //EJB3	218	String APP_CLIENT_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$
209	String APP_CLIENT_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ //AppClient 6	219	String APP_CLIENT_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$
		220	String APP_CLIENT_SCHEMA_LOC_7 = "http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$
210	String EJB_JAR_SCHEMA_LOC_2_1 = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"; //$NON-NLS-1$	221	String EJB_JAR_SCHEMA_LOC_2_1 = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"; //$NON-NLS-1$
211	String EJB_JAR_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$ // EJB3	222	String EJB_JAR_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$
212	String EJB_JAR_SCHEMA_LOC_3_1 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$ // EJB3.1	223	String EJB_JAR_SCHEMA_LOC_3_1 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$
		224	String EJB_JAR_SCHEMA_LOC_3_2 = "http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$
213	String CONNECTOR_SCHEMA_LOC_1_5 = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"; //$NON-NLS-1$	225	String CONNECTOR_SCHEMA_LOC_1_5 = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"; //$NON-NLS-1$
214	String CONNECTOR_SCHEMA_LOC_1_6 = "http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"; //$NON-NLS-1$	226	String CONNECTOR_SCHEMA_LOC_1_6 = "http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"; //$NON-NLS-1$
		227	String CONNECTOR_SCHEMA_LOC_1_7 = "http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd"; //$NON-NLS-1$
215	String WEB_APP_SCHEMA_LOC_2_4 = "http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; //$NON-NLS-1$	228	String WEB_APP_SCHEMA_LOC_2_4 = "http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; //$NON-NLS-1$
216	String WEB_APP_SCHEMA_LOC_2_5 = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; //$NON-NLS-1$ //EJB3	229	String WEB_APP_SCHEMA_LOC_2_5 = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; //$NON-NLS-1$
217	String WEB_APP_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; //$NON-NLS-1$ //Web 3	230	String WEB_APP_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; //$NON-NLS-1$
		231	String WEB_APP_SCHEMA_LOC_3_1 = "http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"; //$NON-NLS-1$
218	String WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$	232	String WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$
219	String JSP_SCHEMA_LOC_2_0 = "http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"; //$NON-NLS-1$	233	String JSP_SCHEMA_LOC_2_0 = "http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"; //$NON-NLS-1$
220	String JSP_SCHEMA_LOC_2_1 = "http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd"; //$NON-NLS-1$ //EJB3	234	String JSP_SCHEMA_LOC_2_1 = "http://java.sun.com/xml/ns/javaee/jsp_2_1.xsd"; //$NON-NLS-1$ //EJB3
221	String WEBFRAGMENT_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; //$NON-NLS-1$ //Web Fragment3	235	String WEBFRAGMENT_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"; //$NON-NLS-1$ //Web Fragment3
		236	String WEBFRAGMENT_SCHEMA_LOC_3_1 = "http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"; //$NON-NLS-1$ //Web Fragment3
222		237
223	public static final String EAR_MODEL_NAME = "EAR_VALIDATION"; //$NON-NLS-1$	238	public static final String EAR_MODEL_NAME = "EAR_VALIDATION"; //$NON-NLS-1$
224	}	239	}




	public int J2EE_1_4_ID = 14;
	public int JEE_5_0_ID = 50;
	public int JEE_6_0_ID = 60;
	public int JEE_7_0_ID = 70;
	public int EJB_1_0_ID = 10;	
	public int EJB_1_1_ID = 11;	
	public int EJB_2_0_ID = 20;	
	public int EJB_2_1_ID = 21;	
	public int EJB_3_0_ID = 30;
	public int EJB_3_1_ID = 31;
	public int EJB_3_2_ID = 32;
	public int WEB_2_2_ID = 22;
	public int WEB_2_3_ID = 23;
	public int WEB_2_4_ID = 24;
	public int WEB_2_5_ID = 25;
	public int WEB_3_0_ID = 30;
	public int WEB_3_1_ID = 31;
	public int WEBFRAGMENT_3_0_ID = 30;
	public int TAGLIB_1_1_ID = 11;
	public int TAGLIB_1_2_ID = 12;

	public int SERVLET_2_4 = 24;
	public int SERVLET_2_5 = 25;
	public int SERVLET_3_0 = 30;
	public int SERVLET_3_1 = 31;
	public int JCA_1_0_ID = 10;
	public int JCA_1_5_ID = 15;
	public int JCA_1_6_ID = 16;

	public int VERSION_1_4 = 14;
	public int VERSION_1_5 = 15;
	public int VERSION_1_6 = 16;
	public int VERSION_1_7 = 17;
	public int VERSION_2_0 = 20;
	public int VERSION_2_1 = 21;	
	public int VERSION_2_2 = 22;	

	public int VERSION_2_5 = 25; 
	public int VERSION_3_0 = 30; 
	public int VERSION_3_1 = 31; 
	public int VERSION_3_2 = 32;
	public int VERSION_5_0 = 50; 
	public int VERSION_6_0 = 60; 
	public int VERSION_7_0 = 70;
	
	public String VERSION_1_0_TEXT		= "1.0"; //$NON-NLS-1$
	public String VERSION_1_1_TEXT    	= "1.1"; //$NON-NLS-1$

	public String VERSION_2_5_TEXT		= "2.5"; //$NON-NLS-1$
	public String VERSION_3_0_TEXT		= "3.0"; //$NON-NLS-1$
	public String VERSION_3_1_TEXT		= "3.1"; //$NON-NLS-1$
	public String VERSION_3_2_TEXT		= "3.2"; //$NON-NLS-1$
	public String VERSION_5_0_TEXT		= "5.0"; //$NON-NLS-1$
	public String VERSION_6_0_TEXT		= "6.0"; //$NON-NLS-1$
	public String VERSION_7_0_TEXT		= "7.0"; //$NON-NLS-1$
	public String VERSION_5_TEXT        = "5";   //$NON-NLS-1$
	public String VERSION_6_TEXT        = "6";   //$NON-NLS-1$
	public String VERSION_7_TEXT        = "7";   //$NON-NLS-1$
					
}

Lines 146-151 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/ConnectorResourceImpl.java (+1 lines)
146	@Override	146	@Override
147	public void setJ2EEVersionID(int id) {	147	public void setJ2EEVersionID(int id) {
148	switch (id) {	148	switch (id) {
		149	case(JEE_7_0_ID) :
149	case(JEE_6_0_ID) :	150	case(JEE_6_0_ID) :
150	primSetDoctypeValues(null, null);	151	primSetDoctypeValues(null, null);
151	primSetVersionID(JCA_1_6_ID);	152	primSetVersionID(JCA_1_6_ID);




	public static final String CONNECTOR_XML_TEMPLATE_10		= "rartp10.xml";								//$NON-NLS-1$
	public static final String CONNECTOR_XML_TEMPLATE_15		= "rartp15.xml"; //$NON-NLS-1$
	public static final String CONNECTOR_XML_TEMPLATE_16		= "rartp16.xml"; //$NON-NLS-1$
	public static final String CONNECTOR_XML_TEMPLATE_17		= "rartp17.xml"; //$NON-NLS-1$
	
	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
		if (monitor != null) {

			IPath configFolderpath = pjpath.append(configFolderName);
			sourceFolder = ws.getRoot().getFolder(configFolderpath);

			if( fv == IJ2EEFacetConstants.JCA_17)
			{
		        if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
		            // Create the deployment descriptor (ra.xml) if one doesn't exist
		            IFile rarFile = sourceFolder.getFile(new Path(J2EEConstants.RAR_DD_URI));
		            if (!rarFile.exists()) {
		                try {
		                    if(!rarFile.getParent().exists()
		                            && (rarFile.getParent().getType() ==  IResource.FOLDER)){
		                        ((IFolder)rarFile.getParent()).create(true, true, monitor);
		                    }
		                    InputStream in = getClass().getResourceAsStream(CONNECTOR_XML_TEMPLATE_17);
		                    rarFile.create(in, true, monitor);
		                    populateDefaultContent(project, fv);
		                } catch (CoreException e) {
		                	J2EEPlugin.logError(e);
		                }
		            }
		        }
			}
			else if( fv == IJ2EEFacetConstants.JCA_16)
			{
		        if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
		            // Create the deployment descriptor (ra.xml) if one doesn't exist

Added Link Here

(-)a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp17.xml (+9 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<connector id="Connector_ID" version="1.6" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd">
3	<description></description>
4	<vendor-name></vendor-name>
5	<eis-type></eis-type>
6	<resourceadapter-version></resourceadapter-version>
7	<resourceadapter>
8	</resourceadapter>
9	</connector>




    <project-facet-version facet="jst.web" version="2.5">
      <constraint>
        <and>
          <requires facet="jst.java" version="[1.5"/>
          <conflicts group="modules"/>
        </and>
      </constraint>

    <project-facet-version facet="jst.web" version="3.0">
      <constraint>
        <and>
          <requires facet="jst.java" version="[1.6"/>
          <conflicts group="modules"/>
        </and>
      </constraint>
      <group-member id="modules"/>
    </project-facet-version>

    <project-facet-version facet="jst.web" version="3.1">
      <constraint>
        <and>
          <requires facet="jst.java" version="[1.7"/>
          <conflicts group="modules"/>
        </and>
      </constraint>
      <group-member id="modules"/>
    </project-facet-version>

    <action facet="jst.web" type="INSTALL" id="jst.web.install">
      <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/>
      <config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/>
    </action>

    <event-handler facet="jst.web" type="RUNTIME_CHANGED">
       <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
    </event-handler>
    
    <event-handler type="POST_INSTALL" facet="jst.web">
      <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetPostInstallDelegate"/>
    </event-handler>
    

Lines 99-104 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java (+3 lines)
99	else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(facetVersion)) {	99	else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(facetVersion)) {
100	return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE6_DYNAMIC_WEB_GENERATE_DD));	100	return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE6_DYNAMIC_WEB_GENERATE_DD));
101	}	101	}
		102	else if(J2EEVersionConstants.VERSION_3_1_TEXT.equals(facetVersion)) {
		103	return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE7_DYNAMIC_WEB_GENERATE_DD));
		104	}
102		105
103	return Boolean.TRUE;	106	return Boolean.TRUE;
104	}else if (propertyName.equals(INSTALL_WEB_LIBRARY)){	107	}else if (propertyName.equals(INSTALL_WEB_LIBRARY)){

Lines 110-116 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java (-1 / +24 lines)
110	J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(webroot, configFolderPath, null);	110	J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(webroot, configFolderPath, null);
111	}	111	}
112		112
113	if( fv == WebFacetUtils.WEB_30 )	113	if( fv == WebFacetUtils.WEB_31 )
		114	{
		115	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
		116	createWeb31DeploymentDescriptor(project, fv, webinfFolder, monitor);
		117	}
		118	}
		119	else if( fv == WebFacetUtils.WEB_30 )
114	{	120	{
115	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){	121	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
116	createWeb30DeploymentDescriptor(project, fv, webinfFolder, monitor);	122	createWeb30DeploymentDescriptor(project, fv, webinfFolder, monitor);
Lines 220-225 Link Here
220	}	226	}
221	return pjpath.append(model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));	227	return pjpath.append(model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));
222	}	228	}
		229
		230	private void createWeb31DeploymentDescriptor(final IProject project, final IProjectFacetVersion fv,
		231	IFolder webinfFolder, IProgressMonitor monitor) throws CoreException {
		232	// Create the deployment descriptor (web.xml) if one doesn't exist
		233	IFile webxmlFile = webinfFolder.getFile("web.xml"); //$NON-NLS-1$
		234	if (!webxmlFile.exists()) {
		235	try {
		236	// Create a minimal web.xml file, so the model can be initialized
		237	final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"3.1\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd\">\n</web-app>"; //$NON-NLS-1$
		238	webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
		239
		240	populateDefaultContent(project, fv);
		241	} catch (UnsupportedEncodingException e) {
		242	WebPlugin.logError(e);
		243	}
		244	}
		245	}
223		246
224	private void createWeb30DeploymentDescriptor(final IProject project, final IProjectFacetVersion fv,	247	private void createWeb30DeploymentDescriptor(final IProject project, final IProjectFacetVersion fv,
225	IFolder webinfFolder, IProgressMonitor monitor) throws CoreException {	248	IFolder webinfFolder, IProgressMonitor monitor) throws CoreException {

Lines 24-29 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java (+1 lines)
24	public static final IProjectFacetVersion WEB_24 = WEB_FACET.getVersion("2.4"); //$NON-NLS-1$	24	public static final IProjectFacetVersion WEB_24 = WEB_FACET.getVersion("2.4"); //$NON-NLS-1$
25	public static final IProjectFacetVersion WEB_25 = WEB_FACET.getVersion("2.5"); //$NON-NLS-1$	25	public static final IProjectFacetVersion WEB_25 = WEB_FACET.getVersion("2.5"); //$NON-NLS-1$
26	public static final IProjectFacetVersion WEB_30 = WEB_FACET.getVersion("3.0"); //$NON-NLS-1$	26	public static final IProjectFacetVersion WEB_30 = WEB_FACET.getVersion("3.0"); //$NON-NLS-1$
		27	public static final IProjectFacetVersion WEB_31 = WEB_FACET.getVersion("3.1"); //$NON-NLS-1$
27	public static final IProjectFacetVersion WEBFRAGMENT_30 = WEBFRAGMENT_FACET.getVersion("3.0"); //$NON-NLS-1$	28	public static final IProjectFacetVersion WEBFRAGMENT_30 = WEBFRAGMENT_FACET.getVersion("3.0"); //$NON-NLS-1$
28		29
29	public static final IProjectFacet WEB_XDOCLET_FACET = getWebDocletFacet();	30	public static final IProjectFacet WEB_XDOCLET_FACET = getWebDocletFacet();




import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.project.ManifestFileCreationAction;
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;

        IFile file = aFolder.getFile(new Path(J2EEConstants.WEBFRAGMENT_DD_URI));
        if (file.exists()) return;
        try {
        	createWebFragmentFile(file, project, fv);
        } catch (CoreException e) {
            J2EEPlugin.logError(e);
        } catch (IOException e) {

        }
    }
	
	public static void createWebFragmentFile(IFile file, IProject project, IProjectFacetVersion fv) throws CoreException, IOException {
		try {
			WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(file);
			String projectNamewithoutSpecialChars = getNameWithoutSpecialCharacters(project.getName());
			
			final String webFragXmlContents;
			
			if( fv == IJ2EEFacetConstants.WEBFRAGMENT_31 )
			{
				webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.0\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) +  "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
			}
			else
			{
				webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) +  "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
			}
			
			out.write(webFragXmlContents.getBytes("UTF-8")); //$NON-NLS-1$
			out.close();
		} catch (IOException ioe) {

Lines 114-120 Link Here

(-)a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java (-2 / +7 lines)
114	IPath configFolderpath = pjpath.append(configFolderName);	114	IPath configFolderpath = pjpath.append(configFolderName);
115	sourceFolder = ws.getRoot().getFolder(configFolderpath);	115	sourceFolder = ws.getRoot().getFolder(configFolderpath);
116		116
117	if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60 \|\| fv == IJ2EEFacetConstants.APPLICATION_CLIENT_50)	117	if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_70 \|\|
		118	fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60 \|\|
		119	fv == IJ2EEFacetConstants.APPLICATION_CLIENT_50 )
118	{	120	{
119	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){	121	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
120	// Create the deployment descriptor (application-client.xml) if one doesn't exist	122	// Create the deployment descriptor (application-client.xml) if one doesn't exist
Lines 126-132 Link Here
126	((IFolder)appClientFile.getParent()).create(true, true, monitor);	128	((IFolder)appClientFile.getParent()).create(true, true, monitor);
127	}	129	}
128	String appClientXmlContents = null;	130	String appClientXmlContents = null;
129	if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60) {	131	if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_70) {
		132	appClientXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application-client version=\"7\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application-client>"; //$NON-NLS-1$ //$NON-NLS-2$
		133	}
		134	else if( fv == IJ2EEFacetConstants.APPLICATION_CLIENT_60) {
130	appClientXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application-client version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application-client>"; //$NON-NLS-1$ //$NON-NLS-2$	135	appClientXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application-client version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application-client>"; //$NON-NLS-1$ //$NON-NLS-2$
131	}	136	}
132	else {	137	else {

Lines 192-197 Link Here

(-)a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java (+6 lines)
192	version = J2EEVersionConstants.JEE_5_0_ID;	192	version = J2EEVersionConstants.JEE_5_0_ID;
193	} else if (versionStr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {	193	} else if (versionStr.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {
194	version = J2EEVersionConstants.JEE_6_0_ID;	194	version = J2EEVersionConstants.JEE_6_0_ID;
		195	} else if (versionStr.equals(J2EEVersionConstants.VERSION_7_0_TEXT)) {
		196	version = J2EEVersionConstants.JEE_7_0_ID;
195	}	197	}
196	break;	198	break;
197	case J2EEVersionConstants.CONNECTOR_TYPE:	199	case J2EEVersionConstants.CONNECTOR_TYPE:
Lines 214-219 Link Here
214	version = J2EEVersionConstants.EJB_3_0_ID;	216	version = J2EEVersionConstants.EJB_3_0_ID;
215	} else if (versionStr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) {	217	} else if (versionStr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) {
216	version = J2EEVersionConstants.EJB_3_1_ID;	218	version = J2EEVersionConstants.EJB_3_1_ID;
		219	} else if (versionStr.equals(J2EEVersionConstants.VERSION_3_2_TEXT)) {
		220	version = J2EEVersionConstants.EJB_3_2_ID;
217	}	221	}
218	break;	222	break;
219	case J2EEVersionConstants.WEB_TYPE:	223	case J2EEVersionConstants.WEB_TYPE:
Lines 227-232 Link Here
227	version = J2EEVersionConstants.WEB_2_5_ID;	231	version = J2EEVersionConstants.WEB_2_5_ID;
228	} else if (versionStr.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {	232	} else if (versionStr.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {
229	version = J2EEVersionConstants.WEB_3_0_ID;	233	version = J2EEVersionConstants.WEB_3_0_ID;
		234	} else if (versionStr.equals(J2EEVersionConstants.VERSION_3_1_TEXT)) {
		235	version = J2EEVersionConstants.WEB_3_1_ID;
230	}	236	}
231	break;	237	break;
232	}	238	}

Lines 39-44 Link Here

(-)a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java (+32 lines)
39		39
40	case J2EEVersionConstants.SERVLET_3_0:	40	case J2EEVersionConstants.SERVLET_3_0:
41	return J2EEVersionConstants.VERSION_3_0_TEXT;	41	return J2EEVersionConstants.VERSION_3_0_TEXT;
		42
		43	case J2EEVersionConstants.SERVLET_3_1:
		44	return J2EEVersionConstants.VERSION_3_1_TEXT;
42	}	45	}
43	return ""; //$NON-NLS-1$	46	return ""; //$NON-NLS-1$
44		47
Lines 64-69 Link Here
64		67
65	case J2EEVersionConstants.EJB_3_1_ID:	68	case J2EEVersionConstants.EJB_3_1_ID:
66	return J2EEVersionConstants.VERSION_3_1_TEXT;	69	return J2EEVersionConstants.VERSION_3_1_TEXT;
		70
		71	case J2EEVersionConstants.EJB_3_2_ID:
		72	return J2EEVersionConstants.VERSION_3_2_TEXT;
67	}	73	}
68	return ""; //$NON-NLS-1$	74	return ""; //$NON-NLS-1$
69	}	75	}
Lines 100-105 Link Here
100	case J2EEVersionConstants.JEE_6_0_ID:	106	case J2EEVersionConstants.JEE_6_0_ID:
101	return J2EEVersionConstants.VERSION_6_0_TEXT;	107	return J2EEVersionConstants.VERSION_6_0_TEXT;
102		108
		109	case J2EEVersionConstants.JEE_7_0_ID:
		110	return J2EEVersionConstants.VERSION_7_0_TEXT;
		111
103	}	112	}
104	return "";//$NON-NLS-1$	113	return "";//$NON-NLS-1$
105	}	114	}
Lines 115-120 Link Here
115	return J2EEVersionConstants.JEE_5_0_ID;	124	return J2EEVersionConstants.JEE_5_0_ID;
116	if (version.equals(J2EEVersionConstants.VERSION_6_0_TEXT))	125	if (version.equals(J2EEVersionConstants.VERSION_6_0_TEXT))
117	return J2EEVersionConstants.JEE_6_0_ID;	126	return J2EEVersionConstants.JEE_6_0_ID;
		127	if (version.equals(J2EEVersionConstants.VERSION_7_0_TEXT))
		128	return J2EEVersionConstants.JEE_7_0_ID;
118	// default	129	// default
119	return J2EEVersionConstants.JEE_5_0_ID;	130	return J2EEVersionConstants.JEE_5_0_ID;
120	}	131	}
Lines 130-135 Link Here
130	return J2EEVersionConstants.JEE_5_0_ID;	141	return J2EEVersionConstants.JEE_5_0_ID;
131	if (version.equals(J2EEVersionConstants.VERSION_3_1_TEXT))	142	if (version.equals(J2EEVersionConstants.VERSION_3_1_TEXT))
132	return J2EEVersionConstants.JEE_6_0_ID;	143	return J2EEVersionConstants.JEE_6_0_ID;
		144	if (version.equals(J2EEVersionConstants.VERSION_3_2_TEXT))
		145	return J2EEVersionConstants.JEE_7_0_ID;
133	// default	146	// default
134	return J2EEVersionConstants.JEE_5_0_ID;	147	return J2EEVersionConstants.JEE_5_0_ID;
135	}	148	}
Lines 145-150 Link Here
145	return J2EEVersionConstants.JEE_5_0_ID;	158	return J2EEVersionConstants.JEE_5_0_ID;
146	if (version.equals(J2EEVersionConstants.VERSION_3_0_TEXT))	159	if (version.equals(J2EEVersionConstants.VERSION_3_0_TEXT))
147	return J2EEVersionConstants.JEE_6_0_ID;	160	return J2EEVersionConstants.JEE_6_0_ID;
		161	if (version.equals(J2EEVersionConstants.VERSION_3_1_TEXT))
		162	return J2EEVersionConstants.JEE_7_0_ID;
148	// default	163	// default
149	return J2EEVersionConstants.J2EE_1_4_ID;	164	return J2EEVersionConstants.J2EE_1_4_ID;
150	}	165	}
Lines 176-181 Link Here
176	return J2EEVersionConstants.EJB_3_0_ID;	191	return J2EEVersionConstants.EJB_3_0_ID;
177	case J2EEVersionConstants.JEE_6_0_ID:	192	case J2EEVersionConstants.JEE_6_0_ID:
178	return J2EEVersionConstants.EJB_3_1_ID;	193	return J2EEVersionConstants.EJB_3_1_ID;
		194	case J2EEVersionConstants.JEE_7_0_ID:
		195	return J2EEVersionConstants.EJB_3_2_ID;
179	}	196	}
180	// default	197	// default
181	return J2EEVersionConstants.EJB_3_1_ID;	198	return J2EEVersionConstants.EJB_3_1_ID;
Lines 193-198 Link Here
193	return J2EEVersionConstants.WEB_2_5_ID;	210	return J2EEVersionConstants.WEB_2_5_ID;
194	case J2EEVersionConstants.JEE_6_0_ID:	211	case J2EEVersionConstants.JEE_6_0_ID:
195	return J2EEVersionConstants.WEB_3_0_ID;	212	return J2EEVersionConstants.WEB_3_0_ID;
		213	case J2EEVersionConstants.JEE_7_0_ID:
		214	return J2EEVersionConstants.WEB_3_1_ID;
196	}	215	}
197	// default	216	// default
198	return J2EEVersionConstants.WEB_3_0_ID;	217	return J2EEVersionConstants.WEB_3_0_ID;
Lines 206-211 Link Here
206	case J2EEVersionConstants.JEE_5_0_ID:	225	case J2EEVersionConstants.JEE_5_0_ID:
207	return J2EEVersionConstants.JCA_1_5_ID;	226	return J2EEVersionConstants.JCA_1_5_ID;
208	case J2EEVersionConstants.JEE_6_0_ID:	227	case J2EEVersionConstants.JEE_6_0_ID:
		228	case J2EEVersionConstants.JEE_7_0_ID:
209	return J2EEVersionConstants.JCA_1_6_ID;	229	return J2EEVersionConstants.JCA_1_6_ID;
210	}	230	}
211	// default	231	// default
Lines 275-285 Link Here
275	else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version))	295	else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version))
276	nVersion = J2EEVersionConstants.VERSION_3_1;	296	nVersion = J2EEVersionConstants.VERSION_3_1;
277		297
		298	else if (J2EEVersionConstants.VERSION_3_2_TEXT.equals(version))
		299	nVersion = J2EEVersionConstants.VERSION_3_2;
		300
278	else if (J2EEVersionConstants.VERSION_5_0_TEXT.equals(version))	301	else if (J2EEVersionConstants.VERSION_5_0_TEXT.equals(version))
279	nVersion = J2EEVersionConstants.VERSION_5_0;	302	nVersion = J2EEVersionConstants.VERSION_5_0;
280		303
281	else if (J2EEVersionConstants.VERSION_6_0_TEXT.equals(version))	304	else if (J2EEVersionConstants.VERSION_6_0_TEXT.equals(version))
282	nVersion = J2EEVersionConstants.VERSION_6_0;	305	nVersion = J2EEVersionConstants.VERSION_6_0;
		306
		307	else if (J2EEVersionConstants.VERSION_7_0_TEXT.equals(version))
		308	nVersion = J2EEVersionConstants.VERSION_7_0;
283		309
284	return nVersion;	310	return nVersion;
285	}	311	}
Lines 331-342 Link Here
331	else if (version == J2EEVersionConstants.VERSION_3_1)	357	else if (version == J2EEVersionConstants.VERSION_3_1)
332	nVersion = J2EEVersionConstants.VERSION_3_1_TEXT;	358	nVersion = J2EEVersionConstants.VERSION_3_1_TEXT;
333		359
		360	else if (version == J2EEVersionConstants.VERSION_3_2)
		361	nVersion = J2EEVersionConstants.VERSION_3_2_TEXT;
		362
334	else if (version == J2EEVersionConstants.VERSION_5_0)	363	else if (version == J2EEVersionConstants.VERSION_5_0)
335	nVersion = J2EEVersionConstants.VERSION_5_0_TEXT;	364	nVersion = J2EEVersionConstants.VERSION_5_0_TEXT;
336		365
337	else if (version == J2EEVersionConstants.VERSION_6_0)	366	else if (version == J2EEVersionConstants.VERSION_6_0)
338	nVersion = J2EEVersionConstants.VERSION_6_0_TEXT;	367	nVersion = J2EEVersionConstants.VERSION_6_0_TEXT;
339		368
		369	else if (version == J2EEVersionConstants.VERSION_7_0)
		370	nVersion = J2EEVersionConstants.VERSION_7_0_TEXT;
		371
340	return nVersion;	372	return nVersion;
341	}	373	}
342		374

Lines 72-78 Link Here

(-)a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java (-2 / +5 lines)
72	J2EEPlugin.logError(e);	72	J2EEPlugin.logError(e);
73	}	73	}
74		74
75	if( fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60 \|\| fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_50) {	75	if( fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_70 \|\| fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60 \|\| fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_50) {
76	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){	76	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
77	// Create the deployment descriptor (application.xml) if one doesn't exist	77	// Create the deployment descriptor (application.xml) if one doesn't exist
78	IFile appXmlFile = earroot.getUnderlyingFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));	78	IFile appXmlFile = earroot.getUnderlyingFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
Lines 83-89 Link Here
83	((IFolder)appXmlFile.getParent()).create(true, true, monitor);	83	((IFolder)appXmlFile.getParent()).create(true, true, monitor);
84	}	84	}
85	String appXmlContents = null;	85	String appXmlContents = null;
86	if(fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60) {	86	if(fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_70) {
		87	appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"6\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$
		88	}
		89	else if(fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60) {
87	appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$	90	appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$
88	}	91	}
89	else {	92	else {

Lines 382-389 Link Here

(-)a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java (+13 lines)
382		382
383	if (DYNAMIC_WEB.equals(moduleProjectFacetId)) {	383	if (DYNAMIC_WEB.equals(moduleProjectFacetId)) {
384	switch (earVersion) {	384	switch (earVersion) {
		385	case J2EEVersionConstants.VERSION_7_0:
		386	retVal.add(DYNAMIC_WEB_31);
		387	//$FALL-THROUGH$
385	case J2EEVersionConstants.VERSION_6_0:	388	case J2EEVersionConstants.VERSION_6_0:
386	retVal.add(DYNAMIC_WEB_30);	389	retVal.add(DYNAMIC_WEB_30);
		390	//$FALL-THROUGH$
387	case J2EEVersionConstants.VERSION_5_0:	391	case J2EEVersionConstants.VERSION_5_0:
388	retVal.add(DYNAMIC_WEB_25);	392	retVal.add(DYNAMIC_WEB_25);
389	//$FALL-THROUGH$	393	//$FALL-THROUGH$
Lines 399-406 Link Here
399	}	403	}
400	} else if (EJB.equals(moduleProjectFacetId)) {	404	} else if (EJB.equals(moduleProjectFacetId)) {
401	switch (earVersion) {	405	switch (earVersion) {
		406	case J2EEVersionConstants.VERSION_7_0:
		407	retVal.add(EJB_32);
		408	//$FALL-THROUGH$
402	case J2EEVersionConstants.VERSION_6_0:	409	case J2EEVersionConstants.VERSION_6_0:
403	retVal.add(EJB_31);	410	retVal.add(EJB_31);
		411	//$FALL-THROUGH$
404	case J2EEVersionConstants.VERSION_5_0:	412	case J2EEVersionConstants.VERSION_5_0:
405	retVal.add(EJB_30);	413	retVal.add(EJB_30);
406	//$FALL-THROUGH$	414	//$FALL-THROUGH$
Lines 415-420 Link Here
415	}	423	}
416	} else if (JCA.equals(moduleProjectFacetId)) {	424	} else if (JCA.equals(moduleProjectFacetId)) {
417	switch (earVersion) {	425	switch (earVersion) {
		426	case J2EEVersionConstants.VERSION_7_0:
418	case J2EEVersionConstants.VERSION_6_0:	427	case J2EEVersionConstants.VERSION_6_0:
419	retVal.add(JCA_16);	428	retVal.add(JCA_16);
420	case J2EEVersionConstants.VERSION_5_0:	429	case J2EEVersionConstants.VERSION_5_0:
Lines 429-436 Link Here
429	}	438	}
430	} else if (APPLICATION_CLIENT.equals(moduleProjectFacetId)) {	439	} else if (APPLICATION_CLIENT.equals(moduleProjectFacetId)) {
431	switch (earVersion) {	440	switch (earVersion) {
		441	case J2EEVersionConstants.VERSION_7_0:
		442	retVal.add(APPLICATION_CLIENT_70);
		443	//$FALL-THROUGH$
432	case J2EEVersionConstants.VERSION_6_0:	444	case J2EEVersionConstants.VERSION_6_0:
433	retVal.add(APPLICATION_CLIENT_60);	445	retVal.add(APPLICATION_CLIENT_60);
		446	//$FALL-THROUGH$
434	case J2EEVersionConstants.VERSION_5_0:	447	case J2EEVersionConstants.VERSION_5_0:
435	retVal.add(APPLICATION_CLIENT_50);	448	retVal.add(APPLICATION_CLIENT_50);
436	//$FALL-THROUGH$	449	//$FALL-THROUGH$




	public static final IProjectFacetVersion ENTERPRISE_APPLICATION_14 = ENTERPRISE_APPLICATION_FACET.getVersion("1.4"); //$NON-NLS-1$
	public static final IProjectFacetVersion ENTERPRISE_APPLICATION_50 = ENTERPRISE_APPLICATION_FACET.getVersion("5.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion ENTERPRISE_APPLICATION_60 = ENTERPRISE_APPLICATION_FACET.getVersion("6.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion ENTERPRISE_APPLICATION_70 = ENTERPRISE_APPLICATION_FACET.getVersion("7.0"); //$NON-NLS-1$
	
	public static final String APPLICATION_CLIENT = IModuleConstants.JST_APPCLIENT_MODULE;
	public IProjectFacet APPLICATION_CLIENT_FACET = ProjectFacetsManager.getProjectFacet(APPLICATION_CLIENT);

	public static final IProjectFacetVersion APPLICATION_CLIENT_14 = APPLICATION_CLIENT_FACET.getVersion("1.4"); //$NON-NLS-1$
	public static final IProjectFacetVersion APPLICATION_CLIENT_50 = APPLICATION_CLIENT_FACET.getVersion("5.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion APPLICATION_CLIENT_60 = APPLICATION_CLIENT_FACET.getVersion("6.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion APPLICATION_CLIENT_70 = APPLICATION_CLIENT_FACET.getVersion("7.0"); //$NON-NLS-1$
	
	public static final String EJB = IModuleConstants.JST_EJB_MODULE;
	public IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet(EJB);

	public static final IProjectFacetVersion EJB_21 = EJB_FACET.getVersion("2.1"); //$NON-NLS-1$
	public static final IProjectFacetVersion EJB_30 = EJB_FACET.getVersion("3.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion EJB_31 = EJB_FACET.getVersion("3.1"); //$NON-NLS-1$
	public static final IProjectFacetVersion EJB_32 = EJB_FACET.getVersion("3.2"); //$NON-NLS-1$

	public static final String DYNAMIC_WEB = IModuleConstants.JST_WEB_MODULE;
	public IProjectFacet DYNAMIC_WEB_FACET = ProjectFacetsManager.getProjectFacet(DYNAMIC_WEB);

	public static final IProjectFacetVersion DYNAMIC_WEB_24 = DYNAMIC_WEB_FACET.getVersion("2.4"); //$NON-NLS-1$
	public static final IProjectFacetVersion DYNAMIC_WEB_25 = DYNAMIC_WEB_FACET.getVersion("2.5"); //$NON-NLS-1$
	public static final IProjectFacetVersion DYNAMIC_WEB_30 = DYNAMIC_WEB_FACET.getVersion("3.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion DYNAMIC_WEB_31 = DYNAMIC_WEB_FACET.getVersion("3.1"); //$NON-NLS-1$
	
	public static final String DYNAMIC_WEB_XDOCLET = "jst.web.xdoclet"; //$NON-NLS-1$
	

	public static final IProjectFacetVersion JCA_10 = JCA_FACET.getVersion("1.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion JCA_15 = JCA_FACET.getVersion("1.5"); //$NON-NLS-1$
	public static final IProjectFacetVersion JCA_16 = JCA_FACET.getVersion("1.6"); //$NON-NLS-1$
	public static final IProjectFacetVersion JCA_17 = JCA_FACET.getVersion("1.7"); //$NON-NLS-1$

	public static final String STATIC_WEB = IModuleConstants.WST_WEB_MODULE;

	public static final String JAVA = IModuleConstants.JST_JAVA;
	public static final String WEBFRAGMENT = IModuleConstants.JST_WEBFRAGMENT_MODULE;
	public static final IProjectFacet WEBFRAGMENT_FACET = ProjectFacetsManager.getProjectFacet(WEBFRAGMENT);
	public static final IProjectFacetVersion WEBFRAGMENT_30 = WEBFRAGMENT_FACET.getVersion("3.0"); //$NON-NLS-1$
	public static final IProjectFacetVersion WEBFRAGMENT_31 = WEBFRAGMENT_FACET.getVersion("3.1"); //$NON-NLS-1$
	
}

Lines 83-88 Link Here

(-)a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java (+4 lines)
83	*/	83	*/
84	static final String EE6_DYNAMIC_WEB_GENERATE_DD = "ee6_dynamic_web_generate_dd"; //$NON-NLS-1$	84	static final String EE6_DYNAMIC_WEB_GENERATE_DD = "ee6_dynamic_web_generate_dd"; //$NON-NLS-1$
85	/**	85	/**
		86	* @since 3.5
		87	*/
		88	static final String EE7_DYNAMIC_WEB_GENERATE_DD = "ee7_dynamic_web_generate_dd"; //$NON-NLS-1$
		89	/**
86	* @since 2.0	90	* @since 2.0
87	*/	91	*/
88	static final String EJB_GENERATE_DD = "ejb_generate_dd"; //$NON-NLS-1$	92	static final String EJB_GENERATE_DD = "ejb_generate_dd"; //$NON-NLS-1$




        </and>
      </constraint>
      <group-member id="modules"/>     
             
    </project-facet-version>
    
    <project-facet-version facet="jst.ear" version="6.0">

        </and>
      </constraint>
      <group-member id="modules"/>     
             
    </project-facet-version>
            
    <project-facet-version facet="jst.ear" version="7.0">
      <constraint>
        <and>
          <conflicts group="modules"/>
          <conflicts facet="jst.java"/>
        </and>
      </constraint>
      <group-member id="modules"/>     
    </project-facet-version>
            
    <action facet="jst.ear" type="INSTALL" id="jst.ear.install">
      <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/>
      <config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/>
    </action>
      
    <event-handler facet="jst.ear" type="POST_INSTALL">
      <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetPostInstallDelegate"/>
    </event-handler>  

    <event-handler facet="jst.ear" type="RUNTIME_CHANGED">
      <delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/>
	</event-handler>


    <project-facet-version facet="jst.appclient" version="5.0">
      <constraint>
        <and>
          <requires facet="jst.java" version="[1.5"/>
          <conflicts group="modules"/>
        </and>
      </constraint>

    <project-facet-version facet="jst.appclient" version="6.0">
      <constraint>
        <and>
          <requires facet="jst.java" version="[1.6"/>
          <conflicts group="modules"/>
        </and>
      </constraint>
      <group-member id="modules"/>     
    </project-facet-version>
            
    <project-facet-version facet="jst.appclient" version="7.0">
      <constraint>
        <and>
          <requires facet="jst.java" version="[1.7"/>
          <conflicts group="modules"/>
        </and>
      </constraint>
      <group-member id="modules"/>     
    </project-facet-version>
            
    <action type="install" facet="jst.appclient" id="jst.appclient.install">
      <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/>
      <config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/>
    </action>
	  
    <event-handler type="POST_INSTALL" facet="jst.appclient">
      <delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetPostInstallDelegate"/>
    </event-handler>
        
    <event-handler type="RUNTIME_CHANGED" facet="jst.appclient">
      <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
    </event-handler>
	




   <extension
        point="org.eclipse.jst.j2ee.J2EEModelProvider">
      	<provider>

        	<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25MergedModelProviderFactory"/>
      		<facet id="jst.web" versions="2.5,3.0,3.1"/>
      		<facet id="jst.web" versions="2.5,3.0"/>
      	</provider>
   </extension>
   <extension
        point="org.eclipse.jst.j2ee.J2EEModelProvider">
      	<provider>

        	<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.WebFragment30ModelProviderFactory"/>
      		<facet id="jst.webfragment" versions="3.0"/>
      	</provider>

Lines 15-20 Link Here

(-)a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java (-2 / +6 lines)
15	import java.io.UnsupportedEncodingException;	15	import java.io.UnsupportedEncodingException;
16		16
17	import org.eclipse.core.commands.ExecutionException;	17	import org.eclipse.core.commands.ExecutionException;
		18	import org.eclipse.core.internal.resources.XMLWriter;
18	import org.eclipse.core.resources.IFile;	19	import org.eclipse.core.resources.IFile;
19	import org.eclipse.core.resources.IFolder;	20	import org.eclipse.core.resources.IFolder;
20	import org.eclipse.core.resources.IProject;	21	import org.eclipse.core.resources.IProject;
Lines 72-78 Link Here
72	JEEPlugin.logError(e);	73	JEEPlugin.logError(e);
73	}	74	}
74		75
75	if( fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60 \|\| fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_50) {	76	if( fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_70 \|\| fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60 \|\| fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_50) {
76	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){	77	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
77	// Create the deployment descriptor (web.xml) if one doesn't exist	78	// Create the deployment descriptor (web.xml) if one doesn't exist
78	IFile appXmlFile = earroot.getUnderlyingFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));	79	IFile appXmlFile = earroot.getUnderlyingFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
Lines 83-89 Link Here
83	((IFolder)appXmlFile.getParent()).create(true, true, monitor);	84	((IFolder)appXmlFile.getParent()).create(true, true, monitor);
84	}	85	}
85	String appXmlContents = null;	86	String appXmlContents = null;
86	if(fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60) {	87	if(fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_70) {
		88	appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"6\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd\">\n <display-name>" + XMLWriter.getEscaped(project.getName()) + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$
		89	}
		90	else if(fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60) {
87	appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd\">\n <display-name> \n" + project.getName() + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$	91	appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd\">\n <display-name> \n" + project.getName() + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$
88	}	92	}
89	else {	93	else {

Lines 30-36 Link Here

(-)a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java (-1 / +1 lines)
30	private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE;	30	private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE;
31	private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION;	31	private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION;
32	private static String fSelection= null;	32	private static String fSelection= null;
33	private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT};	33	private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT, J2EEVersionConstants.VERSION_3_1_TEXT};
34	private int fInitialSelectionIndex = fAllowedStrings.length-1;	34	private int fInitialSelectionIndex = fAllowedStrings.length-1;
35		35
36	public static String getSelectedVersion() {	36	public static String getSelectedVersion() {




import java.util.HashSet;
import java.util.Set;

import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;

	    else {
		    facets.add( primaryFacetVersion );
		    
		    if( primaryFacetVersion == WebFacetUtils.WEB_31 )
		    {
		        facets.add( JavaFacet.VERSION_1_7 );
		    }
		    else if( primaryFacetVersion == WebFacetUtils.WEB_30 )
		    {
		        facets.add( JavaFacet.VERSION_1_6 );
		    }
		    else if(primaryFacetVersion == WebFacetUtils.WEB_25 )
		    {
		        facets.add( JavaFacet.VERSION_1_5 );
		    }
		    else if( primaryFacetVersion == WebFacetUtils.WEB_24 )
		    {
		        facets.add( JavaFacet.VERSION_1_4 );
		    }
		    else if( primaryFacetVersion == WebFacetUtils.WEB_23 || primaryFacetVersion == WebFacetUtils.WEB_22 )
		             primaryFacetVersion == WebFacetUtils.WEB_22 )
		    {
		        facets.add( JavaFacet.VERSION_1_3 );
		    }
	    }
		return Collections.unmodifiableSet( facets );

Return to bug 399524

Lines 33-49 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java (+10 lines)
33	public int J2EE_1_4_ID = 14;	33	public int J2EE_1_4_ID = 14;
34	public int JEE_5_0_ID = 50;	34	public int JEE_5_0_ID = 50;
35	public int JEE_6_0_ID = 60;	35	public int JEE_6_0_ID = 60;
		36	public int JEE_7_0_ID = 70;
36	public int EJB_1_0_ID = 10;	37	public int EJB_1_0_ID = 10;
37	public int EJB_1_1_ID = 11;	38	public int EJB_1_1_ID = 11;
38	public int EJB_2_0_ID = 20;	39	public int EJB_2_0_ID = 20;
39	public int EJB_2_1_ID = 21;	40	public int EJB_2_1_ID = 21;
40	public int EJB_3_0_ID = 30;	41	public int EJB_3_0_ID = 30;
41	public int EJB_3_1_ID = 31;	42	public int EJB_3_1_ID = 31;
		43	public int EJB_3_2_ID = 32;
42	public int WEB_2_2_ID = 22;	44	public int WEB_2_2_ID = 22;
43	public int WEB_2_3_ID = 23;	45	public int WEB_2_3_ID = 23;
44	public int WEB_2_4_ID = 24;	46	public int WEB_2_4_ID = 24;
45	public int WEB_2_5_ID = 25;	47	public int WEB_2_5_ID = 25;
46	public int WEB_3_0_ID = 30;	48	public int WEB_3_0_ID = 30;
		49	public int WEB_3_1_ID = 31;
47	public int WEBFRAGMENT_3_0_ID = 30;	50	public int WEBFRAGMENT_3_0_ID = 30;
48	public int TAGLIB_1_1_ID = 11;	51	public int TAGLIB_1_1_ID = 11;
49	public int TAGLIB_1_2_ID = 12;	52	public int TAGLIB_1_2_ID = 12;
Lines 56-61 Link Here
56	public int SERVLET_2_4 = 24;	59	public int SERVLET_2_4 = 24;
57	public int SERVLET_2_5 = 25;	60	public int SERVLET_2_5 = 25;
58	public int SERVLET_3_0 = 30;	61	public int SERVLET_3_0 = 30;
		62	public int SERVLET_3_1 = 31;
59	public int JCA_1_0_ID = 10;	63	public int JCA_1_0_ID = 10;
60	public int JCA_1_5_ID = 15;	64	public int JCA_1_5_ID = 15;
61	public int JCA_1_6_ID = 16;	65	public int JCA_1_6_ID = 16;
Lines 74-79 Link Here
74	public int VERSION_1_4 = 14;	78	public int VERSION_1_4 = 14;
75	public int VERSION_1_5 = 15;	79	public int VERSION_1_5 = 15;
76	public int VERSION_1_6 = 16;	80	public int VERSION_1_6 = 16;
		81	public int VERSION_1_7 = 17;
77	public int VERSION_2_0 = 20;	82	public int VERSION_2_0 = 20;
78	public int VERSION_2_1 = 21;	83	public int VERSION_2_1 = 21;
79	public int VERSION_2_2 = 22;	84	public int VERSION_2_2 = 22;
Lines 82-89 Link Here
82	public int VERSION_2_5 = 25;	87	public int VERSION_2_5 = 25;
83	public int VERSION_3_0 = 30;	88	public int VERSION_3_0 = 30;
84	public int VERSION_3_1 = 31;	89	public int VERSION_3_1 = 31;
		90	public int VERSION_3_2 = 32;
85	public int VERSION_5_0 = 50;	91	public int VERSION_5_0 = 50;
86	public int VERSION_6_0 = 60;	92	public int VERSION_6_0 = 60;
		93	public int VERSION_7_0 = 70;
87		94
88	public String VERSION_1_0_TEXT = "1.0"; //$NON-NLS-1$	95	public String VERSION_1_0_TEXT = "1.0"; //$NON-NLS-1$
89	public String VERSION_1_1_TEXT = "1.1"; //$NON-NLS-1$	96	public String VERSION_1_1_TEXT = "1.1"; //$NON-NLS-1$
Lines 100-108 Link Here
100	public String VERSION_2_5_TEXT = "2.5"; //$NON-NLS-1$	107	public String VERSION_2_5_TEXT = "2.5"; //$NON-NLS-1$
101	public String VERSION_3_0_TEXT = "3.0"; //$NON-NLS-1$	108	public String VERSION_3_0_TEXT = "3.0"; //$NON-NLS-1$
102	public String VERSION_3_1_TEXT = "3.1"; //$NON-NLS-1$	109	public String VERSION_3_1_TEXT = "3.1"; //$NON-NLS-1$
		110	public String VERSION_3_2_TEXT = "3.2"; //$NON-NLS-1$
103	public String VERSION_5_0_TEXT = "5.0"; //$NON-NLS-1$	111	public String VERSION_5_0_TEXT = "5.0"; //$NON-NLS-1$
104	public String VERSION_6_0_TEXT = "6.0"; //$NON-NLS-1$	112	public String VERSION_6_0_TEXT = "6.0"; //$NON-NLS-1$
		113	public String VERSION_7_0_TEXT = "7.0"; //$NON-NLS-1$
105	public String VERSION_5_TEXT = "5"; //$NON-NLS-1$	114	public String VERSION_5_TEXT = "5"; //$NON-NLS-1$
106	public String VERSION_6_TEXT = "6"; //$NON-NLS-1$	115	public String VERSION_6_TEXT = "6"; //$NON-NLS-1$
		116	public String VERSION_7_TEXT = "7"; //$NON-NLS-1$
107		117
108	}	118	}

Lines 67-72 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java (-1 / +22 lines)
67	public static final String CONNECTOR_XML_TEMPLATE_10 = "rartp10.xml"; //$NON-NLS-1$	67	public static final String CONNECTOR_XML_TEMPLATE_10 = "rartp10.xml"; //$NON-NLS-1$
68	public static final String CONNECTOR_XML_TEMPLATE_15 = "rartp15.xml"; //$NON-NLS-1$	68	public static final String CONNECTOR_XML_TEMPLATE_15 = "rartp15.xml"; //$NON-NLS-1$
69	public static final String CONNECTOR_XML_TEMPLATE_16 = "rartp16.xml"; //$NON-NLS-1$	69	public static final String CONNECTOR_XML_TEMPLATE_16 = "rartp16.xml"; //$NON-NLS-1$
		70	public static final String CONNECTOR_XML_TEMPLATE_17 = "rartp17.xml"; //$NON-NLS-1$
70		71
71	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {	72	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
72	if (monitor != null) {	73	if (monitor != null) {
Lines 105-111 Link Here
105	IPath configFolderpath = pjpath.append(configFolderName);	106	IPath configFolderpath = pjpath.append(configFolderName);
106	sourceFolder = ws.getRoot().getFolder(configFolderpath);	107	sourceFolder = ws.getRoot().getFolder(configFolderpath);
107		108
108	if( fv == IJ2EEFacetConstants.JCA_16)	109	if( fv == IJ2EEFacetConstants.JCA_17)
		110	{
		111	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
		112	// Create the deployment descriptor (ra.xml) if one doesn't exist
		113	IFile rarFile = sourceFolder.getFile(new Path(J2EEConstants.RAR_DD_URI));
		114	if (!rarFile.exists()) {
		115	try {
		116	if(!rarFile.getParent().exists()
		117	&& (rarFile.getParent().getType() == IResource.FOLDER)){
		118	((IFolder)rarFile.getParent()).create(true, true, monitor);
		119	}
		120	InputStream in = getClass().getResourceAsStream(CONNECTOR_XML_TEMPLATE_17);
		121	rarFile.create(in, true, monitor);
		122	populateDefaultContent(project, fv);
		123	} catch (CoreException e) {
		124	J2EEPlugin.logError(e);
		125	}
		126	}
		127	}
		128	}
		129	else if( fv == IJ2EEFacetConstants.JCA_16)
109	{	130	{
110	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){	131	if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
111	// Create the deployment descriptor (ra.xml) if one doesn't exist	132	// Create the deployment descriptor (ra.xml) if one doesn't exist

Lines 423-429 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.web/plugin.xml (-5 / +15 lines)
423	<project-facet-version facet="jst.web" version="2.5">	423	<project-facet-version facet="jst.web" version="2.5">
424	<constraint>	424	<constraint>
425	<and>	425	<and>
426	<requires facet="jst.java" version="[5.0"/>	426	<requires facet="jst.java" version="[1.5"/>
427	<conflicts group="modules"/>	427	<conflicts group="modules"/>
428	</and>	428	</and>
429	</constraint>	429	</constraint>
Lines 433-455 Link Here
433	<project-facet-version facet="jst.web" version="3.0">	433	<project-facet-version facet="jst.web" version="3.0">
434	<constraint>	434	<constraint>
435	<and>	435	<and>
436	<requires facet="jst.java" version="[6.0"/>	436	<requires facet="jst.java" version="[1.6"/>
437	<conflicts group="modules"/>	437	<conflicts group="modules"/>
438	</and>	438	</and>
439	</constraint>	439	</constraint>
440	<group-member id="modules"/>	440	<group-member id="modules"/>
441	</project-facet-version>	441	</project-facet-version>
442		442
443	<action facet="jst.web" version="[2.2-3.0]" type="INSTALL" id="jst.web.install">	443	<project-facet-version facet="jst.web" version="3.1">
		444	<constraint>
		445	<and>
		446	<requires facet="jst.java" version="[1.7"/>
		447	<conflicts group="modules"/>
		448	</and>
		449	</constraint>
		450	<group-member id="modules"/>
		451	</project-facet-version>
		452
		453	<action facet="jst.web" type="INSTALL" id="jst.web.install">
444	<delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/>	454	<delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/>
445	<config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/>	455	<config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/>
446	</action>	456	</action>
447		457
448	<event-handler facet="jst.web" version="[2.2-3.0]" type="RUNTIME_CHANGED">	458	<event-handler facet="jst.web" type="RUNTIME_CHANGED">
449	<delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>	459	<delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
450	</event-handler>	460	</event-handler>
451		461
452	<event-handler type="POST_INSTALL" facet="jst.web" version="[2.2-3.0]">	462	<event-handler type="POST_INSTALL" facet="jst.web">
453	<delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetPostInstallDelegate"/>	463	<delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetPostInstallDelegate"/>
454	</event-handler>	464	</event-handler>
455		465

Lines 34-39 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java (-3 / +15 lines)
34	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;	34	import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
35	import org.eclipse.jst.j2ee.internal.project.ManifestFileCreationAction;	35	import org.eclipse.jst.j2ee.internal.project.ManifestFileCreationAction;
36	import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;	36	import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
		37	import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
37	import org.eclipse.wst.common.componentcore.ComponentCore;	38	import org.eclipse.wst.common.componentcore.ComponentCore;
38	import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;	39	import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
39	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;	40	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
Lines 110-116 Link Here
110	IFile file = aFolder.getFile(new Path(J2EEConstants.WEBFRAGMENT_DD_URI));	111	IFile file = aFolder.getFile(new Path(J2EEConstants.WEBFRAGMENT_DD_URI));
111	if (file.exists()) return;	112	if (file.exists()) return;
112	try {	113	try {
113	createWebFragmentFile(file, project);	114	createWebFragmentFile(file, project, fv);
114	} catch (CoreException e) {	115	} catch (CoreException e) {
115	J2EEPlugin.logError(e);	116	J2EEPlugin.logError(e);
116	} catch (IOException e) {	117	} catch (IOException e) {
Lines 118-128 Link Here
118	}	119	}
119	}	120	}
120		121
121	public static void createWebFragmentFile(IFile file, IProject project) throws CoreException, IOException {	122	public static void createWebFragmentFile(IFile file, IProject project, IProjectFacetVersion fv) throws CoreException, IOException {
122	try {	123	try {
123	WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(file);	124	WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(file);
124	String projectNamewithoutSpecialChars = getNameWithoutSpecialCharacters(project.getName());	125	String projectNamewithoutSpecialChars = getNameWithoutSpecialCharacters(project.getName());
125	final String webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	126
		127	final String webFragXmlContents;
		128
		129	if( fv == IJ2EEFacetConstants.WEBFRAGMENT_31 )
		130	{
		131	webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.0\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		132	}
		133	else
		134	{
		135	webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		136	}
		137
126	out.write(webFragXmlContents.getBytes("UTF-8")); //$NON-NLS-1$	138	out.write(webFragXmlContents.getBytes("UTF-8")); //$NON-NLS-1$
127	out.close();	139	out.close();
128	} catch (IOException ioe) {	140	} catch (IOException ioe) {

Lines 432-438 Link Here

(-)a/plugins/org.eclipse.jst.j2ee/plugin.xml (-10 / +28 lines)
432	</and>	432	</and>
433	</constraint>	433	</constraint>
434	<group-member id="modules"/>	434	<group-member id="modules"/>
435
436	</project-facet-version>	435	</project-facet-version>
437		436
438	<project-facet-version facet="jst.ear" version="6.0">	437	<project-facet-version facet="jst.ear" version="6.0">
Lines 443-461 Link Here
443	</and>	442	</and>
444	</constraint>	443	</constraint>
445	<group-member id="modules"/>	444	<group-member id="modules"/>
446
447	</project-facet-version>	445	</project-facet-version>
448		446
449	<action facet="jst.ear" version="[1.2-6.0]" type="INSTALL" id="jst.ear.install">	447	<project-facet-version facet="jst.ear" version="7.0">
		448	<constraint>
		449	<and>
		450	<conflicts group="modules"/>
		451	<conflicts facet="jst.java"/>
		452	</and>
		453	</constraint>
		454	<group-member id="modules"/>
		455	</project-facet-version>
		456
		457	<action facet="jst.ear" type="INSTALL" id="jst.ear.install">
450	<delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/>	458	<delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate"/>
451	<config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/>	459	<config-factory class="org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider"/>
452	</action>	460	</action>
453		461
454	<event-handler facet="jst.ear" version="[1.2-6.0]" type="POST_INSTALL">	462	<event-handler facet="jst.ear" type="POST_INSTALL">
455	<delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetPostInstallDelegate"/>	463	<delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetPostInstallDelegate"/>
456	</event-handler>	464	</event-handler>
457		465
458	<event-handler facet="jst.ear" version="[1.2-6.0]" type="RUNTIME_CHANGED">	466	<event-handler facet="jst.ear" type="RUNTIME_CHANGED">
459	<delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/>	467	<delegate class="org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler$RuntimeChangedDelegate"/>
460	</event-handler>	468	</event-handler>
461		469
Lines 530-536 Link Here
530	<project-facet-version facet="jst.appclient" version="5.0">	538	<project-facet-version facet="jst.appclient" version="5.0">
531	<constraint>	539	<constraint>
532	<and>	540	<and>
533	<requires facet="jst.java" version="[5.0"/>	541	<requires facet="jst.java" version="[1.5"/>
534	<conflicts group="modules"/>	542	<conflicts group="modules"/>
535	</and>	543	</and>
536	</constraint>	544	</constraint>
Lines 540-562 Link Here
540	<project-facet-version facet="jst.appclient" version="6.0">	548	<project-facet-version facet="jst.appclient" version="6.0">
541	<constraint>	549	<constraint>
542	<and>	550	<and>
543	<requires facet="jst.java" version="[6.0"/>	551	<requires facet="jst.java" version="[1.6"/>
544	<conflicts group="modules"/>	552	<conflicts group="modules"/>
545	</and>	553	</and>
546	</constraint>	554	</constraint>
547	<group-member id="modules"/>	555	<group-member id="modules"/>
548	</project-facet-version>	556	</project-facet-version>
549		557
550	<action type="install" facet="jst.appclient" version="[1.2-6.0]" id="jst.appclient.install">	558	<project-facet-version facet="jst.appclient" version="7.0">
		559	<constraint>
		560	<and>
		561	<requires facet="jst.java" version="[1.7"/>
		562	<conflicts group="modules"/>
		563	</and>
		564	</constraint>
		565	<group-member id="modules"/>
		566	</project-facet-version>
		567
		568	<action type="install" facet="jst.appclient" id="jst.appclient.install">
551	<delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/>	569	<delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDelegate"/>
552	<config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/>	570	<config-factory class="org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider"/>
553	</action>	571	</action>
554		572
555	<event-handler type="POST_INSTALL" facet="jst.appclient" version="[1.2-6.0]">	573	<event-handler type="POST_INSTALL" facet="jst.appclient">
556	<delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetPostInstallDelegate"/>	574	<delegate class="org.eclipse.jst.j2ee.project.facet.AppClientFacetPostInstallDelegate"/>
557	</event-handler>	575	</event-handler>
558		576
559	<event-handler type="RUNTIME_CHANGED" facet="jst.appclient" version="[1.2-6.0]">	577	<event-handler type="RUNTIME_CHANGED" facet="jst.appclient">
560	<delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>	578	<delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
561	</event-handler>	579	</event-handler>
562		580

Lines 4-19 Link Here

(-)a/plugins/org.eclipse.jst.jee.web/plugin.xml (-4 / +1 lines)
4	<extension	4	<extension
5	point="org.eclipse.jst.j2ee.J2EEModelProvider">	5	point="org.eclipse.jst.j2ee.J2EEModelProvider">
6	<provider>	6	<provider>
7
8	<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25MergedModelProviderFactory"/>	7	<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25MergedModelProviderFactory"/>
9	<!--<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25ModelProviderFactory"/>-->	8	<facet id="jst.web" versions="2.5,3.0,3.1"/>
10	<facet id="jst.web" versions="2.5,3.0"/>
11	</provider>	9	</provider>
12	</extension>	10	</extension>
13	<extension	11	<extension
14	point="org.eclipse.jst.j2ee.J2EEModelProvider">	12	point="org.eclipse.jst.j2ee.J2EEModelProvider">
15	<provider>	13	<provider>
16
17	<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.WebFragment30ModelProviderFactory"/>	14	<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.WebFragment30ModelProviderFactory"/>
18	<facet id="jst.webfragment" versions="3.0"/>	15	<facet id="jst.webfragment" versions="3.0"/>
19	</provider>	16	</provider>

Lines 15-21 Link Here

(-)a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java (-8 / +11 lines)
15	import java.util.HashSet;	15	import java.util.HashSet;
16	import java.util.Set;	16	import java.util.Set;
17		17
18	import org.eclipse.jst.common.project.facet.JavaFacetUtils;	18	import org.eclipse.jst.common.project.facet.core.JavaFacet;
19	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;	19	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
20	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;	20	import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
21	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;	21	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
Lines 55-76 Link Here
55	else {	55	else {
56	facets.add( primaryFacetVersion );	56	facets.add( primaryFacetVersion );
57		57
58	if( primaryFacetVersion == WebFacetUtils.WEB_30)	58	if( primaryFacetVersion == WebFacetUtils.WEB_31 )
59	{	59	{
60	facets.add( JavaFacetUtils.JAVA_60 );	60	facets.add( JavaFacet.VERSION_1_7 );
		61	}
		62	else if( primaryFacetVersion == WebFacetUtils.WEB_30 )
		63	{
		64	facets.add( JavaFacet.VERSION_1_6 );
61	}	65	}
62	else if(primaryFacetVersion == WebFacetUtils.WEB_25 )	66	else if(primaryFacetVersion == WebFacetUtils.WEB_25 )
63	{	67	{
64	facets.add( JavaFacetUtils.JAVA_50 );	68	facets.add( JavaFacet.VERSION_1_5 );
65	}	69	}
66	else if( primaryFacetVersion == WebFacetUtils.WEB_24 )	70	else if( primaryFacetVersion == WebFacetUtils.WEB_24 )
67	{	71	{
68	facets.add( JavaFacetUtils.JAVA_14 );	72	facets.add( JavaFacet.VERSION_1_4 );
69	}	73	}
70	else if( primaryFacetVersion == WebFacetUtils.WEB_23 \|\|	74	else if( primaryFacetVersion == WebFacetUtils.WEB_23 \|\| primaryFacetVersion == WebFacetUtils.WEB_22 )
71	primaryFacetVersion == WebFacetUtils.WEB_22 )
72	{	75	{
73	facets.add( JavaFacetUtils.JAVA_13 );	76	facets.add( JavaFacet.VERSION_1_3 );
74	}	77	}
75	}	78	}
76	return Collections.unmodifiableSet( facets );	79	return Collections.unmodifiableSet( facets );