Attachment 241448 Details for Bug 429907 – Java EE Tools portion of the patch - update the EMF model

[patch] Java EE Tools portion of the patch - update the EMF model

bug429907.patch (text/plain), 9.72 KB, created by Carl Anderson

on 2014-03-31 18:10:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2014-03-31 18:10:44 EDT

Size: 9.72 KB

patch

obsolete

>diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
>index 3c656e6..295b3c5 100644
>--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
>+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
>@@ -270,6 +270,8 @@
> 						version = J2EEVersionConstants.WEBSERVICES_1_2_ID;
> 					}else if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_3)) {
> 						version = J2EEVersionConstants.WEBSERVICES_1_3_ID;
>+					}else if (schemaName.equals(J2EEConstants.WEBSERVICE_SCHEMA_1_4)) {
>+						version = J2EEVersionConstants.WEBSERVICES_1_4_ID;
> 					}
> 				}
> 				break;
>@@ -382,6 +384,10 @@
> 				break;
> 			case J2EEVersionConstants.WEBSERVICES_1_3_ID:
> 				javaEEVersion = J2EEVersionConstants.JEE_6_0_ID;
>+				break;
>+			case J2EEVersionConstants.WEBSERVICES_1_4_ID:
>+				javaEEVersion = J2EEVersionConstants.JEE_7_0_ID;
>+				break;
> 			}
> 			break;
> 			
>diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
>index 0d434d4..edb0b76 100644
>--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
>+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
>@@ -69,6 +69,7 @@
> 	public int WEBSERVICES_1_1_ID = 11;
> 	public int WEBSERVICES_1_2_ID = 12;
> 	public int WEBSERVICES_1_3_ID = 13;
>+	public int WEBSERVICES_1_4_ID = 14;
> 	public String J2EE_1_4_TEXT 		= "1.4"; //$NON-NLS-1$
> 	
> 
>diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java
>index 7f8349c..8582ee3 100644
>--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java
>+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java
>@@ -35,6 +35,7 @@
> 	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;
>@@ -72,12 +73,18 @@
> 					children12 = create12Children();
> 				}
> 				return children12;
>-			default :
>+			case (JEE_6_0_ID) :
> 				if (children13 == null)
> 				{
> 					children13 = create13Children();
> 				}
> 				return children13;
>+			default :
>+				if (children14 == null)
>+				{
>+					children14 = create14Children();
>+				}
>+				return children14;
> 		}
> 	}
> 
>@@ -138,6 +145,22 @@
> 		};
> 	}
> 
>+	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[] {
>diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java
>index 2990b91..f0c063c 100644
>--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java
>+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java
>@@ -24,6 +24,8 @@
>   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$
>   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$
>   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$
>+  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$
>+  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$
> 
>   public static final String WEBSERVICECLIENT_DD_SHORT_NAME   = "webservicesclient.xml"; //$NON-NLS-1$
>   public static final String WEBSERVICECLIENT_SYSTEMID    = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$
>@@ -45,9 +47,11 @@
>   public static final int WEBSERVICE_1_1_ID = 11;
>   public static final int WEBSERVICE_1_2_ID = 12;
>   public static final int WEBSERVICE_1_3_ID = 13;
>+  public static final int WEBSERVICE_1_4_ID = 14;
>   public static final String WEBSERVICE_SCHEMA_VERSION_1_1 = "1.1";//$NON-NLS-1$
>   public static final String WEBSERVICE_SCHEMA_VERSION_1_2 = "1.2";//$NON-NLS-1$
>   public static final String WEBSERVICE_SCHEMA_VERSION_1_3 = "1.3";//$NON-NLS-1$
>+  public static final String WEBSERVICE_SCHEMA_VERSION_1_4 = "1.4";//$NON-NLS-1$
> 
> }
> 
>diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java
>index f149d97..7e4ac8e 100644
>--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java
>+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java
>@@ -82,5 +82,7 @@
>     J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_2, "javaee_web_services_1_2.xsd"); //$NON-NLS-1$
>     J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$
>     J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_3, "javaee_web_services_1_3.xsd"); //$NON-NLS-1$
>+    J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_1_4, "javaee_web_services_1_4.xsd"); //$NON-NLS-1$
>+    J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN_1_4, "javaee_web_services_1_4.xsd"); //$NON-NLS-1$
>   }
> }
>diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java
>index 1ed30c2..5769d80 100644
>--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java
>+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java
>@@ -51,5 +51,10 @@
> 	 * @return boolean value
> 	 */
> 	public boolean isWebService1_3();
>+	/**
>+	 * Returns true if the WebService is of version 1.2
>+	 * @return boolean value
>+	 */
>+	public boolean isWebService1_4();
>   
> }
>diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java
>index 8b2bfef..7625df4 100644
>--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java
>+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddResourceImpl.java
>@@ -103,6 +103,10 @@
>    {
>       return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_3_ID);  
>    }
>+   public boolean isWebService1_4()
>+   {
>+      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_4_ID);  
>+   }
> 
> 	/* 
> 	 * This directly sets the module version id
>@@ -111,6 +115,10 @@
> 	public void setModuleVersionID(int id) {
> 	//super.setVersionID(id);
> 	switch (id) {
>+			case (WebServiceConstants.WEBSERVICE_1_4_ID) :
>+				super.setDoctypeValues(null, null);
>+				primSetVersionID(WebServiceConstants.WEBSERVICE_1_4_ID);
>+				break;
> 			case (WebServiceConstants.WEBSERVICE_1_3_ID) :
> 				super.setDoctypeValues(null, null);
> 				primSetVersionID(WebServiceConstants.WEBSERVICE_1_3_ID);
>@@ -135,6 +143,10 @@
> 	public void setJ2EEVersionID(int id) 
>   {
>     switch (id) {
>+    	case (JEE_7_0_ID) :
>+					primSetDoctypeValues(null, null);
>+					primSetVersionID(WebServiceConstants.WEBSERVICE_1_4_ID);
>+					break;
>     	case (JEE_6_0_ID) :
> 					primSetDoctypeValues(null, null);
> 					primSetVersionID(WebServiceConstants.WEBSERVICE_1_3_ID);
>@@ -203,8 +215,10 @@
> 				return J2EEVersionConstants.JEE_5_0_ID;
> 			case WebServiceConstants.WEBSERVICE_1_3_ID :
> 				return J2EEVersionConstants.JEE_6_0_ID;
>+			case WebServiceConstants.WEBSERVICE_1_4_ID :
>+				return J2EEVersionConstants.JEE_7_0_ID;
> 			default :
>-			return J2EEVersionConstants.JEE_6_0_ID;
>+			return J2EEVersionConstants.JEE_7_0_ID;
> 		}
> 	}
> 
>@@ -273,7 +287,4 @@
> 	return getModuleVersionID();
> }
> 
>-  
>-    
>-}
>-
>+}
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 429907: 241448 | 241449