Author: objectiser
Date: 2010-12-20 15:25:50 -0500 (Mon, 20 Dec 2010)
New Revision: 512
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/src/java/org/savara/tools/wsdl/actions/GenerateAction.java
Log:
Update to use new parser interface.
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2010-12-20
20:01:32 UTC (rev 511)
+++
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2010-12-20
20:25:50 UTC (rev 512)
@@ -21,7 +21,11 @@
org.scribble.protocol.parser.ProtocolParser parser=
new org.savara.pi4soa.cdm.parser.CDMProtocolParser();
- ret = parser.parse(is, logger);
+ try {
+ ret = parser.parse(is, logger, null);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
return(ret);
}
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/src/java/org/savara/tools/wsdl/actions/GenerateAction.java
===================================================================
---
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/src/java/org/savara/tools/wsdl/actions/GenerateAction.java 2010-12-20
20:01:32 UTC (rev 511)
+++
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/src/java/org/savara/tools/wsdl/actions/GenerateAction.java 2010-12-20
20:25:50 UTC (rev 512)
@@ -41,6 +41,8 @@
import org.savara.tools.wsdl.util.XMLUtils;
import org.savara.wsdl.generator.WSDLGeneratorFactory;
import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding;
+import org.scribble.protocol.model.ProtocolModel;
+import org.scribble.protocol.model.Role;
/**
* This class implements the action to generate the choreography
@@ -48,8 +50,6 @@
*/
public class GenerateAction implements IObjectActionDelegate {
- private static final String CANNOT_GENERATE = "Choreography has errors, so cannot
generate";
-
public GenerateAction() {
}
@@ -64,15 +64,8 @@
IResource res=(IResource)sel.getFirstElement();
- if (res instanceof IFile) {
-
- if (ResourceUtil.hasErrors(res) == false) {
-
- generateWSDL((IFile)res);
-
- } else {
- warn(CANNOT_GENERATE);
- }
+ if (res instanceof IFile) {
+ generateWSDL((IFile)res);
}
}
}
@@ -84,6 +77,8 @@
* @param res The file
*/
protected void generateWSDL(IFile res) {
+
+ /*
ModelReference ref=
org.scribble.eclipse.model.admin.OSGIModelRepository.createReference(res);
ConversationModel conversationModel=null;
@@ -119,16 +114,17 @@
}
}
}
+ */
}
- protected void generateWSDL(ConversationModel cm, ModelReference ref, IResource
cdmResource) throws Exception {
+ protected void generateWSDL(ProtocolModel pm, Role role, IResource cdmResource) throws
Exception {
- if (ref.getAnnotations().containsKey(Contract.class.getName())) {
+ if (role.getProperties().containsKey(Contract.class.getName())) {
javax.wsdl.xml.WSDLWriter writer=
javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter();
org.savara.wsdl.generator.WSDLGenerator generator=
WSDLGeneratorFactory.getWSDLGenerator();
- Contract contract=(Contract)ref.getAnnotations().get(Contract.class.getName());
+ Contract contract=(Contract)role.getProperties().get(Contract.class.getName());
// Generate WSDL folder
IPath wsdlFolderPath=cdmResource.getParent().getFullPath();
@@ -160,7 +156,7 @@
num += i;
}
- String
filename=cm.getModelName().getName()+"_"+ref.getLocatedRole()+num+".wsdl";
+ String
filename=pm.getProtocol().getName()+"_"+role.getName()+num+".wsdl";
if (i > 0) {
javax.wsdl.Import imp=defns.get(0).createImport();
Show replies by date