[savara-commits] savara SVN: r567 - in branches/experimental/2.0.x/bundles: org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules and 1 other directory.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2011-01-12 09:30:08 -0500 (Wed, 12 Jan 2011)
New Revision: 567

Modified:
   branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
   branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java
   branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java
Log:
Update to reflect changes in protocol model.

Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java	2011-01-12 13:42:44 UTC (rev 566)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java	2011-01-12 14:30:08 UTC (rev 567)
@@ -109,7 +109,6 @@
 		ProtocolReference ref1=new ProtocolReference();
 		ref1.setName("mid");
 		ref1.setRole(r);
-		ref1.setInner(true);
 		
 		Run run1=new Run();
 		run1.setProtocolReference(ref1);
@@ -120,7 +119,6 @@
 		ProtocolReference ref2=new ProtocolReference();
 		ref2.setName("sub");
 		ref2.setRole(r);
-		ref2.setInner(true);
 		
 		Run run2=new Run();
 		run2.setProtocolReference(ref2);

Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java	2011-01-12 13:42:44 UTC (rev 566)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java	2011-01-12 14:30:08 UTC (rev 567)
@@ -60,7 +60,6 @@
 
 		ProtocolReference ref=new ProtocolReference();
 		ref.setName(cdl.getChoreography().getName()+"_"+cdl.getFinalizer().getName());
-		ref.setInner(true);
 		
 		ret.setProtocolReference(ref);
 		

Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java	2011-01-12 13:42:44 UTC (rev 566)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java	2011-01-12 14:30:08 UTC (rev 567)
@@ -101,7 +101,6 @@
 	
 			ProtocolReference ref=new ProtocolReference();
 			ref.setName(cdl.getChoreography().getName());
-			ref.setInner(true);
 			
 			run.setProtocolReference(ref);