Fix to the Convoy demo

Signed-off-by: Michal Kit <kit@d3s.mff.cuni.cz>
d3scomp · Nov 30, 2012 · cc49d39 · cc49d39
1 parent d9d6916
commit cc49d39
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 7 deletions.
diff --git a/jdeeco-demo/META-INF/CLOUD.MF b/jdeeco-demo/META-INF/CLOUD.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.4
+Created-By: 1.7.0_06-b24 (Oracle Corporation)
+Export-Package: cz.cuni.mff.d3s.deeco.demo.cloud
diff --git a/jdeeco-demo/META-INF/CONVOY.MF b/jdeeco-demo/META-INF/CONVOY.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.8.4
+Created-By: 1.7.0_06-b24 (Oracle Corporation)
+Export-Package: cz.cuni.mff.d3s.deeco.demo.convoy
+
diff --git a/jdeeco-demo/build.xml b/jdeeco-demo/build.xml
@@ -51,7 +51,7 @@
 	<target name="cloud-local" description="Runs the cloud demo">
 		<java classname="cz.cuni.mff.d3s.deeco.demo.cloud.LocalLauncherCloudNoJPF" fork="true">
 			<classpath>
-				<pathelement location="${dist}/demo.jar"/>
+				<pathelement location="${dist}/cloud.jar"/>
 				<pathelement location="${dist}/jdeeco.jar"/>
 				<pathelement location="${river}/lib/jsk-lib.jar"/>
 				<pathelement location="${river}/lib/jsk-platform.jar"/>
@@ -65,7 +65,7 @@
 		<target name="convoy-local" description="Runs the convoy demo">
 			<java classname="cz.cuni.mff.d3s.deeco.demo.convoy.LocalLauncherConvoyNoJPF" fork="true">
 				<classpath>
-					<pathelement location="${dist}/demo.jar"/>
+					<pathelement location="${dist}/convoy.jar"/>
 					<pathelement location="${dist}/jdeeco.jar"/>
 					<pathelement location="${river}/lib/jsk-lib.jar"/>
 					<pathelement location="${river}/lib/jsk-platform.jar"/>
@@ -81,7 +81,7 @@
 			<antcall target="start-ar"/>
 			<java classname="cz.cuni.mff.d3s.deeco.demo.cloud.TSLauncherCloudNoJPF" fork="true">
 				<classpath>
-					<pathelement location="${dist}/demo.jar"/>
+					<pathelement location="${dist}/cloud.jar"/>
 					<pathelement location="${dist}/jdeeco.jar"/>
 					<pathelement location="${river}/lib/jsk-lib.jar"/>
 					<pathelement location="${river}/lib/jsk-platform.jar"/>
@@ -98,7 +98,7 @@
 			<antcall target="start-ar"/>
 			<java classname="cz.cuni.mff.d3s.deeco.demo.convoy.TSLauncherConvoyNoJPF" fork="true">
 				<classpath>
-					<pathelement location="${dist}/demo.jar"/>
+					<pathelement location="${dist}/convoy.jar"/>
 					<pathelement location="${dist}/jdeeco.jar"/>
 					<pathelement location="${river}/lib/jsk-lib.jar"/>
 					<pathelement location="${river}/lib/jsk-platform.jar"/>
@@ -115,10 +115,9 @@
         <antcall target="ant-jdeeco-core"/>
         <ant antfile="build.xml" dir="jdeeco-demo" target="dist-cloud-demo"/>
 		<java fork="true" classname="cz.cuni.mff.d3s.deeco.runtime.PreLauncher" dir="${dist}">
-			<arg value="cloud-demo.jar"/>
+			<arg value="cloud.jar"/>
 			<classpath>
 				<pathelement location="${dist}/jdeeco.jar"/>
-				<pathelement location="${libs}/bcel-5.2.jar"/>
 			</classpath>
 		</java>
 		<java fork="true" jar="${jpf}/build/RunJPF.jar" dir="${dist}">

diff --git a/jdeeco-demo/pom.xml b/jdeeco-demo/pom.xml
@@ -24,6 +24,7 @@
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<executions>
 					<execution>
@@ -37,6 +38,10 @@
 							<includes>
 								<include>**/cloud/*</include>
 							</includes>
+							<archive>
+								<addMavenDescriptor>false</addMavenDescriptor>
+								<manifestFile>META-INF/CLOUD.MF</manifestFile>
+							</archive>
 						</configuration>
 					</execution>
 					<execution>
@@ -50,6 +55,10 @@
 							<includes>
 								<include>**/convoy/*</include>
 							</includes>
+							<archive>
+								<addMavenDescriptor>false</addMavenDescriptor>
+								<manifestFile>META-INF/CONVOY.MF</manifestFile>
+							</archive>
 						</configuration>
 					</execution>
 				</executions>

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
@@ -23,6 +23,7 @@
 import cz.cuni.mff.d3s.deeco.annotations.DEECoEnsembleMembership;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoIn;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoOut;
+import cz.cuni.mff.d3s.deeco.annotations.DEECoPeriodicScheduling;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoTriggered;
 import cz.cuni.mff.d3s.deeco.ensemble.Ensemble;
 import cz.cuni.mff.d3s.deeco.knowledge.Knowledge;
@@ -34,6 +35,7 @@
  *
  */
 @DEECoEnsemble
+@DEECoPeriodicScheduling(1000)
 public class ConvoyEnsemble extends Ensemble {
 
 	// must be public, static and extend Knowledge

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/RobotFollowerComponent.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/RobotFollowerComponent.java
@@ -23,6 +23,7 @@
 import cz.cuni.mff.d3s.deeco.annotations.DEECoIn;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoInOut;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoInitialize;
+import cz.cuni.mff.d3s.deeco.annotations.DEECoPeriodicScheduling;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoProcess;
 import cz.cuni.mff.d3s.deeco.annotations.DEECoTriggered;
 import cz.cuni.mff.d3s.deeco.knowledge.ComponentKnowledge;
@@ -53,6 +54,7 @@ public static ComponentKnowledge getInitialKnowledge() {
 	}
 
 	@DEECoProcess
+	@DEECoPeriodicScheduling(3000)
 	public static void process(@DEECoInOut("path") Path path,
 			@DEECoInOut("battery") OutWrapper<Integer> battery,
 			@DEECoIn("convoyRobot") @DEECoTriggered String convoyRobot) {

diff --git a/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/RobotLeaderComponent.java b/jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/RobotLeaderComponent.java
@@ -53,7 +53,7 @@ public static ComponentKnowledge getInitialKnowledge() {
 	/*
 	 * Input: path, crossingRobots, convoyRobot Output: path
 	 */
-	@DEECoPeriodicScheduling(8000)
+	@DEECoPeriodicScheduling(3000)
 	@DEECoProcess
 	public static void process(@DEECoInOut("path") Path path,
 			@DEECoInOut("battery") OutWrapper<Integer> battery) {