Refresh to remove xsd's/webservices also server changes

23 files changed, 310 insertions, 253 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
index f819d445d..94f3b9f45 100644
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
+++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
@@ -6,9 +6,6 @@
  */
 package org.eclipse.jst.j2ee.jca.ui.internal.plugin;
 
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPluginDescriptor;
@@ -25,10 +22,8 @@ public class JCAUIPlugin extends AbstractUIPlugin {
 	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.jca.ui"; //$NON-NLS-1$
 	
 	
-//	The shared instance.
+	//	The shared instance.
 	private static JCAUIPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
 
 	/**
 	 * The constructor.
@@ -55,23 +50,4 @@ public class JCAUIPlugin extends AbstractUIPlugin {
 	public static IWorkspace getWorkspace() {
 		return ResourcesPlugin.getWorkspace();
 	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = JCAUIPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
 }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
new file mode 100644
index 000000000..20acd4c42
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
index f798ccc0e..b882011d3 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
@@ -44,9 +44,7 @@ import org.eclipse.jst.j2ee.webapplication.WebApp;
 import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
 import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
 import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
 import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
@@ -55,9 +53,6 @@ import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.ISetSelectionTarget;
 import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl;
 
 import com.ibm.wtp.emf.workbench.ProjectUtilities;
 
@@ -181,18 +176,20 @@ public class OpenJ2EEResourceAction extends AbstractOpenAction {
 		}
 
 		// Handle wsdl case, non emf object
-		if (srcObject instanceof WSDLResourceImpl || isWsdlInstance(srcObject)) {
-			openWsdlEditor();
-			return;
-		}
+		// TODO WebServices for M3
+//		if (srcObject instanceof WSDLResourceImpl || isWsdlInstance(srcObject)) {
+//			openWsdlEditor();
+//			return;
+//		}
 
 		EObject ro = (EObject) srcObject;
 		IProject p = ProjectUtilities.getProject(ro);
 		J2EENature nature = J2EENature.getRegisteredRuntime(p);
 
-		if (ro instanceof Definition || ro instanceof Service || ro instanceof Handler)
-			r = getWebService(p);
-		else if (ro instanceof BeanLink) {
+		// TODO WebServices for M3
+//		if (ro instanceof Definition || ro instanceof Service || ro instanceof Handler)
+//			r = getWebService(p); else
+		if (ro instanceof BeanLink) {
 			openBeanLinkInJavaEditor((BeanLink) ro, p);
 			return;
 		} else if (nature instanceof J2EEModuleNature && ((J2EEModuleNature) nature).isBinaryProject())
@@ -203,17 +200,18 @@ public class OpenJ2EEResourceAction extends AbstractOpenAction {
 		openAppropriateEditor(r);
 	}
 
-	private void openWsdlEditor() {
-		WSDLResourceImpl wsdl = null;
-		if (srcObject instanceof WSDLResourceImpl)
-			wsdl = (WSDLResourceImpl) srcObject;
-		else if (srcObject instanceof Service)
-			wsdl = (WSDLResourceImpl) ((Service) srcObject).eResource();
-		if (wsdl != null) {
-			IResource r = WorkbenchResourceHelper.getFile(wsdl);
-			openAppropriateEditor(r);
-		}
-	}
+	// TODO WebServices for M3
+//	private void openWsdlEditor() {
+//		WSDLResourceImpl wsdl = null;
+//		if (srcObject instanceof WSDLResourceImpl)
+//			wsdl = (WSDLResourceImpl) srcObject;
+//		else if (srcObject instanceof Service)
+//			wsdl = (WSDLResourceImpl) ((Service) srcObject).eResource();
+//		if (wsdl != null) {
+//			IResource r = WorkbenchResourceHelper.getFile(wsdl);
+//			openAppropriateEditor(r);
+//		}
+//	}
 
 	/**
 	 * Get file from the J2EE EditModel for root object
@@ -343,10 +341,11 @@ public class OpenJ2EEResourceAction extends AbstractOpenAction {
 		//	currentDescriptor = getEjbMapEditorDescriptor();
 		else if (obj instanceof BeanLink)
 			currentDescriptor = getBaseJavaEditorDescriptor();
-		else if (isWsdlInstance(obj))
-			currentDescriptor = getWsdlDescriptor();
-		else if (isWebserviceInstance(obj))
-			currentDescriptor = getWebServiceDescriptor();
+		// TODO WebServices for M3
+//		else if (isWsdlInstance(obj))
+//			currentDescriptor = getWsdlDescriptor();
+//		else if (isWebserviceInstance(obj))
+//			currentDescriptor = getWebServiceDescriptor();
 		else {
 			currentDescriptor = null;
 			return false;
@@ -394,17 +393,19 @@ public class OpenJ2EEResourceAction extends AbstractOpenAction {
 	 * @param Object
 	 *            obj - The object to check instanceof.
 	 */
-	protected boolean isWebserviceInstance(Object obj) {
-		EObject root = getRootObject(obj);
-		return (root instanceof Definition || root instanceof WebServices);
-	}
-
-	protected boolean isWsdlInstance(Object obj) {
-		EObject root = getRootObject(obj);
-		IProject p = ProjectUtilities.getProject(root);
-		Object ws = getWebService(p);
-		return (obj instanceof WSDLResourceImpl) || (root instanceof Definition && ws == null);
-	}
+	// TODO WebServices for M3
+//	protected boolean isWebserviceInstance(Object obj) {
+//		EObject root = getRootObject(obj);
+//		return (root instanceof Definition || root instanceof WebServices);
+//	}
+
+	// TODO WebServices for M3
+//	protected boolean isWsdlInstance(Object obj) {
+//		EObject root = getRootObject(obj);
+//		IProject p = ProjectUtilities.getProject(root);
+//		Object ws = getWebService(p);
+//		return (obj instanceof WSDLResourceImpl) || (root instanceof Definition && ws == null);
+//	}
 
 	protected boolean is13ServiceRefForNature(String natureId, EObject root) {
 		try {
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
new file mode 100644
index 000000000..9d9b832e4
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
@@ -0,0 +1,62 @@
+/*
+ * Created on Dec 7, 2004
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.eclipse.jst.j2ee.internal.perspective;
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+
+/**
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class J2EEPerspective implements org.eclipse.ui.IPerspectiveFactory{
+
+	protected static String ID_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView";
+	protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";
+	
+	public J2EEPerspective() {
+		super();	
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
+	 */
+	public void createInitialLayout(IPageLayout layout) {
+		defineLayout(layout);
+		defineActions(layout);
+	}
+
+	public void defineActions(IPageLayout layout) {
+		layout.addShowViewShortcut(ID_J2EE_HIERARCHY_VIEW);
+		layout.addShowViewShortcut(ID_SERVERS_VIEW);
+		layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
+		layout.addShowViewShortcut(IPageLayout.ID_TASK_LIST);		
+	}
+	public void defineLayout(IPageLayout layout) {
+		// Editors are placed for free.
+		String editorArea = layout.getEditorArea();
+
+		// Top left.
+		IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, (float)0.26, editorArea);//$NON-NLS-1$
+		topLeft.addView(ID_J2EE_HIERARCHY_VIEW);
+		
+		// Bottom left.
+		IFolderLayout bottomLeft = layout.createFolder("bottomLeft", IPageLayout.BOTTOM, (float)0.66, "topLeft");//$NON-NLS-1$ //$NON-NLS-2$
+		bottomLeft.addView(IPageLayout.ID_OUTLINE);
+
+		// Bottom right.
+		IFolderLayout bottomRight = layout.createFolder("bottomRight", IPageLayout.BOTTOM, (float)0.66, editorArea);//$NON-NLS-1$
+		bottomRight.addView(IPageLayout.ID_PROBLEM_VIEW);
+		bottomRight.addView(IPageLayout.ID_TASK_LIST);
+		bottomRight.addView(IPageLayout.ID_PROP_SHEET);
+		bottomRight.addView(ID_SERVERS_VIEW);	
+	}
+}
+
+
+
+
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
index 3b89e5715..c2d83d352 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
@@ -23,18 +23,9 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationWrapper;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.jst.j2ee.internal.web.providers.WebAppItemProvider;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
 import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-import com.ibm.wtp.emf.workbench.ProjectUtilities;
 
 /**
  * @author jlanuti
@@ -51,75 +42,77 @@ public class J2EEWebAppItemProvider extends WebAppItemProvider {
 	private WebFilterMappingGroupItemProvider webFilterMappingGroup;
 	private WebReferencesGroupItemProvider webRefsGroup;
 	private WebSecurityGroupItemProvider webSecurityGroup;
-	private J2EEWebServiceClientDDManager clientMgr;
+	// TODO WebServices for M3
+//	private J2EEWebServiceClientDDManager clientMgr;
 	private WebListenerGroupItemProvider webListenerGroup;
 
 	/**
 	 * Listen and fire updates for 1.3 web service clients
 	 */
-	private class J2EEWebServiceClientDDManager extends AdapterImpl implements EditModelListener {
-		private WebApp webApp;
-		private WebServicesManager webServiceMgr = WebServicesManager.getInstance();
-		WebServiceEditModel editModel;
-		WebServicesClient client;
-
-		public J2EEWebServiceClientDDManager(WebApp webApp) {
-			this.webApp = webApp;
-			init();
-		}
-
-		public void setWebApp(WebApp webApp) {
-			this.webApp = webApp;
-		}
-
-		public void init() {
-			editModel = webServiceMgr.getWSEditModel(ProjectUtilities.getProject(webApp));
-			if (editModel != null) {
-				editModel.addListener(this);
-				if (editModel.get13WebServicesClientResource() != null) {
-					client = editModel.get13WebServicesClientResource().getWebServicesClient();
-					if (client != null)
-						client.eAdapters().add(this);
-				}
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
-		 */
-		public void editModelChanged(EditModelEvent anEvent) {
-			if (editModel == null)
-				init();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification notification) {
-			if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
-				if (notification.getFeatureID(WebServicesClient.class) == Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS) {
-					NotificationWrapper notificationWrapper = new NotificationWrapper(webRefsGroup, notification);
-					fireNotifyChanged(notificationWrapper);
-				}
-			}
-			super.notifyChanged(notification);
-		}
-
-		public void dispose() {
-			if (editModel != null) {
-				editModel.removeListener(this);
-				if (editModel.get13WebServicesClientResource() != null) {
-					client = editModel.get13WebServicesClientResource().getWebServicesClient();
-					if (client != null)
-						client.eAdapters().remove(this);
-				}
-			}
-		}
-	}
+	// TODO WebServices for M3
+//	private class J2EEWebServiceClientDDManager extends AdapterImpl implements EditModelListener {
+//		private WebApp webApp;
+//		private WebServicesManager webServiceMgr = WebServicesManager.getInstance();
+//		WebServiceEditModel editModel;
+//		WebServicesClient client;
+//
+//		public J2EEWebServiceClientDDManager(WebApp webApp) {
+//			this.webApp = webApp;
+//			init();
+//		}
+//
+//		public void setWebApp(WebApp webApp) {
+//			this.webApp = webApp;
+//		}
+//
+//		public void init() {
+//			editModel = webServiceMgr.getWSEditModel(ProjectUtilities.getProject(webApp));
+//			if (editModel != null) {
+//				editModel.addListener(this);
+//				if (editModel.get13WebServicesClientResource() != null) {
+//					client = editModel.get13WebServicesClientResource().getWebServicesClient();
+//					if (client != null)
+//						client.eAdapters().add(this);
+//				}
+//			}
+//		}
+//
+//		/*
+//		 * (non-Javadoc)
+//		 * 
+//		 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
+//		 */
+//		public void editModelChanged(EditModelEvent anEvent) {
+//			if (editModel == null)
+//				init();
+//		}
+//
+//		/*
+//		 * (non-Javadoc)
+//		 * 
+//		 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
+//		 */
+//		public void notifyChanged(Notification notification) {
+//			if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
+//				if (notification.getFeatureID(WebServicesClient.class) == Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS) {
+//					NotificationWrapper notificationWrapper = new NotificationWrapper(webRefsGroup, notification);
+//					fireNotifyChanged(notificationWrapper);
+//				}
+//			}
+//			super.notifyChanged(notification);
+//		}
+//
+//		public void dispose() {
+//			if (editModel != null) {
+//				editModel.removeListener(this);
+//				if (editModel.get13WebServicesClientResource() != null) {
+//					client = editModel.get13WebServicesClientResource().getWebServicesClient();
+//					if (client != null)
+//						client.eAdapters().remove(this);
+//				}
+//			}
+//		}
+//	}
 
 	/**
 	 * Default constructor
@@ -132,8 +125,9 @@ public class J2EEWebAppItemProvider extends WebAppItemProvider {
 	 * initilaize list of children
 	 */
 	private void initChildren(WebApp webApp) {
-		if (clientMgr == null)
-			clientMgr = new J2EEWebServiceClientDDManager(webApp);
+		// TODO WebServices for M3
+//		if (clientMgr == null)
+//			clientMgr = new J2EEWebServiceClientDDManager(webApp);
 		children.add(webServletGroup = new WebServletGroupItemProvider(adapterFactory, webApp));
 		children.add(webServletMappingGroup = new WebServletMappingGroupItemProvider(adapterFactory, webApp));
 		children.add(webFiltersGroup = new WebFiltersGroupItemProvider(adapterFactory, webApp));
@@ -168,8 +162,9 @@ public class J2EEWebAppItemProvider extends WebAppItemProvider {
 				provider.setWebApp(app);
 			}
 		}
-		if (clientMgr != null)
-			clientMgr.setWebApp(app);
+		// TODO WebServices for M3
+//		if (clientMgr != null)
+//			clientMgr.setWebApp(app);
 	}
 
 	/*
@@ -233,8 +228,9 @@ public class J2EEWebAppItemProvider extends WebAppItemProvider {
 	 * @see org.eclipse.emf.edit.provider.IDisposable#dispose()
 	 */
 	public void dispose() {
-		if (clientMgr != null)
-			clientMgr.dispose();
+		// TODO WebServices for M3
+//		if (clientMgr != null)
+//			clientMgr.dispose();
 		super.dispose();
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
index 5347332e1..9ab09e669 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
@@ -18,13 +18,11 @@ package org.eclipse.jst.j2ee.internal.war.ui.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
 
 /**
@@ -69,15 +67,16 @@ public class WebReferencesGroupItemProvider extends WebGroupItemProvider {
 		if (!webApp.getMessageDestinationRefs().isEmpty())
 			result.addAll(webApp.getMessageDestinationRefs());
 
-		Collection serviceRefs = null;
-		try {
-			serviceRefs = WebServicesManager.getInstance().getServiceRefs(webApp);
-		} catch (RuntimeException re) {
-			serviceRefs = Collections.EMPTY_LIST;
-		}
-
-		if (!serviceRefs.isEmpty())
-			result.addAll(serviceRefs);
+		// TODO WebServices for M3
+//		Collection serviceRefs = null;
+//		try {
+//			serviceRefs = WebServicesManager.getInstance().getServiceRefs(webApp);
+//		} catch (RuntimeException re) {
+//			serviceRefs = Collections.EMPTY_LIST;
+//		}
+//
+//		if (!serviceRefs.isEmpty())
+//			result.addAll(serviceRefs);
 		return result;
 	}
 
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
index 36dfc1df7..dba70b978 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
@@ -42,7 +42,6 @@
       <import plugin="org.eclipse.wst.common.migration"/>
       <import plugin="org.eclipse.ltk.core.refactoring"/>
       <import plugin="org.eclipse.wst.internet.webbrowser"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.jst.common.annotations.controller"/>
       <import plugin="org.eclipse.jst.common.navigator.java"/>
@@ -68,7 +67,7 @@
             category="org.eclipse.jst.j2ee.internal"
             class="org.eclipse.jst.j2ee.ui.EnterpriseApplicationCreationWizard"
             project="true"
-            finalPerspective="org.eclipse.jst.j2ee.internal.J2EEPerspective"
+            finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
             id="org.eclipse.jst.j2ee.ui.EnterpriseApplicationCreationWizard"
             >
          <description>
@@ -337,7 +336,7 @@
       </adapterFactory>
    </extension>
    
-   
+<!--  TODO WebServices for M3 
    <extension
          point="org.eclipse.wst.common.navigator.views.navigatorContent">
       <navigatorContent
@@ -359,17 +358,18 @@
          </enables>
       </navigatorContent>
    </extension>
-   
+ -->  
    
    <!-- J2EE View Web Services contribution -->
-   <extension
+   <!-- TODO WebServices for M3 -->
+<!--   <extension
          point="org.eclipse.wst.common.navigator.views.navigatorViewer">
       <navigatorViewer
             rootContentExtensionId="org.eclipse.wst.common.frameworks.navigator.webservice"
             viewerId="com.ibm.wtp.ui.ProjectNavigator">
       </navigatorViewer>
    </extension>
-   
+ -->  
 <!-- Navigator Object Contributions -->
 <!-- EAR Group Contributions -->
    <extension
@@ -649,5 +649,14 @@
             </with>
          </enablement> 
 		</renameParticipant>
-	</extension>	
+	</extension>
+  <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            name="%j2ee"
+            icon="icons/full/cview16/j2ee_perspective.gif"
+            class="org.eclipse.jst.j2ee.internal.perspective.J2EEPerspective"
+            id="org.eclipse.jst.j2ee.J2EEPerspective">
+      </perspective>
+   </extension>	
 </plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
index 90c567eb5..2021b2c8e 100644
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
@@ -212,19 +212,6 @@
       </moduleFactory>
    </extension>
    <extension
-         point="org.eclipse.wst.server.core.moduleFactories">
-      <moduleFactory
-            projects="true"
-            icon="icons/full/obj16/webstatic_deploy.gif"
-            class="org.eclipse.jst.j2ee.internal.web.deployables.StaticWebDeployableFactory"
-            id="org.eclipse.jst.j2ee.internal.web.deployables.static">
-         <moduleType
-               versions="1.0"
-               types="web.static">
-         </moduleType>
-      </moduleFactory>
-   </extension>
-   <extension
          point="org.eclipse.jst.common.migration.migrator">
       <migrator
             className="org.eclipse.jst.j2ee.internal.web.operations.WebSettingsMigrator"
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java
index 2588bd986..623dded94 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java
@@ -20,7 +20,7 @@ import org.eclipse.wst.server.core.model.ModuleDelegate;
 public class WebDeployableFactory extends J2EEDeployableFactory {
 	private static final String ID = "com.ibm.wtp.web.server"; //$NON-NLS-1$
 
-	protected static final IPath[] PATHS = new IPath[]{new Path(".websettings") //$NON-NLS-1$
+	protected static final IPath[] PATHS = new IPath[]{new Path(".j2ee") //$NON-NLS-1$
 	};
 
 	/*
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
index 5c3cd0735..c2a257e9f 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
@@ -33,7 +33,6 @@ import org.eclipse.jst.j2ee.common.internal.provider.JNDIEnvRefsGroupItemProvide
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
 import org.eclipse.jst.j2ee.jsp.JspFactory;
 import org.eclipse.jst.j2ee.webapplication.ContextParam;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
@@ -73,8 +72,9 @@ public class WebAppItemProvider extends JNDIEnvRefsGroupItemProvider implements
 	public Collection getChildren(Object object) {
 		WebApp webApp = (WebApp) object;
 		Collection myChildren = super.getChildren(object);
-		if (webApp.getVersionID() <= J2EEVersionConstants.WEB_2_3_ID)
-			myChildren.addAll(WebServicesManager.getInstance().get13ServiceRefs(webApp));
+		// TODO WebServices for M3
+		//if (webApp.getVersionID() <= J2EEVersionConstants.WEB_2_3_ID)
+		//	myChildren.addAll(WebServicesManager.getInstance().get13ServiceRefs(webApp));
 		return myChildren;
 	}
 
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectLoadStrategyImpl.java
index 7cf293b4c..89cb81f21 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectLoadStrategyImpl.java
@@ -43,7 +43,7 @@ import com.ibm.wtp.emf.workbench.WorkbenchURIConverterImpl;
 public class WTProjectLoadStrategyImpl extends org.eclipse.jst.j2ee.internal.archive.operations.J2EELoadStrategyImpl {
 	private final static String SOURCE_DIR = "source"; //$NON-NLS-1$
 
-	public static final String WEBSETTINGS_FILE_URI = ".websettings"; //$NON-NLS-1$
+	public static final String WEBSETTINGS_FILE_URI = ".j2ee"; //$NON-NLS-1$
 
 	/**
 	 * flag which indicates whether or not to export compiled JSP files (compiled files exist in
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java
index cf3fd3a16..5266f654b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java
@@ -107,9 +107,9 @@ public final class WebModuleImportDataModel extends J2EEModuleImportDataModel {
 			if (getBooleanProperty(PRESERVE_PROJECT_METADATA)) {
 				WARFileImpl warFile = (WARFileImpl) getArchiveFile();
 				if (null != warFile) {
-					if (warFile.containsFile(".websettings")) { //$NON-NLS-1$
+					if (warFile.containsFile(".j2ee")) { //$NON-NLS-1$
 						try {
-							webContentName = WebSettings.getWebContentDirectory(warFile.getInputStream(".websettings")); //$NON-NLS-1$
+							webContentName = WebSettings.getWebContentDirectory(warFile.getInputStream(".j2ee")); //$NON-NLS-1$
 						} catch (FileNotFoundException e) {
 						} catch (IOException e) {
 						}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntime.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntime.java
index 710f89f1d..ba6ad4fd2 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntime.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntime.java
@@ -7,7 +7,6 @@ package org.eclipse.jst.j2ee.internal.web.operations;
  */
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.Map;
 
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IContainer;
@@ -42,7 +41,6 @@ import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
 import org.eclipse.jst.j2ee.internal.project.J2EEModuleNature;
 import org.eclipse.jst.j2ee.internal.web.archive.operations.WTProjectLoadStrategyImpl;
 import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
 import org.eclipse.jst.j2ee.web.taglib.ITaglibRegistry;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
 import org.eclipse.jst.j2ee.webapplication.WebAppResource;
@@ -1025,16 +1023,18 @@ public class J2EEWebNatureRuntime extends J2EEModuleNature implements IDynamicWe
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) {
-		return (WebServiceEditModel) getEditModelForRead(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
-	}
+	// TODO WebServices for M3
+//	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) {
+//		return (WebServiceEditModel) getEditModelForRead(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
+//	}
 
 	/**
 	 * Return an editing model used to edit web service resources. Important!!! Calling this method
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) {
-		return (WebServiceEditModel) getEditModelForWrite(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
-	}
+	// TODO WebServices for M3
+//	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) {
+//		return (WebServiceEditModel) getEditModelForWrite(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
+//	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
index 710ec2e30..bde1342e8 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
@@ -40,7 +40,8 @@ import com.ibm.wtp.common.logger.proxy.Logger;
 import com.ibm.wtp.emf.workbench.ProjectUtilities;
 
 public class WebPropertiesUtil {
-	private static final char[] BAD_CHARS = {'/', '\\', ':'};
+	//private static final char[] BAD_CHARS = {'/', '\\', ':'};
+	private static final char[] BAD_CHARS = {':'};
 
 	/**
 	 * Update the Web Content folder to a new value if it is different. This applies to both Static
@@ -70,11 +71,12 @@ public class WebPropertiesUtil {
 					webContentName = J2EEWebNatureRuntimeUtilities.getDefaultJ2EEWebContentName();
 				}
 			}
-			String webNatureOrigName = webNature.getRootPublishableFolder().getName();
-			if (webNatureOrigName.equals(webContentName))
+
+			IPath newPath = new Path(webContentName);
+			if (webNature.getRootPublishableFolder().equals(newPath))
 				return false;
 
-			if (project.exists(new Path(webContentName))) {
+			if (project.exists(newPath)) {
 				IStatus status = new Status(IStatus.ERROR, "org.eclipse.jst.j2ee", IStatus.OK, ProjectSupportResourceHandler.getString("Could_not_rename_____2", new Object[]{webContentName}), null); //$NON-NLS-1$ //$NON-NLS-2$	
 				throw new CoreException(status);
 			}
@@ -96,8 +98,9 @@ public class WebPropertiesUtil {
 	public static void updateWebContentNamePropertiesOnly(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
 
 		IBaseWebNature webNature = J2EEWebNatureRuntimeUtilities.getRuntime(project);
-		String webNatureOrigName = webNature.getRootPublishableFolder().getName();
-		if (webNatureOrigName.equals(webContentName))
+		IPath newPath = new Path(webContentName);
+		//		String webNatureOrigName = webNature.getRootPublishableFolder().getName();
+		if (webNature.getRootPublishableFolder().equals(newPath))
 			return;
 
 		if (!webNature.getModuleServerRootName().equals(webContentName)) {
@@ -110,32 +113,29 @@ public class WebPropertiesUtil {
 				IClasspathEntry[] newClasspath = new IClasspathEntry[classpath.length];
 
 				for (int i = 0; i < classpath.length; i++) {
-
 					if (classpath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-
 						IClasspathEntry library = classpath[i];
 						IPath libpath = library.getPath();
-						if (webNature.getModuleServerRoot().getFullPath().isPrefixOf(libpath)) {
-							IPath prunedPath = libpath.removeFirstSegments(2);
+						IPath modServerRootPath = webNature.getModuleServerRoot().getFullPath();
+						if (modServerRootPath.isPrefixOf(libpath)) {
+							IPath prunedPath = libpath.removeFirstSegments(modServerRootPath.segmentCount());
 							IPath relWebContentPath = new Path(webContentName + "/" + prunedPath.toString()); //$NON-NLS-1$
 							IResource absWebContentPath = project.getFile(relWebContentPath);
 
 							IPath srcAttachmentPath = library.getSourceAttachmentPath();
-							prunedPath = srcAttachmentPath.removeFirstSegments(2);
+							if(null != srcAttachmentPath){
+								prunedPath = srcAttachmentPath.removeFirstSegments(modServerRootPath.segmentCount());
+							}
 							IResource absWebContentSrcAttachmentPath = project.getFile(relWebContentPath);
 
 							newClasspath[i] = JavaCore.newLibraryEntry(absWebContentPath.getFullPath(), absWebContentSrcAttachmentPath.getFullPath(), library.getSourceAttachmentRootPath(), library.isExported());
 
 						} else {
-
 							newClasspath[i] = classpath[i];
-
 						}
 
 					} else {
-
 						newClasspath[i] = classpath[i];
-
 					}
 				}
 
@@ -165,8 +165,26 @@ public class WebPropertiesUtil {
 		IBaseWebNature webNature = J2EEWebNatureRuntimeUtilities.getRuntime(project);
 		IPath newPath = new Path(webContentName);
 		if (!project.exists(newPath)) {
+			if (newPath.segmentCount() > 1) {
+				for (int i = newPath.segmentCount() - 1; i > 0; i--) {
+					IPath tempPath = newPath.removeLastSegments(i);
+					IFolder tempFolder = project.getFolder(tempPath);
+					if (!tempFolder.exists()) {
+						tempFolder.create(true, true, null);
+					}
+				}
+			}
+			newPath = project.getFullPath().append(newPath);
 			IContainer webContentRoot = webNature.getModuleServerRoot();
+			IPath oldPath = webContentRoot.getProjectRelativePath();
 			webContentRoot.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
+			for (int i = 0; i < oldPath.segmentCount(); i++) {
+				IPath tempPath = oldPath.removeLastSegments(i);
+				IFolder tempFolder = project.getFolder(tempPath);
+				if (tempFolder.exists() && tempFolder.members().length == 0) {
+					tempFolder.delete(true, true, null);
+				}
+			}
 		}
 	}
 
@@ -331,8 +349,7 @@ public class WebPropertiesUtil {
 		/*******************************************************************************************
 		 * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
 		 * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
-		 * errorMessage;
-		 *  }
+		 * errorMessage; }
 		 ******************************************************************************************/
 
 		if (name.trim().equals(name)) {
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebSettingsMigrator.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebSettingsMigrator.java
index 0126b32af..42a3ee6d7 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebSettingsMigrator.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebSettingsMigrator.java
@@ -43,7 +43,7 @@ import com.ibm.wtp.emf.workbench.ProjectUtilities;
  */
 public class WebSettingsMigrator implements IMigrator {
 	protected J2EESettings j2eeSettings;
-	protected String WEBSETINGS_KEY = "websettings"; //$NON-NLS-1$
+	protected String WEBSETINGS_KEY = "j2eesettings"; //$NON-NLS-1$
 
 	/**
 	 *  
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java
index 0e094434f..1777415c7 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java
@@ -33,7 +33,6 @@ import org.eclipse.jst.j2ee.internal.archive.operations.ApplicationClientProject
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.j2ee.internal.project.J2EEModuleNature;
 import org.eclipse.jst.j2ee.internal.project.J2EEModuleWorkbenchURIConverterImpl;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
 import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
 
 import com.ibm.wtp.emf.workbench.ProjectUtilities;
@@ -273,9 +272,10 @@ public class ApplicationClientNatureRuntime extends J2EEModuleNature implements
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) {
-		return (WebServiceEditModel) getEditModelForRead(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
-	}
+	// TODO WebServices for M3
+//	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) {
+//		return (WebServiceEditModel) getEditModelForRead(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
+//	}
 
 
 	/**
@@ -283,9 +283,10 @@ public class ApplicationClientNatureRuntime extends J2EEModuleNature implements
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) {
-		return (WebServiceEditModel) getEditModelForWrite(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
-	}
+	// TODO WebServices for M3
+//	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) {
+//		return (WebServiceEditModel) getEditModelForWrite(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params);
+//	}
 
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
index 4c0a5e4f5..405cf907b 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
@@ -38,7 +38,6 @@ import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGro
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersResourceHandler;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
 import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
 
 import com.ibm.wtp.emf.workbench.ProjectUtilities;
@@ -258,8 +257,9 @@ public class ApplicationClientItemProvider extends CompatibilityDescriptionGroup
 
 		ApplicationClient client = (ApplicationClient) object;
 		Collection myChildren = super.getChildren(object);
-		if (client.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID)
-			myChildren.addAll(WebServicesManager.getInstance().get13ServiceRefs(client));
+		// TODO WebServices for M3
+//		if (client.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID)
+//			myChildren.addAll(WebServicesManager.getInstance().get13ServiceRefs(client));
 		return myChildren;
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/build.properties b/plugins/org.eclipse.jst.j2ee/build.properties
index 2e1f3c220..714c5787e 100644
--- a/plugins/org.eclipse.jst.j2ee/build.properties
+++ b/plugins/org.eclipse.jst.j2ee/build.properties
@@ -10,10 +10,12 @@
 ###############################################################################
 bin.includes = schema/,\
                icons/,\
+               dtds/,\
                plugin.properties,\
                prepareAllPII.xml,\
                plugin.xml,\
-               runtime/j2eeplugin.jar
+               runtime/j2eeplugin.jar,\
+               xsds/
 source.runtime/j2eeplugin.jar = j2eeplugin/,\
                                 common/,\
                                 commonedit/,\
@@ -27,5 +29,6 @@ source.runtime/j2eeplugin.jar = j2eeplugin/,\
                                 property_files/
 jars.compile.order = runtime/j2eeplugin.jar
 src.includes = rose/,\
-               schema/
+               schema/,\
+               dtds/
 output.runtime/j2eeplugin.jar = bin/
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/moduleextension/WebModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/moduleextension/WebModuleExtension.java
index 549212d95..83c2c7e6b 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/moduleextension/WebModuleExtension.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/moduleextension/WebModuleExtension.java
@@ -37,7 +37,7 @@ import org.eclipse.jst.j2ee.internal.project.J2EENature;
  */
 public interface WebModuleExtension extends EarModuleExtension {
 
-	static final String WEBSETTINGS_FILE_URI = ".websettings"; //$NON-NLS-1$
+	static final String WEBSETTINGS_FILE_URI = ".j2ee"; //$NON-NLS-1$
 
 	void initializeEjbReferencesToModule(J2EENature nature, UpdateModuleReferencesInEARProjectCommand command);
 
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IWebNatureConstants.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IWebNatureConstants.java
index 0d0e6adeb..b7aced471 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IWebNatureConstants.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/IWebNatureConstants.java
@@ -45,8 +45,8 @@ public interface IWebNatureConstants {
 	String DEPLOYMENT_DESCRIPTOR_FILE_NAME = "web.xml"; //$NON-NLS-1$
 	String BINDINGS_FILE_NAME = "ibm-web-bnd.xmi"; //$NON-NLS-1$
 	String EXTENSIONS_FILE_NAME = "ibm-web-ext.xmi"; //$NON-NLS-1$
-	String WEBSETTINGS_FILE_NAME = ".websettings"; //$NON-NLS-1$
-
+	//String WEBSETTINGS_FILE_NAME = ".websettings"; //$NON-NLS-1$
+	String WEBSETTINGS_FILE_NAME = ".j2ee"; //$NON-NLS-1$
 	String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
 	String META_INFO_DIRECTORY = "META-INF"; //$NON-NLS-1$
 	String CLASSES_DIRECTORY = "classes"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java
index cb2dd2a3c..217d4168a 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java
@@ -39,7 +39,6 @@ import org.eclipse.jst.j2ee.application.Module;
 import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
 import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel;
 
 import com.ibm.wtp.emf.workbench.ProjectResourceSet;
 import com.ibm.wtp.emf.workbench.ProjectUtilities;
@@ -306,35 +305,39 @@ public abstract class J2EEModuleNature extends J2EENature {
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey) {
-		return getWebServiceEditModelForRead(accessorKey, null);
-	}
+	// TODO WebServices for M3
+//	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey) {
+//		return getWebServiceEditModelForRead(accessorKey, null);
+//	}
 
 	/**
 	 * Return an editing model used to read web service resources. Important!!! Calling this method
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) {
-		return null;
-	}
+	// TODO WebServices for M3
+//	public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) {
+//		return null;
+//	}
 
 	/**
 	 * Return an editing model used to edit web service resources. Important!!! Calling this method
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey) {
-		return getWebServiceEditModelForWrite(accessorKey, null);
-	}
+	// TODO WebServices for M3
+//	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey) {
+//		return getWebServiceEditModelForWrite(accessorKey, null);
+//	}
 
 	/**
 	 * Return an editing model used to edit web service resources. Important!!! Calling this method
 	 * increments the use count of this model. When you are done accessing the model, call
 	 * releaseAccess()!
 	 */
-	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) {
-		return null;
-	}
+	// TODO Webservices for M3
+//	public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) {
+//		return null;
+//	}
 
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java
index 2c82f162e..ec6ec41aa 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java
@@ -28,7 +28,6 @@ import org.eclipse.jst.j2ee.internal.J2EEConstants;
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
 import org.eclipse.jst.j2ee.internal.common.operations.J2EEModelModifierOperationDataModel;
 import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
 import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
 import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
@@ -237,11 +236,13 @@ public abstract class ReferenceDataModel extends J2EEModelModifierOperationDataM
 					return false;
 				if (checkMessageDestRefExists(bean.getMessageDestinationRefs(), nameValue))
 					return false;
-			} else {
-				Collection temp = WebServicesManager.getInstance().get13ServiceRefs(bean);
-				if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue))
-					return false;
-			}
+			} 
+			// TODO WebServices for M3
+//			else {
+//				Collection temp = WebServicesManager.getInstance().get13ServiceRefs(bean);
+//				if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue))
+//					return false;
+//			}
 		} else if (ownerType == APP_CLIENT_TYPE) {
 			ApplicationClient appClient = (ApplicationClient) getProperty(ReferenceDataModel.OWNER);
 			if (checkResourceRefExists(appClient.getResourceRefs(), nameValue))
@@ -255,11 +256,13 @@ public abstract class ReferenceDataModel extends J2EEModelModifierOperationDataM
 					return false;
 				if (checkMessageDestRefExists(appClient.getMessageDestinationRefs(), nameValue))
 					return false;
-			} else {
-				Collection temp = WebServicesManager.getInstance().get13ServiceRefs(appClient);
-				if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue))
-					return false;
-			}
+			} 
+			// TODO WebServices for M3
+//			else {
+//				Collection temp = WebServicesManager.getInstance().get13ServiceRefs(appClient);
+//				if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue))
+//					return false;
+//			}
 		} else if (ownerType == WEB_TYPE) {
 			WebApp webApp = (WebApp) getProperty(ReferenceDataModel.OWNER);
 			if (checkResourceRefExists(webApp.getResourceRefs(), nameValue))
@@ -275,11 +278,13 @@ public abstract class ReferenceDataModel extends J2EEModelModifierOperationDataM
 					return false;
 				if (checkMessageDestRefExists(webApp.getMessageDestinationRefs(), nameValue))
 					return false;
-			} else {
-				Collection temp = WebServicesManager.getInstance().get13ServiceRefs(webApp);
-				if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue))
-					return false;
-			}
+			} 
+			// TODO WebServices for M3
+//			else {
+//				Collection temp = WebServicesManager.getInstance().get13ServiceRefs(webApp);
+//				if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue))
+//					return false;
+//			}
 		}
 		return true;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
index 96af6466b..1e0b99daa 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml
@@ -40,8 +40,6 @@
       <import plugin="org.eclipse.wst.common.migration"/>
       <import plugin="org.eclipse.emf.codegen"/>
       <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.wst.ws.parser"/>
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.jst.common.frameworks"/>
    </requires>
@@ -133,7 +131,7 @@
 <!--===================================================-->
 <!-- Register known J2EE DTDs and XSDs for XML editor  -->
 <!-- DTD and XSD Contributions                         -->
-<!-- Removing for now   - Work to be done regarding caching dtd's -->
+<!-- Removing these until final location is known...   -->
 <!--===================================================-->
 <!--   <extension
          point="com.ibm.etools.xmlcatalog.catalogContributor">