Author: objectiser Date: 2011-01-10 14:42:04 -0500 (Mon, 10 Jan 2011) New Revision: 565 Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java Log: Main distribution and tools build now working. Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-09 23:22:28 UTC (rev 564) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-10 19:42:04 UTC (rev 565) @@ -15,6 +15,7 @@ org.scribble.common, org.scribble.protocol, org.junit, - org.savara.common + org.savara.common, + org.scribble.protocol.projection Export-Package: org.savara.pi4soa.cdm, org.savara.pi4soa.cdm.parser Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-09 23:22:28 UTC (rev 564) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-10 19:42:04 UTC (rev 565) @@ -70,6 +70,12 @@ <version>${emfecore.version}</version> </dependency> <dependency> + <groupId>org.scribble.bundles</groupId> + <artifactId>org.scribble.protocol.projection</artifactId> + <version>${scribble.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> 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 2011-01-09 23:22:28 UTC (rev 564) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-01-10 19:42:04 UTC (rev 565) @@ -2,6 +2,7 @@ import static org.junit.Assert.*; +import org.savara.common.util.ScribbleServices; import org.scribble.common.logging.Journal; import org.scribble.protocol.model.ProtocolModel; @@ -67,6 +68,12 @@ e.printStackTrace(); } } + + @org.junit.Before + public void setup() { + ScribbleServices.setProtocolProjector( + new org.scribble.protocol.projection.impl.ProtocolProjectorImpl()); + } @org.junit.Test public void testParse() {