Attachment #230362 for bug #405873

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

Lines 207-212 Link Here

(-)mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java (+1 lines)
207		207
208	String J2EE_NS_URL = "http://java.sun.com/xml/ns/j2ee"; //$NON-NLS-1$	208	String J2EE_NS_URL = "http://java.sun.com/xml/ns/j2ee"; //$NON-NLS-1$
209	String JAVAEE_NS_URL = "http://java.sun.com/xml/ns/javaee"; //$NON-NLS-1$ //EJB3	209	String JAVAEE_NS_URL = "http://java.sun.com/xml/ns/javaee"; //$NON-NLS-1$ //EJB3
		210	String JAVAEE7_NS_URL = "http://xmlns.jcp.org/xml/ns/javaee"; //$NON-NLS-1$
210	String J2EE_1_4_XSD_SHORT_NAME = "j2ee_1_4.xsd"; //$NON-NLS-1$	211	String J2EE_1_4_XSD_SHORT_NAME = "j2ee_1_4.xsd"; //$NON-NLS-1$
211	String JAVAEE_5_XSD_SHORT_NAME = "javaee_5.xsd"; //$NON-NLS-1$ //EJB3	212	String JAVAEE_5_XSD_SHORT_NAME = "javaee_5.xsd"; //$NON-NLS-1$ //EJB3
212	String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$	213	String XSI_NS_URL = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$




			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_2_5);
			war.setVersion(WebAppVersionType._25_LITERAL);
		}
		else if(version != null && version.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {
		{
			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_3_0);
			war.setVersion(WebAppVersionType._30_LITERAL);
		}
		else
		{
			dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL);  //$NON-NLS-1$
			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_3_1);
			// note that later EMF generations remove the _LITERAL from the enum
			war.setVersion(WebAppVersionType._31);
		}		
		dd.setWebApp(war);		
		res.getContents().add((EObject) dd);

Lines 66-72 Link Here

(-)web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java (-1 / +8 lines)
66	if(version != null && version.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {	66	if(version != null && version.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {
67	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0);	67	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0);
68	webFragment.setVersion(WebAppVersionType._30_LITERAL);	68	webFragment.setVersion(WebAppVersionType._30_LITERAL);
69	}	69	}
		70	else
		71	{
		72	dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$
		73	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_1);
		74	// note that later EMF generations remove the _LITERAL from the enum
		75	webFragment.setVersion(WebAppVersionType._31);
		76	}
70	dd.setWebFragment(webFragment);	77	dd.setWebFragment(webFragment);
71	res.getContents().add((EObject) dd);	78	res.getContents().add((EObject) dd);
72	}	79	}

Lines 64-73 Link Here

(-)jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java (-1 / +6 lines)
64	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_5);	64	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_5);
65	client.setVersion(J2EEVersionConstants.VERSION_5_TEXT);	65	client.setVersion(J2EEVersionConstants.VERSION_5_TEXT);
66	}	66	}
67	else {	67	else if(version != null && version.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {
68	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_6);	68	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_6);
69	client.setVersion(J2EEVersionConstants.VERSION_6_TEXT);	69	client.setVersion(J2EEVersionConstants.VERSION_6_TEXT);
70	}	70	}
		71	else {
		72	dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$
		73	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_7);
		74	client.setVersion(J2EEVersionConstants.VERSION_7_TEXT);
		75	}
71		76
72	dd.setApplicationClient(client);	77	dd.setApplicationClient(client);
73	res.getContents().add((EObject) dd);	78	res.getContents().add((EObject) dd);




			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.CONNECTOR_SCHEMA_LOC_1_6);
			connector.setVersion(J2EEVersionConstants.VERSION_1_6_TEXT);
		}
		else 
		{
			// default to 1.7 for now
			dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL);  //$NON-NLS-1$
			dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.CONNECTOR_SCHEMA_LOC_1_7);
			connector.setVersion(J2EEVersionConstants.VERSION_1_7_TEXT);
		}
		dd.setConnector(connector);
		res.getContents().add((EObject) dd);

Lines 102-110 Link Here

(-)jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java (-2 / +6 lines)
102	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_5);	102	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_5);
103	ear.setVersion(J2EEVersionConstants.VERSION_5_TEXT);	103	ear.setVersion(J2EEVersionConstants.VERSION_5_TEXT);
104	}	104	}
105	else {	105	else if(version != null && version.equals(J2EEVersionConstants.VERSION_6_0_TEXT)) {
106	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_6);	106	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_6);
107	ear.setVersion(J2EEVersionConstants.VERSION_6_TEXT);	107	ear.setVersion(J2EEVersionConstants.VERSION_6_TEXT);
		108	} else {
		109	dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$
		110	dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_7);
		111	ear.setVersion(J2EEVersionConstants.VERSION_7_TEXT);
108	}	112	}
109		113
110	dd.setApplication(ear);	114	dd.setApplication(ear);

Return to bug 405873