diff options
Diffstat (limited to 'bundles')
10 files changed, 223 insertions, 58 deletions
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml index 34d39c594..7d1a97b84 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml +++ b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml @@ -686,6 +686,7 @@ point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget"> <objectSelectionWidget class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget" + transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionTransformer" id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"> </objectSelectionWidget> </extension> @@ -784,5 +785,7 @@ moduleTypesExclude=""> </clientType> </extension> - + + + </plugin> diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java new file mode 100644 index 000000000..61f6e3a66 --- /dev/null +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java @@ -0,0 +1,25 @@ +package org.eclipse.jst.ws.internal.consumption.ui.widgets.object; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jst.j2ee.ejb.EnterpriseBean; +import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer; + +public class EJBSelectionTransformer implements Transformer +{ + + public Object transform(Object value) + { + if (value instanceof IStructuredSelection) + { + Object sel = ((IStructuredSelection)value).getFirstElement(); + if (sel instanceof EnterpriseBean) + { + return new StructuredSelection(((EnterpriseBean)sel).getName()); + } + } + return value; + } + + +} diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java index afead6126..922cf67ed 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java @@ -16,15 +16,12 @@ import java.util.Vector; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jst.j2ee.ejb.EJBJar; +import org.eclipse.jst.j2ee.ejb.EJBResource; import org.eclipse.jst.j2ee.ejb.Session; -import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; -import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; -import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime; -import org.eclipse.jst.j2ee.internal.ejb.project.EJBProjectResources; +import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit; import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -42,16 +39,20 @@ import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents; import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils; import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus; import org.eclipse.wst.command.internal.provisional.env.core.common.Status; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget { private String pluginId_ = "org.eclipse.jst.ws.consumption.ui"; private Combo earList; private EJBTableViewer beanList; - private EARNatureRuntime[] earProjects; + private IVirtualComponent[] earComponents; + //rskejb private EARNatureRuntime[] earProjects; private Integer selectedBeanIndex = null; private Vector ejbBeanNames; - private Vector ejbProjectNames; + private Vector ejbComponentNames; + private Vector ejbComponentProjectNames; + //rskejb private Vector ejbProjectNames; private Listener statusListener_; /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */ private String INFOPOP_PEBD_EAR_PROJECTS = "org.eclipse.jst.ws.consumption.ui.PEBD0001"; @@ -60,7 +61,11 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements public EJBSelectionWidget() { + earComponents = J2EEUtils.getAllEARComponents(); + /* rskejb IProject[] projects = J2EEUtils.getEARProjects(); + + Vector earVector = new Vector(); for (int i = 0; i < projects.length; i++) { @@ -73,6 +78,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements } } earProjects = (EARNatureRuntime[]) earVector.toArray(new EARNatureRuntime[0]); + rskejb */ } public String getSelectedBean() @@ -88,7 +94,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements { if (selectedBeanIndex != null) { - return (String) (ejbProjectNames.elementAt(selectedBeanIndex.intValue())); + return (String) (ejbComponentProjectNames.elementAt(selectedBeanIndex.intValue())); } return null; } @@ -117,7 +123,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements public void widgetSelected(SelectionEvent evt) { Combo widget = (Combo) (evt.widget); - setBeanList(earProjects[widget.getSelectionIndex()]); + setBeanList(earComponents[widget.getSelectionIndex()]); selectedBeanIndex = null; statusListener_.handleEvent(null); } @@ -146,9 +152,9 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements }); beanTable.setToolTipText(msgUtils.getMessage("TOOLTIP_TABLE_BEAN_NAMES")); PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES); - if (earProjects != null && earProjects.length > 0) + if (earComponents != null && earComponents.length > 0) { - setBeanList(earProjects[0]); + setBeanList(earComponents[0]); } beanTable.getColumn(0).pack(); beanTable.getColumn(1).pack(); @@ -160,23 +166,61 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements private void addEARNamesToList() { - if (earProjects != null && earProjects.length > 0) + if (earComponents != null && earComponents.length > 0) { - for (int index = 0; index < earProjects.length; index++) + for (int index = 0; index < earComponents.length; index++) { - earList.add(earProjects[index].getProject().getName()); + earList.add(earComponents[index].getName()); } earList.setText(earList.getItem(0)); } } + private void setBeanList(IVirtualComponent earComponent) + { + IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject(), earComponent.getName()); + Table beanTable = beanList.getTable(); + beanTable.removeAll(); + ejbBeanNames = new Vector(); + ejbComponentNames = new Vector(); + ejbComponentProjectNames = new Vector(); + for (int index = 0; index < ejbComponentsArray.length; index++) + { + EJBArtifactEdit ejbEdit = null; + try { + ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponentsArray[index]); + EJBResource ejbRes = ejbEdit.getEJBJarXmiResource(); + EJBJar jar = ejbRes.getEJBJar(); + Vector beans = J2EEUtils.getBeanNames(jar); + String componentName = ejbComponentsArray[index].getName(); + String projectName = ejbComponentsArray[index].getProject().getName(); + ejbBeanNames.addAll(beans); + ejbComponentNames.addAll(Collections.nCopies(beans.size(), componentName)); + ejbComponentProjectNames.addAll(Collections.nCopies(beans.size(), projectName)); + } + finally { + if (ejbEdit!=null) + ejbEdit.dispose(); + } + } + beanList.setData(ejbBeanNames, ejbComponentNames); + beanList.setInput(ejbBeanNames); + + } + + /* + * @deprecated + */ + /* private void setBeanList(EARNatureRuntime earProject) { Vector ejbProjects = J2EEUtils.getEJBProjects(earProject); Table beanTable = beanList.getTable(); beanTable.removeAll(); ejbBeanNames = new Vector(); - ejbProjectNames = new Vector(); + //rskejb ejbProjectNames = new Vector(); + ejbComponentNames = new Vector(); + ejbComponents = new Vector(); for (int index = 0; index < ejbProjects.size(); index++) { EJBNatureRuntime ejbNature = (EJBNatureRuntime) (ejbProjects.elementAt(index)); @@ -191,7 +235,8 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements beanList.setData(ejbBeanNames, ejbProjectNames); beanList.setInput(ejbBeanNames); } - + */ + public void setInitialSelection(IStructuredSelection initialSelection) { if (initialSelection != null && !initialSelection.isEmpty()) @@ -203,8 +248,32 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements EJBJar jar = session.getEjbJar(); if (jar != null) { - for (int i = 0; i < earProjects.length; i++) + for (int i = 0; i < earComponents.length; i++) { + IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject(), earComponents[i].getName()); + for (int j=0; j <ejbComponents.length; j++) + { + EJBArtifactEdit ejbEdit = null; + try { + ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[j]); + EJBResource ejbRes = ejbEdit.getEJBJarXmiResource(); + if (ejbRes.getEJBJar() == jar) + { + earList.setText(earComponents[i].getName()); + setBeanList(earComponents[i]); + beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))})); + selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName())); + return; + } + + } + finally { + if (ejbEdit!=null) + ejbEdit.dispose(); + } + + } + /* rskejb Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[i]); for (Iterator it = ejbProjects.iterator(); it.hasNext();) { @@ -220,6 +289,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements } ejbResource.cleanup(); } + rskejb */ } } } @@ -237,6 +307,33 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements String selEJBName = (String) ejbBeanNames.get(((Integer) object).intValue()); if (selEJBName != null) { + IProject project = earComponents[earList.getSelectionIndex()].getProject(); + String name = earComponents[earList.getSelectionIndex()].getName(); + IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project, name); + for (int i=0; i<ejbComponents.length; i++) + { + EJBArtifactEdit ejbEdit = null; + try + { + ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[i]); + EJBResource ejbRes = ejbEdit.getEJBJarXmiResource(); + EJBJar jar = ejbRes.getEJBJar(); + java.util.List sessions = jar.getSessionBeans(); + for (Iterator it2 = sessions.iterator(); it2.hasNext();) + { + Session session = (Session) it2.next(); + if (selEJBName.equals(session.getName())) + { + return new StructuredSelection(new Session[]{session}); + } + } + } + finally { + if (ejbEdit!=null) + ejbEdit.dispose(); + } + } + /* rskejb Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[earList.getSelectionIndex()]); for (Iterator it = ejbProjects.iterator(); it.hasNext();) { @@ -254,6 +351,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements } ejbResource.cleanup(); } + rskejb */ } } } @@ -271,16 +369,12 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements public String getComponentName() { - String projectName = getSelectedProject(); - if (projectName != null && projectName.length() > 0) + if (selectedBeanIndex != null) { - IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - String comp = J2EEUtils.getFirstWebModuleName(p); - return comp; + return (String) (ejbComponentNames.elementAt(selectedBeanIndex.intValue())); } - else - return null; - } + return null; + } public Status validateSelection(IStructuredSelection objectSelection) { diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java index 19be650c6..c02da861a 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java @@ -860,9 +860,12 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends SimpleCommand } */ - protected void updateClientProject(String projectName, String componentName) + protected void updateClientProject(String projectName, String componentName, String serviceTypeId) { - String[] updatedNames = ResourceUtils.getClientProjectComponentName(projectName, componentName); + boolean isEJB = false; + String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(serviceTypeId); + isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb")); + String[] updatedNames = ResourceUtils.getClientProjectComponentName(projectName, componentName, isEJB); getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(updatedNames[0]); clientComponentName_ = updatedNames[1]; @@ -909,26 +912,28 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends SimpleCommand private void setDefaultsForExtension(Environment env) { - IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntime(clientIds_.getRuntimeId()); - WebServiceClientInfo wsInfo = new WebServiceClientInfo(); + IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntime(clientIds_.getRuntimeId()); + if (wsrt != null) + { + WebServiceClientInfo wsInfo = new WebServiceClientInfo(); - wsInfo.setJ2eeLevel(clientJ2EEVersion_); - wsInfo.setServerFactoryId(clientIds_.getServerId()); - wsInfo.setServerInstanceId(clientIds_.getServerInstanceId()); - wsInfo.setState(WebServiceState.UNKNOWN_LITERAL); - wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId()); - wsInfo.setWsdlURL(wsdlURI_); + wsInfo.setJ2eeLevel(clientJ2EEVersion_); + wsInfo.setServerFactoryId(clientIds_.getServerId()); + wsInfo.setServerInstanceId(clientIds_.getServerInstanceId()); + wsInfo.setState(WebServiceState.UNKNOWN_LITERAL); + wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId()); + wsInfo.setWsdlURL(wsdlURI_); - environment_ = env; - webServiceClient_ = wsrt.getWebServiceClient(wsInfo); - WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL; - if (resourceContext_!=null) - { - context_ = new SimpleContext(true, true, true, true, true, true, test_, - false, scenario, resourceContext_.isOverwriteFilesEnabled(), - resourceContext_.isCreateFoldersEnabled(), resourceContext_ - .isCheckoutFilesEnabled()); + environment_ = env; + webServiceClient_ = wsrt.getWebServiceClient(wsInfo); + WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL; + if (resourceContext_ != null) + { + context_ = new SimpleContext(true, true, true, true, true, true, test_, false, scenario, resourceContext_.isOverwriteFilesEnabled(), resourceContext_ + .isCreateFoldersEnabled(), resourceContext_.isCheckoutFilesEnabled()); + } } + } public void setClientInitialSelection(IStructuredSelection selection) diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java index df9363a62..c3a3d76c9 100644 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java @@ -178,7 +178,7 @@ public class ProjectSelectionWidget extends SimpleWidgetDataContributor { String projectName = moduleProject_.getText(); IProject project = ProjectUtilities.getProject( projectName ); - componentType_ = J2EEUtils.WEB; + componentType_ = J2EEUtils.WEB | J2EEUtils.EJB; IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, componentType_ ); String[] modules = new String[components.length]; diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml index fec193e98..207c411bc 100644 --- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml +++ b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml @@ -4,10 +4,10 @@ <plugin> <!-- EJB Web Service Types --> - +<!-- <extension point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType"> -<!-- + <webServiceType label="%WEBSERVICETYPE_NAME_WSDL_EJB_TP" resourceTypeMetadata="File IResource" @@ -17,7 +17,7 @@ excludeNatures="" id="org.eclipse.jst.ws.type.wsdl.ejb"> </webServiceType> ---> + <webServiceType label="%WEBSERVICETYPE_NAME_EJB_TP" resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl" @@ -27,8 +27,8 @@ excludeNatures="" id="org.eclipse.jst.ws.type.ejb"> </webServiceType> - </extension> +--> <!-- Popups --> @@ -46,4 +46,29 @@ </objectContribution> </extension> + +<!-- EJB stuff --> + <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl"> + <webServiceImpl + id="org.eclipse.jst.ws.wsImpl.ejb" + label="%WEBSERVICETYPE_NAME_EJB_TP" + resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl" + extensionMetadata=".java .class .SessionImpl" + objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"> + </webServiceImpl> + </extension> + +<extension point="org.eclipse.jst.ws.consumption.ui.serviceType"> + <serviceType + id="org.eclipse.jst.ws.serviceType.ejb" + implId="org.eclipse.jst.ws.wsImpl.ejb" + buModuleTypesInclude="org.eclipse.jst.j2ee.ejb.EJBNature" + buModuleTypesExclude="" + tdModuleTypesInclude="org.eclipse.jst.j2ee.ejb.EJBNature" + tdModuleTypesExclude=""> + </serviceType> +</extension> + + + </plugin>
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java index 825717960..5ea8fc17a 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java @@ -337,6 +337,7 @@ public class ServerRuntimeSelectionWidget extends SimpleWidgetDataContributor //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance(); //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId(); //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId(); + /* rskejb boolean isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBModuleFor(serviceServerFactoryId, webServiceRuntimeId, webServiceTypeId); if (!isEJBRequired) { @@ -344,7 +345,8 @@ public class ServerRuntimeSelectionWidget extends SimpleWidgetDataContributor //isEJBRequired = wssrtRegistry.requiresEJBProject(webServiceTypeId); isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBProject(webServiceTypeId); } - + rskejb */ + boolean isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBProject(webServiceRuntimeId, webServiceTypeId); if (isEJBRequired && !J2EEUtils.isEJBComponent(serviceProj, serviceComponentName)) { finalStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_INVALID_EJB_PROJECT",new String[]{serviceProjName}),Status.ERROR); diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java index 88b528818..3caf1b6fb 100644 --- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java +++ b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java @@ -97,7 +97,7 @@ public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntime setDefaultEARs(); setDefaultServer(); updateServiceEARs(); - updateClientProject(getServiceProject2EARProject().getList().getSelection(), serviceComponentName_); + updateClientProject(getServiceProject2EARProject().getList().getSelection(), serviceComponentName_, serviceIds_.getTypeId()); updateClientEARs(); // rskreg diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java index dd136bdae..a9bc9095d 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java @@ -414,7 +414,7 @@ public final class J2EEUtils { IVirtualComponent[] webVC = getWebComponents(project); addToArrayListHelper(webVC, v); } - if ( (EJB & componentType)==WEB ){ + if ( (EJB & componentType)==EJB ){ IVirtualComponent[] ejbVC = getEJBComponents(project); addToArrayListHelper(ejbVC, v); } diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java index 7971035ef..904bf3c2d 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java @@ -109,6 +109,7 @@ public final class ResourceUtils { public static String SERVLET_EXT = "/servlet/rpcrouter"; private static final String DEFAULT_CLIENT_WEB_PROJECT_EXT = "Client"; + private static final String DEFAULT_CLIENT_EJB_PROJECT_EXT = "EJBClient"; private static final String DEFAULT_EJB_PROJECT_NAME = "WebServiceEJBProject"; private static final String DEFAULT_EJB_COMPONENT_NAME = "WebServiceEJB"; private static final String DEFAULT_WEB_PROJECT_NAME = "WebServiceProject"; @@ -1717,12 +1718,22 @@ public final class ResourceUtils { return clientWebProjectName; } - public static String[] getClientProjectComponentName(String projectName, String componentName) + public static String[] getClientProjectComponentName(String projectName, String componentName, boolean isEJB) { - String clientProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT; - String baseName = clientProjectName; - String clientComponentName = componentName + DEFAULT_CLIENT_WEB_PROJECT_EXT; - String baseCompName = clientComponentName; + String clientProjectName = null; + String clientComponentName = null; + if (isEJB) + { + clientProjectName = projectName + DEFAULT_CLIENT_EJB_PROJECT_EXT; + clientComponentName = componentName + DEFAULT_CLIENT_EJB_PROJECT_EXT; + } + else + { + clientProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT; + String baseName = clientProjectName; + clientComponentName = componentName + DEFAULT_CLIENT_WEB_PROJECT_EXT; + String baseCompName = clientComponentName; + } // boolean foundWebProject = false; // int i = 1; |