[jbosstools-commits] JBoss Tools SVN: r25535 - in trunk/bpel/plugins/org.eclipse.bpel.ui: src/org/eclipse/bpel/ui/wizards and 3 other directories.

Author: bbrodt Date: 2010-10-06 15:19:53 -0400 (Wed, 06 Oct 2010) New Revision: 25535 Added: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties Log: https://jira.jboss.org/browse/JBIDE-7165 Added a WSDL for "Empty Process" template. The process will be invalid because it does not have a start activity Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -63,19 +63,26 @@ static final String BUNDLE_DIRECTORY = "/"; //$NON-NLS-1$ /** Key or property under which the name of the template is present */ - static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ + public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ /** The key name of the template */ - static final String PROPERTY_KEY = "key"; //$NON-NLS-1$ + public static final String PROPERTY_KEY = "key"; //$NON-NLS-1$ + + // https://jira.jboss.org/browse/JBIDE-7165 + /** All of the known template keys */ + public static final String TEMPLATE_KEY_ASYNC = "async"; + public static final String TEMPLATE_KEY_SYNC = "sync"; + public static final String TEMPLATE_KEY_EMPTY = "empty"; + /** Add more above, as new templates are created */ /** * Key or property under which the encoding information for the template * resources is present */ - static final String PROPERTY_ENCODING = "encoding"; //$NON-NLS-1$ + public static final String PROPERTY_ENCODING = "encoding"; //$NON-NLS-1$ /** Key or property under which the description of the template is present */ - static final String PROPERTY_DESCRIPTION = "description"; //$NON-NLS-1$ + public static final String PROPERTY_DESCRIPTION = "description"; //$NON-NLS-1$ /** avoid empty string */ static final String EMPTY = ""; //$NON-NLS-1$ @@ -191,6 +198,8 @@ mTemplateByName.put(name, template); String id = props.getProperty(PROPERTY_KEY); if (id != null) { + // https://jira.jboss.org/browse/JBIDE-7165 + template.mKey = id; mTemplateByKey.put(id, template); } @@ -340,6 +349,10 @@ public class Template { + // https://jira.jboss.org/browse/JBIDE-7165 + /** Template key so we don't have to worry about using localized names everywhere */ + String mKey; + /** Name of the process template */ String mName; @@ -358,6 +371,14 @@ return mName; } + /** + * @return the key + * @see https://jira.jboss.org/browse/JBIDE-7165 + */ + public String getKey() { + return mKey; + } + void add(TemplateResource resource) { mResources.add(resource); resource.mTemplate = this; @@ -476,18 +497,26 @@ int start = src.indexOf("</definitions>"); if (start > 0) { StringBuffer ss = new StringBuffer(src.substring(0, start)); - if ("Asynchronous BPEL Process".equals(args.get("type"))) { - if ("soap".equals(args.get("protocol"))) { + // https://jira.jboss.org/browse/JBIDE-7165 + // use key instead of [possibly] localized template name + Object key = args.get(Templates.PROPERTY_KEY); + String protocol = (String) args.get("protocol"); + if (protocol!=null) + protocol = protocol.toLowerCase(); + if (Templates.TEMPLATE_KEY_ASYNC.equals(key)) { + if ("soap".equals(protocol)) { ss.append(WSDLServiceDetail.Async_SOAPDetail); } else { ss.append(WSDLServiceDetail.Async_HTTPDetail); } - } else if ("Synchronous BPEL Process".equals(args.get("type"))) { - if ("soap".equals(args.get("protocol"))) { + } else if (Templates.TEMPLATE_KEY_SYNC.equals(key)) { + if ("soap".equals(protocol)) { ss.append(WSDLServiceDetail.Sync_SOAPDetail); } else { ss.append(WSDLServiceDetail.Sync_HTTPDetail); } + } else if (Templates.TEMPLATE_KEY_EMPTY.equals(key)) { + ss.append(WSDLServiceDetail.Empty_Detail); } ss.append("</definitions>"); src = ss.toString(); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.bpel.ui.BPELUIPlugin; +import org.eclipse.bpel.ui.Templates.Template; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -248,6 +249,15 @@ } /** + * @return the currently selected Template + * @see https://jira.jboss.org/browse/JBIDE-7165 + */ + public Template getSelectedTemplate() + { + return fMainPage.getSelectedTemplate(); + } + + /** * * Final condition for the wizard to finish */ Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -21,6 +21,7 @@ import org.eclipse.bpel.model.util.BPELConstants; import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IBPELUIConstants; +import org.eclipse.bpel.ui.Templates; import org.eclipse.bpel.ui.Templates.Template; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; @@ -205,12 +206,15 @@ public void handleEvent(Event event) { String val = processTemplateField.getText().trim(); - mArgs.put("type", val); + // https://jira.jboss.org/browse/JBIDE-7165 + mArgs.put(Templates.PROPERTY_NAME, val); Template template = BPELUIPlugin.INSTANCE.getTemplates() .getTemplateByName(val); if (template != null) { String txt = template.getDescription(); templateDescription.setText(txt == null ? EMPTY : txt); + // https://jira.jboss.org/browse/JBIDE-7165 + mArgs.put(Templates.PROPERTY_KEY, template.getKey()); } } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -5,6 +5,8 @@ import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IBPELUIConstants; +import org.eclipse.bpel.ui.Templates; +import org.eclipse.bpel.ui.Templates.Template; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -23,14 +25,19 @@ /** Service name field */ private Text serviceNameField; + // https://jira.jboss.org/browse/JBIDE-7165 + // make labels class variables so we can hide them for the "Empty" template /** Port name field */ + private Label portNameLabel; private Text portNameField; /** Address name field */ + private Label addressLabel; private Text addressField; /** binding protocol */ - Combo bindingField; + private Label bindingLabel; + private Combo bindingField; private Map<String, String> mArgs = new HashMap<String, String>(); @@ -98,9 +105,9 @@ serviceNameField.addListener(SWT.Modify, validateListner); // new port label - Label portLabel = new Label(fields, SWT.NONE); - portLabel.setText(Messages.NewFileWizard_WSDLCustomPage_PortLabel); - portLabel.setFont(parent.getFont()); + portNameLabel = new Label(fields, SWT.NONE); + portNameLabel.setText(Messages.NewFileWizard_WSDLCustomPage_PortLabel); + portNameLabel.setFont(parent.getFont()); // new port name entry field portNameField = new Text(fields, SWT.BORDER); @@ -111,7 +118,7 @@ portNameField.addListener(SWT.Modify, validateListner); // new address label - Label addressLabel = new Label(fields, SWT.NONE); + addressLabel = new Label(fields, SWT.NONE); addressLabel .setText(Messages.NewFileWizard_WSDLCustomPage_AddressLabel); addressLabel.setFont(parent.getFont()); @@ -124,7 +131,7 @@ addressField.setFont(parent.getFont()); addressField.addListener(SWT.Modify, validateListner); - Label bindingLabel = new Label(fields, SWT.NONE); + bindingLabel = new Label(fields, SWT.NONE); bindingLabel .setText(Messages.NewFileWizard_WSDLCustomPage_BindingLabel); bindingLabel.setFont(parent.getFont()); @@ -141,36 +148,76 @@ bindingField.addListener(SWT.Modify, validateListner); } + // https://jira.jboss.org/browse/JBIDE-7165 + // show or hide additional WSDL parameters depending on whether the template is the "Empty" + @Override + public void setVisible(boolean visible) { + // TODO Auto-generated method stub + super.setVisible(visible); + Template template = ((NewFileWizard)getWizard()).getSelectedTemplate(); + if ( template==null || Templates.TEMPLATE_KEY_EMPTY.equals(template.getKey()) ) { + // this is an Empty BPEL process, so no ports or bindings will be generated. + // Hide the Port Name, Service Address and Binding controls + portNameLabel.setVisible(false); + portNameField.setVisible(false); + + addressLabel.setVisible(false); + addressField.setVisible(false); + + bindingLabel.setVisible(false); + bindingField.setVisible(false); + } + else { + portNameLabel.setVisible(true); + portNameField.setVisible(true); + + addressLabel.setVisible(true); + addressField.setVisible(true); + + bindingLabel.setVisible(true); + bindingField.setVisible(true); + } + } + protected boolean validatePage() { + setErrorMessage(null); + String serviceName = serviceNameField.getText().trim(); if (isEmptyOrSpace(serviceName, "Service Name")) { return false; } - String portName = portNameField.getText().trim(); - if (isEmptyOrSpace(portName, "Port Name")) { - return false; + + // https://jira.jboss.org/browse/JBIDE-7165 + Template template = ((NewFileWizard)getWizard()).getSelectedTemplate(); + if ( template!=null && !Templates.TEMPLATE_KEY_EMPTY.equals(template.getKey()) ) { + String portName = portNameField.getText().trim(); + if (isEmptyOrSpace(portName, "Port Name")) { + return false; + } + String addressName = addressField.getText().trim(); + if (isEmptyOrSpace(addressName, "Service Address")) { + return false; + } + String protocol = bindingField.getText().trim(); + if (!("SOAP".equals(protocol) || "HTTP".equals(protocol))) { + setErrorMessage(Messages.Error_NewFileWizard_WSDLCustomPage_Protocol); + return false; + } + + // Template arguments + mArgs.put("portName", portName); //$NON-NLS-1$ + mArgs.put("address", addressName); //$NON-NLS-1$ + mArgs.put("protocol", protocol.toLowerCase()); //$NON-NLS-1$ + if("SOAP".equals(protocol)){ + mArgs.put("protocolNamespace", SOAP_NAMESPACE); + } else { + mArgs.put("protocolNamespace", HTTP_NAMESPACE); + } } - String addressName = addressField.getText().trim(); - if (isEmptyOrSpace(addressName, "Service Address")) { - return false; - } - String protocol = bindingField.getText().trim(); - if (!("SOAP".equals(protocol) || "HTTP".equals(protocol))) { - setErrorMessage(Messages.Error_NewFileWizard_WSDLCustomPage_Protocol); - return false; - } - setErrorMessage(null); - + // Template arguments mArgs.put("serviceName", serviceName); //$NON-NLS-1$ - mArgs.put("portName", portName); //$NON-NLS-1$ - mArgs.put("address", addressName); //$NON-NLS-1$ - mArgs.put("protocol", protocol.toLowerCase()); //$NON-NLS-1$ - if("SOAP".equals(protocol)){ - mArgs.put("protocolNamespace", SOAP_NAMESPACE); - } else { - mArgs.put("protocolNamespace", HTTP_NAMESPACE); - } + return true; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -2,10 +2,157 @@ public class WSDLServiceDetail { - public static final String Sync_SOAPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n <soap:binding style=\"document\"\n transport=\"http://schemas.xmlsoap.org/soap/http\" />\n <operation name=\"process\">\n <soap:operation\n soapAction=\"${namespace}/process\" />\n <input>\n <soap:body use=\"literal\" />\n </input>\n <output>\n <soap:body use=\"literal\" />\n </output>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~! ~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <soap:address location=\"${address}\" />\n </port>\n </service>\n"; - public static final String Sync_HTTPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"process\">\n <http:operation location=\"/process\" />\n <input>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </input>\n <output>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </output>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~! ~~~~~~~~~~~~~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <http:address location=\"${address}\"/>\n </port>\n </service>\n"; - public static final String Async_SOAPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n <soap:binding style=\"document\"\n transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n <operation name=\"initiate\">\n <soap:operation\n soapAction=\"${namespace}/initiate\"/>\n <input>\n <soap:body use=\"literal\"/>\n </input>\n </operation>\n </binding>\n\n <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\">\n <soap:binding style=\"document\" transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n <operation name=\"onResult\">\n <soap:operation\n so! apAction=\"${namespace}/onResult\"/>\n <input>\n <soap:body use=\"literal\"/>\n </input>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <soap:address location=\"${address}\"/>\n </port>\n </service>\n\n <service name=\"${serviceName}Callback\">\n <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n <soap:address location=\"${address}Callback\"/>\n </port>\n </service>\n"; - public static final String Async_HTTPDetail = "\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n BINDING DEFINITION - Defines the message format and protocol details\n for a web service.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"initiate\">\n <http:operation location=\"/initiate\" />\n <input>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </input>\n </operation>\n </binding>\n\n <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"onResult\">\n <http:operation location=\"/onResult\" />\n <input>\n <mime:content type! =\"text/xml\" part=\"payload\"/>\n </input>\n </operation>\n </binding>\n\n<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n SERVICE DEFINITION - A service groups a set of port into\n a service unit.\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <http:address location=\"${address}\"/>\n </port>\n </service>\n\n <service name=\"${serviceName}Callback\">\n <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n <http:address location=\"${address}Callback\"/>\n </port>\n </service>\n"; + // https://jira.jboss.org/browse/JBIDE-7165 + // reformatted because the extremely long line lengths were causing eclipse editor to crash! + public static final String Sync_SOAPDetail = "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " BINDING DEFINITION - Defines the message format and protocol details\n"+ + " for a web service.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n"+ + " <soap:binding style=\"document\"\n"+ + " transport=\"http://schemas.xmlsoap.org/soap/http\" />\n"+ + " <operation name=\"process\">\n"+ + " <soap:operation\n"+ + " soapAction=\"${namespace}/process\" />\n"+ + " <input>\n"+ + " <soap:body use=\"literal\" />\n"+ + " </input>\n"+ + " <output>\n"+ + " <soap:body use=\"literal\" />\n"+ + " </output>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " SERVICE DEFINITION - A service groups a set of ports into\n"+ + " a service unit.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <soap:address location=\"${address}\" />\n"+ + " </port>\n"+ + " </service>\n"; + + public static final String Sync_HTTPDetail = "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " BINDING DEFINITION - Defines the message format and protocol details\n"+ + " for a web service.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n"+ + " <http:binding verb=\"POST\" />\n"+ + " <operation name=\"process\">\n"+ + " <http:operation location=\"/process\" />\n"+ + " <input>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </input>\n"+ + " <output>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </output>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " SERVICE DEFINITION - A service groups a set of ports into\n"+ + " a service unit.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <http:address location=\"${address}\"/>\n"+ + " </port>\n"+ + " </service>\n"; + + public static final String Async_SOAPDetail = "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " BINDING DEFINITION - Defines the message format and protocol details\n"+ + " for a web service.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n"+ + " <soap:binding style=\"document\"\n"+ + " transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n"+ + " <operation name=\"initiate\">\n"+ + " <soap:operation\n"+ + " soapAction=\"${namespace}/initiate\"/>\n"+ + " <input>\n"+ + " <soap:body use=\"literal\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + " <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\">\n"+ + " <soap:binding style=\"document\" transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n"+ + " <operation name=\"onResult\">\n"+ + " <soap:operation\n"+ + " soapAction=\"${namespace}/onResult\"/>\n"+ + " <input>\n"+ + " <soap:body use=\"literal\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " SERVICE DEFINITION - A service groups a set of ports into\n"+ + " a service unit.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <soap:address location=\"${address}\"/>\n"+ + " </port>\n"+ + " </service>\n"+ + "\n"+ + " <service name=\"${serviceName}Callback\">\n"+ + " <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n"+ + " <soap:address location=\"${address}Callback\"/>\n"+ + " </port>\n"+ + " </service>\n"; + + public static final String Async_HTTPDetail = "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " BINDING DEFINITION - Defines the message format and protocol details\n"+ + " for a web service.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n"+ + " <http:binding verb=\"POST\" />\n"+ + " <operation name=\"initiate\">\n"+ + " <http:operation location=\"/initiate\" />\n"+ + " <input>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + " <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n"+ + " <http:binding verb=\"POST\" />\n"+ + " <operation name=\"onResult\">\n"+ + " <http:operation location=\"/onResult\" />\n"+ + " <input>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " SERVICE DEFINITION - A service groups a set of ports into\n"+ + " a service unit.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <http:address location=\"${address}\"/>\n"+ + " </port>\n"+ + " </service>\n"+ + "\n"+ + " <service name=\"${serviceName}Callback\">\n"+ + " <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n"+ + " <http:address location=\"${address}Callback\"/>\n"+ + " </port>\n"+ + " </service>\n"; + public static final String Empty_Detail = "\n"+ + "<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"+ + " SERVICE DEFINITION - A service groups a set of ports into\n"+ + " a service unit.\n"+ + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->\n"+ + " <service name=\"${serviceName}\">\n"+ + " </service>\n"; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,12 +1,12 @@ <!-- ${processName} BPEL Process [Generated by the Eclipse BPEL Designer] --> <!-- Date: ${date} --> - <bpel:process name="${processName}" targetNamespace="${namespace}" suppressJoinFailure="yes" xmlns:tns="${namespace}" xmlns:bpel="${bpelNamespace}" + <!-- Import the client WSDL --> <bpel:import location="${processName}Artifacts.wsdl" namespace="${namespace}" importType="http://schemas.xmlsoap.org/wsdl/" /> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,5 +1,6 @@ # # +key=async name = Asynchronous BPEL Process # resource.1 = sample.bpel Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel 2010-10-06 19:19:53 UTC (rev 25535) @@ -6,26 +6,18 @@ xmlns:tns="${namespace}" xmlns:bpel="${bpelNamespace}" - - <!-- ================================================================= --> - <!-- PARTNERLINKS --> - <!-- List of services participating in this BPEL process --> - <!-- ================================================================= --> - <bpel:partnerLinks> - </bpel:partnerLinks> - - <!-- ================================================================= --> - <!-- VARIABLES --> - <!-- List of messages and XML documents used within this BPEL process --> - <!-- ================================================================= --> - <bpel:variables> - </bpel:variables> - <!-- ================================================================= --> - <!-- ORCHESTRATION LOGIC --> - <!-- Set of activities coordinating the flow of messages across the --> - <!-- services integrated within this business process --> - <!-- ================================================================= --> - <bpel:sequence/> + <!-- Import the client WSDL --> + <bpel:import location="${processName}Artifacts.wsdl" namespace="${namespace}" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <!-- ================================================================= --> + <!-- ORCHESTRATION LOGIC --> + <!-- Set of activities coordinating the flow of messages across the --> + <!-- services integrated within this business process --> + <!-- ================================================================= --> + <bpel:sequence name="main"> + <bpel:empty name="Empty"></bpel:empty> + </bpel:sequence> </bpel:process> Added: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl 2010-10-06 19:19:53 UTC (rev 25535) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<definitions name="${processName}" + targetNamespace="${namespace}" + xmlns:tns="${namespace}" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:${protocol}="${protocolNamespace}" + > + +</definitions> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,9 +1,13 @@ # # +key=empty name = Empty BPEL Process resource.1 = sample.bpel resource.1.name = ${processName}.bpel +resource.2 = sample.wsdl +resource.2.name = ${processName}Artifacts.wsdl + description = Generates a completely empty BPEL process. No partner links are generated. \ Only the basic skeleton of the BPEL process is created. # Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,4 +1,5 @@ <!-- ${processName} BPEL Process [Generated by the Eclipse BPEL Designer] --> +<!-- Date: ${date} --> <bpel:process name="${processName}" targetNamespace="${namespace}" suppressJoinFailure="yes" Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,5 +1,6 @@ # # +key=sync name = Synchronous BPEL Process resource.1 = sample.bpel resource.1.name = ${processName}.bpel