[savara-commits] savara SVN: r290 - branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Jul 1 15:39:55 EDT 2010
Author: objectiser
Date: 2010-07-01 15:39:54 -0400 (Thu, 01 Jul 2010)
New Revision: 290
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
trunk/tools/eclipse/releng/build.properties
Log:
Fixed faultMessageType value and added external service imports into Artifacts.wsdl file.
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -459,6 +459,33 @@
defn.appendChild(imp);
+ // Add imports for associated roles
+ java.util.ListIterator<Role> roles=localcm.getConversation().getRoles().listIterator();
+
+ while (roles.hasNext()) {
+ Role r=roles.next();
+ Contract contract=(Contract)r.getAnnotations().get(Contract.class.getName());
+
+ boolean gen=false;
+
+ for (int i=0; gen == false && i < contract.getInterfaces().size(); i++) {
+ if (contract.getInterfaces().get(i).getMessageExchangePatterns().size() > 0) {
+ gen = true;
+ }
+ }
+
+ if (gen) {
+ wsdlName = getWSDLFileName(r, localcm.getModelName().getName(), "");
+
+ imp = doc.createElement(WSDL_IMPORT);
+
+ imp.setAttribute("namespace", contract.getNamespace());
+ imp.setAttribute("location", wsdlName);
+
+ defn.appendChild(imp);
+ }
+ }
+
// Create partner link types
java.util.Map<String, String> nsMap=new java.util.HashMap<String, String>();
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-06-30 09:36:45 UTC (rev 289)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -121,16 +121,22 @@
Catch c=new Catch(bpelModel);
c.setFaultVariable(faultVarName);
+ Contract contract = ModelChangeUtils.getContract(context,
+ ((Interaction)act).getFromRole().getName());
+
// Define fault message type
+ QName qname= WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ faultName);
+
String mesgType=InteractionPatterns.getMessageTypeLocalPart((Interaction)act);
- String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
+ //String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
// Find namespace prefix
- if (namespace != null) {
- String prefix=bpelModel.getBPELProcess().addNamespace(namespace);
+ if (qname != null) {
+ String prefix=bpelModel.getBPELProcess().addNamespace(qname.getNamespaceURI());
if (prefix != null) {
- mesgType = prefix+":"+mesgType;
+ mesgType = prefix+":"+qname.getLocalPart();
faultName = prefix+":"+faultName;
}
}
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -384,8 +384,8 @@
ret.setName(mep.getOperation());
- QName msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Request");
+ QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname,
mep.getTypes(), wsdlBinding);
@@ -405,8 +405,8 @@
if (mep instanceof RequestResponseMEP) {
RequestResponseMEP rr=(RequestResponseMEP)mep;
- msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Response");
+ msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message om=getMessage(wsdls, contract, msgname,
rr.getResponseTypes(), wsdlBinding);
@@ -426,8 +426,8 @@
for (int i=0; i < rr.getFaultDetails().size(); i++) {
FaultDetails fd=rr.getFaultDetails().get(i);
- msgname = new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Fault"+(i+1));
+ msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(),
+ fd.getName());
javax.wsdl.Message fm=getMessage(wsdls, contract, msgname,
fd.getTypes(), wsdlBinding);
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -459,6 +459,33 @@
defn.appendChild(imp);
+ // Add imports for associated roles
+ java.util.ListIterator<Role> roles=localcm.getConversation().getRoles().listIterator();
+
+ while (roles.hasNext()) {
+ Role r=roles.next();
+ Contract contract=(Contract)r.getAnnotations().get(Contract.class.getName());
+
+ boolean gen=false;
+
+ for (int i=0; gen == false && i < contract.getInterfaces().size(); i++) {
+ if (contract.getInterfaces().get(i).getMessageExchangePatterns().size() > 0) {
+ gen = true;
+ }
+ }
+
+ if (gen) {
+ wsdlName = getWSDLFileName(r, localcm.getModelName().getName(), "");
+
+ imp = doc.createElement(WSDL_IMPORT);
+
+ imp.setAttribute("namespace", contract.getNamespace());
+ imp.setAttribute("location", wsdlName);
+
+ defn.appendChild(imp);
+ }
+ }
+
// Create partner link types
java.util.Map<String, String> nsMap=new java.util.HashMap<String, String>();
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -121,16 +121,22 @@
Catch c=new Catch(bpelModel);
c.setFaultVariable(faultVarName);
+ Contract contract = ModelChangeUtils.getContract(context,
+ ((Interaction)act).getFromRole().getName());
+
// Define fault message type
+ QName qname= WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ faultName);
+
String mesgType=InteractionPatterns.getMessageTypeLocalPart((Interaction)act);
- String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
+ //String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
// Find namespace prefix
- if (namespace != null) {
- String prefix=bpelModel.getBPELProcess().addNamespace(namespace);
+ if (qname != null) {
+ String prefix=bpelModel.getBPELProcess().addNamespace(qname.getNamespaceURI());
if (prefix != null) {
- mesgType = prefix+":"+mesgType;
+ mesgType = prefix+":"+qname.getLocalPart();
faultName = prefix+":"+faultName;
}
}
Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -384,8 +384,8 @@
ret.setName(mep.getOperation());
- QName msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Request");
+ QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname,
mep.getTypes(), wsdlBinding);
@@ -405,8 +405,8 @@
if (mep instanceof RequestResponseMEP) {
RequestResponseMEP rr=(RequestResponseMEP)mep;
- msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Response");
+ msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message om=getMessage(wsdls, contract, msgname,
rr.getResponseTypes(), wsdlBinding);
@@ -426,8 +426,8 @@
for (int i=0; i < rr.getFaultDetails().size(); i++) {
FaultDetails fd=rr.getFaultDetails().get(i);
- msgname = new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Fault"+(i+1));
+ msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(),
+ fd.getName());
javax.wsdl.Message fm=getMessage(wsdls, contract, msgname,
fd.getTypes(), wsdlBinding);
Modified: trunk/tools/eclipse/releng/build.properties
===================================================================
--- trunk/tools/eclipse/releng/build.properties 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/releng/build.properties 2010-07-01 19:39:54 UTC (rev 290)
@@ -25,13 +25,14 @@
repositoryURLs=\
http://download.eclipse.org/releases/galileo/,\
http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite,\
-http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/all/JBossTools-Update-3.2.0.v201006210931N-H358-M1.zip
+http://download.jboss.org/jbosstools/builds/nightly/trunk/201006290654/all/JBossTools-Update-3.2.0.v201006290654N-H394-M1.zip
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+\
org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\
org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+\
org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.service+org.pi4soa.designer+javax.wsdl+org.eclipse.stp.bpmn+\
-org.eclipse.gmf.runtime.notation
+org.eclipse.gmf.runtime.notation+org.eclipse.wst.common.project.facet.core+org.eclipse.jst.common.frameworks+\
+org.eclipse.wst.common.frameworks
flattenDependencies=true
parallelCompilation=true
More information about the savara-commits
mailing list