Attachment 161649 Details for Bug 304405 – patch

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

patch

patch.txt (text/plain), 3.90 KB, created by Eric Peters

on 2010-03-10 14:15:51 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Peters

Created: 2010-03-10 14:15:51 EST

Size: 3.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.jaxrs.core
>Index: src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java,v
>retrieving revision 1.4
>diff -u -r1.4 JAXRSFacetInstallDelegate.java
>--- src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java	3 Mar 2010 21:40:29 -0000	1.4
>+++ src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSFacetInstallDelegate.java	10 Mar 2010 19:14:19 -0000
>@@ -12,12 +12,12 @@
>  * 20091021   291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
>  * 20091106   291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
>  * 20100303   291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
>+ * 20100310   304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1
>  *******************************************************************************/
> package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
> 
> import java.util.ArrayList;
> import java.util.Iterator;
>-import java.util.List;
> 
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.ResourcesPlugin;
>@@ -209,7 +209,7 @@
> 
> 		IModelProvider provider = JAXRSUtils.getModelProvider(project);
> 		IPath webXMLPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$
>-		if (JAXRSJEEUtils.isWebApp25(provider.getModelObject())) {
>+		if (JAXRSJEEUtils.isWebApp25or30(provider.getModelObject())) {
> 			provider.modify(new UpdateWebXMLForJavaEE(project, config),
> 					doesDDFileExist(project, webXMLPath) ? webXMLPath
> 							: IModelProvider.FORCESAVE);
>Index: src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJEEUtils.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.jaxrs.core/src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJEEUtils.java,v
>retrieving revision 1.2
>diff -u -r1.2 JAXRSJEEUtils.java
>--- src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJEEUtils.java	3 Mar 2010 21:40:29 -0000	1.2
>+++ src/org/eclipse/jst/ws/jaxrs/core/internal/project/facet/JAXRSJEEUtils.java	10 Mar 2010 19:14:19 -0000
>@@ -11,6 +11,7 @@
>  * -------- -------- -----------------------------------------------------------
>  * 20091021   291954 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS: Implement JAX-RS Facet
>  * 20100303   291954 kchong@ca.ibm.com - Keith Chong, JAX-RS: Implement JAX-RS Facet
>+ * 20100310   304405 ericdp@ca.ibm.com - Eric D. Peters, JAX-RS Facet : support JAX-RS 1.1
>  *******************************************************************************/
> package org.eclipse.jst.ws.jaxrs.core.internal.project.facet;
> 
>@@ -30,7 +31,7 @@
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> 
> /**
>- * Utility file for Web 2.5 model
>+ * Utility file for Web 2.5 or 3.0 model
>  */
> public class JAXRSJEEUtils extends JAXRSUtils {
> 
>@@ -140,7 +141,20 @@
> 	}
> 
> 	/**
>-	 * Creates servlet-mappings for the servlet for 2.5 WebModules or greated
>+	 * @param webAppObj
>+	 *            as Object
>+	 * @return true if webApp instanceof org.eclipse.jst.javaee.web.WebApp and
>+	 *         WebAppVersionType._25 or WebAppVersionType._30
>+	 */
>+	public static boolean isWebApp25or30(final Object webAppObj) {
>+		if (webAppObj instanceof WebApp
>+				&& ((WebApp) webAppObj).getVersion() == WebAppVersionType._25_LITERAL || ((WebApp) webAppObj).getVersion() == WebAppVersionType._30_LITERAL)
>+			return true;
>+		return false;
>+	}
>+	
>+	/**
>+	 * Creates servlet-mappings for the servlet for 2.5 WebModules or greater
> 	 * 
> 	 * @param webApp
> 	 * @param urlMappingList

Actions: View

Attachments on bug 304405: 161649