Attachment #241448 for bug #429907

Lines 270-275 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java (+6 lines)
270	version = J2EEVersionConstants.WEBSERVICES_1_2_ID;	270	version = J2EEVersionConstants.WEBSERVICES_1_2_ID;
271	}else if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_3)) {	271	}else if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_3)) {
272	version = J2EEVersionConstants.WEBSERVICES_1_3_ID;	272	version = J2EEVersionConstants.WEBSERVICES_1_3_ID;
		273	}else if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_4)) {
		274	version = J2EEVersionConstants.WEBSERVICES_1_4_ID;
273	}	275	}
274	}	276	}
275	break;	277	break;
Lines 382-387 Link Here
382	break;	384	break;
383	case J2EEVersionConstants.WEBSERVICES_1_3_ID:	385	case J2EEVersionConstants.WEBSERVICES_1_3_ID:
384	javaEEVersion = J2EEVersionConstants.JEE_6_0_ID;	386	javaEEVersion = J2EEVersionConstants.JEE_6_0_ID;
		387	break;
		388	case J2EEVersionConstants.WEBSERVICES_1_4_ID:
		389	javaEEVersion = J2EEVersionConstants.JEE_7_0_ID;
		390	break;
385	}	391	}
386	break;	392	break;
387		393

Lines 69-74 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java (+1 lines)
69	public int WEBSERVICES_1_1_ID = 11;	69	public int WEBSERVICES_1_1_ID = 11;
70	public int WEBSERVICES_1_2_ID = 12;	70	public int WEBSERVICES_1_2_ID = 12;
71	public int WEBSERVICES_1_3_ID = 13;	71	public int WEBSERVICES_1_3_ID = 13;
		72	public int WEBSERVICES_1_4_ID = 14;
72	public String J2EE_1_4_TEXT = "1.4"; //$NON-NLS-1$	73	public String J2EE_1_4_TEXT = "1.4"; //$NON-NLS-1$
73		74
74		75




	private static Translator[] children11;
	private static Translator[] children12;
	private static Translator[] children13;
	private static Translator[] children14;

	private static WsddPackage WSDD_PKG = WsddPackage.eINSTANCE;
	private static WscommonPackage WSCOMMON_PKG = WscommonPackage.eINSTANCE;

					children12 = create12Children();
				}
				return children12;
			case (JEE_6_0_ID) :
				if (children13 == null)
				{
					children13 = create13Children();
				}
				return children13;
			default :
				if (children14 == null)
				{
					children14 = create14Children();
				}
				return children14;
		}
	}


		};
	}

	protected Translator[] create14Children() {
		
		return new Translator[] {
			IDTranslator.INSTANCE,
			new ConstantAttributeTranslator(XML_NS, JAVAEE_NS_URL),
			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, JAVAEE_NS_URL+' '+WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_4),
			new ConstantAttributeTranslator(VERSION, WebServiceConstants.WEBSERVICE_SCHEMA_VERSION_1_4),			  
			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
			CommonTranslators.ICONS_TRANSLATOR,
			// nothing changed between 1.3 and 1.4, except the URI and the version number
			create13WebServiceDescTranslator()
		};
	}

	public Translator create10WebServiceDescTranslator() {
		GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions());
		result.setChildren(new Translator[] {

Lines 82-86 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java (+2 lines)
82	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_2, "javaee_web_services_1_2.xsd"); //$NON-NLS-1$	82	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_2, "javaee_web_services_1_2.xsd"); //$NON-NLS-1$
83	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$	83	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$
84	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$	84	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$
		85	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_4, "javaee_web_services_1_4.xsd"); //$NON-NLS-1$
		86	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_4, "javaee_web_services_1_4.xsd"); //$NON-NLS-1$
85	}	87	}
86	}	88	}

Lines 51-55 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java (+5 lines)
51	* @return boolean value	51	* @return boolean value
52	*/	52	*/
53	public boolean isWebService1_3();	53	public boolean isWebService1_3();
		54	/**
		55	* Returns true if the WebService is of version 1.2
		56	* @return boolean value
		57	*/
		58	public boolean isWebService1_4();
54		59
55	}	60	}

Lines 103-108 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java (-5 / +16 lines)
103	{	103	{
104	return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_3_ID);	104	return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_3_ID);
105	}	105	}
		106	public boolean isWebService1_4()
		107	{
		108	return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_4_ID);
		109	}
106		110
107	/*	111	/*
108	* This directly sets the module version id	112	* This directly sets the module version id
Lines 111-116 Link Here
111	public void setModuleVersionID(int id) {	115	public void setModuleVersionID(int id) {
112	//super.setVersionID(id);	116	//super.setVersionID(id);
113	switch (id) {	117	switch (id) {
		118	case (WebServiceConstants.WEBSERVICE_1_4_ID) :
		119	super.setDoctypeValues(null, null);
		120	primSetVersionID(WebServiceConstants.WEBSERVICE_1_4_ID);
		121	break;
114	case (WebServiceConstants.WEBSERVICE_1_3_ID) :	122	case (WebServiceConstants.WEBSERVICE_1_3_ID) :
115	super.setDoctypeValues(null, null);	123	super.setDoctypeValues(null, null);
116	primSetVersionID(WebServiceConstants.WEBSERVICE_1_3_ID);	124	primSetVersionID(WebServiceConstants.WEBSERVICE_1_3_ID);
Lines 135-140 Link Here
135	public void setJ2EEVersionID(int id)	143	public void setJ2EEVersionID(int id)
136	{	144	{
137	switch (id) {	145	switch (id) {
		146	case (JEE_7_0_ID) :
		147	primSetDoctypeValues(null, null);
		148	primSetVersionID(WebServiceConstants.WEBSERVICE_1_4_ID);
		149	break;
138	case (JEE_6_0_ID) :	150	case (JEE_6_0_ID) :
139	primSetDoctypeValues(null, null);	151	primSetDoctypeValues(null, null);
140	primSetVersionID(WebServiceConstants.WEBSERVICE_1_3_ID);	152	primSetVersionID(WebServiceConstants.WEBSERVICE_1_3_ID);
Lines 203-210 Link Here
203	return J2EEVersionConstants.JEE_5_0_ID;	215	return J2EEVersionConstants.JEE_5_0_ID;
204	case WebServiceConstants.WEBSERVICE_1_3_ID :	216	case WebServiceConstants.WEBSERVICE_1_3_ID :
205	return J2EEVersionConstants.JEE_6_0_ID;	217	return J2EEVersionConstants.JEE_6_0_ID;
		218	case WebServiceConstants.WEBSERVICE_1_4_ID :
		219	return J2EEVersionConstants.JEE_7_0_ID;
206	default :	220	default :
207	return J2EEVersionConstants.JEE_6_0_ID;	221	return J2EEVersionConstants.JEE_7_0_ID;
208	}	222	}
209	}	223	}
210		224
Lines 273-279 Link Here
273	return getModuleVersionID();	287	return getModuleVersionID();
274	}	288	}
275		289
276		290	}
277
278	}
279

Return to bug 429907

Lines 35-40 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java (-1 / +24 lines)
35	private static Translator[] children11;	35	private static Translator[] children11;
36	private static Translator[] children12;	36	private static Translator[] children12;
37	private static Translator[] children13;	37	private static Translator[] children13;
		38	private static Translator[] children14;
38		39
39	private static WsddPackage WSDD_PKG = WsddPackage.eINSTANCE;	40	private static WsddPackage WSDD_PKG = WsddPackage.eINSTANCE;
40	private static WscommonPackage WSCOMMON_PKG = WscommonPackage.eINSTANCE;	41	private static WscommonPackage WSCOMMON_PKG = WscommonPackage.eINSTANCE;
Lines 72-83 Link Here
72	children12 = create12Children();	73	children12 = create12Children();
73	}	74	}
74	return children12;	75	return children12;
75	default :	76	case (JEE_6_0_ID) :
76	if (children13 == null)	77	if (children13 == null)
77	{	78	{
78	children13 = create13Children();	79	children13 = create13Children();
79	}	80	}
80	return children13;	81	return children13;
		82	default :
		83	if (children14 == null)
		84	{
		85	children14 = create14Children();
		86	}
		87	return children14;
81	}	88	}
82	}	89	}
83		90
Lines 138-143 Link Here
138	};	145	};
139	}	146	}
140		147
		148	protected Translator[] create14Children() {
		149
		150	return new Translator[] {
		151	IDTranslator.INSTANCE,
		152	new ConstantAttributeTranslator(XML_NS, JAVAEE_NS_URL),
		153	new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
		154	new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, JAVAEE_NS_URL+' '+WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_4),
		155	new ConstantAttributeTranslator(VERSION, WebServiceConstants.WEBSERVICE_SCHEMA_VERSION_1_4),
		156	CommonTranslators.DESCRIPTIONS_TRANSLATOR,
		157	CommonTranslators.DISPLAYNAMES_TRANSLATOR,
		158	CommonTranslators.ICONS_TRANSLATOR,
		159	// nothing changed between 1.3 and 1.4, except the URI and the version number
		160	create13WebServiceDescTranslator()
		161	};
		162	}
		163
141	public Translator create10WebServiceDescTranslator() {	164	public Translator create10WebServiceDescTranslator() {
142	GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions());	165	GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions());
143	result.setChildren(new Translator[] {	166	result.setChildren(new Translator[] {

Lines 24-29 Link Here

(-)a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java (+4 lines)
24	public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_2 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd";//$NON-NLS-1$	24	public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_2 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd";//$NON-NLS-1$
25	public static final String WEBSERVICE_SCHEMA_LOC_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$	25	public static final String WEBSERVICE_SCHEMA_LOC_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$
26	public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$	26	public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_3 = "http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd";//$NON-NLS-1$
		27	public static final String WEBSERVICE_SCHEMA_LOC_1_4 = "http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd";//$NON-NLS-1$
		28	public static final String WEBSERVICE_SCHEMA_LOC_SUN_1_4 = "http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd";//$NON-NLS-1$
27		29
28	public static final String WEBSERVICECLIENT_DD_SHORT_NAME = "webservicesclient.xml"; //$NON-NLS-1$	30	public static final String WEBSERVICECLIENT_DD_SHORT_NAME = "webservicesclient.xml"; //$NON-NLS-1$
29	public static final String WEBSERVICECLIENT_SYSTEMID = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$	31	public static final String WEBSERVICECLIENT_SYSTEMID = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$
Lines 45-53 Link Here
45	public static final int WEBSERVICE_1_1_ID = 11;	47	public static final int WEBSERVICE_1_1_ID = 11;
46	public static final int WEBSERVICE_1_2_ID = 12;	48	public static final int WEBSERVICE_1_2_ID = 12;
47	public static final int WEBSERVICE_1_3_ID = 13;	49	public static final int WEBSERVICE_1_3_ID = 13;
		50	public static final int WEBSERVICE_1_4_ID = 14;
48	public static final String WEBSERVICE_SCHEMA_VERSION_1_1 = "1.1";//$NON-NLS-1$	51	public static final String WEBSERVICE_SCHEMA_VERSION_1_1 = "1.1";//$NON-NLS-1$
49	public static final String WEBSERVICE_SCHEMA_VERSION_1_2 = "1.2";//$NON-NLS-1$	52	public static final String WEBSERVICE_SCHEMA_VERSION_1_2 = "1.2";//$NON-NLS-1$
50	public static final String WEBSERVICE_SCHEMA_VERSION_1_3 = "1.3";//$NON-NLS-1$	53	public static final String WEBSERVICE_SCHEMA_VERSION_1_3 = "1.3";//$NON-NLS-1$
		54	public static final String WEBSERVICE_SCHEMA_VERSION_1_4 = "1.4";//$NON-NLS-1$
51		55
52	}	56	}
53		57