[gee-svn] SF.net SVN: gabel: [161] trunk/gee/war
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [161] trunk/gee/war
|
From: <al...@us...> - 2006-03-11 01:30:58
|
Revision: 161 Author: alllee Date: 2006-03-10 17:30:40 -0800 (Fri, 10 Mar 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=161&view=rev Log Message: ----------- renamed getConsent.jsp => consent.jsp, and changing startExperiment.jsp to use freemarker instead. Should make freemarker the default in webwork.properties. Modified Paths: -------------- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java trunk/gee/war/WEB-INF/classes/xwork.xml trunk/gee/war/startExperiment.jsp Added Paths: ----------- trunk/gee/war/consent.jsp Removed Paths: ------------- trunk/gee/war/getConsent.jsp Modified: trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-03-10 20:21:07 UTC (rev 160) +++ trunk/gee/src/java/edu/indiana/psych/gee/ExperimentConfigurationEntity.java 2006-03-11 01:30:40 UTC (rev 161) @@ -45,6 +45,8 @@ private String experimentName; private String clientJarName; private String clientMainClass; + private int worldHeight; + private int worldWidth; private ConsentForm consentForm; private int serverPort; private String serverName; 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-10 20:21:07 UTC (rev 160) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/ForagerConfiguration.java 2006-03-11 01:30:40 UTC (rev 161) @@ -32,14 +32,11 @@ private List<ForagerExperimentParameters> allParameters; + public ForagerConfiguration(String serverName, int port) { super(serverName, port); } - public static ForagerConfiguration getDefaultConfiguration() { - return new ForagerConfiguration("groups.psych.indiana.edu", 25000); - } - @Transient public Duration getDelayBetweenRounds() { return Duration.create(30); Modified: trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java =================================================================== --- trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java 2006-03-10 20:21:07 UTC (rev 160) +++ trunk/gee/src/java/edu/indiana/psych/gee/forager/client/ForagerClient.java 2006-03-11 01:30:40 UTC (rev 161) @@ -65,11 +65,6 @@ private ClientDispatcher dispatcher; private Identifier id; - - public ForagerClient(Dimension screenSize) { - this(screenSize, ForagerConfiguration.getDefaultConfiguration()); - } - public ForagerClient(Dimension screenSize, ForagerConfiguration configuration) { setConfiguration(configuration); @@ -256,10 +251,11 @@ System.err.println(message); } + /* public static void main(String[] args) { Runnable createGuiRunnable = new Runnable() { public void run() { - Dimension defaultDimension = new Dimension(500, 500); + Dimension defaultDimension = new Dimension(600, 600); JFrame frame = new JFrame(); ForagerClient client = new ForagerClient(defaultDimension); client.connect(); @@ -272,6 +268,7 @@ }; SwingUtilities.invokeLater(createGuiRunnable); } + */ /** Modified: trunk/gee/war/WEB-INF/classes/xwork.xml =================================================================== --- trunk/gee/war/WEB-INF/classes/xwork.xml 2006-03-10 20:21:07 UTC (rev 160) +++ trunk/gee/war/WEB-INF/classes/xwork.xml 2006-03-11 01:30:40 UTC (rev 161) @@ -15,8 +15,8 @@ <result name="success" type="freemarker">index.jsp</result> </action> <action name="start" class="edu.indiana.psych.gee.action.StartExperiment" method="start"> - <result name="success">startExperiment.jsp</result> - <result name="input">getConsent.jsp</result> + <result name="success" type="freemarker">startExperiment.jsp</result> + <result name="input">consent.jsp</result> </action> <action name="consent" class="edu.indiana.psych.gee.action.StartExperiment" method="prepare"> <!-- FIXME: do not use a validating stack here --> Copied: trunk/gee/war/consent.jsp (from rev 152, trunk/gee/war/getConsent.jsp) =================================================================== --- trunk/gee/war/consent.jsp (rev 0) +++ trunk/gee/war/consent.jsp 2006-03-11 01:30:40 UTC (rev 161) @@ -0,0 +1,154 @@ +<%@ taglib prefix="ww" uri="webwork" %> +<head> +<title> Consent Form for [ <ww:property value="experimentName"/> ]</title> + <% + String commitDate = "$Date$"; + java.util.StringTokenizer toke = new java.util.StringTokenizer(commitDate, " "); + toke.nextToken(); + String lastModifiedDate = toke.nextToken(); + %> +<meta name="lastModifiedDate" content="<%= commitDate %>"/> +</head> + +<TABLE BGCOLOR="#A4B5C5" CELLPADDING="4" CELLSPACING="0" WIDTH="100%" BORDER="0"> + <TR> + <TD WIDTH="100%"> + <H3><ww:property value="experimentName"/> consent form</H3> + </TD> + <TD ALIGN="right" VALIGN="top" BGCOLOR="#A4B5C5" WIDTH="70%" style="white-space: nowrap;"> + <b>Study #04-9064</b><br/> + <small>Last Modified: <%= lastModifiedDate %></small> + </TD> + </TR> +</TABLE> + +<TABLE CELLPADDING="4" CELLSPACING="2" BORDER="0"> + <TR> + <TD> + + <B>Forager</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + + You are invited to participate in a research study, entitled Group Behavior. The purpose of the study is to investigate how people think, act, and make decisions in groups. You will be given a full debriefing at the end of the experiment. Each of the experiments will take 5-10 minutes to complete. The particular instructions for an experiment will be displayed on the computer screen. During the experiment, you will be interacting with a group of humans or artificial intelligence agents. You will see the choices they make, and they will see your choices. <P> + + <B>Deception</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + + No deception is used in this study.<P> + + <B>Confidentiality</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + + The information in the study records will be kept confidential. Data will be made available only to persons conducting the study. No reference will be made in verbal or written form which could link your name to the study. Your name is not recorded with your data. <P> + + <B>Compensation</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + + There is no monetary compensation for participating in this study.<P> + + <B>Risks</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + + There are no anticipated risks associated with the experiments.<P> + + <B>Benefits</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + +Society benefits from this research because an understanding of how groups behave can help us to predict the behaviors of complex organizations and develop technologies that promote the efficient and accurate flow of information within groups. You benefit from this experience because you learn something about how group psychology experiments are designed and conducted, what issues are of interest to cognitive scientists, and what kinds of group behaviors emerge when individuals try to reach their goals in an environment that consists largely of other individuals. In addition, many people find the experiments to be fun and intriguing. At the end of the experiment, you will be shown your own performance compared to the average performance of others in your group, a debriefing that describes what the experiment was about, and links to related research. <P> + + + <B>Contact</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + + If you have questions at any time about the study or the procedures, you may + contact the researcher, Robert Goldstone, at: <P> + + <TABLE CELLPADDING="1" CELLSPACING="0" BORDER="0"> + <TR><TD BGCOLOR="#5566AA"> + <TABLE CELLPADDING="10" CELLSPACING="0" BORDER="0"> + <TR><TD BGCOLOR="#F0F4FF"> + <PRE> +Dr. Robert Goldstone +338 Psychology Building +Indiana University +Bloomington, IN, 47405 +Phone: 812-855-4853 +Email: <a href='mailto:rgo...@in...'>rgo...@in...</a></PRE> + </TD></TR> + </TABLE> + </TD></TR></TABLE> + + <P> + If you have questions about your rights as a subject, contact the + office for the Human Subjects Committee at:<P> + + <TABLE CELLPADDING="1" CELLSPACING="0" BORDER="0"> + <TR><TD BGCOLOR="#5566AA"> + <TABLE CELLPADDING="10" CELLSPACING="0" BORDER="0"> + <TR><TD BGCOLOR="#F0F4FF"> + <PRE> +Human Subjects Committee +Indiana University Carmichael Center L03 +530 E. Kirkwood Ave +Bloomington, IN 47408 +Phone: 812-855-3067 +Email: <a href='mailto:iu...@in...'>iu...@in...</a></PRE> + </TD></TR> + </TABLE> + </TD></TR></TABLE> + <P> + + <B>Participation</B><BR> + <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> + <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> + </TABLE> + + Your participation in this study is purely voluntary. You may decline to participate. + If you decide to participate, you may withdraw from the study at any time without + penalty or loss of benefits. If you withdraw from the study prior to the completion + of your session your data will not be saved. <P> + + + + </TD> + </TR> +</TABLE> + +<p style="font-weight: bolder; background-color: #FFE303;">I have read and +understand the information presented above. I agree to participate in this +study.</p> +<ww:form method="post" validate="true" action='start'> + <ww:select label="Age" name="participantAge" required="true" + list="#{'17':'Under 18', '18':'18-24', '25':'25-36', '37':'37-55', '55':'Over 55'}" + value="'18'"/> + <ww:textfield label="Name" name="participantName" required="true" /> + <ww:hidden name="experimentName"/> + <ww:submit/> +</ww:form> +<hr /> +<small> +IRB Approved +<br/> +<ww:text name="approval.date"> + <ww:param name="value" value="%{consentForm.irbDateApproved}"/> +</ww:text> +<br/> +<ww:text name="approval.expiration.date"> + <ww:param name="value" value="%{consentForm.irbDateApprovalExpires}"/> +</ww:text> +</small> + Deleted: trunk/gee/war/getConsent.jsp =================================================================== --- trunk/gee/war/getConsent.jsp 2006-03-10 20:21:07 UTC (rev 160) +++ trunk/gee/war/getConsent.jsp 2006-03-11 01:30:40 UTC (rev 161) @@ -1,154 +0,0 @@ -<%@ taglib prefix="ww" uri="webwork" %> -<head> -<title> Consent Form for [ <ww:property value="experimentName"/> ]</title> - <% - String commitDate = "$Date$"; - java.util.StringTokenizer toke = new java.util.StringTokenizer(commitDate, " "); - toke.nextToken(); - String lastModifiedDate = toke.nextToken(); - %> -<meta name="lastModifiedDate" content="<%= commitDate %>"/> -</head> - -<TABLE BGCOLOR="#A4B5C5" CELLPADDING="4" CELLSPACING="0" WIDTH="100%" BORDER="0"> - <TR> - <TD WIDTH="100%"> - <H3><ww:property value="experimentName"/> consent form</H3> - </TD> - <TD ALIGN="right" VALIGN="top" BGCOLOR="#A4B5C5" WIDTH="70%" style="white-space: nowrap;"> - <b>Study #04-9064</b><br/> - <small>Last Modified: <%= lastModifiedDate %></small> - </TD> - </TR> -</TABLE> - -<TABLE CELLPADDING="4" CELLSPACING="2" BORDER="0"> - <TR> - <TD> - - <B>Forager</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - - You are invited to participate in a research study, entitled Group Behavior. The purpose of the study is to investigate how people think, act, and make decisions in groups. You will be given a full debriefing at the end of the experiment. Each of the experiments will take 5-10 minutes to complete. The particular instructions for an experiment will be displayed on the computer screen. During the experiment, you will be interacting with a group of humans or artificial intelligence agents. You will see the choices they make, and they will see your choices. <P> - - <B>Deception</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - - No deception is used in this study.<P> - - <B>Confidentiality</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - - The information in the study records will be kept confidential. Data will be made available only to persons conducting the study. No reference will be made in verbal or written form which could link your name to the study. Your name is not recorded with your data. <P> - - <B>Compensation</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - - There is no monetary compensation for participating in this study.<P> - - <B>Risks</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - - There are no anticipated risks associated with the experiments.<P> - - <B>Benefits</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - -Society benefits from this research because an understanding of how groups behave can help us to predict the behaviors of complex organizations and develop technologies that promote the efficient and accurate flow of information within groups. You benefit from this experience because you learn something about how group psychology experiments are designed and conducted, what issues are of interest to cognitive scientists, and what kinds of group behaviors emerge when individuals try to reach their goals in an environment that consists largely of other individuals. In addition, many people find the experiments to be fun and intriguing. At the end of the experiment, you will be shown your own performance compared to the average performance of others in your group, a debriefing that describes what the experiment was about, and links to related research. <P> - - - <B>Contact</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - - If you have questions at any time about the study or the procedures, you may - contact the researcher, Robert Goldstone, at: <P> - - <TABLE CELLPADDING="1" CELLSPACING="0" BORDER="0"> - <TR><TD BGCOLOR="#5566AA"> - <TABLE CELLPADDING="10" CELLSPACING="0" BORDER="0"> - <TR><TD BGCOLOR="#F0F4FF"> - <PRE> -Dr. Robert Goldstone -338 Psychology Building -Indiana University -Bloomington, IN, 47405 -Phone: 812-855-4853 -Email: <a href='mailto:rgo...@in...'>rgo...@in...</a></PRE> - </TD></TR> - </TABLE> - </TD></TR></TABLE> - - <P> - If you have questions about your rights as a subject, contact the - office for the Human Subjects Committee at:<P> - - <TABLE CELLPADDING="1" CELLSPACING="0" BORDER="0"> - <TR><TD BGCOLOR="#5566AA"> - <TABLE CELLPADDING="10" CELLSPACING="0" BORDER="0"> - <TR><TD BGCOLOR="#F0F4FF"> - <PRE> -Human Subjects Committee -Indiana University Carmichael Center L03 -530 E. Kirkwood Ave -Bloomington, IN 47408 -Phone: 812-855-3067 -Email: <a href='mailto:iu...@in...'>iu...@in...</a></PRE> - </TD></TR> - </TABLE> - </TD></TR></TABLE> - <P> - - <B>Participation</B><BR> - <TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100%"> - <TR><TD WIDTH="100%" BGCOLOR="#A4B5C5" HEIGHT="5"><IMG SRC="/images/blank.gif" WIDTH="1" HEIGHT="1"></TD></TR> - </TABLE> - - Your participation in this study is purely voluntary. You may decline to participate. - If you decide to participate, you may withdraw from the study at any time without - penalty or loss of benefits. If you withdraw from the study prior to the completion - of your session your data will not be saved. <P> - - - - </TD> - </TR> -</TABLE> - -<p style="font-weight: bolder; background-color: #FFE303;">I have read and -understand the information presented above. I agree to participate in this -study.</p> -<ww:form method="post" validate="true" action='start'> - <ww:select label="Age" name="participantAge" required="true" - list="#{'17':'Under 18', '18':'18-24', '25':'25-36', '37':'37-55', '55':'Over 55'}" - value="'18'"/> - <ww:textfield label="Name" name="participantName" required="true" /> - <ww:hidden name="experimentName"/> - <ww:submit/> -</ww:form> -<hr /> -<small> -IRB Approved -<br/> -<ww:text name="approval.date"> - <ww:param name="value" value="%{consentForm.irbDateApproved}"/> -</ww:text> -<br/> -<ww:text name="approval.expiration.date"> - <ww:param name="value" value="%{consentForm.irbDateApprovalExpires}"/> -</ww:text> -</small> - Modified: trunk/gee/war/startExperiment.jsp =================================================================== --- trunk/gee/war/startExperiment.jsp 2006-03-10 20:21:07 UTC (rev 160) +++ trunk/gee/war/startExperiment.jsp 2006-03-11 01:30:40 UTC (rev 161) @@ -1,7 +1,6 @@ <!-- vim:sts=2:sw=2: --> -<%@ taglib prefix="ww" uri="webwork" %> <head> <meta name="lastModifiedDate" content="$Date$"/> </head> @@ -9,16 +8,17 @@ If you experience any problems, please read the <a href='<ww:url action="faq"/>'> FAQ </a> or <a href='<ww:url action="contact"/>'>contact us.</a> </p> - <p>Currently participating in the <span class="highlight"><ww:property value="experiment.name"/></span> experiment. + <@ww.push value="experiment"> + <p>Currently participating in the <span class="highlight">${name}</span> experiment. </p> <!-- FIXME: add instructions to the right panel --> - <!-- FIXME: make width/height configurable later? --> - <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'/>" /> + <applet code='${configuration.clientMainClass}' width="600" height="600" + archive='${configuration.clientJarName}'> + <param name='experiment-hostname' value="${configuration.serverAddress.hostName}" /> + <param name='experiment-port' value="${serverPort?c}" /> </applet> + </@ww.push> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
