Attachment #96342 for bug #215084




 * 20080318   213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
 * 20080326   198439 kathy@ca.ibm.com - Kathy Chan
 * 20080402   198439 kathy@ca.ibm.com - Kathy Chan
 * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
 *******************************************************************************/
package org.eclipse.jst.ws.internal.creation.ui.widgets;


	private TypeRuntimeServer ids_;
	private LabelsAndIds labelIds_;
	private String serviceProjectName_;
	private IProject initialProject_;
	private String serviceEarProjectName_;
	private String serviceComponentType_;
	private WebServicesParser parser_;

		String earProjectName = getServiceEarProjectName();
		String projectTypeId = getServiceComponentType();
		IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId, 
				serverInstanceId, projectName, initialProject_.getName(), needEar, earProjectName, projectTypeId, false);
		if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) {
			return serviceSideErrorStatus;
		}

		packSelf();	
	  }
	
	public void setInitialProject(IProject project)
	{
		initialProject_ = project;
	}
	
	 public void setServiceEarProjectName(String name)
	  {	  
		 serviceEarProjectName_ = name;

Lines 30-35 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java (+3 lines)
30	* 20071031 140518 joan@ca.ibm.com - Joan Haggarty	30	* 20071031 140518 joan@ca.ibm.com - Joan Haggarty
31	* 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews	31	* 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews
32	* 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews	32	* 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
		33	* 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
33	*******************************************************************************/	34	*******************************************************************************/
34	package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;	35	package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
35		36
Lines 154-159 Link Here
154	dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidget.class);	155	dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidget.class);
155	dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidget.class);	156	dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidget.class);
156	dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidget.class);	157	dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidget.class);
		158	dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerWizardWidget.class);
		159
157		160
158		161
159	// After ServerWizardWidget	162	// After ServerWizardWidget




 * 20080312   147442 trungha@ca.ibm.com - Trung Ha
 * 20080311   222103 trungha@ca.ibm.com - Trung, Changing service scale doesn't update completely non-UI part of client scale
 * 20080327   224452 trungha@ca.ibm.com - Trung Ha
 * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
 *******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.widgets;


		boolean needEar = getClientNeedEAR();
		String earProjectName = getClientEarProjectName();
		String projectTypeId = getClientComponentType();
		// Defect 215084 - no need to pass initial project for client scenario
		IStatus possibleErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId,
				serverInstanceId, projectName,"", needEar, earProjectName, projectTypeId, true);
		return possibleErrorStatus;
	}





 * 20071107   203826 kathy@ca.ibm.com - Kathy Chan
 * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
 * 20080205   170141 kathy@ca.ibm.com - Kathy Chan
 * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
 *******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.ui.common;


import org.eclipse.wst.common.project.facet.core.VersionFormatException;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;

   * IStatus with severity IStatus.ERROR otherwise.
   */
  public IStatus checkErrorStatus(int validationState, String typeId, String runtimeId, String serverId,
			String serverInstanceId, String projectName, String initialProjectName, boolean needEar, String earProjectName, String projectTypeId,
			boolean isClient) {
	
	  	// Ensure server, Web service runtime, and Web service type are

					}
				}
			}
	    	
	    	if (serverId != null && !initialProjectName.equals(projectName) &&
		    		(WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP) &&
		    		J2EEUtils.isJavaComponent(ProjectUtilities.getProject(initialProjectName))){
		    		
		    		Set javaSet = FacetUtils.getFacetsForProject(initialProjectName);
		    		if(!doesServerSupportFacets(serverId,javaSet)){
		    	    	return StatusUtils.errorStatus(NLS.bind(
								ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT,
								new String[] { serverLabel, initialProjectName }));
		  		    }
		    	}
		}
	    
		// If the project exists, ensure it supports the Web service type, Web

	    		runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);
	    	}
	    	if (runtimeChecker != null) {
	    		return runtimeChecker.checkRuntimeCompatibility(serverId, serverInstanceId, projectName, projectTypeId, earProjectName);
		    }
	    }
	    	    
	    
		return Status.OK_STATUS;

	}

Lines 31-36 Link Here

(-)src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties (-1 / +3 lines)
31	# 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report	31	# 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
32	# 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews	32	# 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews
33	# 20080331 225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category	33	# 20080331 225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category
		34	# 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
34	###############################################################################	35	###############################################################################
35		36
36	#	37	#
Lines 202-208 Link Here
202	MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME=The flexible project preference is off. Therefore, project names and module names must be the same for new modules.	203	MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME=The flexible project preference is off. Therefore, project names and module names must be the same for new modules.
203		204
204	MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT=The {0} Web service runtime does not support the service project {1}.	205	MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT=The {0} Web service runtime does not support the service project {1}.
205	MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the service project {1}.	206	MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the service project {1}.
		207	MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT The {0} server does not support the java project {1}.
206	MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE=The {0} Web service runtime does not support the service project type {1}.	208	MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE=The {0} Web service runtime does not support the service project type {1}.
207	MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE=The {0} server does not support the service project type {1}.	209	MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE=The {0} server does not support the service project type {1}.
208		210

Return to bug 215084

Lines 55-60 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java (-1 / +8 lines)
55	* 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)	55	* 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
56	* 20080326 198439 kathy@ca.ibm.com - Kathy Chan	56	* 20080326 198439 kathy@ca.ibm.com - Kathy Chan
57	* 20080402 198439 kathy@ca.ibm.com - Kathy Chan	57	* 20080402 198439 kathy@ca.ibm.com - Kathy Chan
		58	* 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
58	*******************************************************************************/	59	*******************************************************************************/
59	package org.eclipse.jst.ws.internal.creation.ui.widgets;	60	package org.eclipse.jst.ws.internal.creation.ui.widgets;
60		61
Lines 168-173 Link Here
168	private TypeRuntimeServer ids_;	169	private TypeRuntimeServer ids_;
169	private LabelsAndIds labelIds_;	170	private LabelsAndIds labelIds_;
170	private String serviceProjectName_;	171	private String serviceProjectName_;
		172	private IProject initialProject_;
171	private String serviceEarProjectName_;	173	private String serviceEarProjectName_;
172	private String serviceComponentType_;	174	private String serviceComponentType_;
173	private WebServicesParser parser_;	175	private WebServicesParser parser_;
Lines 1198-1204 Link Here
1198	String earProjectName = getServiceEarProjectName();	1200	String earProjectName = getServiceEarProjectName();
1199	String projectTypeId = getServiceComponentType();	1201	String projectTypeId = getServiceComponentType();
1200	IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId,	1202	IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId,
1201	serverInstanceId, projectName, needEar, earProjectName, projectTypeId, false);	1203	serverInstanceId, projectName, initialProject_.getName(), needEar, earProjectName, projectTypeId, false);
1202	if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) {	1204	if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) {
1203	return serviceSideErrorStatus;	1205	return serviceSideErrorStatus;
1204	}	1206	}
Lines 1303-1308 Link Here
1303	packSelf();	1305	packSelf();
1304	}	1306	}
1305		1307
		1308	public void setInitialProject(IProject project)
		1309	{
		1310	initialProject_ = project;
		1311	}
		1312
1306	public void setServiceEarProjectName(String name)	1313	public void setServiceEarProjectName(String name)
1307	{	1314	{
1308	serviceEarProjectName_ = name;	1315	serviceEarProjectName_ = name;

Lines 37-42 Link Here

(-)src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java (-1 / +3 lines)
37	* 20080312 147442 trungha@ca.ibm.com - Trung Ha	37	* 20080312 147442 trungha@ca.ibm.com - Trung Ha
38	* 20080311 222103 trungha@ca.ibm.com - Trung, Changing service scale doesn't update completely non-UI part of client scale	38	* 20080311 222103 trungha@ca.ibm.com - Trung, Changing service scale doesn't update completely non-UI part of client scale
39	* 20080327 224452 trungha@ca.ibm.com - Trung Ha	39	* 20080327 224452 trungha@ca.ibm.com - Trung Ha
		40	* 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
40	*******************************************************************************/	41	*******************************************************************************/
41	package org.eclipse.jst.ws.internal.consumption.ui.widgets;	42	package org.eclipse.jst.ws.internal.consumption.ui.widgets;
42		43
Lines 987-994 Link Here
987	boolean needEar = getClientNeedEAR();	988	boolean needEar = getClientNeedEAR();
988	String earProjectName = getClientEarProjectName();	989	String earProjectName = getClientEarProjectName();
989	String projectTypeId = getClientComponentType();	990	String projectTypeId = getClientComponentType();
		991	// Defect 215084 - no need to pass initial project for client scenario
990	IStatus possibleErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId,	992	IStatus possibleErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId,
991	serverInstanceId, projectName, needEar, earProjectName, projectTypeId, true);	993	serverInstanceId, projectName,"", needEar, earProjectName, projectTypeId, true);
992	return possibleErrorStatus;	994	return possibleErrorStatus;
993	}	995	}
994		996

Lines 23-28 Link Here

(-)src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java (-5 / +17 lines)
23	* 20071107 203826 kathy@ca.ibm.com - Kathy Chan	23	* 20071107 203826 kathy@ca.ibm.com - Kathy Chan
24	* 20071130 203826 kathy@ca.ibm.com - Kathy Chan	24	* 20071130 203826 kathy@ca.ibm.com - Kathy Chan
25	* 20080205 170141 kathy@ca.ibm.com - Kathy Chan	25	* 20080205 170141 kathy@ca.ibm.com - Kathy Chan
		26	* 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews
26	*******************************************************************************/	27	*******************************************************************************/
27	package org.eclipse.jst.ws.internal.consumption.ui.common;	28	package org.eclipse.jst.ws.internal.consumption.ui.common;
28		29
Lines 79-87 Link Here
79	import org.eclipse.wst.common.project.facet.core.VersionFormatException;	80	import org.eclipse.wst.common.project.facet.core.VersionFormatException;
80	import org.eclipse.wst.server.core.IRuntime;	81	import org.eclipse.wst.server.core.IRuntime;
81	import org.eclipse.wst.server.core.IRuntimeType;	82	import org.eclipse.wst.server.core.IRuntimeType;
		83	import org.eclipse.wst.server.core.IServer;
82	import org.eclipse.wst.server.core.IServerType;	84	import org.eclipse.wst.server.core.IServerType;
83	import org.eclipse.wst.server.core.ServerCore;	85	import org.eclipse.wst.server.core.ServerCore;
84	import org.eclipse.wst.server.core.ServerUtil;
85	import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;	86	import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
86	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;	87	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
87	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;	88	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
Lines 271-277 Link Here
271	* IStatus with severity IStatus.ERROR otherwise.	272	* IStatus with severity IStatus.ERROR otherwise.
272	*/	273	*/
273	public IStatus checkErrorStatus(int validationState, String typeId, String runtimeId, String serverId,	274	public IStatus checkErrorStatus(int validationState, String typeId, String runtimeId, String serverId,
274	String serverInstanceId, String projectName, boolean needEar, String earProjectName, String projectTypeId,	275	String serverInstanceId, String projectName, String initialProjectName, boolean needEar, String earProjectName, String projectTypeId,
275	boolean isClient) {	276	boolean isClient) {
276		277
277	// Ensure server, Web service runtime, and Web service type are	278	// Ensure server, Web service runtime, and Web service type are
Lines 311-316 Link Here
311	}	312	}
312	}	313	}
313	}	314	}
		315
		316	if (serverId != null && !initialProjectName.equals(projectName) &&
		317	(WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP) &&
		318	J2EEUtils.isJavaComponent(ProjectUtilities.getProject(initialProjectName))){
		319
		320	Set javaSet = FacetUtils.getFacetsForProject(initialProjectName);
		321	if(!doesServerSupportFacets(serverId,javaSet)){
		322	return StatusUtils.errorStatus(NLS.bind(
		323	ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT,
		324	new String[] { serverLabel, initialProjectName }));
		325	}
		326	}
314	}	327	}
315		328
316	// If the project exists, ensure it supports the Web service type, Web	329	// If the project exists, ensure it supports the Web service type, Web
Lines 464-474 Link Here
464	runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);	477	runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);
465	}	478	}
466	if (runtimeChecker != null) {	479	if (runtimeChecker != null) {
467	return runtimeChecker.checkRuntimeCompatibility(serverId, serverInstanceId, projectName, projectTypeId, earProjectName);	480	return runtimeChecker.checkRuntimeCompatibility(serverId, serverInstanceId, projectName, projectTypeId, earProjectName);
468	}	481	}
469	}	482	}
470		483
471
472	return Status.OK_STATUS;	484	return Status.OK_STATUS;
473		485
474	}	486	}