[savara-commits] savara SVN: r659 - in branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl: META-INF and 1 other directories.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2011-02-11 10:40:48 -0500 (Fri, 11 Feb 2011)
New Revision: 659

Modified:
   branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF
   branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml
   branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/src/java/org/savara/tools/wsdl/actions/GenerateAction.java
Log:
Support WSDL generation from an Eclipse action.

Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF	2011-02-11 14:44:07 UTC (rev 658)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF	2011-02-11 15:40:48 UTC (rev 659)
@@ -15,5 +15,6 @@
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.scribble.protocol,
- org.savara.wsdl
+ org.savara.wsdl,
+ org.savara.protocol
 Bundle-ActivationPolicy: lazy

Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml	2011-02-11 14:44:07 UTC (rev 658)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml	2011-02-11 15:40:48 UTC (rev 659)
@@ -21,6 +21,21 @@
  		</dependency>
  		<dependency>
  			<groupId>org.savara.bundles</groupId>
+			<artifactId>org.savara.common</artifactId> 
+			<version>${savara.version}</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.savara.bundles</groupId>
+			<artifactId>org.savara.protocol</artifactId> 
+			<version>${savara.version}</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.savara.bundles</groupId>
+			<artifactId>org.savara.contract </artifactId> 
+			<version>${savara.version}</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.savara.bundles</groupId>
 			<artifactId>org.savara.wsdl</artifactId> 
 			<version>${savara.version}</version>
  		</dependency>

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	2011-02-11 14:44:07 UTC (rev 658)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/src/java/org/savara/tools/wsdl/actions/GenerateAction.java	2011-02-11 15:40:48 UTC (rev 659)
@@ -38,9 +38,14 @@
 import org.savara.contract.model.Contract;
 import org.savara.contract.model.Interface;
 import org.savara.contract.model.Namespace;
+import org.savara.protocol.contract.generator.ContractGenerator;
+import org.savara.protocol.contract.generator.ContractGeneratorFactory;
+import org.savara.protocol.util.ProtocolServices;
 import org.savara.tools.wsdl.util.XMLUtils;
 import org.savara.wsdl.generator.WSDLGeneratorFactory;
 import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding;
+import org.scribble.common.logging.CachedJournal;
+import org.scribble.common.logging.Journal;
 import org.scribble.protocol.model.ProtocolModel;
 import org.scribble.protocol.model.Role;
 
@@ -76,35 +81,38 @@
 	 * 
 	 * @param res The file
 	 */
-	protected void generateWSDL(IFile res) {
-		
-		/*
+	protected void generateWSDL(IFile res) {		
 		Journal journal=new CachedJournal();
 		
 		try {
-			m_protocolModel = ScribbleServices.getParserManager().parse(res.getFileExtension(),
+			ProtocolModel model = ProtocolServices.getParserManager().parse(res.getFileExtension(),
 								res.getContents(), journal, null);
 			
-			if (m_protocolModel == null) {
+			if (model == null) {
 				logger.error("Unable to load model used to generate the WSDL definition");
+				warn("The model has errors so cannot be used to generate WSDL definitions");
+			} else {
+				java.util.List<Role> roles=model.getRoles();
+				
+				for (Role role : roles) {
+					generateWSDL(model, role, res);
+				}
 			}
 		} catch(Exception e) {
 			logger.error("Failed to load model used to generated WSDL definition", e);
+			warn("Failed to load choreography");
 		}
-		*/
 	}
 
 	protected void generateWSDL(ProtocolModel pm, Role role, IResource cdmResource) throws Exception {		
 
 		Contract contract=null;
-		/*
 		ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
 		
 		if (cg != null) {
 			CachedJournal journal=new CachedJournal();
-			contract=cg.generate(m_protocolModel.getProtocol(), null, role, journal);
+			contract=cg.generate(pm.getProtocol(), null, role, journal);
 		}
-		*/
 		
 		if (contract != null) {
 			javax.wsdl.xml.WSDLWriter writer=