### Eclipse Workspace Patch 1.0 #P org.eclipse.jst.ws.creation.ui Index: src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java =================================================================== RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java,v retrieving revision 1.60 diff -u -r1.60 ServerWidgetBinding.java --- src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java 26 Mar 2008 20:11:17 -0000 1.60 +++ src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java 16 Apr 2008 19:41:25 -0000 @@ -30,6 +30,7 @@ * 20071031 140518 joan@ca.ibm.com - Joan Haggarty * 20071218 200193 gilberta@ca.ibm.com - Gilbert Andrews * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews + * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews *******************************************************************************/ package org.eclipse.jst.ws.internal.creation.ui.widgets.binding; @@ -154,6 +155,8 @@ dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidget.class); dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidget.class); dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidget.class); + dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerWizardWidget.class); + // After ServerWizardWidget Index: src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java =================================================================== RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java,v retrieving revision 1.65 diff -u -r1.65 ServerWizardWidget.java --- src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java 2 Apr 2008 15:03:07 -0000 1.65 +++ src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java 16 Apr 2008 19:41:25 -0000 @@ -55,6 +55,7 @@ * 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; @@ -168,6 +169,7 @@ private TypeRuntimeServer ids_; private LabelsAndIds labelIds_; private String serviceProjectName_; + private IProject initialProject_; private String serviceEarProjectName_; private String serviceComponentType_; private WebServicesParser parser_; @@ -1198,7 +1200,7 @@ String earProjectName = getServiceEarProjectName(); String projectTypeId = getServiceComponentType(); IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId, - serverInstanceId, projectName, needEar, earProjectName, projectTypeId, false); + serverInstanceId, projectName, initialProject_.getName(), needEar, earProjectName, projectTypeId, false); if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) { return serviceSideErrorStatus; } @@ -1303,6 +1305,11 @@ packSelf(); } + public void setInitialProject(IProject project) + { + initialProject_ = project; + } + public void setServiceEarProjectName(String name) { serviceEarProjectName_ = name; #P org.eclipse.jst.ws.consumption.ui Index: src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java =================================================================== RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java,v retrieving revision 1.25 diff -u -r1.25 ConsumptionUIMessages.java --- src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java 26 Mar 2008 20:11:10 -0000 1.25 +++ src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java 16 Apr 2008 19:41:25 -0000 @@ -29,6 +29,7 @@ * 20080318 213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client) * 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report * 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews + * 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews *******************************************************************************/ package org.eclipse.jst.ws.internal.consumption.ui; @@ -130,6 +131,7 @@ public static String MSG_MODULE; public static String MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME; public static String MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT; + public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT; public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT; public static String MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE; public static String MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE; Index: src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties =================================================================== RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties,v retrieving revision 1.31 diff -u -r1.31 ConsumptionUI.properties --- src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties 2 Apr 2008 16:52:54 -0000 1.31 +++ src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties 16 Apr 2008 19:41:25 -0000 @@ -31,6 +31,7 @@ # 20080326 171705 trungha@ca.ibm.com - Trung, improve AntTask errors report # 20080325 184761 gilberta@ca.ibm.com - Gilbert Andrews # 20080331 225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category +# 20080416 215084 gilberta@ca.ibm.com - Gilbert Andrews ############################################################################### # @@ -202,7 +203,8 @@ 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. MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT=The {0} Web service runtime does not support the service project {1}. -MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the service project {1}. +MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT=The {0} server does not support the service project {1}. +MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT The {0} server does not support the java project {1}. MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE=The {0} Web service runtime does not support the service project type {1}. MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE=The {0} server does not support the service project type {1}. Index: src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java =================================================================== RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java,v retrieving revision 1.44 diff -u -r1.44 WebServiceClientTypeWidget.java --- src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java 27 Mar 2008 20:04:17 -0000 1.44 +++ src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java 16 Apr 2008 19:41:25 -0000 @@ -37,6 +37,7 @@ * 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; @@ -988,7 +989,7 @@ String earProjectName = getClientEarProjectName(); String projectTypeId = getClientComponentType(); IStatus possibleErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId, - serverInstanceId, projectName, needEar, earProjectName, projectTypeId, true); + serverInstanceId, projectName,"", needEar, earProjectName, projectTypeId, true); return possibleErrorStatus; } Index: src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java =================================================================== RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java,v retrieving revision 1.34 diff -u -r1.34 ValidationUtils.java --- src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java 5 Feb 2008 20:35:31 -0000 1.34 +++ src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java 16 Apr 2008 19:41:25 -0000 @@ -23,6 +23,7 @@ * 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; @@ -79,9 +80,9 @@ 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; @@ -271,7 +272,7 @@ * IStatus with severity IStatus.ERROR otherwise. */ public IStatus checkErrorStatus(int validationState, String typeId, String runtimeId, String serverId, - String serverInstanceId, String projectName, boolean needEar, String earProjectName, String projectTypeId, + String serverInstanceId, String projectName, String javaProjectName, boolean needEar, String earProjectName, String projectTypeId, boolean isClient) { // Ensure server, Web service runtime, and Web service type are @@ -464,10 +465,28 @@ runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId); } if (runtimeChecker != null) { - return runtimeChecker.checkRuntimeCompatibility(serverId, serverInstanceId, projectName, projectTypeId, earProjectName); + runtimeChecker.checkRuntimeCompatibility(serverId, serverInstanceId, projectName, projectTypeId, earProjectName); } } + if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES + || validationState == VALIDATE_PROJECT_CHANGES) { + + + if (serverId != null && !javaProjectName.equals(projectName) && + (WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP) && + J2EEUtils.isJavaComponent(ProjectUtilities.getProject(javaProjectName))){ + + Set javaSet = FacetUtils.getFacetsForProject(javaProjectName); + if(!doesServerSupportFacets(serverId,javaSet)){ + return StatusUtils.errorStatus(NLS.bind( + ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT, + new String[] { serverLabel, javaProjectName })); + } + } + + } + return Status.OK_STATUS;