March 2011 - Chorem-commits - mailman.cloud.codelutin.com

r28 - in trunk/chorem-web/src/main: resources resources/i18n webapp/WEB-INF/jsp/gepeto/admin
by vbriand＠users.chorem.org March 17, 2011

March 17, 2011

Author: vbriand Date: 2011-03-17 16:48:40 +0100 (Thu, 17 Mar 2011) New Revision: 28 Url: http://chorem.org/repositories/revision/chorem/28 Log: New jsp page for adding a task Updated struts.xml Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-17 15:44:09 UTC (rev 27) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-17 15:48:40 UTC (rev 28) @@ -1,6 +1,6 @@ chorem.config.configFileName.description=chorem''s configuration filename -chorem.error.internal= -chorem.gepeto.home= +chorem.error.internal=An internal error occurred +chorem.gepeto.home=Home chorem.gepeto.project=Project {0} chorem.gepeto.project.add=Add a new project chorem.gepeto.project.description=Description @@ -8,4 +8,8 @@ chorem.gepeto.projectDetails.title=Details of project {0} chorem.gepeto.projectsByYear.title=Projects of year {0} chorem.gepeto.results.title=Results by year +chorem.gepeto.task=Task {0} +chorem.gepeto.task.add=Add a new task +chorem.gepeto.task.description=Description +chorem.gepeto.task.name=Task name chorem.home=Home Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-17 15:44:09 UTC (rev 27) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-17 15:48:40 UTC (rev 28) @@ -1,6 +1,6 @@ chorem.config.configFileName.description=Nom du fichier de configuration de chorem -chorem.error.internal= -chorem.gepeto.home= +chorem.error.internal=Une erreur interne s''est produite +chorem.gepeto.home=Accueil chorem.gepeto.project=Projet {0} chorem.gepeto.project.add=Ajouter un nouveau projet chorem.gepeto.project.description=Description @@ -8,4 +8,8 @@ chorem.gepeto.projectDetails.title=D\u00E9tails du projet {0} chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0} chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e +chorem.gepeto.task=T\u00E2che {0} +chorem.gepeto.task.add=Ajouter une nouvelle t\u00E2che +chorem.gepeto.task.description=Description +chorem.gepeto.task.name=Nom de la t\u00E2che chorem.home=Accueil Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 15:44:09 UTC (rev 27) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 15:48:40 UTC (rev 28) @@ -7,8 +7,8 @@ <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> <package name="chorem" namespace="/" extends="struts-default"> - <default-action-ref name="home" /> - <action name="home"> + <default-action-ref name="home" /> + <action name="home" class="org.chorem.action.HomeAction"> <result>/WEB-INF/jsp/home.jsp</result> </action> </package> @@ -20,13 +20,16 @@ </package>--> <package name="gepeto" namespace="/gepeto" extends="struts-default"> - <default-action-ref name="home" /> + <default-action-ref name="home" /> <action name="home"> <result>/WEB-INF/jsp/gepeto/home.jsp</result> </action> <action name="addProjectPage"> <result>/WEB-INF/jsp/gepeto/admin/addProject.jsp</result> </action> + <action name="addTaskPage"> + <result>/WEB-INF/jsp/gepeto/admin/addTask.jsp</result> + </action> </package> <!--<package name="billy" namespace="/billy" extends="struts-default"> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp 2011-03-17 15:48:40 UTC (rev 28) @@ -0,0 +1,28 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="chorem.gepeto.task.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.gepeto.task.add" /></h2> + <s:form action="addTask" method="post"> + <fieldset> + <legend> + <s:text name="chorem.gepeto.task"> + <s:param></s:param> + </s:text> + </legend> + <s:textfield key="chorem.gepeto.task.name" name="name" labelSeparator=": " /> + <br /> + <br /> + <s:textarea key="chorem.gepeto.task.description" name="description" cols="50" rows="10" labelposition="top" /> + <br /> + <s:submit key="chorem.gepeto.task.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r27 - trunk/chorem-entities/src/main/xmi
by vbriand＠users.chorem.org March 17, 2011

March 17, 2011

Author: vbriand Date: 2011-03-17 16:44:09 +0100 (Thu, 17 Mar 2011) New Revision: 27 Url: http://chorem.org/repositories/revision/chorem/27 Log: Removed an association not shown on diagram which caused a build error (an attribute "0" was created) Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo =================================================================== (Binary files differ)

1 0

r26 - trunk/chorem-web/src/main/resources
by bpoussin＠users.chorem.org March 17, 2011

March 17, 2011

Author: bpoussin Date: 2011-03-17 15:51:40 +0100 (Thu, 17 Mar 2011) New Revision: 26 Url: http://chorem.org/repositories/revision/chorem/26 Log: add log4j config Added: trunk/chorem-web/src/main/resources/log4j.properties Added: trunk/chorem-web/src/main/resources/log4j.properties =================================================================== --- trunk/chorem-web/src/main/resources/log4j.properties (rev 0) +++ trunk/chorem-web/src/main/resources/log4j.properties 2011-03-17 14:51:40 UTC (rev 26) @@ -0,0 +1,34 @@ +### +# #%L +# bow +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +# Global logging configuration +log4j.rootLogger=WARN, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.chorem=INFO +log4j.logger.org.nuiton=INFO

1 0

r25 - trunk/chorem-web/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org March 17, 2011

March 17, 2011

Author: bpoussin Date: 2011-03-17 15:50:59 +0100 (Thu, 17 Mar 2011) New Revision: 25 Url: http://chorem.org/repositories/revision/chorem/25 Log: - add ovierview home chorem view Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp Modified: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp 2011-03-17 14:44:59 UTC (rev 24) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp 2011-03-17 14:50:59 UTC (rev 25) @@ -1,12 +1,64 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags" %> +<%-- + Document : Home + Created on : 15 mars 2011, 16:26:56 + Author : poussin +--%> -<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="chorem.home" /></title> - <s:head /> - </head> - <body> - </body> +<%@page import="java.util.Arrays"%> +<%@page import="org.chorem.action.HomeAction"%> +<%@page import="java.util.Map"%> +<%@page import="com.opensymphony.xwork2.ActionContext"%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Chorem</title> + </head> + <body> + <h1>Overview</h1> + + <div class="block"> + <ul> + <li>Company: <%=HomeAction.getAction().getNbCompany()%></li> + <li>People: <%=HomeAction.getAction().getNbPerson()%></li> + <li>Touch + this week <%=HomeAction.getAction().getNbTouchThisWeekForMe()%>/<%=HomeAction.getAction().getNbTouchThisWeek()%> + planned <%=HomeAction.getAction().getNbTouchForNext7DaysForMe()%>/<%=HomeAction.getAction().getNbTouchForNext7Days()%> + </li> + </ul> + </div> + + <div class="block"> + <ul> + <li>Project open: <%=HomeAction.getAction().getNbProjectOrderOpen()%></li> + <li>Task: + <%=HomeAction.getAction().getNbTaskOpenForMe()%>/<%=HomeAction.getAction().getNbTaskOpen()%> + </li> + <li>Invoice to send <%=HomeAction.getAction().getNbInvoiceToSend()%> + for <%=HomeAction.getAction().getInvoiceAmountToSend()%> + </li> + </ul> + </div> + + <div class="block"> + <ul> + <li>Cash flow <%=Arrays.toString(HomeAction.getAction().getCashFlow())%></li> + <li>Sales turnover <%=HomeAction.getAction().getSalesTurnoverThisYear()%> + (<%=HomeAction.getAction().getSalesTurnoverLastYear()%>) + </li> + <li>Invoice send <%=HomeAction.getAction().getNbInvoiceSendThisYear()%> + (<%=HomeAction.getAction().getNbInvoiceSendLastYear()%>) + </li> + <li>Unpaid invoice <%=HomeAction.getAction().getNbInvoiceNotPaid()%> + and late <%=HomeAction.getAction().getNbInvoiceNotPaidAndLate()%> + </li> + </ul> + </div> + + </body> </html>

1 0

r24 - trunk/chorem-web/src/main/java/org/chorem/action
by bpoussin＠users.chorem.org March 17, 2011

March 17, 2011

Author: bpoussin Date: 2011-03-17 15:44:59 +0100 (Thu, 17 Mar 2011) New Revision: 24 Url: http://chorem.org/repositories/revision/chorem/24 Log: - overview home chorem Added: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java Added: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java (rev 0) +++ trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java 2011-03-17 14:44:59 UTC (rev 24) @@ -0,0 +1,137 @@ +package org.chorem.action; + +import com.opensymphony.xwork2.ActionContext; +import static org.nuiton.i18n.I18n.n_; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.WikittyProxy; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class HomeAction extends BaseAction { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(HomeAction.class); + + static public HomeAction getAction() { + return (HomeAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + } + + @Override + public String execute() { + try { + WikittyProxy proxy = getChoremProxy(); + load(proxy); + } catch (Exception eee) { + addActionError(getText(n_("chorem.error.internal"))); + log.error("Can't load data for home page", eee); + } + return SUCCESS; + } + + protected int nbCompany = 0; + protected int nbPerson = 0; + protected int nbTouchThisWeek = 0; + protected int nbTouchForNext7Days = 0; + protected int nbTouchThisWeekForMe = 0; + protected int nbTouchForNext7DaysForMe = 0; + + protected int nbProjectOrderOpen = 0; + protected int nbTaskOpen = 0; + protected int nbTaskOpenForMe = 0; + protected int nbInvoiceToSend = 0; + protected int invoiceAmountToSend = 0; + + protected double[] cashFlow = new double[3]; + + protected int nbInvoiceSendThisYear = 0; + protected int nbInvoiceSendLastYear = 0; + protected int nbInvoiceNotPaid = 0; + protected int nbInvoiceNotPaidAndLate = 0; + protected double salesTurnoverThisYear = 0; + protected double salesTurnoverLastYear = 0; + + public void load(WikittyProxy proxy) { +// FIXME write criteria to get information + } + + public double[] getCashFlow() { + return cashFlow; + } + + public int getNbInvoiceNotPaid() { + return nbInvoiceNotPaid; + } + + public int getNbInvoiceNotPaidAndLate() { + return nbInvoiceNotPaidAndLate; + } + + public int getNbInvoiceSendLastYear() { + return nbInvoiceSendLastYear; + } + + public int getNbInvoiceSendThisYear() { + return nbInvoiceSendThisYear; + } + + public int getNbInvoiceToSend() { + return nbInvoiceToSend; + } + + public int getNbCompany() { + return nbCompany; + } + + public int getNbPerson() { + return nbPerson; + } + + public int getNbProjectOrderOpen() { + return nbProjectOrderOpen; + } + + public int getNbTaskOpen() { + return nbTaskOpen; + } + + public int getNbTaskOpenForMe() { + return nbTaskOpenForMe; + } + + public int getNbTouchForNext7Days() { + return nbTouchForNext7Days; + } + + public int getNbTouchForNext7DaysForMe() { + return nbTouchForNext7DaysForMe; + } + + public int getNbTouchThisWeek() { + return nbTouchThisWeek; + } + + public int getNbTouchThisWeekForMe() { + return nbTouchThisWeekForMe; + } + + public int getInvoiceAmountToSend() { + return invoiceAmountToSend; + } + + public double getSalesTurnoverLastYear() { + return salesTurnoverLastYear; + } + + public double getSalesTurnoverThisYear() { + return salesTurnoverThisYear; + } + +}

1 0

r23 - in trunk/chorem-web/src/main: i18n java/org/chorem/gepeto/action resources resources/i18n webapp webapp/WEB-INF/jsp/gepeto webapp/WEB-INF/jsp/gepeto/admin
by vbriand＠users.chorem.org March 17, 2011

March 17, 2011

Author: vbriand Date: 2011-03-17 15:28:49 +0100 (Thu, 17 Mar 2011) New Revision: 23 Url: http://chorem.org/repositories/revision/chorem/23 Log: Added new i18n rule for textarea Added (empty) home pages for chorem and gepeto Added new gepeto jsp page for adding a new project Added: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp Removed: trunk/chorem-web/src/main/webapp/index.jsp Modified: trunk/chorem-web/src/main/i18n/jsp.rules trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml Modified: trunk/chorem-web/src/main/i18n/jsp.rules =================================================================== --- trunk/chorem-web/src/main/i18n/jsp.rules 2011-03-17 13:39:37 UTC (rev 22) +++ trunk/chorem-web/src/main/i18n/jsp.rules 2011-03-17 14:28:49 UTC (rev 23) @@ -5,5 +5,6 @@ //s:textfield/@key //s:password/@key //s:file/@key +//s:textarea/@key //sx:datetimepicker/@key Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-17 13:39:37 UTC (rev 22) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-17 14:28:49 UTC (rev 23) @@ -1,5 +1,6 @@ chorem.config.configFileName.description=chorem''s configuration filename chorem.error.internal= +chorem.gepeto.home= chorem.gepeto.project=Project {0} chorem.gepeto.project.add=Add a new project chorem.gepeto.project.description=Description @@ -7,4 +8,4 @@ chorem.gepeto.projectDetails.title=Details of project {0} chorem.gepeto.projectsByYear.title=Projects of year {0} chorem.gepeto.results.title=Results by year -chorem.home= +chorem.home=Home Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-17 13:39:37 UTC (rev 22) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-17 14:28:49 UTC (rev 23) @@ -1,5 +1,6 @@ chorem.config.configFileName.description=Nom du fichier de configuration de chorem chorem.error.internal= +chorem.gepeto.home= chorem.gepeto.project=Projet {0} chorem.gepeto.project.add=Ajouter un nouveau projet chorem.gepeto.project.description=Description @@ -7,4 +8,4 @@ chorem.gepeto.projectDetails.title=D\u00E9tails du projet {0} chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0} chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e -chorem.home= +chorem.home=Accueil Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 13:39:37 UTC (rev 22) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 14:28:49 UTC (rev 23) @@ -6,36 +6,39 @@ <constant name="struts.devMode" value="true" /> <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> - <package name="default" extends="struts-default"> - - </package> - <package name="chorem" namespace="/" extends="struts-default"> - <action name="home" class="org.chorem.action.HomeAction"> + <default-action-ref name="home" /> + <action name="home"> <result>/WEB-INF/jsp/home.jsp</result> </action> </package>  <package name="gepeto" namespace="/gepeto" extends="struts-default"> - <action name="home" class="org.chorem.gepeto.action.HomeAction"> + <default-action-ref name="home" /> + <action name="home"> <result>/WEB-INF/jsp/gepeto/home.jsp</result> </action> + <action name="addProjectPage"> + <result>/WEB-INF/jsp/gepeto/admin/addProject.jsp</result> + </action> </package> - <package name="billy" namespace="/billy" extends="struts-default"> - <action name="home" class="org.chorem.billy.action.HomeAction"> +<!--<package name="billy" namespace="/billy" extends="struts-default"> + <default-action-ref name="home" /> + <action name="home"> <result>/WEB-INF/jsp/billy/home.jsp</result> </action> </package> <package name="cash" namespace="/cash" extends="struts-default"> - <action name="home" class="org.chorem.cash.action.HomeAction"> + <default-action-ref name="home" /> + <action name="home"> <result>/WEB-INF/jsp/cash/home.jsp</result> </action> </package> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp 2011-03-17 14:28:49 UTC (rev 23) @@ -0,0 +1,28 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="chorem.gepeto.project.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.gepeto.project.add" /></h2> + <s:form action="addProject" method="post"> + <fieldset> + <legend> + <s:text name="chorem.gepeto.project"> + <s:param></s:param> + </s:text> + </legend> + <s:textfield key="chorem.gepeto.project.name" name="name" labelSeparator=": " /> + <br /> + <br /> + <s:textarea key="chorem.gepeto.project.description" name="description" cols="50" rows="10" labelposition="top" /> + <br /> + <s:submit key="chorem.gepeto.project.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp 2011-03-17 14:28:49 UTC (rev 23) @@ -0,0 +1,12 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="chorem.gepeto.home" /></title> + <s:head /> + </head> + <body> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/home.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/chorem-web/src/main/webapp/index.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/index.jsp 2011-03-17 13:39:37 UTC (rev 22) +++ trunk/chorem-web/src/main/webapp/index.jsp 2011-03-17 14:28:49 UTC (rev 23) @@ -1,7 +0,0 @@ -<html> - <head> - <title>Index</title> - </head> - <body> - </body> -</html> \ No newline at end of file

1 0

r22 - trunk/chorem-web/src/main/webapp/WEB-INF/decorators
by vbriand＠users.chorem.org March 17, 2011

March 17, 2011

Author: vbriand Date: 2011-03-17 14:39:37 +0100 (Thu, 17 Mar 2011) New Revision: 22 Url: http://chorem.org/repositories/revision/chorem/22 Log: Updated links to jsp pages Modified: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp Modified: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp 2011-03-17 13:32:45 UTC (rev 21) +++ trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp 2011-03-17 13:39:37 UTC (rev 22) @@ -16,8 +16,8 @@ <link href="${CSS}" rel="stylesheet" type="text/css" media="all" /> </head> <body> - <s:include value="/jsp/common/inc/header.jsp" /> + <s:include value="/WEB-INF/jsp/common/inc/header.jsp" /> <decorator:body /> - <s:include value="/jsp/common/inc/footer.jsp" /> + <s:include value="/WEB-INF/jsp/common/inc/footer.jsp" /> </body> </html>

1 0

r21 - in trunk/chorem-web/src/main: resources resources/i18n webapp webapp/WEB-INF webapp/WEB-INF/jsp
by vbriand＠users.chorem.org March 17, 2011

March 17, 2011

Author: vbriand Date: 2011-03-17 14:32:45 +0100 (Thu, 17 Mar 2011) New Revision: 21 Url: http://chorem.org/repositories/revision/chorem/21 Log: Moved jsp pages to WEB-INF Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp Removed: trunk/chorem-web/src/main/webapp/jsp/ Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties trunk/chorem-web/src/main/resources/struts.xml Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-17 13:20:47 UTC (rev 20) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties 2011-03-17 13:32:45 UTC (rev 21) @@ -3,6 +3,8 @@ chorem.gepeto.project=Project {0} chorem.gepeto.project.add=Add a new project chorem.gepeto.project.description=Description +chorem.gepeto.project.name=Project name chorem.gepeto.projectDetails.title=Details of project {0} chorem.gepeto.projectsByYear.title=Projects of year {0} chorem.gepeto.results.title=Results by year +chorem.home= Modified: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties =================================================================== --- trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-17 13:20:47 UTC (rev 20) +++ trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties 2011-03-17 13:32:45 UTC (rev 21) @@ -3,6 +3,8 @@ chorem.gepeto.project=Projet {0} chorem.gepeto.project.add=Ajouter un nouveau projet chorem.gepeto.project.description=Description +chorem.gepeto.project.name=Nom du projet chorem.gepeto.projectDetails.title=D\u00E9tails du projet {0} chorem.gepeto.projectsByYear.title=Projets de l''ann\u00E9e {0} chorem.gepeto.results.title=R\u00E9sultats par ann\u00E0e +chorem.home= Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 13:20:47 UTC (rev 20) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-17 13:32:45 UTC (rev 21) @@ -11,15 +11,33 @@ </package> <package name="chorem" namespace="/" extends="struts-default"> - <action name="home" class="org.chorem.action.HomeAction" method="execute"> - <result name="success">/WEB-INF/jsp/Home.jsp</result> + <action name="home" class="org.chorem.action.HomeAction"> + <result>/WEB-INF/jsp/home.jsp</result> </action> </package>  </struts> Added: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp 2011-03-17 13:32:45 UTC (rev 21) @@ -0,0 +1,12 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@taglib prefix="s" uri="/struts-tags" %> + +<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <head> + <title><s:text name="chorem.home" /></title> + <s:head /> + </head> + <body> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r20 - trunk/chorem-entities/src/main/xmi
by vbriand＠users.chorem.org March 17, 2011

March 17, 2011

Author: vbriand Date: 2011-03-17 14:20:47 +0100 (Thu, 17 Mar 2011) New Revision: 20 Url: http://chorem.org/repositories/revision/chorem/20 Log: Added missing relation between Time and Task Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo =================================================================== (Binary files differ)

1 0

r19 - trunk/chorem-entities/src/main/xmi
by vbriand＠users.chorem.org March 17, 2011

March 17, 2011

Author: vbriand Date: 2011-03-17 12:26:07 +0100 (Thu, 17 Mar 2011) New Revision: 19 Url: http://chorem.org/repositories/revision/chorem/19 Log: Updated model Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo Modified: trunk/chorem-entities/src/main/xmi/chorem.zargo =================================================================== (Binary files differ)

1 0