Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 192005 | Differences between
and this patch

Collapse All | Expand All

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
Lines 2-8 Link Here
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %PLUGIN_NAME
3
Bundle-Name: %PLUGIN_NAME
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.core;singleton:=true
4
Bundle-SymbolicName: org.eclipse.jst.ws.axis2.core;singleton:=true
5
Bundle-Version: 1.0.104.qualifier
5
Bundle-Version: 1.0.204.qualifier
6
Bundle-Activator: org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin
6
Bundle-Activator: org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin
7
Bundle-Vendor: %PLUGIN_PROVIDER
7
Bundle-Vendor: %PLUGIN_PROVIDER
8
Bundle-Localization: plugin
8
Bundle-Localization: plugin
(-)src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java (-1 / +3 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2007 WSO2 Inc. and others.
2
 * Copyright (c) 2007, 2010 WSO2 Inc. and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 14-19 Link Here
14
 * 20071029   206967 sandakith@wso2.com - Lahiru Sandakith
14
 * 20071029   206967 sandakith@wso2.com - Lahiru Sandakith
15
 * 20080521   231098 sandakith@wso2.com - Lahiru Sandakith, Fix for Axis2 1.4 dependency chenge
15
 * 20080521   231098 sandakith@wso2.com - Lahiru Sandakith, Fix for Axis2 1.4 dependency chenge
16
 * 20080604   193371 samindaw@wso2.com - Saminda Wijeratne, creating a function to validate services.xml
16
 * 20080604   193371 samindaw@wso2.com - Saminda Wijeratne, creating a function to validate services.xml
17
 * 20091207   192005 samindaw@wso2.com - merge the web.xml to have axis2 welcome file defined
17
 *******************************************************************************/
18
 *******************************************************************************/
18
package org.eclipse.jst.ws.axis2.core.constant;
19
package org.eclipse.jst.ws.axis2.core.constant;
19
20
Lines 72-77 Link Here
72
	public static final String JUNIT_BUNDLE="org.junit";						//$NON-NLS-1$
73
	public static final String JUNIT_BUNDLE="org.junit";						//$NON-NLS-1$
73
	public static final String DIR_AXIS2_WEB="axis2-web";						//$NON-NLS-1$
74
	public static final String DIR_AXIS2_WEB="axis2-web";						//$NON-NLS-1$
74
	public static final String FILE_WEB_XML="web.xml";							//$NON-NLS-1$
75
	public static final String FILE_WEB_XML="web.xml";							//$NON-NLS-1$
76
	public static final String AXIS2_WELCOME_FILE="/"+DIR_AXIS2_WEB+"/index.jsp";//$NON-NLS-1$
75
	public static final String FILE_SERVLET_API="servletapi";					//$NON-NLS-1$
77
	public static final String FILE_SERVLET_API="servletapi";					//$NON-NLS-1$
76
	public static final String[] AXIS2_LIB_PREFIXES = {							//$NON-NLS-1$
78
	public static final String[] AXIS2_LIB_PREFIXES = {							//$NON-NLS-1$
77
        "ant",
79
        "ant",
(-)src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java (-1 / +14 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2003, 2007 WSO2 Inc, IBM Corporation and others.
2
 * Copyright (c) 2003, 2010 WSO2 Inc, IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 12-17 Link Here
12
 * -------- -------- -----------------------------------------------------------
12
 * -------- -------- -----------------------------------------------------------
13
 * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
13
 * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
14
 * 20070606   177421 sandakith@wso2.com - fix web.xml wiped out when Axis2 facet
14
 * 20070606   177421 sandakith@wso2.com - fix web.xml wiped out when Axis2 facet
15
 * 20091207   192005 samindaw@wso2.com - merge the web.xml to have axis2 welcome file defined
15
 *******************************************************************************/
16
 *******************************************************************************/
16
package org.eclipse.jst.ws.axis2.facet.commands;
17
package org.eclipse.jst.ws.axis2.facet.commands;
17
18
Lines 37-42 Link Here
37
import org.eclipse.jst.javaee.core.JavaeeFactory;
38
import org.eclipse.jst.javaee.core.JavaeeFactory;
38
import org.eclipse.jst.javaee.core.UrlPatternType;
39
import org.eclipse.jst.javaee.core.UrlPatternType;
39
import org.eclipse.jst.javaee.web.WebFactory;
40
import org.eclipse.jst.javaee.web.WebFactory;
41
import org.eclipse.jst.javaee.web.WelcomeFileList;
42
import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
40
import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
43
import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
41
import org.eclipse.wst.common.environment.IEnvironment;
44
import org.eclipse.wst.common.environment.IEnvironment;
42
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
45
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
Lines 214-219 Link Here
214
				webapp.getServletMappings().add(servletMapping);					
217
				webapp.getServletMappings().add(servletMapping);					
215
			}
218
			}
216
		}
219
		}
220
		List welcomeFileLists = webapp.getWelcomeFileLists();
221
		if (welcomeFileLists!=null){
222
			for (Object list : welcomeFileLists) {
223
				if (list instanceof WelcomeFileList){
224
					WelcomeFileList welcomeList=(WelcomeFileList) list;
225
					if (!welcomeList.getWelcomeFiles().contains(Axis2Constants.AXIS2_WELCOME_FILE))
226
						welcomeList.getWelcomeFiles().add(Axis2Constants.AXIS2_WELCOME_FILE);
227
				}
228
			}
229
		}
217
	}
230
	}
218
  
231
  
219
232
(-)feature.xml (-1 / +1 lines)
Lines 2-8 Link Here
2
<feature
2
<feature
3
      id="org.eclipse.jst.ws.axis2tools.feature"
3
      id="org.eclipse.jst.ws.axis2tools.feature"
4
      label="%featureName"
4
      label="%featureName"
5
      version="1.1.0.qualifier"
5
      version="1.1.100.qualifier"
6
      provider-name="%providerName"
6
      provider-name="%providerName"
7
      plugin="org.eclipse.jst.ws.axis2.ui">
7
      plugin="org.eclipse.jst.ws.axis2.ui">
8
8

Return to bug 192005