[savara-commits] savara SVN: r620 - in branches/experimental/2.0.x: tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator and 1 other directories.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2011-01-25 10:18:08 -0500 (Tue, 25 Jan 2011)
New Revision: 620

Modified:
   branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF
   branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
   branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/.project
Log:
Sorting out tool issues based on the changes to use annotations.

Modified: branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF	2011-01-25 14:23:05 UTC (rev 619)
+++ branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF	2011-01-25 15:18:08 UTC (rev 620)
@@ -8,6 +8,7 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="1.3.0"
 Export-Package: org.savara.common.config,
+ org.savara.common.model.annotation,
  org.savara.common.model.generator,
  org.savara.common.util
 Bundle-ActivationPolicy: lazy

Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java	2011-01-25 14:23:05 UTC (rev 619)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java	2011-01-25 15:18:08 UTC (rev 620)
@@ -36,7 +36,11 @@
 import org.savara.bpel.model.*;
 import org.savara.bpel.util.BPELModelUtil;
 import org.savara.protocol.model.util.PropertyName;
+import org.savara.common.model.annotation.Annotation;
+import org.savara.common.model.annotation.AnnotationDefinitions;
 import org.savara.common.util.XMLUtils;
+import org.savara.contract.generator.ContractGenerator;
+import org.savara.contract.generator.ContractGeneratorFactory;
 import org.savara.contract.model.Contract;
 import org.savara.contract.model.Interface;
 import org.savara.contract.model.Namespace;
@@ -220,6 +224,14 @@
 		
 		CachedJournal journal=new CachedJournal();
 		
+		// TODO: SAVARA-169 (and related to SAVARA-168)
+		// Currently necessary to generate contracts from global model and
+		// associate with model
+		ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+		if (cg != null) {
+			cg.generate(m_protocolModel, journal, null);
+		}
+		
 		DefaultProtocolContext context=new DefaultProtocolContext(ScribbleServices.getParserManager(),
 						new DefaultResourceLocator(cdmResource.getParent().getFullPath().toFile()));
 		
@@ -227,6 +239,15 @@
 								localRole, journal, context);
 		
 		if (local != null) {
+			// TODO: SAVARA-167 - issue when projection is based on a sub-protocol
+			if (AnnotationDefinitions.getAnnotation(local.getProtocol().getProperties(),
+							AnnotationDefinitions.TYPE) == null &&
+					AnnotationDefinitions.getAnnotation(m_protocolModel.getProtocol().getProperties(),
+									AnnotationDefinitions.TYPE) != null) {
+				AnnotationDefinitions.copyAnnotations(m_protocolModel.getProtocol().getProperties(),
+						local.getProtocol().getProperties(), AnnotationDefinitions.TYPE);
+			}
+			
 			// TODO: Obtain model generator from manager class (SAVARA-156)
 			ProtocolToBPELModelGenerator generator=new ProtocolToBPELModelGenerator();
 			
@@ -258,10 +279,22 @@
 			bpelFile.create(null, true,
 					new org.eclipse.core.runtime.NullProgressMonitor());
 			
+			// Obtain any namespace prefix map
 			java.util.Map<String, String> prefixes=
-					(java.util.Map<String, String>)
-					localcm.getProperties().get(PropertyName.NAMESPACE_PREFIXES);
+					new java.util.HashMap<String, String>();
 			
+			java.util.List<Annotation> list=
+				AnnotationDefinitions.getAnnotations(localcm.getProtocol().getProperties(),
+						AnnotationDefinitions.TYPE);
+			
+			for (Annotation annotation : list) {
+				if (annotation.getProperties().containsKey(AnnotationDefinitions.NAMESPACE_PROPERTY) &&
+						annotation.getProperties().containsKey(AnnotationDefinitions.PREFIX_PROPERTY)) {
+					prefixes.put((String)annotation.getProperties().get(AnnotationDefinitions.NAMESPACE_PROPERTY),
+							(String)annotation.getProperties().get(AnnotationDefinitions.PREFIX_PROPERTY));
+				}
+			}
+			
 			//String bpelText=XMLUtils.toText(bpelProcess.getDOMElement());
 			ByteArrayOutputStream os=new ByteArrayOutputStream();
 			BPELModelUtil.serialize(bpelProcess, os, prefixes);

Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/.project
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/.project	2011-01-25 14:23:05 UTC (rev 619)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/.project	2011-01-25 15:18:08 UTC (rev 620)
@@ -1,7 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<projectDescription>
+	<name>org.savara.tools.wsdl</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>