Author: objectiser Date: 2010-02-16 14:55:29 -0500 (Tue, 16 Feb 2010) New Revision: 165 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java Log: SAVARA-56 - change partner link types wsdl file name in line with the naming used by the BPEL editor. Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-02-16 19:30:19 UTC (rev 164) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-02-16 19:55:29 UTC (rev 165) @@ -286,7 +286,12 @@ // Check if definition has a port type if (defn.getPortTypes().size() > 0 || defn.getMessages().size() > 0 || (f_hasMEP && defn.getServices().size() > 0)) { - String filename=getWSDLFileName(role, localcm.getModelName().getName(), i); + String num=""; + if (i > 0) { + num += i; + } + + String filename=getWSDLFileName(role, localcm.getModelName().getName(), num); if (i > 0) { javax.wsdl.Import imp=defns.get(0).createImport(); @@ -419,9 +424,11 @@ } // Write partner link types to file + String filename=getWSDLFileName(role, localcm.getModelName().getName(), "Artifacts"); + IPath wsdlPath=proj.getFullPath().append( new Path(getBuildSystem().getBPELFilePath())). - append(role.getName()+"PartnerLinkTypes.wsdl"); + append(filename); IFile wsdlFile=proj.getProject().getWorkspace().getRoot().getFile(wsdlPath); GeneratorUtil.createParentFolder(wsdlFile); @@ -561,13 +568,8 @@ * @param fileNum The file name (zero being the main wsdl file) * @return The file name */ - public static String getWSDLFileName(Role role, String modelName, int fileNum) { - String num=""; - if (fileNum > 0) { - num += fileNum; - } - - return(modelName+"_"+role.getName()+num+".wsdl"); + public static String getWSDLFileName(Role role, String modelName, String suffix) { + return(modelName+"_"+role.getName()+suffix+".wsdl"); } protected IProject createProject(String projectName) Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2010-02-16 19:30:19 UTC (rev 164) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2010-02-16 19:55:29 UTC (rev 165) @@ -157,7 +157,7 @@ // Add import for partner link types Import imp=new Import(bpelModel); - imp.setLocation(context.getRole().getName()+"PartnerLinkTypes.wsdl"); + imp.setLocation(bpelModel.getBPELProcess().getName()+"Artifacts.wsdl"); imp.setNamespace(roleNamespace); imp.setImportType("http://schemas.xmlsoap.org/wsdl/"); @@ -227,7 +227,7 @@ if (gen) { String fileName=Generator.getWSDLFileName(role, - conv.getLocatedName().getName(), 0); + conv.getLocatedName().getName(), ""); Import imp=new Import(bpelModel);