[virtualcommons-svn] commit/foraging: alllee: merging stable changes back into default, dev should continue on default as usual

[Bitbucket <com...@bi...>]

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/6ebbd98871e0/
changeset:   6ebbd98871e0
user:        alllee
date:        2012-01-30 23:19:23
summary:     merging stable changes back into default, dev should continue on default as usual
affected #:  6 files

diff -r 0fcf636f10c29759643bceb55ec10fd1fbe926e4 -r 6ebbd98871e080bb9e755fb8057278655b33573e pom.xml
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
       <releases><enabled>false</enabled></releases><snapshots><enabled>true</enabled></snapshots></repository>
+  </repositories><dependencies><dependency><groupId>javax.jnlp</groupId>
@@ -72,7 +73,8 @@
     <dependency><groupId>junit</groupId><artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.10</version>
+      <scope>test</scope></dependency><dependency><groupId>edu.asu.commons</groupId>


diff -r 0fcf636f10c29759643bceb55ec10fd1fbe926e4 -r 6ebbd98871e080bb9e755fb8057278655b33573e src/main/resources/configuration/asu/2011/t2/server.xml
--- a/src/main/resources/configuration/asu/2011/t2/server.xml
+++ b/src/main/resources/configuration/asu/2011/t2/server.xml
@@ -179,7 +179,7 @@
 </p>
 ]]></entry>
-<entry key="sameRoundAsPreviousInstructions">
+<entry key="same-as-previous-round-instructions"><![CDATA[
 <h3>Round {self.roundNumber} Instructions</h3><hr>
@@ -236,7 +236,15 @@
 <h2>Payment</h2><hr><p>
-When payments are ready we will call you up one by one. Please wait until your computer number, <b>{clientData.id}</b>, is called to turn in your survey and receive payment.  Please answer the survey carefully and thank you for participating. 
+When payments are ready we will call you up one by one. Please wait until your
+computer number, <b>{clientData.id}</b>, is called to turn in your survey and
+receive payment.  Please answer the survey carefully and thank you for
+participating. 
+</p>
+<p>
+NOTE: Please <b>answer the survey completely (there may be a back side)</b>
+and <b>bring all your belongings with you</b> when you come up to
+receive your payment to help us speed up the payment process.
 </p>
 {endif}
 ]]>


diff -r 0fcf636f10c29759643bceb55ec10fd1fbe926e4 -r 6ebbd98871e080bb9e755fb8057278655b33573e src/main/resources/configuration/asu/2011/t3/server.xml
--- a/src/main/resources/configuration/asu/2011/t3/server.xml
+++ b/src/main/resources/configuration/asu/2011/t3/server.xml
@@ -179,7 +179,7 @@
 </p>
 ]]></entry>
-<entry key="sameRoundAsPreviousInstructions">
+<entry key="same-as-previous-round-instructions"><![CDATA[
 <h3>Round {self.roundNumber} Instructions</h3><hr>
@@ -236,7 +236,15 @@
 <h2>Payment</h2><hr><p>
-When payments are ready we will call you up one by one. Please wait until your computer number, <b>{clientData.id}</b>, is called to turn in your survey and receive payment.  Please answer the survey carefully and thank you for participating. 
+When payments are ready we will call you up one by one. Please wait until your
+computer number, <b>{clientData.id}</b>, is called to turn in your survey and
+receive payment.  Please answer the survey carefully and thank you for
+participating. 
+</p>
+<p>
+NOTE: Please <b>answer the survey completely (there may be a back side)</b>
+and <b>bring all your belongings with you</b> when you come up to
+receive your payment to help us speed up the payment process.
 </p>
 {endif}
 ]]>


diff -r 0fcf636f10c29759643bceb55ec10fd1fbe926e4 -r 6ebbd98871e080bb9e755fb8057278655b33573e src/main/resources/configuration/asu/2011/t4/server.xml
--- a/src/main/resources/configuration/asu/2011/t4/server.xml
+++ b/src/main/resources/configuration/asu/2011/t4/server.xml
@@ -179,7 +179,7 @@
 </p>
 ]]></entry>
-<entry key="sameRoundAsPreviousInstructions">
+<entry key="same-as-previous-round-instructions"><![CDATA[
 <h3>Round {self.roundNumber} Instructions</h3><hr>
@@ -236,7 +236,15 @@
 <h2>Payment</h2><hr><p>
-When payments are ready we will call you up one by one. Please wait until your computer number, <b>{clientData.id}</b>, is called to turn in your survey and receive payment.  Please answer the survey carefully and thank you for participating. 
+When payments are ready we will call you up one by one. Please wait until your
+computer number, <b>{clientData.id}</b>, is called to turn in your survey and
+receive payment.  Please answer the survey carefully and thank you for
+participating. 
+</p>
+<p>
+NOTE: Please <b>answer the survey completely (there may be a back side)</b>
+and <b>bring all your belongings with you</b> when you come up to
+receive your payment to help us speed up the payment process.
 </p>
 {endif}
 ]]>


diff -r 0fcf636f10c29759643bceb55ec10fd1fbe926e4 -r 6ebbd98871e080bb9e755fb8057278655b33573e src/main/resources/web/client.jnlp
--- a/src/main/resources/web/client.jnlp
+++ b/src/main/resources/web/client.jnlp
@@ -11,7 +11,7 @@
   <resources><j2se version="1.6+"/><jar href="client.jar"/>
-    <jar href='stringtemplate.jar'/>
+    <jar href='ST4.jar'/><jar href='antlr-runtime.jar'/><jar href='@FRAMEWORK_JAR@'/><!--


diff -r 0fcf636f10c29759643bceb55ec10fd1fbe926e4 -r 6ebbd98871e080bb9e755fb8057278655b33573e src/main/resources/web/facilitator.jnlp
--- a/src/main/resources/web/facilitator.jnlp
+++ b/src/main/resources/web/facilitator.jnlp
@@ -12,7 +12,7 @@
   <resources><j2se version="1.6+"/><jar href="facilitator.jar"/>
-    <jar href='stringtemplate.jar'/>
+    <jar href='ST4.jar'/><jar href='antlr-runtime.jar'/><jar href='@FRAMEWORK_JAR@'/></resources>

Repository URL: https://bitbucket.org/virtualcommons/foraging/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.