Author: Grid.Qian Date: 2011-01-05 04:57:35 -0500 (Wed, 05 Jan 2011) New Revision: 27903 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java Log: JBIDE-7913: add warning dialog for overwrite impl class and web.xml Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-01-05 09:55:22 UTC (rev 27902) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-01-05 09:57:35 UTC (rev 27903) @@ -1,12 +1,15 @@ package org.jboss.tools.ws.creation.core.commands; import java.io.File; -import java.net.URI; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import javax.wsdl.Definition; import javax.wsdl.WSDLException; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; +import javax.xml.namespace.QName; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IProject; @@ -49,16 +52,17 @@ import org.eclipse.jdt.core.dom.Type; import org.eclipse.jdt.core.dom.TypeDeclaration; import org.eclipse.jdt.core.dom.WildcardType; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.text.edits.TextEdit; +import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; import org.jboss.tools.ws.core.utils.StatusUtils; import org.jboss.tools.ws.creation.core.JBossWSCreationCorePlugin; import org.jboss.tools.ws.creation.core.data.ServiceModel; import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; import org.jboss.tools.ws.creation.core.utils.JBossWSCreationUtils; -import org.jboss.tools.ws.creation.core.utils.WSDLPropertyReader; public class ImplementationClassCreationCommand extends AbstractDataModelOperation { @@ -100,27 +104,36 @@ IJavaProject javaPrj = JavaCore.create(project); List<ICompilationUnit> serviceUnits = JBossWSCreationUtils - .findJavaUnitsByAnnotation( - javaPrj, + .findJavaUnitsByAnnotation(javaPrj, JBossWSCreationCoreMessages.Webservice_Annotation, model.getCustomPackage()); - + packageName = model.getCustomPackage(); boolean noPackageName = false; - if("".equals(packageName)){ //$NON-NLS-1$ + if ("".equals(packageName)) { //$NON-NLS-1$ noPackageName = true; } + boolean isCheck = true; for (ICompilationUnit service : serviceUnits) { if (!service.findPrimaryType().isInterface()) { continue; } - if(noPackageName){ + if (noPackageName) { packageName = service.getParent().getElementName(); } + String implClsName = getImplClassName(getClassName(service + .getElementName())); + if (isCheck) { + if (findImplClass(implClsName)) { + isCheck = false; + if (!isOverwriteClass()) { + break; + } + } + } generateImplClass(service); - String implClsName = getImplPackageName() - + "." + getImplClassName(getClassName(service.getElementName())); //$NON-NLS-1$ - model.addServiceClasses(implClsName); + model.addServiceClasses(getImplPackageName() + + "." + implClsName); //$NON-NLS-1$ } } catch (CoreException e) { @@ -139,42 +152,48 @@ return status; } - protected String getTNSFromWSDL() { - WSDLPropertyReader reader = new WSDLPropertyReader(); - try { - URI fileURI = new URI(model.getWsdlURI()); - File tempFile = new File(fileURI); - reader.readWSDL(tempFile.getAbsolutePath()); - return reader.getTargetnamespace(); - } catch (WSDLException e) { - e.printStackTrace(); - } catch (URISyntaxException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + private boolean isOverwriteClass() throws JavaModelException { + boolean b = MessageDialog + .openConfirm( + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(), + JBossWSCreationCoreMessages.Confirm_Override_ImplClass, + JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSImpl_Overwrite); + return b; + } + + private boolean findImplClass(String claName) throws JavaModelException { + boolean b = false; + IPackageFragmentRoot root = getPackageFragmentRoot(); + String implPackageName = getImplPackageName(); + IPackageFragment pack = root.getPackageFragment(implPackageName); + if (pack.getCompilationUnit(claName + ".java").exists()) { //$NON-NLS-1$ + b = true; } - return null; + return b; } - protected String getServiceNameFromWSDL() { - WSDLPropertyReader reader = new WSDLPropertyReader(); - + protected String[] getServiceNameFromWSDL() { + String[] names = new String[2]; try { - URI fileURI = new URI(model.getWsdlURI()); - File tempFile = new File(fileURI); - reader.readWSDL(tempFile.getAbsolutePath()); - List<String> services = reader.getServiceList(); - if (services != null && services.size() > 0) { - return services.get(0); + WSDLFactory factory = WSDLFactory.newInstance(); + WSDLReader wsdlReader = factory.newWSDLReader(); + Definition def = wsdlReader.readWSDL(model.getWsdlURI()); + Map<?, ?> services = def.getServices(); + if (services != null) { + QName[] a = new QName[services.keySet().size()]; + if (a != null && a.length > 0) { + services.keySet().toArray(a); + names[0] = a[0].getLocalPart(); + } } + names[1] = def.getTargetNamespace(); } catch (WSDLException e) { e.printStackTrace(); - } catch (URISyntaxException e) { - // TODO Auto-generated catch block - e.printStackTrace(); } - return null; + return names; } - + @SuppressWarnings("unchecked") protected void generateImplClass(ICompilationUnit service) throws CoreException, BadLocationException { @@ -186,11 +205,13 @@ String className = getClassName(service.getElementName()); String implFileName = getJavaFileName(className); - - String serviceName = getServiceNameFromWSDL(); - - String targetNamespace = getTNSFromWSDL(); + String[] names = getServiceNameFromWSDL(); + + String serviceName = names[0]; + + String targetNamespace = names[1]; + ICompilationUnit icu = pack.createCompilationUnit(implFileName, "", true, null); //$NON-NLS-1$ // create a working copy with a new owner @@ -363,8 +384,8 @@ ANNOTATION_PROPERTY_ENDPOINT_INTERFACE, endpoint); ann.values().add(member); if (targetNamespace != null) { - member = createMemberValuePair(ast, - ANNOTATION_PROPERTY_TNS, targetNamespace); + member = createMemberValuePair(ast, ANNOTATION_PROPERTY_TNS, + targetNamespace); ann.values().add(member); } return ann; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2011-01-05 09:55:22 UTC (rev 27902) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2011-01-05 09:57:35 UTC (rev 27903) @@ -33,9 +33,7 @@ throws ExecutionException { try { - String location = JBossWSCreationUtils - .getJBossWSRuntimeLocation(JBossWSCreationUtils - .getProjectByName(model.getWebProjectName())); + String location = JBossWSCreationUtils.getJBossWSRuntimeLocation(JBossWSCreationUtils.getProjectByName(model.getWebProjectName())); if (location.equals("")) { //$NON-NLS-1$ return StatusUtils .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2011-01-05 09:55:22 UTC (rev 27902) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/MergeWebXMLCommand.java 2011-01-05 09:57:35 UTC (rev 27903) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.j2ee.model.ModelProviderManager; import org.eclipse.jst.javaee.core.DisplayName; @@ -32,6 +33,7 @@ import org.eclipse.jst.javaee.web.WebFactory; import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties; import org.eclipse.jst.jee.project.facet.WebCreateDeploymentFilesDataModelProvider; +import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; @@ -71,19 +73,24 @@ for (int i = 0; i < serviceClasses.size(); i++) { servletDescriptors[i] = getServletDescriptor(serviceClasses.get(i)); } - IProject pro = JBossWSCreationUtils.getProjectByName(model.getWebProjectName()); - if (!hasWebXML(pro)) { + IProject pro = JBossWSCreationUtils.getProjectByName(model + .getWebProjectName()); + if (!hasWebXML(pro)) { IVirtualComponent vc = ComponentCore.createComponent(pro); - IDataModel model = DataModelFactory.createDataModel(new WebCreateDeploymentFilesDataModelProvider()); - model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, vc); - model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, pro); + IDataModel model = DataModelFactory + .createDataModel(new WebCreateDeploymentFilesDataModelProvider()); + model.setProperty( + ICreateDeploymentFilesDataModelProperties.GENERATE_DD, vc); + model.setProperty( + ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, + pro); IDataModelOperation op = model.getDefaultOperation(); try { op.execute(new NullProgressMonitor(), null); } catch (ExecutionException e1) { // Ignore - } - } + } + } mergeWebXML(servletDescriptors); return status; } @@ -120,24 +127,48 @@ protected void addServlet(IProject projectByName, ServletDescriptor servletDescriptor, org.eclipse.jst.j2ee.webapplication.WebApp webapp) { + @SuppressWarnings("rawtypes") List theServlets = webapp.getServlets(); + boolean b = false; for (int i = 0; i < theServlets.size(); i++) { org.eclipse.jst.j2ee.webapplication.Servlet aServlet = (org.eclipse.jst.j2ee.webapplication.Servlet) theServlets .get(i); if (aServlet.getServletName().equals(servletDescriptor.getName())) { - status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same); - return; + if (b) { + theServlets.remove(aServlet); + } else { + b = isOverrideServlet(); + if (b) { + theServlets.remove(aServlet); + break; + } else { + status = StatusUtils.errorStatus(""); //$NON-NLS-1$ + return; + } + } } } + @SuppressWarnings("rawtypes") List theServletMapplings = webapp.getServletMappings(); for (int i = 0; i < theServletMapplings.size(); i++) { org.eclipse.jst.j2ee.webapplication.ServletMapping aServletMapping = (org.eclipse.jst.j2ee.webapplication.ServletMapping) theServletMapplings .get(i); - if (aServletMapping.getServlet().getServletName().equals(servletDescriptor.getName()) + if (aServletMapping.getServlet().getServletName() + .equals(servletDescriptor.getName()) || aServletMapping.getUrlPattern().equals( servletDescriptor.getMappings())) { - status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same); - return; + if (b) { + theServletMapplings.remove(aServletMapping); + } else { + b = isOverrideServlet(); + if (b) { + theServletMapplings.remove(aServletMapping); + break; + } else { + status = StatusUtils.errorStatus(""); //$NON-NLS-1$ + return; + } + } } } org.eclipse.jst.j2ee.webapplication.WebapplicationFactory factory = org.eclipse.jst.j2ee.webapplication.WebapplicationFactory.eINSTANCE; @@ -162,52 +193,61 @@ } } - private ServletDescriptor getServletDescriptor(String clsName) { - String servletName = model.getServiceName(); - if (servletName == null) { - servletName = JBossWSCreationUtils - .classNameFromQualifiedName(clsName); - } - if (servletName.endsWith("Impl") && servletName.length() > 4) { //$NON-NLS-1$ - servletName = servletName.substring(0, servletName.length() - 4); - } - ServletDescriptor sd = new ServletDescriptor(); - sd.setName(servletName); - sd.setDisplayName(sd.getName()); - sd.setClassName(clsName); - sd.setMappings(JBossWSCreationCoreMessages.Separator_Java + sd.getName()); - return sd; - } - - @SuppressWarnings("unchecked") public void addjeeServlet(IProject webProject, ServletDescriptor servletDescriptor, WebApp webapp) { + @SuppressWarnings("rawtypes") List theServlets = webapp.getServlets(); + boolean b = false; for (int i = 0; i < theServlets.size(); i++) { Servlet aServlet = (Servlet) theServlets.get(i); if (aServlet.getServletName().equals(servletDescriptor.getName())) { - status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same); - return; + b = isOverrideServlet(); + if (b) { + theServlets.remove(aServlet); + break; + } else { + status = StatusUtils.errorStatus(""); //$NON-NLS-1$ + return; + } } } - List theServletMapplings = webapp.getServletMappings(); + List<ServletMapping> theServletMapplings = webapp.getServletMappings(); for (int i = 0; i < theServletMapplings.size(); i++) { ServletMapping aServletMapping = (ServletMapping) theServletMapplings .get(i); - if (aServletMapping.getServletName() - .equals(servletDescriptor.getName())) { - status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same); - return; + if (aServletMapping.getServletName().equals( + servletDescriptor.getName())) { + if (b) { + theServletMapplings.remove(aServletMapping); + } else { + b = isOverrideServlet(); + if (b) { + theServletMapplings.remove(aServletMapping); + break; + } else { + status = StatusUtils.errorStatus(""); //$NON-NLS-1$ + return; + } + } } - List list = aServletMapping.getUrlPatterns(); + List<UrlPatternType> list = aServletMapping.getUrlPatterns(); if (list != null) { for (int j = 0; j < list.size(); j++) { UrlPatternType url = (UrlPatternType) list.get(j); if (url.getValue().equals(servletDescriptor.getMappings())) { - status = StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same); - return; + if (b) { + theServletMapplings.remove(aServletMapping); + } else { + if (isOverrideServlet()) { + theServletMapplings.remove(aServletMapping); + break; + } else { + status = StatusUtils.errorStatus(""); //$NON-NLS-1$ + return; + } + } } } } @@ -234,15 +274,45 @@ webapp.getServletMappings().add(servletMapping); } } + + + private ServletDescriptor getServletDescriptor(String clsName) { + String servletName = model.getServiceName(); + if (servletName == null) { + servletName = JBossWSCreationUtils + .classNameFromQualifiedName(clsName); + } + if (servletName.endsWith("Impl") && servletName.length() > 4) { //$NON-NLS-1$ + servletName = servletName.substring(0, servletName.length() - 4); + } + ServletDescriptor sd = new ServletDescriptor(); + sd.setName(servletName); + sd.setDisplayName(sd.getName()); + sd.setClassName(clsName); + sd.setMappings(JBossWSCreationCoreMessages.Separator_Java + + sd.getName()); + return sd; + } private boolean hasWebXML(IProject pro) { // we are looking for this recursively because though application.xml // is always in META-INF, it's not always in "earcontent" since the // earcontent folder name can be custom - File file = JBossWSCreationUtils.findFileByPath(WEB_XML, pro.getLocation().toOSString()); - if(file == null){ - return false; - } + File file = JBossWSCreationUtils.findFileByPath(WEB_XML, pro + .getLocation().toOSString()); + if (file == null) { + return false; + } return true; } + + private boolean isOverrideServlet() { + boolean b = MessageDialog + .openConfirm( + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getShell(), + JBossWSCreationCoreMessages.Confirm_Override_Servlet, + JBossWSCreationCoreMessages.Error_JBossWS_GenerateWizard_WSName_Same); + return b; + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2011-01-05 09:55:22 UTC (rev 27902) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/WSDL2JavaCommand.java 2011-01-05 09:57:35 UTC (rev 27903) @@ -27,7 +27,6 @@ @Override protected void addCommandlineArgs(List<String> command) { - if(model.getCustomPackage() != null && !"".equals(model.getCustomPackage())){ //$NON-NLS-1$ command.add("-p"); //$NON-NLS-1$ command.add(model.getCustomPackage()); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2011-01-05 09:55:22 UTC (rev 27902) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2011-01-05 09:57:35 UTC (rev 27903) @@ -36,8 +36,11 @@ Error_WS_Location=The JBoss WS Runtime Location is NULL. Please set the location on JBoss WS preferences page. Error_Create_Client_Sample=When create a client sample, a error comes up. Please check the generated files. Error_No_Package=The service implementation selected does not follow Java naming conventions. This may result in not being able to generate your WebService. -Error_JBossWS_GenerateWizard_WSName_Same=The Web Service Name has been used in the web.xml of the web project. +Error_JBossWS_GenerateWizard_WSName_Same=The Web Service Name has been used in the web.xml of the web project. Do you want to overwrite it? +Error_JBossWS_GenerateWizard_WSImpl_Overwrite=The Web Service implementation classes have been there. Do you want to overwrite them? RestEasyLibUtils_Error_UnableToFindRuntimeForProject=Unable to find runtime associated with selected project. RSMergeWebXMLCommand_REST_App_Exists=Rest Application exists with same name RSMergeWebXMLCommand_REST_Servlet_Exists=RestEasy servlet already exists. RSMergeWebXMLCommand_REST_Servlet_Mapping_Exists=RestEasy servlet mapping already exists. +Confirm_Override_Servlet=Confirm Web Service Name Overwrite +Confirm_Override_ImplClass=Confirm Web Service Implementation classes Overwrite \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2011-01-05 09:55:22 UTC (rev 27902) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCoreMessages.java 2011-01-05 09:57:35 UTC (rev 27903) @@ -43,6 +43,7 @@ public static String Error_Create_Client_Sample; public static String Error_Message_No_Runtime_Specified; public static String Error_JBossWS_GenerateWizard_WSName_Same; + public static String Error_JBossWS_GenerateWizard_WSImpl_Overwrite; public static String RestEasyLibUtils_Error_UnableToFindRuntimeForProject; @@ -52,6 +53,8 @@ public static String RSMergeWebXMLCommand_REST_Servlet_Mapping_Exists; + public static String Confirm_Override_Servlet; + public static String Confirm_Override_ImplClass; private JBossWSCreationCoreMessages() { } Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java 2011-01-05 09:55:22 UTC (rev 27902) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/projects/ClientTest/src/org/example/www/helloworld/HelloWorldService.java 2011-01-05 09:57:35 UTC (rev 27903) @@ -15,7 +15,7 @@ * Generated source version: 2.0 * */ -@WebServiceClient(name = "HelloWorldService", targetNamespace = "http://www.example.org/HelloWorld", wsdlLocation = "http://localhost:8080/JavaFirstTestProject/HelloWorld?wsdl") +@WebServiceClient(name = "HelloWorldService", targetNamespace = "http://www.example.org/HelloWorld", wsdlLocation = "http://127.0.0.1:8080/JavaFirstTestProject/HelloWorld?wsdl") public class HelloWorldService extends Service {