virtualcommons-svn — Virtual Commons source control (SVN/HG) commit traffic

[virtualcommons-svn] [virtualcommons-jira] Resolved: (CSAN-13) Extract aggregate click statistics from Indiana experiment's raw data.

[Allen L. (V. Commons-JIRA) <all...@as...>]

     [ https://dev.commons.asu.edu/jira/browse/CSAN-13?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Allen Lee resolved CSAN-13.
---------------------------

    Resolution: Fixed

Implemented in CsanSaveFileConverter for legacy IU spring experiments and in latest ForagingSaveFileConverter for current version of foraging experiments run at IU this fall/winter.

> Extract aggregate click statistics from Indiana experiment's raw data.
> ----------------------------------------------------------------------
>
>                 Key: CSAN-13
>                 URL: https://dev.commons.asu.edu/jira/browse/CSAN-13
>             Project: Foraging
>          Issue Type: Task
>          Components: 2D
>            Reporter: Allen Lee
>            Assignee: Allen Lee
>
> From Marco's email:
> "Extract the distribution of the number of clicks in the same direction until the resource is depleted. This will be for all experiments has done, also in the Spring. This is the same as you have done once for the experiments at ASU. This is one of the patterns for the patterns oriented modeling. (whether participants goes more likely in the same direction instead of changing the direction)."
> Will have to see if the code still works from the Spring csan experiments. 

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://dev.commons.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] [virtualcommons-jira] Created: (CSAN-13) Extract aggregate click statistics from Indiana experiment's raw data.

[Allen L. (V. Commons-JIRA) <all...@as...>]

Extract aggregate click statistics from Indiana experiment's raw data.
----------------------------------------------------------------------

                 Key: CSAN-13
                 URL: https://csid.asu.edu/jira/browse/CSAN-13
             Project: Foraging
          Issue Type: Task
          Components: 2D
            Reporter: Allen Lee
            Assignee: Allen Lee


>From Marco's email:

"Extract the distribution of the number of clicks in the same direction until the resource is depleted. This will be for all experiments has done, also in the Spring. This is the same as you have done once for the experiments at ASU. This is one of the patterns for the patterns oriented modeling. (whether participants goes more likely in the same direction instead of changing the direction)."

Will have to see if the code still works from the Spring csan experiments. 

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] [virtualcommons-jira] Resolved: (CSAN-11) Manifest class-path in jarfiles breaks in Windows

[Allen L. (V. Commons-JIRA) <all...@as...>]

     [ https://csid.asu.edu/jira/browse/CSAN-11?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Allen Lee resolved CSAN-11.
---------------------------

    Resolution: Fixed

Fixed by using ant manifestclasspath built-in task.

> Manifest class-path in jarfiles breaks in Windows
> -------------------------------------------------
>
>                 Key: CSAN-11
>                 URL: https://csid.asu.edu/jira/browse/CSAN-11
>             Project: Foraging
>          Issue Type: Bug
>          Components: Infrastructure
>         Environment: Windows NT/XP/Vista
>            Reporter: Allen Lee
>            Assignee: Allen Lee
>
> The Class-Path manifest entry in server.jar doesn't work on Windows and in fact shouldn't work on Linux either according to the specification (but it somehow manages to squeak by).  This is being generated in Ant and should be easily fixed, the main issue is that the paths to other jars are absolute instead of relative.  

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] [virtualcommons-jira] Resolved: (CSAN-12) bundle Maven Jetty plugin with foraging package

[Allen L. (V. Commons-JIRA) <all...@as...>]

     [ https://csid.asu.edu/jira/browse/CSAN-12?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Allen Lee resolved CSAN-12.
---------------------------

    Resolution: Fixed

First cut at mvn jetty:run deployment complete.  Right now is still a mish-mash of ant/ivy/maven, find out if we can simplify things.

> bundle Maven Jetty plugin with foraging package
> -----------------------------------------------
>
>                 Key: CSAN-12
>                 URL: https://csid.asu.edu/jira/browse/CSAN-12
>             Project: Foraging
>          Issue Type: New Feature
>          Components: Infrastructure
>            Reporter: Allen Lee
>            Assignee: Allen Lee
>
> Users that don't want to install & configure & deploy a webserver just to run the foraging software should be able to use the jetty maven plugin to deploy the client & facilitator JNLP files.  In the future may consider creating the facilitator control webapp in jetty as well, and have configuration on the fly.  There's a lot that could be done with making the experiments truly "web-enabled".

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] [virtualcommons-jira] Resolved: (CSAN-9) Special case fix 3/27/08 IU save files due to incompatible serialization

[Allen L. (V. Commons-JIRA) <all...@as...>]

     [ https://csid.asu.edu/jira/browse/CSAN-9?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Allen Lee resolved CSAN-9.
--------------------------

    Resolution: Fixed

Fixed.

> Special case fix 3/27/08 IU save files due to incompatible serialization
> ------------------------------------------------------------------------
>
>                 Key: CSAN-9
>                 URL: https://csid.asu.edu/jira/browse/CSAN-9
>             Project: Foraging
>          Issue Type: Bug
>          Components: 2D
>            Reporter: Allen Lee
>            Assignee: Allen Lee
>
> java.io.InvalidClassException: edu.asu.csid.conf.ExperimentConfiguration$Base; local class incompatible: stream classdesc serialVersionUID = 8936075404166796486, local class serialVersionUID = 1679614060238100147
>         at java.io.ObjectStreamClass.initNonProxy(ObjectStreamClass.java:562)
>         at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1583)
>         at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1496)
>         at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1583)
>         at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1496)
>         at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1732)
>         at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1329)
>         at java.io.ObjectInputStream.readObject(ObjectInputStream.java:351)
>         at edu.asu.csid.experiment.Persister.restoreExperimentConfiguration(Persister.java:209)
>         at edu.asu.csid.experiment.Persister.processSaveDirectory(Persister.java:182)
>         at edu.asu.csid.experiment.Persister.processSaveFiles(Persister.java:168)
>         at edu.asu.commons.csan.util.CsanSaveFileConverter.main(CsanSaveFileConverter.java:54)
> Aug 20, 2008 4:02:25 PM edu.asu.csid.experiment.Persister processSaveDirectory
> SEVERE: Error while processing [save directory: iu-csan-data/03-27-08] - ignoring.
> java.lang.RuntimeException: java.io.InvalidClassException: edu.asu.csid.conf.ExperimentConfiguration$Base; local class incompatible: stream classdesc serialVersionUID = 8936075404166796486, local class serialVersionUID = 1679614060238100147
>         at edu.asu.csid.experiment.Persister.restoreExperimentConfiguration(Persister.java:215)
>         at edu.asu.csid.experiment.Persister.processSaveDirectory(Persister.java:182)
>         at edu.asu.csid.experiment.Persister.processSaveFiles(Persister.java:168)
>         at edu.asu.commons.csan.util.CsanSaveFileConverter.main(CsanSaveFileConverter.java:54)
> Caused by: java.io.InvalidClassException: edu.asu.csid.conf.ExperimentConfiguration$Base; local class incompatible: stream classdesc serialVersionUID = 8936075404166796486, local class serialVersionUID = 1679614060238100147
>         at java.io.ObjectStreamClass.initNonProxy(ObjectStreamClass.java:562)
>         at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1583)
>         at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1496)
>         at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1583)
>         at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1496)
>         at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1732)
>         at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1329)
>         at java.io.ObjectInputStream.readObject(ObjectInputStream.java:351)
>         at edu.asu.csid.experiment.Persister.restoreExperimentConfiguration(Persister.java:209)

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] SF.net SVN: virtualcommons:[70] vcweb/trunk/virtualcommons/experiment

[<al...@us...>]

Revision: 70
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=70&view=rev
Author:   alllee
Date:     2008-12-20 00:01:02 +0000 (Sat, 20 Dec 2008)

Log Message:
-----------
latest version of forestry drupal web-based game from Seema

Modified Paths:
--------------
    vcweb/trunk/virtualcommons/experiment/experiment.inc
    vcweb/trunk/virtualcommons/experiment/experiment.module
    vcweb/trunk/virtualcommons/experiment/games/forestry_v2/forestry_v2.module
    vcweb/trunk/virtualcommons/experiment/rules/rules.module
    vcweb/trunk/virtualcommons/experiment/student_login/student_login.module
    vcweb/trunk/virtualcommons/experiment/survey/survey.module

Modified: vcweb/trunk/virtualcommons/experiment/experiment.inc
===================================================================
--- vcweb/trunk/virtualcommons/experiment/experiment.inc	2008-12-15 22:33:36 UTC (rev 69)
+++ vcweb/trunk/virtualcommons/experiment/experiment.inc	2008-12-20 00:01:02 UTC (rev 70)
@@ -1472,7 +1472,8 @@
                     FROM {vc_forestry_student} 
                     WHERE vc_student_id='%s'
                     AND vc_stage_id=%d
-        			AND round_no=%d", 
+        			AND round_no=%d
+        			AND practice_round_flag=true", 
                     $this->stud_id,
                     $stage_id,$round_no-1));
                     $total=$total+$harvest_decision;

Modified: vcweb/trunk/virtualcommons/experiment/experiment.module
===================================================================
--- vcweb/trunk/virtualcommons/experiment/experiment.module	2008-12-15 22:33:36 UTC (rev 69)
+++ vcweb/trunk/virtualcommons/experiment/experiment.module	2008-12-20 00:01:02 UTC (rev 70)
@@ -349,6 +349,12 @@
       '#value'=>theme('table',$header,$row)
       );
 
+  $form['print']=array(
+      '#title'=>t('<a href ="?q=studentId" target="_blank">Print student Ids</a>'),
+      '#type'=>'item'
+      
+      );
+  
   $form['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Start Practice Rounds!!!')

Modified: vcweb/trunk/virtualcommons/experiment/games/forestry_v2/forestry_v2.module
===================================================================
--- vcweb/trunk/virtualcommons/experiment/games/forestry_v2/forestry_v2.module	2008-12-15 22:33:36 UTC (rev 69)
+++ vcweb/trunk/virtualcommons/experiment/games/forestry_v2/forestry_v2.module	2008-12-20 00:01:02 UTC (rev 70)
@@ -137,7 +137,8 @@
  * 
  */
 function forestry_intro() {
-  $output = t('Welcome to the Forestry game!  (Add more instructions here?). The following table lists the maximum harvest decisions you can make associated with a given resource level range.');
+  $output = t('<p><b>The following table lists the maximum harvest decisions you can make, associated with a given resource level range. 
+  				<br/>For example, if resource level is 13, you can harvest maximum of 4 units. If resource level is 1, you can not harvest anything.</b></p>');
   // Return the HTML generated from the $form data structure.
   $output .= generate_harvest_table();
   $output .= drupal_get_form('forestry_intro_form');
@@ -235,6 +236,8 @@
   else if ($student->shouldVote())
   {
     return drupal_get_form('voting_rules_form');
+   
+    //return 'forestry/info/second_stage';
   }
   
   else 
@@ -253,7 +256,7 @@
     else
     		$start=1;
     		
-   drupal_set_message(t('start flag is: '. $start));
+   //drupal_set_message(t('start flag is: '. $start));
     $output .= (!$start) ? drupal_get_form('forestry_play_multiform') :  drupal_get_form('forestry_wait_form');
   }
   return $output;
@@ -558,6 +561,5 @@
   {
   	Session::remove('practice_round');
   }
-  
   return 'forestry/play';
 }

Modified: vcweb/trunk/virtualcommons/experiment/rules/rules.module
===================================================================
--- vcweb/trunk/virtualcommons/experiment/rules/rules.module	2008-12-15 22:33:36 UTC (rev 69)
+++ vcweb/trunk/virtualcommons/experiment/rules/rules.module	2008-12-20 00:01:02 UTC (rev 70)
@@ -35,8 +35,10 @@
 function voting_rules() {
 
     // Return the HTML generated from the $form data structure.
-    $output = drupal_get_form('voting_rules_form');
-    return $output;
+    
+    //$output = drupal_get_form('voting_rules_form');
+    
+    return 'forestry/info/second_stage ';
 }
 
 
@@ -52,7 +54,7 @@
 
     foreach($rules_data as $key=>$value)
     {
-        drupal_set_message(t('$key is : ' . $key));
+        //drupal_set_message(t('$key is : ' . $key));
         $header[]='Rule '.$key;
         $rule_no=$key;
         foreach($value as $key=>$value1)

Modified: vcweb/trunk/virtualcommons/experiment/student_login/student_login.module
===================================================================
--- vcweb/trunk/virtualcommons/experiment/student_login/student_login.module	2008-12-15 22:33:36 UTC (rev 69)
+++ vcweb/trunk/virtualcommons/experiment/student_login/student_login.module	2008-12-20 00:01:02 UTC (rev 70)
@@ -73,5 +73,5 @@
 {
     $_SESSION['student_id']=$form_values['id'];
 
-    return 'forestry/info';
+    return 'forestry/info/first_stage';
 }

Modified: vcweb/trunk/virtualcommons/experiment/survey/survey.module
===================================================================
--- vcweb/trunk/virtualcommons/experiment/survey/survey.module	2008-12-15 22:33:36 UTC (rev 69)
+++ vcweb/trunk/virtualcommons/experiment/survey/survey.module	2008-12-20 00:01:02 UTC (rev 70)
@@ -279,7 +279,7 @@
 {
 	$student=Session::get('student');
     //check whether teacher processed the votings
-    if(!$student->getGroup()->getGame()->isRuleSelected())
+    if(! $student->getGroup()->getGame()->isRuleSelected())
     {
     	return 'rule_decision';
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[69] foraging/trunk/ivysettings.xml

[<al...@us...>]

Revision: 69
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=69&view=rev
Author:   alllee
Date:     2008-12-15 22:33:36 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
updating ivy to check local maven 2 repository for resources on the filesystem 

Modified Paths:
--------------
    foraging/trunk/ivysettings.xml

Modified: foraging/trunk/ivysettings.xml
===================================================================
--- foraging/trunk/ivysettings.xml	2008-12-13 01:59:30 UTC (rev 68)
+++ foraging/trunk/ivysettings.xml	2008-12-15 22:33:36 UTC (rev 69)
@@ -4,10 +4,15 @@
 -->
 <ivysettings>
   <settings defaultResolver="chain-resolver" checkUpToDate="false"/>
+  <property name='local-m2-pattern'
+  value='${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision]'/>
   <resolvers>
     <chain name='chain-resolver' returnFirst='true'>
+      <filesystem name='m2' m2compatible='true'>
+        <ivy pattern='${local-m2-pattern}.pom' />
+        <artifact pattern='${local-m2-pattern}.[ext]'/>
+      </filesystem>
       <ibiblio name='tdar-archiva' m2compatible='true' root='http://dev.tdar.org/archiva/repository/internal'/>
-      <ibiblio name='dev.java.net' m2compatible='true' root='http://download.java.net/maven/2'/>
       <filesystem name="local">
         <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml"/>
         <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] [virtualcommons-jira] Created: (VC-3) update participant database

[Allen L. (V. Commons-JIRA) <all...@as...>]

update participant database
---------------------------

                 Key: VC-3
                 URL: https://csid.asu.edu/jira/browse/VC-3
             Project: Virtual Commons
          Issue Type: Task
            Reporter: Allen Lee
            Assignee: Allen Lee
            Priority: Critical


The participant database webapp needs to be updated, and incoming freshman should be added as well.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] SF.net SVN: virtualcommons:[68] foraging/trunk

[<al...@us...>]

Revision: 68
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=68&view=rev
Author:   alllee
Date:     2008-12-13 01:59:30 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
- updated dependencies, now using dev.java.net maven repo for jogl 
- adding ant runner to execute ant tasks (not fully functional yet)

Modified Paths:
--------------
    foraging/trunk/build.xml
    foraging/trunk/ivy.xml
    foraging/trunk/ivysettings.xml
    foraging/trunk/pom.xml

Modified: foraging/trunk/build.xml
===================================================================
--- foraging/trunk/build.xml	2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/build.xml	2008-12-13 01:59:30 UTC (rev 68)
@@ -333,6 +333,13 @@
      </junit>
    </target>
 
+  <property name='savefile.converter.class' value='edu.asu.commons.foraging.util.ForagingSaveFileConverter'/>
+   <target name='convert-savefiles' depends='compile'>
+    <java classname='${savefile.converter.class}' classpathref='project.classpath' fork='yes'>
+      <arg value='raw-data'/>
+    </java>
+   </target>
+
   <!-- Run Test on GUI -->
   <target name="guitest" depends="compile-tests">
     <java fork="yes" classname="junit.swingui.TestRunner" taskname="JUnit" failonerror="true" dir="${basedir}">

Modified: foraging/trunk/ivy.xml
===================================================================
--- foraging/trunk/ivy.xml	2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/ivy.xml	2008-12-13 01:59:30 UTC (rev 68)
@@ -5,9 +5,8 @@
 <ivy-module version="2.0">
   <info organisation="edu.asu.commons" module="foraging"/>
   <dependencies>
-    <dependency org="junit" name="junit" rev="4.4"/>
+    <dependency org="junit" name="junit" rev="latest.integration"/>
     <dependency org="edu.asu.commons" name="csidex" rev="latest.integration"/>
-    <dependency org="net.java.dev.jogl" name="jogl" rev="1.1.1"/>
-    <dependency org="net.java.dev.jogl" name="gluegen-rt" rev="1.1.1"/>
+    <dependency org="net.java.dev.jogl" name="jogl" rev="1.1.1-rc6"/>
   </dependencies>
 </ivy-module>

Modified: foraging/trunk/ivysettings.xml
===================================================================
--- foraging/trunk/ivysettings.xml	2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/ivysettings.xml	2008-12-13 01:59:30 UTC (rev 68)
@@ -3,12 +3,15 @@
 vim:sts=2:sw=2:
 -->
 <ivysettings>
-  <settings defaultResolver="tdar-archiva" checkUpToDate="false"/>
+  <settings defaultResolver="chain-resolver" checkUpToDate="false"/>
   <resolvers>
-    <ibiblio name='tdar-archiva' m2compatible='true' root='http://dev.tdar.org/archiva/repository/internal'/>
-    <filesystem name="local">
-      <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml"/>
-      <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]"/>
-    </filesystem>
+    <chain name='chain-resolver' returnFirst='true'>
+      <ibiblio name='tdar-archiva' m2compatible='true' root='http://dev.tdar.org/archiva/repository/internal'/>
+      <ibiblio name='dev.java.net' m2compatible='true' root='http://download.java.net/maven/2'/>
+      <filesystem name="local">
+        <ivy pattern="${repository.dir}/[module]/ivy-[revision].xml"/>
+        <artifact pattern="${repository.dir}/[module]/[artifact]-[revision].[ext]"/>
+      </filesystem>
+    </chain>
   </resolvers>
 </ivysettings>

Modified: foraging/trunk/pom.xml
===================================================================
--- foraging/trunk/pom.xml	2008-12-02 17:09:48 UTC (rev 67)
+++ foraging/trunk/pom.xml	2008-12-13 01:59:30 UTC (rev 68)
@@ -17,35 +17,32 @@
       <name>tDAR Maven2 repository</name>
       <url>http://dev.tdar.org/archiva/repository/internal</url>
     </repository>
+    <!--
     <repository>
       <id>java.net</id>
       <name>java.net</name>
       <url>http://download.java.net/maven/2</url>
       <layout>default</layout>
     </repository>
+    -->
   </repositories>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.4</version>
+      <version>4.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>edu.asu.commons</groupId>
       <artifactId>csidex</artifactId>
-      <version>0.2</version>
+      <version>0.2.1</version>
     </dependency>
     <dependency>
       <groupId>net.java.dev.jogl</groupId>
       <artifactId>jogl</artifactId>
-      <version>1.1.1</version>
+      <version>1.1.1-rc6</version>
     </dependency>
-    <dependency>
-      <groupId>net.java.dev.jogl</groupId>
-      <artifactId>gluegen-rt</artifactId>
-      <version>1.1.1</version>
-    </dependency>
   </dependencies>
   <build>
     <finalName>foraging</finalName>
@@ -66,4 +63,44 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>ant</id>
+      <build>
+        <defaultGoal>antrun:run</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <goals>
+              <goal>load</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <!-- 
+                can be invoked via 
+                mvn -P ant -D target=deploy
+                -->
+                <property name="compile.classpath" refid="maven.compile.classpath"/>
+                <property name="runtime.classpath" refid="maven.runtime.classpath"/>
+                <property name="test.classpath" refid="maven.test.classpath"/>
+                <property name="plugin.classpath" refid="maven.plugin.classpath"/>
+                <ant antfile="${basedir}/build.xml" inheritRefs="true" inheritAll="true">
+                  <target name="${target}"/>
+                </ant>
+              </tasks>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+        <dependency>
+          <groupId>ant-contrib</groupId>
+          <artifactId>ant-contrib</artifactId>
+          <version>1.0b2</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+  </profiles>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[67] foraging/trunk/src/main/resources/ configuration/indiana-experiments

[<al...@us...>]

Revision: 67
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=67&view=rev
Author:   alllee
Date:     2008-12-02 17:09:48 +0000 (Tue, 02 Dec 2008)

Log Message:
-----------
configuration for communication / open access treatment to be run at Indiana

Added Paths:
-----------
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round0.xml
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round1.xml
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round2.xml
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round3.xml
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round4.xml
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round5.xml
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round6.xml
    foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/server.xml

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round0.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round0.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round0.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="resource-width">13</entry>
+<entry key="resource-depth">13</entry>
+<entry key="practice-round">true</entry>
+<entry key="private-property">true</entry>
+<entry key="duration">240</entry>
+
+<entry key='regrowth-rate'>.01</entry>
+<entry key='initial-distribution'>.25</entry>
+<entry key='always-explicit'>true</entry>
+
+<entry key="quiz">true</entry>
+<entry key="q1">C</entry>
+<entry key="q2">B</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>General Instructions</h3>
+<p>
+You appear on the screen as a yellow dot <img src="@CODEBASE_URL@/images/gem-self.gif">, 
+and your other group members appear as blue dots <img src="@CODEBASE_URL@/images/gem-other.gif">.
+You move by pressing the four arrow keys to the right of your keyboard.  You
+can move either up, down, left, or right.  You have to press a key for every
+move of your yellow dot.  In this experiment you can collect green diamond
+shaped tokens 
+<img src="@CODEBASE_URL@/images/gem-token.gif"> and you will
+earn two cents for each collected token.  To collect a token, simply move your
+yellow dot over a green token and press the <b>space bar</b>.  If you move
+over a token without pressing the <b>space bar</> you will NOT collect that
+token.
+</p>
+
+<p>
+The tokens that you collect have the potential to regenerate.  After you have
+collected a green token, a new token can once again appear on that empty cell.
+However, the rate at which new tokens will appear depends on the number of
+adjacent cells that still have tokens.  The more tokens in the 8 cells around
+an empty cel, the faster a new token will appear on that empty cell.  Tokens
+generate new tokens.  Thus the middle cell in Image 1 denoted with X will be
+regenerated at a faster rate than the middle cell in Image 2.  When all
+neighboring cells are empty, there is no renewal.
+
+<table width="100%">
+<tr>
+<td align="center"><b>Image 1</b></td>
+<td align="center"><b>Image 2</b></td>
+</tr>
+<tr>
+<td align="center">
+<img src="@CODEBASE_URL@/images/8neighbors.jpg" alt="image 1">
+</td>
+<td align="center">
+<img src="@CODEBASE_URL@/images/5neighbors.jpg" alt="image 2">
+</td>
+</tr>
+</table>
+<hr>
+<h3>Practice Round Instructions</h3>
+<hr>
+<p>
+You will now have four minutes to practice with the experimental environment.
+The decisions you make in this round will NOT influence your earnings.  At the
+At the beginning of the practice round half of the cells are occupied
+with green tokens.  The environment is a 13 x 13 grid of cells.
+</p>
+<p>
+When you push the <b>R</b> key you will reset the distribution of
+the tokens to randomly occupying half of the cells with green tokens.
+</p>
+
+<p><center><b>Please do not communicate with any other participant.</b></center></p>
+<p>If you have any questions please raise your hand. <b>Do you have any
+questions so far?</b></p>
+]]>
+</entry>
+
+<entry key="quiz-instructions">
+<![CDATA[
+<p>
+Before we begin the practice round you need to answer the following questions
+correctly. You can only continue when you have answered all questions
+correctly.  If an error is made you will need to answer the questions again.
+</p>
+<br>
+<form>
+Which of the statements is incorrect? <br>
+<input type="radio" name="q1" value="A">Your decisions of where to collect tokens affect the regeneration of tokens.<br>
+<input type="radio" name="q1" value="B">When you have collected all tokens on
+the screen, no new tokens will appear.<br>
+<input type="radio" name="q1" value="C">Tokens grow from the middle of the
+screen.<br>
+<input type="radio" name="q1" value="D">In order to collect a token you need
+to press the space bar while your avatar is on a cell with a token.<br>
+<br><br>
+
+Which sequence of situations is not possible? <br>
+<img src="@CODEBASE_URL@/images/question2.jpg"><br>
+<input type="radio" name="q2" value="A">A<br>
+<input type="radio" name="q2" value="B">B<br>
+<input type="radio" name="q2" value="C">C<br>
+<br>
+<input type="submit" name="submit" value="Submit">
+</form>
+]]>
+</entry>
+<entry key="welcome-instructions">
+<![CDATA[
+<h3>Welcome</h3>
+<p>
+Welcome. You have already earned 5 dollars for showing up at this experiment.
+You can earn more, up to a maximum of 40 dollars, by participating in this
+experiment, which will take about an hour.  The amount of money you earn
+depends on your decisions as well as the decisions of your group members
+during the four rounds of the experiment.
+</p>
+]]>
+</entry>
+
+</properties>

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round1.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round1.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round1.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="duration">240</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<!-- before this round begins, we have a chat session -->
+<entry key="chat-enabled">true</entry>
+<entry key="chat-duration">240</entry>
+
+<entry key="chat-instructions">
+<![CDATA[
+<p>
+You can now chat with the other participants in your group for 4 minutes
+total. During the chat round, you may communicate about any aspect of the
+experiment that you would like to discuss with other participants with whom
+you have been matched. You may not promise them side-payments after the
+experiment is completed or threaten them with any consequence after the
+experiment is finished. We are monitoring the chat traffic while you chat. If
+we detect that somebody has revealed their identity, we will have to stop the
+experiment and remove that person's entire group from the experiment.
+</p>
+<p>
+You will see other participants labeled as "1", "2","3", "4", or "5" in the
+chat box.  You can send a chat message by typing into the textfield at the
+bottom of the screen and clicking the "send" button with your mouse or
+pressing the "enter" key on your keyboard.  </p>
+]]>
+</entry>
+
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 1 Instructions</h3>
+<hr>
+<p>
+This is the first round of the experiment. The length of the round is 4
+minutes. As in the practice round you can collect green tokens but there are
+two important differences. You will earn <b>two cents</b> for each token
+collected and you <b>cannot reset</b> the distribution of green tokens. 
+</p>
+<p>
+In this round the renewable resource will become five times bigger. You
+will share this larger environment with four other players in this room.
+Each of you has been randomly assigned to one of several equal-sized
+groups.  Each of the groups is collecting tokens from an identical, but
+separate resource. 
+</p>
+<p>
+Each of you has been assigned a number from 1 to 5.  The other four players
+will appear on the screen as blue dots 
+<img src="@CODEBASE_URL@/images/gem-other.gif"> with a white
+number embedded in the dot.  On the top right corner of the screen you can see
+how many tokens each player has collected.
+</p>
+<p>
+Before the next round starts you can anonymously communicate via text messages
+for four minutes with the other participants in your group. You can use this
+opportunity to discuss the experiment and coordinate your actions to improve
+your earnings. You may not promise them side-payments after the experiment is
+completed or make any threats. You are also not allowed to reveal your real
+identity. We will be monitoring the chat traffic while you chat.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+</properties>

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round2.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round2.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round2.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="duration">240</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+<!-- before this round begins, we have a chat session -->
+<entry key="chat-enabled">true</entry>
+<entry key="chat-duration">240</entry>
+
+<entry key="chat-instructions">
+<![CDATA[
+<p>
+You can now chat with the other participants in your group for 4 minutes
+total. During the chat round, you may communicate about any aspect of the
+experiment that you would like to discuss with other participants with whom
+you have been matched. You may not promise them side-payments after the
+experiment is completed or threaten them with any consequence after the
+experiment is finished. We are monitoring the chat traffic while you chat. If
+we detect that somebody has revealed their identity, we will have to stop the
+experiment and remove that person's entire group from the experiment.
+</p>
+<p>
+You will see other participants labeled as "1", "2","3", "4", or "5" in the
+chat box.  You can send a chat message by typing into the textfield at the
+bottom of the screen and clicking the "send" button with your mouse or
+pressing the "enter" key on your keyboard.  </p>
+]]>
+</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 2 Instructions</h3>
+<hr>
+<p>
+Round 2 is the same as round 1.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+</properties>

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round3.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round3.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round3.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="duration">240</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<!-- resource regrowth parameters -->
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<!-- before this round begins, we have a chat session -->
+<entry key="chat-enabled">true</entry>
+<entry key="chat-duration">240</entry>
+
+<entry key="chat-instructions">
+<![CDATA[
+<p>
+You can now chat with the other participants in your group for 4 minutes
+total. During the chat round, you may communicate about any aspect of the
+experiment that you would like to discuss with other participants with whom
+you have been matched. You may not promise them side-payments after the
+experiment is completed or threaten them with any consequence after the
+experiment is finished. We are monitoring the chat traffic while you chat. If
+we detect that somebody has revealed their identity, we will have to stop the
+experiment and remove that person's entire group from the experiment.
+</p>
+<p>
+You will see other participants labeled as "1", "2","3", "4", or "5" in the
+chat box.  You can send a chat message by typing into the textfield at the
+bottom of the screen and clicking the "send" button with your mouse or
+pressing the "enter" key on your keyboard.  </p>
+]]>
+</entry>
+
+<!--
+<entry key="patchy">true</entry>
+<entry key="top-initial-distribution">0.50</entry>
+<entry key="top-rate">0.02</entry>
+<entry key="bottom-initial-distribution">0.25</entry>
+<entry key="bottom-rate">0.01</entry>
+-->
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 3 Instructions</h3>
+<hr>
+<p>
+Round 3 is the same as round 2.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+</properties>

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round4.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round4.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round4.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+<entry key="duration">240</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 4 Instructions</h3>
+<hr>
+<p>
+Round 4 is the same as the previous rounds with one exception - you will not
+be able to anonymously communicate with the other participants in your group.
+</p>
+<p>
+The length of this round is four minutes.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+
+</properties>

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round5.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round5.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round5.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+<entry key="duration">240</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 5 Instructions</h3>
+<hr>
+<p>
+Round 5 is the same as round 4.</p>
+<p>
+The length of this round is again four minutes.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+
+</properties>

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round6.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round6.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/round6.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+<entry key="duration">240</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 6 Instructions</h3>
+<hr>
+<p>
+Round 6 is the same as round 5.</p>
+<p>
+The length of this round is again four minutes.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+
+<entry key="last-round-debriefing">
+<![CDATA[
+<p>
+This was the last round, but not the end of the experiment. We will now
+determine your payments. While we are doing this, we request that you
+carefully fill out a brief survey.
+</p>
+<p>
+When we are ready we will call you one by one to the room next door. We will
+pay you there in private. Please wait until your computer number is called,
+and then proceed to the room next door to turn in your computer number and
+your survey. 
+</p>
+<p>
+Please answer the survey carefully and thank you for participating. 
+</p>
+]]>
+</entry>
+
+</properties>

Added: foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/server.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/server.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/indiana-experiments/chat-open-access/server.xml	2008-12-02 17:09:48 UTC (rev 67)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML experiment round configuration</comment>
+<entry key="hostname">@SERVER_ADDRESS@</entry>
+<entry key="port">@PORT_NUMBER@</entry>
+<entry key="round0">round0.xml</entry>
+<entry key="round1">round1.xml</entry>
+<entry key="round2">round2.xml</entry>
+<entry key="round3">round3.xml</entry>
+<entry key="round4">round4.xml</entry>
+<entry key="round5">round5.xml</entry>
+<entry key="round6">round6.xml</entry>
+<entry key="wait-for-participants">true</entry>
+<entry key="number-of-rounds">7</entry>
+<entry key="facilitator-instructions">
+<![CDATA[
+<h3>Facilitator Instructions</h3>
+<p>
+Welcome to the facilitator interface.  This interface allows you to control
+the experiment.  You may only modify configuration parameters <b>before</b>
+you start the experiment by selecting the Configuration menu.  When all the
+participants are ready to begin the experiment, you can start the experiment
+by selecting Experiment -&gt; Start.  After a round has been completed you
+will be able to view the statistics for all of the participants.  You can
+begin the next round by selecting Round -&gt; Start.
+</p>
+]]>
+</entry>
+</properties>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[66] csidex/trunk/src/main/java/edu/asu/commons

[<al...@us...>]

Revision: 66
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=66&view=rev
Author:   alllee
Date:     2008-11-18 00:21:04 +0000 (Tue, 18 Nov 2008)

Log Message:
-----------
patching restoration of savefiles 

Modified Paths:
--------------
    csidex/trunk/src/main/java/edu/asu/commons/experiment/Persister.java
    csidex/trunk/src/main/java/edu/asu/commons/experiment/SavedRoundData.java
    csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java

Modified: csidex/trunk/src/main/java/edu/asu/commons/experiment/Persister.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/experiment/Persister.java	2008-10-29 23:37:17 UTC (rev 65)
+++ csidex/trunk/src/main/java/edu/asu/commons/experiment/Persister.java	2008-11-18 00:21:04 UTC (rev 66)
@@ -1,6 +1,7 @@
 package edu.asu.commons.experiment;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -176,23 +177,31 @@
             logger.warning("Tried to restore a non-directory: " + directory);
             return;
         }
-        for (File saveDirectory : directory.listFiles()) {
-            if (saveDirectory.isDirectory()) {
-                // we are doing the "right thing", this is a directory of directories.
-                processSaveDirectory(saveDirectory, processors);
+        File[] subdirectories = directory.listFiles(new FileFilter() {
+            public boolean accept(File pathname) {
+                return pathname.isDirectory();
             }
-            else {
-                // check to see if we are already in a save file directory
-                processSaveDirectory(directory, processors);
+        });
+        if (subdirectories.length == 0) {
+            processSaveDirectory(directory, processors);
+        }
+        else {
+            for (File subdirectory: subdirectories) {
+                // recur on the subdirectory.  
+                processSaveFiles(subdirectory, processors);
             }
         }
     }
     
-
+    /**
+     * Processes the actual directory containing the save files.
+     * @param directory
+     * @param processors
+     */
     private static void processSaveDirectory(File directory, List<SaveFileProcessor> processors) {
         try {
-            ExperimentConfiguration experimentConfiguration = restoreExperimentConfiguration(directory, DEFAULT_EXPERIMENT_CONFIGURATION_FILE);
-            int numberOfRounds = experimentConfiguration.getAllParameters().size();
+//            ExperimentConfiguration experimentConfiguration = restoreExperimentConfiguration(directory, DEFAULT_EXPERIMENT_CONFIGURATION_FILE);
+            int numberOfRounds = restoreExperimentConfiguration(directory).getAllParameters().size();
             for (int roundNumber = 0; roundNumber < numberOfRounds; roundNumber++) {
                 SavedRoundData savedRoundData = restoreSavedRoundData(directory, roundNumber);
                 String roundSaveFilePath = savedRoundData.getSaveFilePath();
@@ -210,7 +219,11 @@
             logger.log(Level.SEVERE, "Error while processing [save directory: " + directory + "] - ignoring.", e);
         }
     }
-    
+    @SuppressWarnings("unchecked")
+    public static ExperimentConfiguration restoreExperimentConfiguration(File saveDirectory) {
+        return restoreExperimentConfiguration(saveDirectory, DEFAULT_EXPERIMENT_CONFIGURATION_FILE);
+    }
+    @SuppressWarnings("unchecked")
     public static ExperimentConfiguration restoreExperimentConfiguration(File saveDirectory, String experimentConfigurationFilename) {
         if (experimentConfigurationFilename == null || "".equals(experimentConfigurationFilename)) {
             experimentConfigurationFilename = DEFAULT_EXPERIMENT_CONFIGURATION_FILE;

Modified: csidex/trunk/src/main/java/edu/asu/commons/experiment/SavedRoundData.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/experiment/SavedRoundData.java	2008-10-29 23:37:17 UTC (rev 65)
+++ csidex/trunk/src/main/java/edu/asu/commons/experiment/SavedRoundData.java	2008-11-18 00:21:04 UTC (rev 66)
@@ -10,6 +10,7 @@
 import com.thoughtworks.xstream.XStream;
 
 import edu.asu.commons.conf.ExperimentRoundParameters;
+import edu.asu.commons.event.ChatRequest;
 import edu.asu.commons.event.PersistableEvent;
 
 /**
@@ -24,6 +25,7 @@
  * @author <a href='mailto:All...@as...'>Allen Lee</a>
  * @version $Revision$
  */
+@SuppressWarnings("unchecked")
 public class SavedRoundData implements Serializable {
     
     private static final long serialVersionUID = -2136359143854670064L;
@@ -33,6 +35,7 @@
     private ExperimentRoundParameters roundParameters;
     private DataModel dataModel;
     private SortedSet<PersistableEvent> actions;
+    private SortedSet<ChatRequest> chatRequests;
     private final String saveFilePath;
     
     private long roundStartTime;
@@ -107,6 +110,8 @@
             savedRoundData.setDataModel(dataModel);
             SortedSet<PersistableEvent> actions = (SortedSet<PersistableEvent>) stream.readObject();
             savedRoundData.setActions(actions);
+            SortedSet<ChatRequest> chatRequests = (SortedSet<ChatRequest>) stream.readObject();
+            savedRoundData.setChatRequests(chatRequests);
 //            SavedRoundData savedRoundData = new SavedRoundData(roundSaveFilePath, roundParameters, dataModel, actions);
             return savedRoundData;
         }
@@ -187,4 +192,12 @@
             this.actions = actions;
         }
     }
+
+    public SortedSet<ChatRequest> getChatRequests() {
+        return chatRequests;
+    }
+
+    public void setChatRequests(SortedSet<ChatRequest> chatRequests) {
+        this.chatRequests = chatRequests;
+    }
 }

Modified: csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java
===================================================================
--- csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java	2008-10-29 23:37:17 UTC (rev 65)
+++ csidex/trunk/src/main/java/edu/asu/commons/net/NioDispatcher.java	2008-11-18 00:21:04 UTC (rev 66)
@@ -31,6 +31,9 @@
  * are used to uniformly refer to the individual connections across the network.
  * The NioDispatcher is both a client and a server dispatcher, allowing p2p 
  * connections.
+ * 
+ * FIXME: replace WorkerPool implementation with 1.5 concurrency constructs
+ * instead from java.util.concurrent.
  *
  * @author <a href='All...@as...'>Allen Lee</a>
  * @version $Revision$


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] [virtualcommons-jira] Created: (IRRIG-1) new irrigation tasks for the next round of experiments.

[Allen L. (V. Commons-JIRA) <all...@as...>]

new irrigation tasks for the next round of experiments.
-------------------------------------------------------

                 Key: IRRIG-1
                 URL: https://csid.asu.edu/jira/browse/IRRIG-1
             Project: Irrigation Experiment
          Issue Type: Task
            Reporter: Allen Lee
            Assignee: Allen Lee


Next version of irrigation game. Attached is a document of ideas we like to implement in future versions

-          we adjust the framing from bandwidth investment to irrigation. This is mainly a change in instructions, and a few visualization aspects like a waterflow animation instead of a document opening animation.

* Change CanalPanel to modify the balls/gates visualization
* Change MiddleWindowPanel to modify the scores + file downloading animation

-          Availability of water: constant availability, regular fluctuations, irregular fluctuations. The participants may see a bar of the level of water streaming into the headgate, and this may go up or down. Of course they don't know the pattern over time. We may say that on average 40 units per second are available.

* Modify IrrigationServer's process(GroupDataModel) to also fluctuate the bandwidth if necessary (based on configuration), pack that info into the SendFileProgressEvent, and then the IrrigationClient should set CanalPanel's totalContributedBandwidth

-          Another aspect we like to implement (not for next experiment to be done, but we may implement it anyway) is to have two types of crops. One crop give modest return with modest amount of water, other leads to much higher income with high amount of water provided. If the experimenter decided to have two crops, the participant has 10 button to flick on, but for each button it can click say for crop 1 (left) or crop 2 (right).

* ScoreBoxPanel is lower right panel, IrrigationGameWindow is the dashboard

-          Finally we can implement a temporary collapse of the headgate. The participants need to invest an amount in order to repair the headgate. Sat a button appears on the screen for each participant where they can push on to help repair at a cost of one token (for example). Only when all participants have contributed, the water will flow again.
* server creates a shock for a Group within process(Group), add handlers for it on the client side that add button to IrrigationGameWindow to repair and modify CanalPanel's visualization accordingly.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] SF.net SVN: virtualcommons:[65] csidex/tags/csidex-0.2/

[<al...@us...>]

Revision: 65
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=65&view=rev
Author:   alllee
Date:     2008-10-29 23:37:17 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
Tagging 0.2 release for csidex framework

Added Paths:
-----------
    csidex/tags/csidex-0.2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[64] csidex/trunk/pom.xml

[<al...@us...>]

Revision: 64
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=64&view=rev
Author:   alllee
Date:     2008-10-29 23:35:45 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
version bump in pom for csidex

Modified Paths:
--------------
    csidex/trunk/pom.xml

Modified: csidex/trunk/pom.xml
===================================================================
--- csidex/trunk/pom.xml	2008-10-29 20:55:51 UTC (rev 63)
+++ csidex/trunk/pom.xml	2008-10-29 23:35:45 UTC (rev 64)
@@ -25,7 +25,7 @@
     </repository>
   </repositories>
   <packaging>jar</packaging>
-  <version>0.1-SNAPSHOT</version>
+  <version>0.2-SNAPSHOT</version>
   <name>csidex</name>
   <url>http://commons.asu.edu/software/csidex</url>
   <dependencies>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[63] foraging/trunk/deploy.bat

[<al...@us...>]

Revision: 63
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=63&view=rev
Author:   alllee
Date:     2008-10-29 20:55:51 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
deploy.bat no longer runs ant server as well since the jar Class-Path manifest
issue should be resolved now.

Modified Paths:
--------------
    foraging/trunk/deploy.bat

Modified: foraging/trunk/deploy.bat
===================================================================
--- foraging/trunk/deploy.bat	2008-10-29 20:07:54 UTC (rev 62)
+++ foraging/trunk/deploy.bat	2008-10-29 20:55:51 UTC (rev 63)
@@ -4,4 +4,4 @@
 set ANT_HOME=C:\tools\ant
 set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_10
 set PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;%PATH%
-ant deploy-server
+ant deploy


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[62] foraging/tags/foraging-0.2/

[<al...@us...>]

Revision: 62
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=62&view=rev
Author:   alllee
Date:     2008-10-29 20:07:54 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
foraging 0.2 release
- improved support for XML serialization of data files and chat logs via
  XStream.  Most improvements were in the csidex framework, with dependencies
  added here.
- added jetty maven webserver + configuration for users that don't have their
  own external webserver to deliver the client & facilitator JNLP files
- added simple windows batch scripts for marginally easier deployment (at
  least setting environment variables for Ant and Maven)

Added Paths:
-----------
    foraging/tags/foraging-0.2/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] [virtualcommons-jira] Created: (CSAN-12) bundle Maven Jetty plugin with foraging package

[Allen L. (V. Commons-JIRA) <all...@as...>]

bundle Maven Jetty plugin with foraging package
-----------------------------------------------

                 Key: CSAN-12
                 URL: https://csid.asu.edu/jira/browse/CSAN-12
             Project: Foraging
          Issue Type: New Feature
          Components: Infrastructure
            Reporter: Allen Lee
            Assignee: Allen Lee


Users that don't want to install & configure & deploy a webserver just to run the foraging software should be able to use the jetty maven plugin to deploy the client & facilitator JNLP files.  In the future may consider creating the facilitator control webapp in jetty as well, and have configuration on the fly.  There's a lot that could be done with making the experiments truly "web-enabled".

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] [virtualcommons-jira] Created: (CSAN-11) Manifest class-path in jarfiles breaks in Windows

[Allen L. (V. Commons-JIRA) <all...@as...>]

Manifest class-path in jarfiles breaks in Windows
-------------------------------------------------

                 Key: CSAN-11
                 URL: https://csid.asu.edu/jira/browse/CSAN-11
             Project: Foraging
          Issue Type: Bug
          Components: Infrastructure
         Environment: Windows NT/XP/Vista
            Reporter: Allen Lee
            Assignee: Allen Lee


The Class-Path manifest entry in server.jar doesn't work on Windows and in fact shouldn't work on Linux either according to the specification (but it somehow manages to squeak by).  This is being generated in Ant and should be easily fixed, the main issue is that the paths to other jars are absolute instead of relative.  

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] [virtualcommons-jira] Resolved: (CSAN-5) redesign persistence and Persister.

[Allen L. (V. Commons-JIRA) <all...@as...>]

     [ https://csid.asu.edu/jira/browse/CSAN-5?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Allen Lee resolved CSAN-5.
--------------------------

    Resolution: Fixed

Resolving this issue for now after implementing XML persistence via XStream.  Current persistence mechanisms include binary ObjectOutputStream and XStream XML (which gets pretty large).  Chat logs are also doubly maintained.

Should reraise if we decide to go with an RDBMS based solution or something builtin like Derby or HSQLDB or db4o.

> redesign persistence and Persister.
> -----------------------------------
>
>                 Key: CSAN-5
>                 URL: https://csid.asu.edu/jira/browse/CSAN-5
>             Project: Foraging Experiment
>          Issue Type: Improvement
>          Components: 2D Visualization, 3D Visualization
>            Reporter: Allen Lee
>            Assignee: Allen Lee
>            Priority: Critical
>
> At the start of a round, certain things must be reinitialized (namely the persister and the resource dispenser).  However, something like persisting chat information in between rounds is problematic because the persister has already saved the previous round's information and has not yet initialized itself for the upcoming round.  We can fix this by reinitializing the persister as soon as the next round begins, but that may cause unforeseen problems as well.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: https://csid.asu.edu/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

[virtualcommons-svn] SF.net SVN: virtualcommons:[61] foraging/trunk/build.xml

[<al...@us...>]

Revision: 61
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=61&view=rev
Author:   alllee
Date:     2008-10-29 18:26:21 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
using manifestclasspath instead of pathconvert to generate proper Jar manifest
classpaths that work on Windows and Linux (instead of just Linux).

Modified Paths:
--------------
    foraging/trunk/build.xml

Modified: foraging/trunk/build.xml
===================================================================
--- foraging/trunk/build.xml	2008-10-28 22:29:18 UTC (rev 60)
+++ foraging/trunk/build.xml	2008-10-29 18:26:21 UTC (rev 61)
@@ -192,9 +192,9 @@
   </target>
 
   <target name='build-jar'>
-    <pathconvert property='manifest.classpath' pathsep=' '>
-      <path refid='project.classpath'/>
-    </pathconvert>
+    <manifestclasspath property='manifest.classpath' jarfile='${jar.name}'>
+      <classpath refid='project.classpath'/>
+    </manifestclasspath>
     <chmod dir='${build.dir}' perm='a+rx' type='dir' includes='**'/>
     <chmod dir='${build.dir}' perm='a+r' type='file' includes='**'/>
     <manifest file='manifest.mf'>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[60] foraging/trunk/build.xml

[<al...@us...>]

Revision: 60
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=60&view=rev
Author:   alllee
Date:     2008-10-28 22:29:18 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
adding explicit copy of configuration files so that each invocation of ant
server will use the latest build.properties settings

Modified Paths:
--------------
    foraging/trunk/build.xml

Modified: foraging/trunk/build.xml
===================================================================
--- foraging/trunk/build.xml	2008-10-28 21:47:47 UTC (rev 59)
+++ foraging/trunk/build.xml	2008-10-28 22:29:18 UTC (rev 60)
@@ -240,6 +240,12 @@
       <compilerarg value='-Xlint:unchecked'/> 
       <classpath refid="project.classpath" />
     </javac>
+    <copy todir='${build.dir}/data'>
+      <fileset dir='${resources.dir}/data'/>
+    </copy>
+    <copy todir='${build.dir}/images'>
+      <fileset dir='${resources.dir}/images'/>
+    </copy>
     <copy todir='${build.dir}/conf'>
       <fileset dir='${conf.dir}'/>
       <filterset>
@@ -248,12 +254,6 @@
         <filter token='CODEBASE_URL' value='${codebase.url}'/>
       </filterset>
     </copy>
-    <copy todir='${build.dir}/data'>
-      <fileset dir='${resources.dir}/data'/>
-    </copy>
-    <copy todir='${build.dir}/images'>
-      <fileset dir='${resources.dir}/images'/>
-    </copy>
   </target>
 
   <target name='profile' depends='test'>
@@ -291,6 +291,15 @@
   <target name='deploy-server' depends='deploy, server' />
 
   <target name='server' depends='compile'>
+    <!-- make sure we update the configuration -->
+    <copy todir='${build.dir}/conf' overwrite='true'>
+      <fileset dir='${conf.dir}'/>
+      <filterset>
+        <filter token='SERVER_ADDRESS' value='${server.address}'/>
+        <filter token='PORT_NUMBER' value='${server.port}'/>
+        <filter token='CODEBASE_URL' value='${codebase.url}'/>
+      </filterset>
+    </copy>
     <java classname='${server.class}' classpathref='project.classpath' fork='yes'>
       <jvmarg value="-server"/>
     </java>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[59] foraging/trunk

[<al...@us...>]

Revision: 59
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=59&view=rev
Author:   alllee
Date:     2008-10-28 21:47:47 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
fixing broken reference to %JAVA_HOME% and making deploy.bat execute the
deploy-server ant target instead since there are some problems getting Windows
to handle java -jar -server server.jar right now...

Modified Paths:
--------------
    foraging/trunk/deploy.bat
    foraging/trunk/jetty.bat

Modified: foraging/trunk/deploy.bat
===================================================================
--- foraging/trunk/deploy.bat	2008-10-28 18:45:11 UTC (rev 58)
+++ foraging/trunk/deploy.bat	2008-10-28 21:47:47 UTC (rev 59)
@@ -3,5 +3,5 @@
 REM executables and library dependencies.
 set ANT_HOME=C:\tools\ant
 set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_10
-set PATH=%ANT_HOME%\bin;%JAVA_HOME\bin;%PATH%
-ant deploy
+set PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;%PATH%
+ant deploy-server

Modified: foraging/trunk/jetty.bat
===================================================================
--- foraging/trunk/jetty.bat	2008-10-28 18:45:11 UTC (rev 58)
+++ foraging/trunk/jetty.bat	2008-10-28 21:47:47 UTC (rev 59)
@@ -1,7 +1,11 @@
 REM set M2_HOME to the location where you unpacked Maven.  Inside this
 REM directory should be bin and lib directories containing the Maven
 REM executables and library dependencies.
+REM *******
+REM You MUST RUN deploy.bat or server.bat before this to properly compile and
+REM configure this application.
+set ANT_HOME=C:\tools\ant
 set M2_HOME=C:\tools\maven
 set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_10
-set PATH=%M2_HOME%\bin;%JAVA_HOME\bin;%PATH%
+set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%M2_HOME%\bin;%PATH%
 mvn jetty:run


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[58] foraging/trunk

[<al...@us...>]

Revision: 58
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=58&view=rev
Author:   alllee
Date:     2008-10-28 18:45:11 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
adding comments to windows deployment, adding WEB-INF to
src/main/resources/web so Jetty won't be unhappy

Modified Paths:
--------------
    foraging/trunk/build.xml
    foraging/trunk/deploy.bat
    foraging/trunk/jetty.bat

Added Paths:
-----------
    foraging/trunk/src/main/resources/web/WEB-INF/
    foraging/trunk/src/main/resources/web/WEB-INF/web.xml

Modified: foraging/trunk/build.xml
===================================================================
--- foraging/trunk/build.xml	2008-10-28 18:36:56 UTC (rev 57)
+++ foraging/trunk/build.xml	2008-10-28 18:45:11 UTC (rev 58)
@@ -133,6 +133,7 @@
       </fileset>
       <fileset dir='${resources.dir}/web'>
         <include name='index.html'/>
+        <include name='WEB-INF/**'/>
       </fileset>
     </copy>
     <!-- copy images -->

Modified: foraging/trunk/deploy.bat
===================================================================
--- foraging/trunk/deploy.bat	2008-10-28 18:36:56 UTC (rev 57)
+++ foraging/trunk/deploy.bat	2008-10-28 18:45:11 UTC (rev 58)
@@ -1,3 +1,6 @@
+REM set ANT_HOME to the location where you unpacked Ant.  Inside this
+REM directory should be bin and lib directories containing the Ant
+REM executables and library dependencies.
 set ANT_HOME=C:\tools\ant
 set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_10
 set PATH=%ANT_HOME%\bin;%JAVA_HOME\bin;%PATH%

Modified: foraging/trunk/jetty.bat
===================================================================
--- foraging/trunk/jetty.bat	2008-10-28 18:36:56 UTC (rev 57)
+++ foraging/trunk/jetty.bat	2008-10-28 18:45:11 UTC (rev 58)
@@ -1,3 +1,6 @@
+REM set M2_HOME to the location where you unpacked Maven.  Inside this
+REM directory should be bin and lib directories containing the Maven
+REM executables and library dependencies.
 set M2_HOME=C:\tools\maven
 set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_10
 set PATH=%M2_HOME%\bin;%JAVA_HOME\bin;%PATH%

Added: foraging/trunk/src/main/resources/web/WEB-INF/web.xml
===================================================================
--- foraging/trunk/src/main/resources/web/WEB-INF/web.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/web/WEB-INF/web.xml	2008-10-28 18:45:11 UTC (rev 58)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+vim:sts=2:sw=2
+-->
+<web-app>
+
+  <display-name>The Virtual Commons Foraging Experiment</display-name>
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
+
+</web-app>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[57] foraging/trunk

[<al...@us...>]

Revision: 57
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=57&view=rev
Author:   alllee
Date:     2008-10-28 18:36:56 +0000 (Tue, 28 Oct 2008)

Log Message:
-----------
adding a jetty.bat to set up environment variables to execute mvn jetty:run on
windows and fixing the default values for web.dir in the
build.properties.example

Modified Paths:
--------------
    foraging/trunk/build.properties.example
    foraging/trunk/src/main/resources/configuration/round0.xml
    foraging/trunk/src/main/resources/configuration/round1.xml
    foraging/trunk/src/main/resources/configuration/round2.xml
    foraging/trunk/src/main/resources/configuration/round3.xml
    foraging/trunk/src/main/resources/configuration/round4.xml
    foraging/trunk/src/main/resources/configuration/server.xml

Added Paths:
-----------
    foraging/trunk/jetty.bat
    foraging/trunk/src/main/resources/configuration/round5.xml
    foraging/trunk/src/main/resources/configuration/round6.xml

Modified: foraging/trunk/build.properties.example
===================================================================
--- foraging/trunk/build.properties.example	2008-10-27 23:49:32 UTC (rev 56)
+++ foraging/trunk/build.properties.example	2008-10-28 18:36:56 UTC (rev 57)
@@ -1,5 +1,7 @@
-# Any custom build properties set here will override the defaults provided in
-# the build.xml file.
+# Any configuration properties set here will override the defaults provided in
+# the build.xml file.  If you are using the builtin Maven Jetty webserver, you
+# just need to change the server address (and the port listed in the
+# codebase.url property if you are running on a port other than 8080).
 
 # server name, set this to the IP address or domain name that will be running
 # the experiment server 
@@ -12,13 +14,13 @@
 # (should be accessible / mounted by the webserver)
 # NOTE: for windows, use double backslashes as a path separator
 # web.dir=C:\\WebServer\\foraging
-web.dir=/var/www/html/foraging/
+web.dir=src/main/webapp
 
 # The URL that maps to the path above.  If you don't mind using "foraging" as
 # part of the URL you can just set the server.address and leave this property
 # blank since the build.xml that loads this properties file sets the codebase
 # url to the ${server.address} + "/foraging" by default.
-codebase.url=http://libai.la.asu.edu/foraging
+codebase.url=http://${server.address}:8080/foraging
 
 # set to whatever port you want the Java experiment server to run on (this is
 # *not* the webserver port, this is the experiment server port used to

Added: foraging/trunk/jetty.bat
===================================================================
--- foraging/trunk/jetty.bat	                        (rev 0)
+++ foraging/trunk/jetty.bat	2008-10-28 18:36:56 UTC (rev 57)
@@ -0,0 +1,4 @@
+set M2_HOME=C:\tools\maven
+set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_10
+set PATH=%M2_HOME%\bin;%JAVA_HOME\bin;%PATH%
+mvn jetty:run

Modified: foraging/trunk/src/main/resources/configuration/round0.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round0.xml	2008-10-27 23:49:32 UTC (rev 56)
+++ foraging/trunk/src/main/resources/configuration/round0.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -2,22 +2,20 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
 <comment>Foraging XML-ized experiment round configuration</comment>
-<entry key="resource-width">14</entry>
-<entry key="resource-depth">14</entry>
-
+<entry key="resource-width">13</entry>
+<entry key="resource-depth">13</entry>
+<entry key="practice-round">true</entry>
 <entry key="private-property">true</entry>
 <entry key="duration">240</entry>
 
 <entry key='regrowth-rate'>.01</entry>
 <entry key='initial-distribution'>.25</entry>
-
 <entry key='always-explicit'>true</entry>
 
 <entry key="quiz">true</entry>
 <entry key="q1">C</entry>
 <entry key="q2">B</entry>
 
-<entry key="practice-round">true</entry>
 <entry key="instructions">
 <![CDATA[
 <h3>General Instructions</h3>
@@ -40,11 +38,10 @@
 collected a green token, a new token can once again appear on that empty cell.
 However, the rate at which new tokens will appear depends on the number of
 adjacent cells that still have tokens.  The more tokens in the 8 cells around
-an empty cell, the faster a new token will appear on that empty cell.  In
-other words, the presence of tokens will generate new tokens over time.  Thus
-the middle cell in Image 1 denoted with X will be regenerated at a faster rate
-than the middle cell in Image 2.  When all neighboring cells are empty, there
-is no renewal.
+an empty cel, the faster a new token will appear on that empty cell.  Tokens
+generate new tokens.  Thus the middle cell in Image 1 denoted with X will be
+regenerated at a faster rate than the middle cell in Image 2.  When all
+neighboring cells are empty, there is no renewal.
 
 <table width="100%">
 <tr>
@@ -65,9 +62,9 @@
 <hr>
 <p>
 You will now have four minutes to practice with the experimental environment.
-The decisions you make in this round will NOT influence your earnings. At the
-beginning of the practice round half of the cells are occupied with green
-tokens.  The environment is a 14 x 14 grid of cells.
+The decisions you make in this round will NOT influence your earnings.  At the
+At the beginning of the practice round half of the cells are occupied
+with green tokens.  The environment is a 13 x 13 grid of cells.
 </p>
 <p>
 When you push the <b>R</b> key you will reset the distribution of
@@ -104,8 +101,7 @@
 <input type="radio" name="q2" value="A">A<br>
 <input type="radio" name="q2" value="B">B<br>
 <input type="radio" name="q2" value="C">C<br>
-<br><br>
-
+<br>
 <input type="submit" name="submit" value="Submit">
 </form>
 ]]>

Modified: foraging/trunk/src/main/resources/configuration/round1.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round1.xml	2008-10-27 23:49:32 UTC (rev 56)
+++ foraging/trunk/src/main/resources/configuration/round1.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -3,26 +3,18 @@
 <properties>
 <comment>Foraging XML-ized experiment round configuration</comment>
 <entry key="display-group-tokens">true</entry>
-<entry key="clients-per-group">4</entry>
+<entry key="clients-per-group">5</entry>
 <entry key="duration">240</entry>
-<entry key="resource-depth">28</entry>
-<entry key="resource-width">28</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
 
 <entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
 
 <entry key="initial-distribution">.25</entry>
 <entry key="regrowth-rate">0.01</entry>
-<entry key='chat-enabled'>true</entry>
 
 
-<!--
-<entry key="patchy">true</entry>
-<entry key="top-initial-distribution">0.50</entry>
-<entry key="top-rate">0.02</entry>
-<entry key="bottom-initial-distribution">0.25</entry>
-<entry key="bottom-rate">0.01</entry>
--->
-
 <entry key="instructions">
 <![CDATA[
 <h3>Round 1 Instructions</h3>
@@ -34,13 +26,14 @@
 <b>cannot</b> reset the distribution of green tokens. 
 </p>
 <p>
-In this round the renewable resource will become four times bigger. You will
-share this larger environment with four other players in this room.  Each of
-you has been randomly assigned to one of several equal-sized groups.  Each of
-the groups is collecting tokens from an identical, but separate resource. 
+In this round the renewable resource will become five times bigger. You
+will share this larger environment with four other players in this room.
+Each of you has been randomly assigned to one of several equal-sized
+groups.  Each of the groups is collecting tokens from an identical, but
+separate resource. 
 </p>
 <p>
-Each of you has been assigned a number from 1 to 4.  The other three players
+Each of you has been assigned a number from 1 to 5.  The other four players
 will appear on the screen as blue dots 
 <img src="@CODEBASE_URL@/images/gem-other.gif"> with a white
 number embedded in the dot.  On the top right corner of the screen you can see

Modified: foraging/trunk/src/main/resources/configuration/round2.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round2.xml	2008-10-27 23:49:32 UTC (rev 56)
+++ foraging/trunk/src/main/resources/configuration/round2.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -3,70 +3,28 @@
 <properties>
 <comment>Foraging XML-ized experiment round configuration</comment>
 <entry key="display-group-tokens">true</entry>
-<entry key="clients-per-group">4</entry>
+<entry key="clients-per-group">5</entry>
 <entry key="duration">240</entry>
-<entry key="resource-depth">28</entry>
-<entry key="resource-width">28</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
 
 <entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
 
 <entry key="initial-distribution">.25</entry>
 <entry key="regrowth-rate">0.01</entry>
 
-<!-- before this round begins, we have a chat session -->
-<entry key="chat-enabled">true</entry>
-<entry key="chat-duration">240</entry>
-
 <entry key="instructions">
 <![CDATA[
 <h3>Round 2 Instructions</h3>
 <hr>
 <p>
-Round 2 is the same as round 1.  However, before the next round starts you
-will be given the opportunity to anonymously communicate by text messages for
-four minutes with the other participants in your group. You can use this
-opportunity to discuss the experiment and coordinate your actions to improve
-your earnings. You may not promise them side-payments after the experiment is
-completed or make any threats. You are also not allowed to reveal your real
-identity. We are monitoring the chat traffic while you chat.
+Round 2 is the same as round 1.
 </p>
-
 <p>
 If you have any questions please raise your hand.  <b>Do you have any
 questions so far?</b>
 </p>
 ]]>
 </entry>
-
-<entry key="chat-instructions">
-<![CDATA[
-<p>
-You can now chat with the other participants in your group for 4 minutes
-total. During the chat round, you may communicate about any aspect of the
-experiment that you would like to discuss with other participants with whom
-you have been matched. You may not promise them side-payments after the
-experiment is completed or threaten them with any consequence after the
-experiment is finished. We are monitoring the chat traffic while you chat. If
-we see that somebody reveals his or her identity, we have to stop the
-experiment and remove the whole group from which this person is a member out
-of this room.
-</p>
-<p>
-You will see other participants labeled as "1", "2","3", or "4" in the chat
-box.  You can send a chat message by typing into the textfield at the bottom
-of the screen and then clicking the "send" button with your mouse or pressing
-the "enter" key on your keyboard.  </p>
-]]>
-</entry>
-
-<entry key="private-chat-instructions">
-<![CDATA[
-You may send private messages to a specific participant by clicking on the
-appropriately labeled button (1, 2, 3, or 4) before typing your message in the
-chat box and sending it.  By default you are communicating with all members of
-your group. 
-]]>
-</entry>
-
-
 </properties>

Modified: foraging/trunk/src/main/resources/configuration/round3.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round3.xml	2008-10-27 23:49:32 UTC (rev 56)
+++ foraging/trunk/src/main/resources/configuration/round3.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -1,95 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-<comment>Foraging XML-ized experiment round configuration</comment>
-<entry key="practice-round">true</entry>
-<entry key='resource-width'>8</entry>
-<entry key='resource-depth'>8</entry>
-<entry key='resource-scale'>32</entry>
-<entry key="duration">240</entry>
-<entry key="initial-distribution">.25</entry>
-<entry key="private-property">false</entry>
-<entry key="clients-per-group">4</entry>
-<entry key="quiz-enabled">false</entry>
-<entry key="chat-radius">64</entry>
-<entry key="seconds-per-year">30</entry>
-<entry key="regrowth-rate">.01</entry>
-<entry key="tokens-per-fruits">10</entry>
-<entry key="experiment-type">forestry</entry>
-<entry key="maximum-resource-age">10</entry>
-
-<entry key="instructions">
-<![CDATA[
-<h3>Round 3 Instructions</h3>
-<p>
-Round 3 is another practice round where you will be able to collect tokens by
-harvesting trees and fruit in a 3D representation of a forest.
-</p>
-<p>
-The forest consists of trees which are growing slowly over time. When a tree
-is big enough it will generate fruit. You can collect fruit from a tree and
-you can cut down a tree. The older the tree the more tokens you collect by
-harvesting it. A tree which is one minute old leads to 5 tokens, while a tree
-that is four minutes old gives you 25 tokens. After 4 minutes the tree will
-not grow any further. If a tree is cut down, it takes some time before a new
-seedling generates a new start for a tree to grow. A tree will generate fruits
-at age of 5 minutes. You can collect fruits, which generates 10 tokens per
-harvest. When you have harvested fruit, new fruit will be added as illustrated
-in the figure below. The tree can generate fruit indefinitely.
-<table width="100%">
-<tr>
-<td align="center">
-<img src="@CODEBASE_URL@/images/trees.jpg"></td>
-</tr>
-</table> 
-You will share the forest with three other participants. You will appear on
-the screen as an avatar.
-</p>
-<p>
-<b>Moving your avatar:</b> You can move your avatar by pressing the <b>W</b>,
-<b>A</b>, <b>S</b>, <b>D</b> keys or via the arrow keys. <b>W</b> or the
-<b>Up</b> arrow key will move your avatar forward while <b>S</b> or the
-<b>Down</b> arrow key will move it backward. <b>A</b> or the <b>Left</b> arrow
-key will rotate the avatar to its left while <b>D</b> or the <b>Right</b>
-arrow key will rotate it to its right.
-</p>
-<p>
-<b>Cutting a tree:</b> Cutting a tree is a two step process.
-First you need to select the tree you wish to cut. You can do this by standing
-next to the tree and pressing the <b>Q</b> key. You will see the selected tree
-changing its color to blue. Then you can cut the selected tree by pressing the
-<b>E</b> key. You will see that the avatar moves its axe to cut the tree. The
-bigger the tree the more effort the avatar needs to make to cut the tree. When
-the tree is cut, you will see tokens added to your total at the top of the
-screen. 
-</p>
-<p>
-<b>Collecting fruits:</b> Collecting fruits is also a two step process. 
-First you need to select the tree you wish collect fruits from. You can do
-this by standing next to the tree and pressing the key <b>Q</b>. You will see
-the selected tree changing its color to blue. Then you can collect the fruits
-by pressing the key <b>X</b>. You will see that the fruits are falling down,
-representing the fruit harvest. On the top of the screen you will see that
-tokens are added to your total.
-</p>
-<p>
-<b>Chatting with other players:</b> A chat box is present at the bottom of the
-screen. When another player is in the neighborhood, you can click on that
-avatar using the left mouse button to start a chat. You will see the character
-associated with the selected avatar (<i>A</i>, <i>B</i>, <i>C</i> or <i>D</i>)
-appearing in the chat box indicating that you can send messages to that
-player.
-</p>
-<hr>
-<h3>Practice Round Instructions</h3>
-<hr>
-<p>
-You will now have four minutes to practice with the experimental environment.
-You will share the environment with three other participants. Make sure you
-try out the chat option, the cutting of a tree and the collection of fruit.
-<p><center><b>Please do not communicate with any other participant.</b></center></p>
-<p>If you have any questions please raise your hand. <b>Do you have any
-questions so far?</b></p>
-]]>
-</entry>
-</properties>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="duration">240</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<!-- resource regrowth parameters -->
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<!--
+<entry key="patchy">true</entry>
+<entry key="top-initial-distribution">0.50</entry>
+<entry key="top-rate">0.02</entry>
+<entry key="bottom-initial-distribution">0.25</entry>
+<entry key="bottom-rate">0.01</entry>
+-->
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 3 Instructions</h3>
+<hr>
+<p>
+Round 3 is the same as round 2.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+</properties>

Modified: foraging/trunk/src/main/resources/configuration/round4.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round4.xml	2008-10-27 23:49:32 UTC (rev 56)
+++ foraging/trunk/src/main/resources/configuration/round4.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -1,88 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-<comment>Foraging XML-ized experiment round configuration</comment>
-<entry key="practice-round">false</entry>
-<entry key='resource-width'>8</entry>
-<entry key='resource-depth'>8</entry>
-<entry key='resource-scale'>32</entry>
-<entry key="duration">900</entry>
-<entry key="initial-distribution">.25</entry>
-<entry key="private-property">false</entry>
-<entry key="clients-per-group">4</entry>
-<entry key="quiz-enabled">false</entry>
-<entry key="chat-radius">64</entry>
-<entry key="seconds-per-year">30</entry>
-<entry key="regrowth-rate">.01</entry>
-<entry key="tokens-per-fruits">10</entry>
-<entry key="experiment-type">forestry</entry>
-<entry key="maximum-resource-age">10</entry>
-
-<entry key="instructions">
-<![CDATA[
-<h3>Round 4 Instructions</h3>
-<hr>
-<p>
-The actual round will now begin. The duration of this round is 15 minutes.
-For review, here is a list of important actions and respective keys:
-</p>
-<p>
-<b>Moving your avatar:</b> You can move your avatar by pressing the <b>W</b>,
-<b>A</b>, <b>S</b>, <b>D</b> keys or via the arrow keys. <b>W</b> or the
-<b>Up</b> arrow key will move your avatar forward while <b>S</b> or the
-<b>Down</b> arrow key will move it backward. <b>A</b> or the <b>Left</b> arrow
-key will rotate the avatar to its left while <b>D</b> or the <b>Right</b>
-arrow key will rotate it to its right.
-</p>
-<p>
-<b>Cutting a tree:</b> Cutting a tree is a two step process.
-First you need to select the tree you wish to cut. You can do this by standing
-next to the tree and pressing the <b>Q</b> key. You will see the selected tree
-changing its color to blue. Then you can cut the selected tree by pressing the
-<b>E</b> key. You will see that the avatar moves its axe to cut the tree. The
-bigger the tree the move effort the avatar needs to make to cut the tree. When
-the tree is cut, you will see tokens added to your total at the top of the
-screen. 
-</p>
-<p>
-<b>Collecting fruits:</b> Collecting fruits is also a two step process. 
-First you need to select the tree you wish collect fruits from. You can do
-this by standing next to the tree and pressing the key <b>Q</b>. You will see
-the selected tree changing its color to blue. Then you can collect the fruits
-by pressing the key <b>X</b>. You will see that the fruits are falling down,
-representing the fruit harvest. On the top of the screen you will see that
-tokens are added to your total.
-</p>
-<p>
-<b>Chatting with other players:</b> A chat box is present at the bottom of the
-screen. When another player is in the neighborhood, you can click on that
-avatar using the left mouse button to start a chat. You will see the character
-associated with the selected avatar (<i>A</i>, <i>B</i>, <i>C</i> or <i>D</i>)
-appearing in the chat box indicating that you can send messages to that
-player.
-</p>
-
-]]>
-</entry>
-
-<entry key="last-round-debriefing">
-<![CDATA[
-<p>
-This was the last round, but not the end of the experiment. We will now
-determine your payments. While we are doing this, we request that you
-carefully fill out a brief survey.
-</p>
-<p>
-When we are ready we will call you one by one to the room next door. We will
-pay you there in private. Please wait until your computer number is called,
-and then proceed to the room next door to turn in your computer number and
-your survey. 
-</p>
-<p>
-Please answer the survey carefully and thank you for participating. 
-</p>
-]]>
-</entry>
-
-
-</properties>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+<entry key="duration">240</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<!-- before this round begins, we have a chat session -->
+<entry key="chat-enabled">true</entry>
+<entry key="chat-duration">240</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 4 Instructions</h3>
+<hr>
+<p>
+Round 4 is the same as the previous two rounds with one exception.  
+</p>
+<p>
+Before the next round starts you can anonymously communicate by text messages
+for four minutes with the other participants in your group. You can use this
+opportunity to discuss the experiment and coordinate your actions to improve
+your earnings. You may not promise them side-payments after the experiment is
+completed or make any threats. You are also not allowed to reveal your real
+identity. We are monitoring the chat traffic while you chat.
+</p>
+<p>
+The length of this round is four minutes.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+
+<entry key="chat-instructions">
+<![CDATA[
+<p>
+You can now chat with the other participants in your group for 4 minutes
+total. During the chat round, you may communicate about any aspect of the
+experiment that you would like to discuss with other participants with whom
+you have been matched. You may not promise them side-payments after the
+experiment is completed or threaten them with any consequence after the
+experiment is finished. We are monitoring the chat traffic while you chat. If
+we see that somebody reveals his or her identity, we have to stop the
+experiment and remove the whole group from which this person is a member out
+of this room.
+</p>
+<p>
+You will see other participants labeled as "1", "2","3", "4", or "5" in the
+chat box.  You can send a chat message by typing into the textfield at the
+bottom of the screen and clicking the "send" button with your mouse or
+pressing the "enter" key on your keyboard.  
+</p>
+]]>
+</entry>
+
+</properties>

Added: foraging/trunk/src/main/resources/configuration/round5.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round5.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/round5.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+<entry key="duration">240</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<!-- before this round begins, we have a chat session -->
+<entry key="chat-enabled">true</entry>
+<entry key="chat-duration">240</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 5 Instructions</h3>
+<hr>
+<p>
+Round 5 is the same as round 4.</p>
+<p>
+The length of this round is again four minutes.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+
+<entry key="chat-instructions">
+<![CDATA[
+<p>
+You can now chat with the other participants in your group for 4 minutes
+total. During the chat round, you may communicate about any aspect of the
+experiment that you would like to discuss with other participants with whom
+you have been matched. You may not promise them side-payments after the
+experiment is completed or threaten them with any consequence after the
+experiment is finished. We are monitoring the chat traffic while you chat. If
+we see that somebody reveals his or her identity, we have to stop the
+experiment and remove the whole group from which this person is a member out
+of this room.
+</p>
+<p>
+You will see other participants labeled as "1", "2","3", "4", or "5" in the
+chat box.  You can send a chat message by typing into the textfield at the
+bottom of the screen and clicking the "send" button with your mouse or
+pressing the "enter" key on your keyboard.  
+</p>
+]]>
+</entry>
+
+<entry key='private-chat-instructions'>
+<![CDATA[
+You may send private messages to a specific participant by clicking on the
+appropriately labeled button (1, 2, 3, 4, or 5) before typing your message in
+the chat box and sending it.  By default you are communicating with all
+members of your group. 
+]]>
+</entry>
+
+</properties>

Added: foraging/trunk/src/main/resources/configuration/round6.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/round6.xml	                        (rev 0)
+++ foraging/trunk/src/main/resources/configuration/round6.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>Foraging XML-ized experiment round configuration</comment>
+<entry key="display-group-tokens">true</entry>
+<entry key="clients-per-group">5</entry>
+<entry key="resource-depth">29</entry>
+<entry key="resource-width">29</entry>
+<entry key="duration">240</entry>
+
+<entry key="initial-distribution">.25</entry>
+<entry key="regrowth-rate">0.01</entry>
+
+<entry key='always-explicit'>true</entry>
+<entry key='max-cell-occupancy'>1</entry>
+
+<!-- before this round begins, we have a chat session -->
+<entry key="chat-enabled">true</entry>
+<entry key="chat-duration">240</entry>
+
+<entry key="instructions">
+<![CDATA[
+<h3>Round 6 Instructions</h3>
+<hr>
+<p>
+Round 6 is the same as round 5.</p>
+<p>
+The length of this round is again four minutes.
+</p>
+<p>
+If you have any questions please raise your hand.  <b>Do you have any
+questions so far?</b>
+</p>
+]]>
+</entry>
+
+<entry key="last-round-debriefing">
+<![CDATA[
+<p>
+This was the last round, but not the end of the experiment. We will now
+determine your payments. While we are doing this, we request that you
+carefully fill out a brief survey.
+</p>
+<p>
+When we are ready we will call you one by one to the room next door. We will
+pay you there in private. Please wait until your computer number is called,
+and then proceed to the room next door to turn in your computer number and
+your survey. 
+</p>
+<p>
+Please answer the survey carefully and thank you for participating. 
+</p>
+]]>
+</entry>
+
+<entry key="chat-instructions">
+<![CDATA[
+<p>
+You can now chat with the other participants in your group for 4 minutes
+total. During the chat round, you may communicate about any aspect of the
+experiment that you would like to discuss with other participants with whom
+you have been matched. You may not promise them side-payments after the
+experiment is completed or threaten them with any consequence after the
+experiment is finished. We are monitoring the chat traffic while you chat. If
+we detect that somebody has revealed their identity, we will have to stop the
+experiment and remove that person's entire group from the experiment.
+</p>
+<p>
+You will see other participants labeled as "1", "2","3", "4", or "5" in the
+chat box.  You can send a chat message by typing into the textfield at the
+bottom of the screen and clicking the "send" button with your mouse or
+pressing the "enter" key on your keyboard.  </p>
+]]>
+</entry>
+</properties>

Modified: foraging/trunk/src/main/resources/configuration/server.xml
===================================================================
--- foraging/trunk/src/main/resources/configuration/server.xml	2008-10-27 23:49:32 UTC (rev 56)
+++ foraging/trunk/src/main/resources/configuration/server.xml	2008-10-28 18:36:56 UTC (rev 57)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties>
-<comment>Foraging XML experiment configuration</comment>
+<comment>Foraging XML experiment server configuration</comment>
 <entry key="hostname">@SERVER_ADDRESS@</entry>
 <entry key="port">@PORT_NUMBER@</entry>
 <entry key="round0">round0.xml</entry>
@@ -9,8 +9,10 @@
 <entry key="round2">round2.xml</entry>
 <entry key="round3">round3.xml</entry>
 <entry key="round4">round4.xml</entry>
+<entry key="round5">round5.xml</entry>
+<entry key="round6">round6.xml</entry>
 <entry key="wait-for-participants">true</entry>
-<entry key="number-of-rounds">5</entry>
+<entry key="number-of-rounds">7</entry>
 <entry key="facilitator-instructions">
 <![CDATA[
 <h3>Facilitator Instructions</h3>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[virtualcommons-svn] SF.net SVN: virtualcommons:[56] foraging/trunk

[<al...@us...>]

Revision: 56
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=56&view=rev
Author:   alllee
Date:     2008-10-27 23:49:32 +0000 (Mon, 27 Oct 2008)

Log Message:
-----------
adding jetty maven for local webserver deployment

deploy now goes to ${deploy.dir} instead of ${web.dir}, and by default gets
copied to src/main/webapp to get picked up by mvn jetty:run

Modified Paths:
--------------
    foraging/trunk/build.xml
    foraging/trunk/pom.xml

Modified: foraging/trunk/build.xml
===================================================================
--- foraging/trunk/build.xml	2008-10-24 19:42:20 UTC (rev 55)
+++ foraging/trunk/build.xml	2008-10-27 23:49:32 UTC (rev 56)
@@ -43,7 +43,7 @@
     </target>
 
     <target name='resolve' depends='init-ivy' description='--> retrieve dependencies with ivy'>
-      <ivy:retrieve pattern='${lib.dir}/[conf]/[artifact].[ext]'/> 
+      <ivy:retrieve pattern='${lib.dir}/[artifact].[ext]'/> 
     </target>
 
   <!-- Load all properties from the build.properties file,
@@ -57,7 +57,7 @@
   <property name='build.dir' value='target'/>
 
   <!-- default web & deployment properties -->
-  <property name='web.dir' value='/var/www/carllab/${ant.project.name}'/>
+  <property name='web.dir' value='src/main/webapp'/>
   <property name='server.port' value='16001'/>
   <property name='server.xml' value='server.xml'/>
   <property name='codebase.url' value='http://${server.address}/${ant.project.name}'/>
@@ -115,14 +115,15 @@
 	
   <target name='build-all' depends='facilitator-jar, client-jar, server-jar, compile'/>
 
-<!-- deploys the client jar to the appropriate webapps directory. -->
-  <target name='deploy' depends='build-all'>
-    <mkdir dir='${web.dir}'/>
+<!-- deploys the client + facilitator + csidex jarfiles to the appropriate
+     webapps directory. -->
+  <target name='deploy-to' depends='build-all'>
+    <mkdir dir='${deploy.dir}'/>
     <!-- 
     copy client jar, facilitator jar, and csidex.jar to web deployment
     directory 
     -->
-    <copy todir='${web.dir}' overwrite='true'>
+    <copy todir='${deploy.dir}' overwrite='true'>
       <fileset dir='${dist.dir}'>
         <include name='client.jar'/>
         <include name='facilitator.jar'/>
@@ -135,31 +136,37 @@
       </fileset>
     </copy>
     <!-- copy images -->
-    <copy todir='${web.dir}/images' overwrite='true'>
+    <copy todir='${deploy.dir}/images' overwrite='true'>
       <fileset dir='${resources.dir}/images'/>
     </copy>
     <!-- 
     copy client and facilitator JNLP descriptor files, replacing
     url/main class tokens.
     -->
-    <copy file='${resources.dir}/web/client.jnlp' todir='${web.dir}' overwrite='true'>
+    <copy file='${resources.dir}/web/client.jnlp' todir='${deploy.dir}' overwrite='true'>
       <filterset>
         <filter token='CODEBASE_URL' value='${codebase.url}'/>
         <filter token='MAIN_CLASS' value='${client.class}'/>
         <filter token='FRAMEWORK_JAR' value='${framework.jar}'/>
       </filterset>
     </copy>
-    <copy file='${resources.dir}/web/facilitator.jnlp' todir='${web.dir}' overwrite='true'>
+    <copy file='${resources.dir}/web/facilitator.jnlp' todir='${deploy.dir}' overwrite='true'>
       <filterset>
         <filter token='CODEBASE_URL' value='${codebase.url}'/>
         <filter token='MAIN_CLASS' value='${facilitator.class}'/>
         <filter token='FRAMEWORK_JAR' value='${framework.jar}'/>
       </filterset>
     </copy>
-    <chmod dir='${web.dir}' perm='664' type='file' includes='**'/>
-    <chmod dir='${web.dir}' perm='775' type='dir' includes='**'/>
+    <chmod dir='${deploy.dir}' perm='664' type='file' includes='**'/>
+    <chmod dir='${deploy.dir}' perm='775' type='dir' includes='**'/>
   </target>
 
+  <target name='deploy'>
+    <antcall target='deploy-to'>
+      <param name='deploy.dir' value='${web.dir}'/>
+    </antcall>
+  </target>
+
   <target name='client-jar' depends='server-jar'>
     <antcall target='build-jar'>
       <param name='main.class' value='${client.class}'/>

Modified: foraging/trunk/pom.xml
===================================================================
--- foraging/trunk/pom.xml	2008-10-24 19:42:20 UTC (rev 55)
+++ foraging/trunk/pom.xml	2008-10-27 23:49:32 UTC (rev 56)
@@ -57,6 +57,13 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.