[192005] Axis2: "Run on server" does not bring Axis2 Web app up on Tomcat 6.0

3 files changed, 18 insertions, 3 deletions

diff --git a/axis2/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF b/axis2/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
index 0b15e5afb..405567bdd 100644
--- a/axis2/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
+++ b/axis2/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 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
diff --git a/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java b/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java
index f4fc8c01c..6b3e882e6 100644
--- a/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java
+++ b/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/constant/Axis2Constants.java
@@ -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 class Axis2Constants {
 	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",
diff --git a/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java b/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java
index 2bac8fbbf..eb1f6a67a 100644
--- a/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java
+++ b/axis2/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/MergeWEBXMLCommand.java
@@ -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.DisplayName;
 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 @@ public class MergeWEBXMLCommand extends AbstractDataModelOperation {
 				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);
+				}
+			}
+		}
 	}