changeset 8:42d774fd621d

Update to work with latest Thermostat head.
author Severin Gehwolf <sgehwolf@redhat.com>
date Thu, 21 Feb 2013 20:35:38 +0100
parents d49a2bbf53b0
children 837ec0451c88
files client-controllers/.classpath client-swing/.classpath copy_jars.sh plugin.conf plugin.xml
diffstat 5 files changed, 15 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/client-controllers/.classpath	Thu Feb 21 16:27:32 2013 +0100
+++ b/client-controllers/.classpath	Thu Feb 21 20:35:38 2013 +0100
@@ -12,11 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
--- a/client-swing/.classpath	Thu Feb 21 16:27:32 2013 +0100
+++ b/client-swing/.classpath	Thu Feb 21 20:35:38 2013 +0100
@@ -12,11 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
--- a/copy_jars.sh	Thu Feb 21 16:27:32 2013 +0100
+++ b/copy_jars.sh	Thu Feb 21 20:35:38 2013 +0100
@@ -12,5 +12,5 @@
 cp -v ./client-common/target/thermostat-tutorial-client-common-0.0.1-SNAPSHOT.jar $PLUGIN
 cp -v ./agent/target/thermostat-tutorial-agent-0.0.1-SNAPSHOT.jar $PLUGIN
 cp -v ./storage-common/target/thermostat-tutorial-storage-common-0.0.1-SNAPSHOT.jar $PLUGIN
-cp -v ./plugin.conf $PLUGIN
+cp -v ./plugin.xml $PLUGIN
 
--- a/plugin.conf	Thu Feb 21 16:27:32 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<plugin>
-  <commands>
-    <existing>
-      <name>gui</name>
-      <bundles>
-	thermostat-tutorial-client-swing-0.0.1-SNAPSHOT.jar,
-	thermostat-tutorial-client-common-0.0.1-SNAPSHOT.jar,
-	thermostat-tutorial-storage-common-0.0.1-SNAPSHOT.jar,
-	thermostat-tutorial-client-controllers-0.0.1-SNAPSHOT.jar
-      </bundles>
-    </existing>
- </commands>
-</plugin>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin.xml	Thu Feb 21 20:35:38 2013 +0100
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<plugin>
+  <commands>
+    <command type="extends">
+      <name>gui</name>
+      <bundles>
+        <bundle>thermostat-tutorial-client-swing-0.0.1-SNAPSHOT.jar</bundle>
+        <bundle>thermostat-tutorial-client-common-0.0.1-SNAPSHOT.jar</bundle>
+        <bundle>thermostat-tutorial-storage-common-0.0.1-SNAPSHOT.jar</bundle>
+        <bundle>thermostat-tutorial-client-controllers-0.0.1-SNAPSHOT.jar</bundle>
+      </bundles>
+    </command>
+ </commands>
+</plugin>