Attachment 155768 Details for Bug 192005 – Modified patch to update versions

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

[patch] Modified patch to update versions

bug192005-patch.txt (text/plain), 5.78 KB, created by Keith Chong

on 2010-01-11 12:39:40 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Chong

Created: 2010-01-11 12:39:40 EST

Size: 5.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.axis2.core
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF,v
>retrieving revision 1.15
>diff -u -r1.15 MANIFEST.MF
>--- META-INF/MANIFEST.MF	15 Oct 2008 14:47:21 -0000	1.15
>+++ META-INF/MANIFEST.MF	11 Jan 2010 17:41:31 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %PLUGIN_NAME
> Bundle-SymbolicName: org.eclipse.jst.ws.axis2.core;singleton:=true
>-Bundle-Version: 1.0.104.qualifier
>+Bundle-Version: 1.0.204.qualifier
> Bundle-Activator: org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin
> Bundle-Vendor: %PLUGIN_PROVIDER
> Bundle-Localization: plugin
>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	11 Jan 2010 17:41:31 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007 WSO2 Inc. and others.
>+ * Copyright (c) 2007, 2010 WSO2 Inc. and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -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	11 Jan 2010 17:41:31 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2007 WSO2 Inc, IBM Corporation and others.
>+ * Copyright (c) 2003, 2010 WSO2 Inc, IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -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);
>+				}
>+			}
>+		}
> 	}
>   
> 
>#P org.eclipse.jst.ws.axis2tools.feature
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/webtools/webservices/features/org.eclipse.jst.ws.axis2tools.feature/feature.xml,v
>retrieving revision 1.8
>diff -u -r1.8 feature.xml
>--- feature.xml	24 May 2009 21:09:16 -0000	1.8
>+++ feature.xml	11 Jan 2010 17:41:31 -0000
>@@ -2,7 +2,7 @@
> <feature
>       id="org.eclipse.jst.ws.axis2tools.feature"
>       label="%featureName"
>-      version="1.1.0.qualifier"
>+      version="1.1.100.qualifier"
>       provider-name="%providerName"
>       plugin="org.eclipse.jst.ws.axis2.ui">
>

Actions: View | Diff

Attachments on bug 192005: 153904 | 155768