[savara-commits] savara SVN: r580 - in branches/experimental/2.0.x/bundles: org.savara.monitor and 3 other directories.

Author: objectiser Date: 2011-01-14 15:07:00 -0500 (Fri, 14 Jan 2011) New Revision: 580 Modified: branches/experimental/2.0.x/bundles/org.savara.activity/ branches/experimental/2.0.x/bundles/org.savara.monitor/ branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java Log: Property changes on: branches/experimental/2.0.x/bundles/org.savara.activity ___________________________________________________________________ Name: svn:ignore + target Property changes on: branches/experimental/2.0.x/bundles/org.savara.monitor ___________________________________________________________________ Name: svn:ignore + target Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF 2011-01-14 18:19:28 UTC (rev 579) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF 2011-01-14 20:07:00 UTC (rev 580) @@ -7,5 +7,7 @@ Bundle-Vendor: www.savara.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.osgi.framework;version="1.3.0" -Require-Bundle: org.scribble.protocol.monitor, +Require-Bundle: org.scribble.protocol.monitor;visibility:=reexport, org.junit +Export-Package: org.savara.monitor, + org.savara.monitor.impl Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml 2011-01-14 18:19:28 UTC (rev 579) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/pom.xml 2011-01-14 20:07:00 UTC (rev 580) @@ -25,6 +25,11 @@ <version>${scribble.version}</version> </dependency> <dependency> + <groupId>org.scribble.bundles</groupId> + <artifactId>org.scribble.protocol.monitor</artifactId> + <version>${scribble.version}</version> + </dependency> + <dependency> <groupId>org.savara.bundles</groupId> <artifactId>org.savara.common</artifactId> <version>${savara.version}</version> Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF 2011-01-14 18:19:28 UTC (rev 579) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF 2011-01-14 20:07:00 UTC (rev 580) @@ -10,7 +10,7 @@ org.osgi.framework Require-Bundle: org.scribble.common, org.savara.common, - org.scribble.protocol.monitor + org.savara.monitor Export-Package: org.savara.scenario.model, org.savara.scenario.simulation, org.savara.scenario.util Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java 2011-01-14 18:19:28 UTC (rev 579) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/simulation/DefaultScenarioSimulator.java 2011-01-14 20:07:00 UTC (rev 580) @@ -17,9 +17,8 @@ */ package org.savara.scenario.simulation; -import org.scribble.protocol.monitor.DefaultMessage; -import org.scribble.protocol.monitor.DefaultProtocolMonitor; -import org.scribble.protocol.monitor.ProtocolMonitor; +import org.savara.monitor.Monitor; +//import org.savara.monitor.impl.DefaultMonitor; /** * This class provides the default implementation of the Scenario Simulator interface. @@ -27,7 +26,7 @@ */ public class DefaultScenarioSimulator implements ScenarioSimulator { - private ProtocolMonitor m_monitor=new DefaultProtocolMonitor(); + //private Monitor m_monitor=new DefaultMonitor(); public void run() {