[gee-svn] SF.net SVN: gabel: [184] trunk/gee/war/WEB-INF/classes
Status: Alpha
Brought to you by:
alllee
|
From: <al...@us...> - 2006-05-25 00:11:00
|
Revision: 184 Author: alllee Date: 2006-05-24 17:10:55 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=184&view=rev Log Message: ----------- adding notion of a experiment Identifer to ExperimentConfiguration, and fixing errors in xwork configuration. Still grinding away on editing experiment configurations via the web. Modified Paths: -------------- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperiment.java trunk/gee/src/java/edu/indiana/psych/gee/bean/ExperimentConfigurationEntity.java trunk/gee/war/WEB-INF/classes/gee-admin.xml Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-05-24 18:17:59 UTC (rev 183) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfiguration.java 2006-05-25 00:10:55 UTC (rev 184) @@ -27,8 +27,22 @@ public String getServerName(); public void setServerName(String serverName); + /** + * Returns a user friendly name for the experiment. This can be duplicated for several + * experiment instances (e.g., forager or social choice experiments have a variety of potential names). + * @return + */ public String getExperimentName(); public void setExperimentName(String experimentName); + + /** + * Returns a unique String name/identifier for the experiment configured by this ExperimentConfiguration object, + * e.g., forager-experiment, forager-web. + * + * @return a unique String identifier for this Experiment. + */ + public String getExperimentIdentifier(); + public void setExperimentIdentifier(String experimentIdentifier); public int getServerPort(); public void setServerPort(int serverPort); Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperiment.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperiment.java 2006-05-24 18:17:59 UTC (rev 183) +++ trunk/gee/src/java/edu/indiana/psych/gee/action/ManageExperiment.java 2006-05-25 00:10:55 UTC (rev 184) @@ -23,22 +23,17 @@ private Set<Experiment> experiments; - private Experiment experiment; private String experimentName; private ExperimentConfiguration configuration; public String authenticate() { - return SUCCESS; } public String configure() { - for (ExperimentRoundParameters parameter: getAllParameters()) { - getLogger().warn("XXX: Returning: " + parameter); - } - // load experiment and various pieces of configuration information? - return SUCCESS; + configuration = getExperiment().getConfiguration(); + return INPUT; } public String start() { @@ -84,12 +79,11 @@ } public Experiment getExperiment() { - return experiment; + return getExperimentService().find(experimentName); } public void setExperimentName(String experimentName) { this.experimentName = experimentName; - this.experiment = getExperimentService().find(experimentName); } } Modified: trunk/gee/src/java/edu/indiana/psych/gee/bean/ExperimentConfigurationEntity.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/bean/ExperimentConfigurationEntity.java 2006-05-24 18:17:59 UTC (rev 183) +++ trunk/gee/src/java/edu/indiana/psych/gee/bean/ExperimentConfigurationEntity.java 2006-05-25 00:10:55 UTC (rev 184) @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -46,6 +47,7 @@ private Long id = Long.valueOf(-1); private String description; private String experimentName; + private String experimentIdentifier; private String clientJarName; private String clientMainClass; private ConsentForm consentForm; @@ -171,6 +173,7 @@ this.description = description; } + @Column(nullable=false) public String getExperimentName() { return experimentName; } @@ -191,4 +194,13 @@ public Duration getDelayBetweenRounds() { return Duration.create(30); } + + @Column(nullable=false, unique=true) + public String getExperimentIdentifier() { + return experimentIdentifier; + } + + public void setExperimentIdentifier(String experimentIdentifier) { + this.experimentIdentifier = experimentIdentifier; + } } Modified: trunk/gee/war/WEB-INF/classes/gee-admin.xml =================================================================== --- trunk/gee/war/WEB-INF/classes/gee-admin.xml 2006-05-24 18:17:59 UTC (rev 183) +++ trunk/gee/war/WEB-INF/classes/gee-admin.xml 2006-05-25 00:10:55 UTC (rev 184) @@ -8,14 +8,17 @@ admin package o' actions and urls. define the login filter here? --> <package name="admin" extends="default" namespace="/admin"> - - <action name="index" class="edu.indiana.psych.gee.action.AuthenticateAction" method="authenticate"> + <action name="index" class="edu.indiana.psych.gee.action.ManageExperiment" method="authenticate"> <result name="success" type="freemarker">listExperiments.jsp</result> <result name="error">error.jsp</result> </action> <action name="experiment" class="edu.indiana.psych.gee.action.ManageExperiment"> <result name="success" type="freemarker">listExperiments.jsp</result> - <result name="input">configureExperiment.jsp</result> + <result name="input" type="freemarker">configureExperiment.jsp</result> </action> + <action name="configuration" class="edu.indiana.psych.gee.action.ManageExperimentConfiguration"> + <result name="success" type="freemarker">listExperimentConfigurations.jsp</result> + <result name="input" type="freemarker">configureExperiment.jsp</result> + </action> </package> </xwork> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |