[gee-svn] SF.net SVN: gabel: [118] trunk/gee/war
Status: Alpha
Brought to you by:
alllee
Menu
▾
▴
[gee-svn] SF.net SVN: gabel: [118] trunk/gee/war
|
From: <al...@us...> - 2006-02-28 01:47:26
|
Revision: 118 Author: alllee Date: 2006-02-27 17:47:08 -0800 (Mon, 27 Feb 2006) ViewCVS: http://svn.sourceforge.net/gabel/?rev=118&view=rev Log Message: ----------- lots of hygiene. WebWork 2.2.1 release fixed a bunch of loosely interpretable things that I was loosely interpreting (read: doing wrong). Had to change ui.theme to ajax, no matter what I did it was failing to find tree.ftl when using the xhtml theme. Modified Paths: -------------- trunk/gee/war/WEB-INF/applicationContext.xml trunk/gee/war/WEB-INF/classes/webwork.properties trunk/gee/war/WEB-INF/classes/xwork.xml trunk/gee/war/WEB-INF/lib/webwork.jar trunk/gee/war/WEB-INF/lib/xwork.jar trunk/gee/war/WEB-INF/web.xml trunk/gee/war/getConsent.jsp trunk/gee/war/template.jsp Modified: trunk/gee/war/WEB-INF/applicationContext.xml =================================================================== --- trunk/gee/war/WEB-INF/applicationContext.xml 2006-02-27 20:50:49 UTC (rev 117) +++ trunk/gee/war/WEB-INF/applicationContext.xml 2006-02-28 01:47:08 UTC (rev 118) @@ -1,53 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans default-autowire="autodetect"> - <!-- MySQL Connection, we may not need any of this stuff.--> - <bean id="mysqlDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> - <property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property> - <property name="url"> - <value>jdbc:mysql://127.0.0.1:3306/gee</value> - </property> - <property name="username"><value></value></property> - <property name="password"><value></value></property> - </bean> - <!-- hibernate session factory --> - <bean id="hibernateSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"> - <property name='configLocation'> - <value>WEB-INF/hibernate-session-factory-config.xml</value> - </property> - <property name='configurationClass'> - <value>org.hibernate.cfg.AnnotationConfiguration</value> - </property> - <property name="hibernateProperties"> - <props> - <prop key="hibernate.cglib.use_reflection_optimizer">false</prop> - <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop> - <prop key="hibernate.show_sql">true</prop> - </props> - </property> - <property name="dataSource"> - <ref bean="mysqlDataSource"/> - </property> - </bean> - <bean id="hibernateTransactionManager" - class="org.springframework.orm.hibernate3.HibernateTransactionManager"> - <property name="sessionFactory"> - <ref local="hibernateSessionFactory"/> - </property> - </bean> - <!-- DAO and Service beans --> - <!-- - XXX: may not need any of this. - database-wise we only need to keep track of participants and users - (roles: experiment creator, technician, administrator). Maybe in the - future we will want to deal with persisting experiment data in the DB? - - <bean id="userDao" class="edu.indiana.psych.gee.persistence.UserDaoImpl"> - <property name="sessionFactory"><ref local="hibernateSessionFactory"/></property> - </bean> - <bean id="participantDao" class="edu.indiana.psych.gee.persistence.ParticipantDaoImpl"> - <property name="sessionFactory"><ref local="hibernateSessionFactory"/></property> - </bean> - --> <bean id="experimentService" class="edu.indiana.psych.gee.service.ExperimentService"/> </beans> Modified: trunk/gee/war/WEB-INF/classes/webwork.properties =================================================================== --- trunk/gee/war/WEB-INF/classes/webwork.properties 2006-02-27 20:50:49 UTC (rev 117) +++ trunk/gee/war/WEB-INF/classes/webwork.properties 2006-02-28 01:47:08 UTC (rev 118) @@ -1,2 +1,4 @@ -webwork.objectFactory = spring -webwork.devMode = true \ No newline at end of file +webwork.objectFactory=spring +webwork.devMode=true + +webwork.ui.theme=ajax Modified: trunk/gee/war/WEB-INF/classes/xwork.xml =================================================================== --- trunk/gee/war/WEB-INF/classes/xwork.xml 2006-02-27 20:50:49 UTC (rev 117) +++ trunk/gee/war/WEB-INF/classes/xwork.xml 2006-02-28 01:47:08 UTC (rev 118) @@ -4,37 +4,31 @@ <xwork> <include file="webwork-default.xml"/> - <!-- + <!-- FIXME: cannot find the following <include file="config-browser.xml"/> - - <include file="xwork-continuations.xml"/> - - <include file="xwork-tags.xml"/> - - <include file="xwork-validation.xml" /> - + <include file="xwork-validation.xml" /> <include file="xwork-actionchaining.xml" /> - <include file="xwork-ajax.xml" /> + <include file="xwork-continuations.xml"/> + <include file="xwork-tags.xml"/> --> <package name="default" extends="webwork-default"> <default-interceptor-ref name="defaultStack"/> <!-- the start page lists all available experiments --> <action name="index" class="edu.indiana.psych.gee.action.ListExperiments"> - <result>index.jsp</result> + <result name="success">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> </action> <action name="consent" class="edu.indiana.psych.gee.action.StartExperiment" method="prepare"> + <!-- FIXME: make sure the stack doesn't validate --> + <interceptor-ref name="basicStack"/> <result name="success">getConsent.jsp</result> <result name="input">getConsent.jsp</result> </action> - <action name='contact'> - <result>contact.jsp</result> - </action> </package> <package name="admin" extends="default" namespace="/admin"> <action name="index" class="edu.indiana.psych.gee.action.AdminAction" @@ -44,7 +38,7 @@ </action> <action name="configure" class="edu.indiana.psych.gee.action.AdminAction" method="configure"> - <result type="freemarker">configureExperiment.jsp</result> + <result name="success" type="freemarker">configureExperiment.jsp</result> </action> <action name="list" class="edu.indiana.psych.gee.action.AdminAction" method="listExperiments"> @@ -53,16 +47,16 @@ </action> <action name="create" class="edu.indiana.psych.gee.action.AdminAction" method="createExperiment"> - <result type="redirect">listExperiments.jsp</result> + <result name="success" type="redirect">listExperiments.jsp</result> <result name="input">createExperiment.jsp</result> </action> <action name="start" class="edu.indiana.psych.gee.action.AdminAction" method="start"> - <result type="freemarker">listExperiments.jsp</result> + <result name="success" type="freemarker">listExperiments.jsp</result> </action> <action name="stop" class="edu.indiana.psych.gee.action.AdminAction" method="stop"> - <result type="freemarker">listExperiments.jsp</result> + <result name="success" type="freemarker">listExperiments.jsp</result> </action> </package> Modified: trunk/gee/war/WEB-INF/lib/webwork.jar =================================================================== (Binary files differ) Modified: trunk/gee/war/WEB-INF/lib/xwork.jar =================================================================== (Binary files differ) Modified: trunk/gee/war/WEB-INF/web.xml =================================================================== --- trunk/gee/war/WEB-INF/web.xml 2006-02-27 20:50:49 UTC (rev 117) +++ trunk/gee/war/WEB-INF/web.xml 2006-02-28 01:47:08 UTC (rev 118) @@ -8,20 +8,32 @@ </description> <filter> - <filter-name>webwork</filter-name> - <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class> + <filter-name>webwork-cleanup</filter-name> + <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class> </filter> - + <!-- <filter> <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.webwork.sitemesh.FreeMarkerPageFilter</filter-class> + </filter> + --> + <filter> + <filter-name>sitemesh</filter-name> <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class> </filter> + <filter> + <filter-name>webwork</filter-name> + <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class> + </filter> <filter-mapping> + <filter-name>webwork-cleanup</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> <filter-name>sitemesh</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <filter-mapping> <filter-name>webwork</filter-name> <url-pattern>/*</url-pattern> @@ -37,6 +49,6 @@ <taglib> <taglib-uri>webwork</taglib-uri> - <taglib-location>/WEB-INF/lib/webwork-2.2.jar</taglib-location> + <taglib-location>/WEB-INF/webwork.tld</taglib-location> </taglib> </web-app> Modified: trunk/gee/war/getConsent.jsp =================================================================== --- trunk/gee/war/getConsent.jsp 2006-02-27 20:50:49 UTC (rev 117) +++ trunk/gee/war/getConsent.jsp 2006-02-28 01:47:08 UTC (rev 118) @@ -146,11 +146,11 @@ <br/> <%-- FIXME: date approved is not getting reset appropriately after invalid input --%> <ww:text name="approval.date"> - <ww:param name="value" value="consentForm.irbDateApproved"/> + <ww:param name="value" value="%{consentForm.irbDateApproved}"/> </ww:text> <br/> <ww:text name="approval.expiration.date"> - <ww:param name="value" value="consentForm.irbDateApprovalExpires"/> + <ww:param name="value" value="%{consentForm.irbDateApprovalExpires}"/> </ww:text> </small> Modified: trunk/gee/war/template.jsp =================================================================== --- trunk/gee/war/template.jsp 2006-02-27 20:50:49 UTC (rev 117) +++ trunk/gee/war/template.jsp 2006-02-28 01:47:08 UTC (rev 118) @@ -1,7 +1,6 @@ <!-- vim:sts=2:sw=2: --> -<%@ taglib uri="webwork" prefix="ww"%> <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %> <%@ include file="/includes/cache.jsp" %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
