Attachment 153904 Details for Bug 192005 – Fix for Bug 192005

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

[patch] Fix for Bug 192005

fix_for_192005.txt (text/plain), 3.55 KB, created by Saminda Wijeratne

on 2009-12-07 03:12:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Saminda Wijeratne

Created: 2009-12-07 03:12:16 EST

Size: 3.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.axis2.core
>Index: src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java,v
>retrieving revision 1.5
>diff -u -r1.5 Axis2Constants.java
>--- src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java	19 Jun 2008 03:50:59 -0000	1.5
>+++ src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java	7 Dec 2009 08:07:17 -0000
>@@ -14,6 +14,7 @@
>  * 20071029   206967 sandakith@wso2.com - Lahiru Sandakith
>  * 20080521   231098 sandakith@wso2.com - Lahiru Sandakith, Fix for Axis2 1.4 dependency chenge
>  * 20080604   193371 samindaw@wso2.com - Saminda Wijeratne, creating a function to validate services.xml
>+ * 20091207   192005 samindaw@wso2.com - merge the web.xml to have axis2 welcome file defined
>  *******************************************************************************/
> package org.eclipse.jst.ws.axis2.core.constant;
> 
>@@ -72,6 +73,7 @@
> 	public static final String JUNIT_BUNDLE="org.junit";						//$NON-NLS-1$
> 	public static final String DIR_AXIS2_WEB="axis2-web";						//$NON-NLS-1$
> 	public static final String FILE_WEB_XML="web.xml";							//$NON-NLS-1$
>+	public static final String AXIS2_WELCOME_FILE="/"+DIR_AXIS2_WEB+"/index.jsp";//$NON-NLS-1$
> 	public static final String FILE_SERVLET_API="servletapi";					//$NON-NLS-1$
> 	public static final String[] AXIS2_LIB_PREFIXES = {							//$NON-NLS-1$
>         "ant",
>Index: src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java,v
>retrieving revision 1.2
>diff -u -r1.2 MergeWEBXMLCommand.java
>--- src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java	12 Jun 2007 00:01:50 -0000	1.2
>+++ src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java	7 Dec 2009 08:07:17 -0000
>@@ -12,6 +12,7 @@
>  * -------- -------- -----------------------------------------------------------
>  * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
>  * 20070606   177421 sandakith@wso2.com - fix web.xml wiped out when Axis2 facet
>+ * 20091207   192005 samindaw@wso2.com - merge the web.xml to have axis2 welcome file defined
>  *******************************************************************************/
> package org.eclipse.jst.ws.axis2.facet.commands;
> 
>@@ -37,6 +38,8 @@
> import org.eclipse.jst.javaee.core.JavaeeFactory;
> import org.eclipse.jst.javaee.core.UrlPatternType;
> import org.eclipse.jst.javaee.web.WebFactory;
>+import org.eclipse.jst.javaee.web.WelcomeFileList;
>+import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
> import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
> import org.eclipse.wst.common.environment.IEnvironment;
> import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
>@@ -214,6 +217,16 @@
> 				webapp.getServletMappings().add(servletMapping);					
> 			}
> 		}
>+		List welcomeFileLists = webapp.getWelcomeFileLists();
>+		if (welcomeFileLists!=null){
>+			for (Object list : welcomeFileLists) {
>+				if (list instanceof WelcomeFileList){
>+					WelcomeFileList welcomeList=(WelcomeFileList) list;
>+					if (!welcomeList.getWelcomeFiles().contains(Axis2Constants.AXIS2_WELCOME_FILE))
>+						welcomeList.getWelcomeFiles().add(Axis2Constants.AXIS2_WELCOME_FILE);
>+				}
>+			}
>+		}
> 	}
>   
>

Flags:

keith.chong.ca: iplog+

Actions: View | Diff

Attachments on bug 192005: 153904 | 155768