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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 115
Author:   alllee
Date:     2006-02-27 01:17:44 -0800 (Mon, 27 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/gabel/?rev=115&view=rev

Log Message:
-----------
updating webwork jar, encountering weird bug where the freemarker
configureExperiments page isn't reflecting its latest changes for some
reason...

Modified Paths:
--------------
    trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java
    trunk/gee/war/WEB-INF/classes/xwork.xml
    trunk/gee/war/WEB-INF/lib/webwork.jar
    trunk/gee/war/admin/listExperiments.jsp

Added Paths:
-----------
    trunk/gee/war/admin/configureExperiments.jsp

Removed Paths:
-------------
    trunk/gee/war/admin.jsp
Modified: trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java
===================================================================

--- trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java	2006-02-26 23:00:21 UTC (rev 114)
+++ trunk/gee/src/java/edu/indiana/psych/gee/action/AdminAction.java	2006-02-27 09:17:44 UTC (rev 115)
@@ -26,18 +26,17 @@
 
     public String configure() {
         // load experiment and various pieces of configuration information?
-        this.experiment = getExperiment(experimentName);
         return SUCCESS;
     }
 
     public String start() {
         getLogger().debug("Starting: " + experimentName);
-        getExperiment(experimentName).start();
+        getExperiment().start();
         return SUCCESS;
     }
 
     public String stop() {
-        Experiment experiment = getExperiment(experimentName);
+        Experiment experiment = getExperiment();
         getLogger().debug("Stopping: " + experimentName + ": " + experiment);
         experiment.stop();
         return SUCCESS;
@@ -60,6 +59,9 @@
     }
 
     public Experiment getExperiment() {
+        if (experiment == null) {
+            experiment = getExperimentService().find(experimentName);
+        }
         return experiment;
     }
 
@@ -67,9 +69,6 @@
         this.experimentName = experimentName;
     }
 
-    private Experiment getExperiment(String experimentName) {
-        return getExperimentService().find(experimentName);
-    }
 }
 /*
  * $Log$

Modified: trunk/gee/war/WEB-INF/classes/xwork.xml
===================================================================
--- trunk/gee/war/WEB-INF/classes/xwork.xml	2006-02-26 23:00:21 UTC (rev 114)
+++ trunk/gee/war/WEB-INF/classes/xwork.xml	2006-02-27 09:17:44 UTC (rev 115)
@@ -44,8 +44,7 @@
 		</action>
 		<action name="configure" class="edu.indiana.psych.gee.action.AdminAction"
 			method="configure">
-			<result name="error">index.action</result>
-			<result name="success">configureExperiment.jsp</result>
+			<result type="freemarker">configureExperiment.jsp</result>
 		</action>
 		<action name="list" class="edu.indiana.psych.gee.action.AdminAction"
 			method="listExperiments">

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

Added: trunk/gee/war/admin/configureExperiments.jsp
===================================================================
--- trunk/gee/war/admin/configureExperiments.jsp	                        (rev 0)
+++ trunk/gee/war/admin/configureExperiments.jsp	2006-02-27 09:17:44 UTC (rev 115)
@@ -0,0 +1,16 @@
+<head>
+<meta name="lastModifiedDate" content="$Date: 2006-02-23 13:12:23 -0500 (Thu, 23 Feb 2006) $"/>
+<title>Configuring [ ${experiment.name} ]</title>
+</head>
+<body>
+<p>
+Configuring the <span class="highlight">${experiment.name}</span> experiment:
+</p>
+<@ww.form action="updateExperimentConfiguration">
+    <@ww.textfield label="Server port" name="experiment.serverPort"/>
+    <@ww.textfield label="Name" name="experiment.name"/>
+    <@ww.textfield label="Server Address" name="experiment.configuration.serverAddress"/>
+    <@ww.textfield label="Description" name="experiment.description"/>
+    <@ww.submit value="Submit"/>
+</@ww.form>
+</body>

Modified: trunk/gee/war/admin/listExperiments.jsp
===================================================================
--- trunk/gee/war/admin/listExperiments.jsp	2006-02-26 23:00:21 UTC (rev 114)
+++ trunk/gee/war/admin/listExperiments.jsp	2006-02-27 09:17:44 UTC (rev 115)
@@ -20,11 +20,10 @@
           Start</a>
           | <a href='<@ww.url action="stop" experimentName="${experiment.name}" />'>
           Stop</a>
-          | <a href='<@ww.url action="edit" experimentName="${experiment.name}" />'>
+          | <a href='<@ww.url action="configure" experimentName="${experiment.name}" />'>
           Edit</a> ) 
         </td>
     </tr>
 </#list>
 </table>
 </body>
-</html>

Deleted: trunk/gee/war/admin.jsp
===================================================================
--- trunk/gee/war/admin.jsp	2006-02-26 23:00:21 UTC (rev 114)
+++ trunk/gee/war/admin.jsp	2006-02-27 09:17:44 UTC (rev 115)
@@ -1,21 +0,0 @@
-<!--
-vim:sts=2:sw=2:
--->
-<%@ taglib prefix="ww" uri="webwork" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-  <head>
-    <LINK REL="stylesheet" HREF="/gee/css/gee.css" TYPE="text/css"/>
-    <title>  </title>
-  </head>
-  <body>
-    <span style="float:left">
-      <a href="http://validator.w3.org/check/referer">
-        <img border="0" src="http://www.w3.org/Icons/valid-html40" alt="Valid HTML 4.0!" height="31" width="88"/>
-      </a>
-      <a href="http://jigsaw.w3.org/css-validator/">
-        <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"/>
-      </a>
-    </span>
-  </body>
-</html>



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




