[gee-svn] SF.net SVN: gabel: [138] trunk/gee/war

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

Revision: 138
Author:   alllee
Date:     2006-03-04 11:10:37 -0800 (Sat, 04 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/gabel/?rev=138&view=rev

Log Message:
-----------
webapp now starts up again at least.  

Modified Paths:
--------------
    trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java
    trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java
    trunk/gee/src/java/edu/indiana/psych/gee/ExperimentParametersEntity.java
    trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java
    trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java
    trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java
    trunk/gee/war/startExperiment.jsp

Added Paths:
-----------
    trunk/gee/war/WEB-INF/lib/asm.jar
Modified: trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java	2006-03-04 18:55:18 UTC (rev 137)
+++ trunk/gee/src/java/edu/indiana/psych/gee/ConsentForm.java	2006-03-04 19:10:37 UTC (rev 138)
@@ -7,6 +7,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * $Id$
@@ -77,12 +78,14 @@
     public void setDescription(String description) {
         this.description = description;
     }
+    @Transient
     public Date getIrbDateApprovalExpires() {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(getIrbDateApproved());
         calendar.add(Calendar.DAY_OF_MONTH, 364);
         return calendar.getTime();
     }
+    @Temporal(TemporalType.DATE)
     public Date getIrbDateApproved() {
         if (irbDateApproved == null || isToday(irbDateApproved)) {
             Calendar calendar = Calendar.getInstance();
@@ -91,6 +94,11 @@
         }
         return irbDateApproved;
     }
+
+    public void setIrbDateApproved(Date irbDateApproved) {
+        this.irbDateApproved = irbDateApproved;
+    }
+
     // FIXME: atrocity
     private boolean isToday(Date date) {
         Calendar now = Calendar.getInstance();
@@ -101,9 +109,7 @@
                 && now.get(Calendar.YEAR) == then.get(Calendar.YEAR)
                 && now.get(Calendar.DAY_OF_MONTH) == then.get(Calendar.DAY_OF_MONTH));
     }
-    public void setIrbDateApproved(Date irbDateApproved) {
-        this.irbDateApproved = irbDateApproved;
-    }
+
     public String getParticipation() {
         return participation;
     }

Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java	2006-03-04 18:55:18 UTC (rev 137)
+++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java	2006-03-04 19:10:37 UTC (rev 138)
@@ -3,6 +3,7 @@
 import java.net.InetSocketAddress;
 import java.util.List;
 
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Inheritance;
@@ -23,6 +24,7 @@
  * @version $Revision$
  */
 
+@Entity
 @Table(name="experiment_configuration")
 @Inheritance(strategy=InheritanceType.JOINED)
 public abstract class ExperimentConfigurationEntity<T extends ExperimentRoundParameters> 
@@ -35,6 +37,7 @@
     private String description;
     private String experimentName;
     private String clientJarName;
+    private String clientMainClass;
     
     
     private ForagerExperimentParameters currentParameters;
@@ -149,6 +152,14 @@
     public void setExperimentName(String experimentName) {
         this.experimentName = experimentName;
     }
+
+    public String getClientMainClass() {
+        return clientMainClass;
+    }
+
+    public void setClientMainClass(String clientMainClass) {
+        this.clientMainClass = clientMainClass;
+    }
 }
 
 

Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentParametersEntity.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentParametersEntity.java	2006-03-04 18:55:18 UTC (rev 137)
+++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentParametersEntity.java	2006-03-04 19:10:37 UTC (rev 138)
@@ -6,6 +6,7 @@
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * $Id: Exp$
@@ -19,11 +20,12 @@
 @Entity
 @Table(name="experiment_parameters")
 @Inheritance(strategy=InheritanceType.JOINED)
-public abstract class ExperimentParametersEntity implements ExperimentRoundParameters {
+public abstract class ExperimentParametersEntity<T extends ExperimentConfiguration> 
+implements ExperimentRoundParameters {
     
     private long id = -1;
 
-    private ExperimentConfiguration configuration;
+    private T configuration;
 
     @Id @GeneratedValue
     public long getId() {
@@ -34,11 +36,13 @@
         this.id = id;
     }
 
-    public ExperimentConfiguration getConfiguration() {
+    @ManyToOne(targetEntity=ExperimentConfigurationEntity.class)
+    @JoinColumn(name="configuration_id", nullable=false)
+    public T getConfiguration() {
         return configuration;
     }
 
-    public void setConfiguration(ExperimentConfiguration configuration) {
+    public void setConfiguration(T configuration) {
         this.configuration = configuration;
     }
     

Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java	2006-03-04 18:55:18 UTC (rev 137)
+++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentRoundParameters.java	2006-03-04 19:10:37 UTC (rev 138)
@@ -15,13 +15,13 @@
  * @version $Revision$
  */
 
-public interface ExperimentRoundParameters {
+public interface ExperimentRoundParameters<T extends ExperimentConfiguration> {
 
     public String getSpecialInstructions();
     
     public Dimension getBoardSize();
     
-    public ExperimentConfiguration getConfiguration();
+    public T getConfiguration();
     
     public Duration getRoundDuration();
     

Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java	2006-03-04 18:55:18 UTC (rev 137)
+++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java	2006-03-04 19:10:37 UTC (rev 138)
@@ -28,7 +28,6 @@
 @Table(name="forager_configuration")
 public class ForagerConfiguration extends ExperimentConfigurationEntity<ForagerExperimentParameters> {
 
-    
     public ForagerConfiguration(String serverName, int port) {
         super(serverName, port);
     }
@@ -38,9 +37,10 @@
         return "forager-client.jar";
     }
 
-    public String getClientClass() {
+    public String getClientMainClass() {
         return ForagerApplet.class.getName();
     }
+
     public String getExperimentName() {
         return "forager";
     }

Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java
===================================================================
--- trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java	2006-03-04 18:55:18 UTC (rev 137)
+++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerExperimentParameters.java	2006-03-04 19:10:37 UTC (rev 138)
@@ -27,7 +27,7 @@
 @PrimaryKeyJoinColumn(name="forager_parameters_id")
 @Proxy(proxyClass=ExperimentRoundParameters.class)
 @Table(name="forager_parameters")
-public class ForagerExperimentParameters extends ExperimentParametersEntity { 
+public class ForagerExperimentParameters extends ExperimentParametersEntity<ForagerConfiguration> { 
 
     
     private ForagerAgentConfiguration agentConfiguration;
@@ -102,12 +102,7 @@
         return Duration.create(240);
     }
 
-    @ManyToOne(targetEntity=ForagerConfiguration.class)
-    @JoinColumn(name="configuration_id", nullable=false)
-    public ForagerConfiguration getConfiguration() {
-        return (ForagerConfiguration) super.getConfiguration();
-    }
-    
+
     @Transient
     public List getAllFoodRegions() {
         return Collections.EMPTY_LIST;

Added: trunk/gee/war/WEB-INF/lib/asm.jar
===================================================================
(Binary files differ)


Property changes on: trunk/gee/war/WEB-INF/lib/asm.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/gee/war/startExperiment.jsp
===================================================================
--- trunk/gee/war/startExperiment.jsp	2006-03-04 18:55:18 UTC (rev 137)
+++ trunk/gee/war/startExperiment.jsp	2006-03-04 19:10:37 UTC (rev 138)
@@ -15,7 +15,7 @@
 
 
   <!-- FIXME: make width/height configurable later? -->
-  <applet code='<ww:property value="experiment.configuration.clientClass"/>' width="600" height="600" 
+  <applet code='<ww:property value="experiment.configuration.clientMainClass"/>' width="600" height="600" 
           archive='<ww:property value="experiment.configuration.clientJarName"/>'>
     <param name='experiment-hostname' value="<ww:property value='experiment.configuration.serverAddress.hostName'/>" />
     <param name='experiment-port' value="<ww:property value='experiment.serverPort'/>" />



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