Author: vbriand Date: 2011-03-18 16:01:37 +0100 (Fri, 18 Mar 2011) New Revision: 34 Url: http://chorem.org/repositories/revision/chorem/34 Log: Removed admin package Added: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp Removed: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/ Modified: trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java trunk/chorem-web/src/main/resources/struts.xml Modified: trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java 2011-03-18 14:45:06 UTC (rev 33) +++ trunk/chorem-web/src/main/java/org/chorem/ChoremProxy.java 2011-03-18 15:01:37 UTC (rev 34) @@ -1,5 +1,10 @@ package org.chorem; +import java.util.List; + +import org.chorem.entities.Attachment; +import org.chorem.entities.ContactDetails; + import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -48,4 +53,26 @@ } return ws; } + + /** + * Returns the attachments linked with a wikitty id ordered by date + * + * @param wikittyId + * @return the list of attachments + */ + static public List<Attachment> getAttachments(String wikittyId) { + //TODO: implement + return null; + } + + /** + * Returns the contact details linked with a wikitty id + * + * @param wikittyId + * @return the list of contact details + */ + static public List<ContactDetails> getContactDetails(String wikittyId) { + //TODO: implement + return null; + } } Copied: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java (from rev 33, trunk/chorem-web/src/main/java/org/chorem/gepeto/action/admin/ProjectAction.java) =================================================================== --- trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java (rev 0) +++ trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java 2011-03-18 15:01:37 UTC (rev 34) @@ -0,0 +1,73 @@ +package org.chorem.gepeto.action; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.action.BaseAction; + +/** + * Project management class + * + */ +public class ProjectAction extends BaseAction { + + private static final long serialVersionUID = 498267854350348906L; + + private static final Log log = LogFactory.getLog(ProjectAction.class); + + protected String name; + protected String description; + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name: the project name + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the project description + */ + public String getDescription() { + return description; + } + + /** + * @param description: the project description + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * Adds a new project + * + * @return INPUT if the mandatory fields haven't all been filled in + * @return SUCCESS if the project has been added + */ + public String add() { + String result = INPUT; + + if (name != null && description != null) { + if (!name.isEmpty() && !description.isEmpty()) { + result = SUCCESS; + } + } + return result; + } + + /** + * Removes a project + * + * @return + */ + public String remove() { + return SUCCESS; + } +} Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml (from rev 33, trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/admin/ProjectAction-validation.xml) =================================================================== --- trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml (rev 0) +++ trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml 2011-03-18 15:01:37 UTC (rev 34) @@ -0,0 +1,16 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + <field name="name"> + <field-validator type="requiredstring"> + <message key="chorem.gepeto.project.name.required" /> + </field-validator> + </field> + <field name="description"> + <field-validator type="requiredstring"> + <message key="chorem.gepeto.project.description.required" /> + </field-validator> + </field> +</validators> Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-validation.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/chorem-web/src/main/resources/struts.xml =================================================================== --- trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 14:45:06 UTC (rev 33) +++ trunk/chorem-web/src/main/resources/struts.xml 2011-03-18 15:01:37 UTC (rev 34) @@ -18,13 +18,13 @@ <result>/WEB-INF/jsp/bonzoms/home.jsp</result> </action> <action name="addCompanyPage"> - <result>/WEB-INF/jsp/bonzoms/admin/addCompany.jsp</result> + <result>/WEB-INF/jsp/bonzoms/addCompany.jsp</result> </action> <action name="addPersonPage"> - <result>/WEB-INF/jsp/bonzoms/admin/addPerson.jsp</result> + <result>/WEB-INF/jsp/bonzoms/addPerson.jsp</result> </action> <action name="addContactDetails"> - <result>/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp</result> + <result>/WEB-INF/jsp/bonzoms/addContactDetails.jsp</result> </action> </package> @@ -34,20 +34,20 @@ <result>/WEB-INF/jsp/gepeto/home.jsp</result> </action> <action name="addProject_input"> - <result>/WEB-INF/jsp/gepeto/admin/addProject.jsp</result> + <result>/WEB-INF/jsp/gepeto/addProject.jsp</result> </action> - <action name="addProject" class="org.chorem.gepeto.action.admin.ProjectAction" method="add"> - <result name="input">/WEB-INF/jsp/gepeto/admin/addProject.jsp</result> + <action name="addProject" class="org.chorem.gepeto.action.ProjectAction" method="add"> + <result name="input">/WEB-INF/jsp/gepeto/addProject.jsp</result> <result type="redirectAction">home</result> </action> - <action name="removeProject" class="org.chorem.gepeto.action.admin.ProjectAction" method="delete"> + <action name="removeProject" class="org.chorem.gepeto.action.ProjectAction" method="delete"> <result type="redirectAction">home</result> </action> <action name="addTaskPage"> - <result>/WEB-INF/jsp/gepeto/admin/addTask.jsp</result> + <result>/WEB-INF/jsp/gepeto/addTask.jsp</result> </action> <action name="addProjectOrder"> - <result>/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp</result> + <result>/WEB-INF/jsp/gepeto/addProjectOrder.jsp</result> </action> </package> Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp (from rev 30, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addCompany.jsp) =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp 2011-03-18 15:01:37 UTC (rev 34) @@ -0,0 +1,27 @@ +<%@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.bonzoms.company.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.bonzoms.company.add" /></h2> + <s:form action="addCompany" method="post"> + <fieldset> + <legend> + <s:text name="chorem.bonzoms.company"> + <s:param></s:param> + </s:text> + </legend> + <s:textfield key="chorem.bonzoms.company.name" name="name" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.company.type" name="type" labelSeparator=": " /> + <br /> + <s:submit key="chorem.bonzoms.company.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addCompany.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addContactDetails.jsp) =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp 2011-03-18 15:01:37 UTC (rev 34) @@ -0,0 +1,25 @@ +<%@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.bonzoms.contactDetails.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.bonzoms.contactDetails.add" /></h2> + <s:form action="addContactDetails" method="post"> + <fieldset> + <legend><s:text name="chorem.bonzoms.contactDetails" /></legend> + <s:textfield key="chorem.bonzoms.contactDetails.name" name="name" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.contactDetails.type" name="type" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.contactDetails.value" name="value" labelSeparator=": " /> + <br /> + <s:submit key="chorem.bonzoms.contactDetails.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addContactDetails.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/admin/addPerson.jsp) =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp 2011-03-18 15:01:37 UTC (rev 34) @@ -0,0 +1,27 @@ +<%@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.bonzoms.person.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.bonzoms.person.add" /></h2> + <s:form action="addPerson" method="post"> + <fieldset> + <legend><s:text name="chorem.bonzoms.person" /></legend> + <s:textfield key="chorem.bonzoms.person.firstName" name="firstName" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.person.lastName" name="lastName" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.person.email" name="email" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.bonzoms.person.birthDate" name="birthDate" labelSeparator=": " /> + <br /> + <s:submit key="chorem.bonzoms.person.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/addPerson.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp (from rev 33, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProject.jsp) =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp 2011-03-18 15:01:37 UTC (rev 34) @@ -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=": " labelposition="top" /> + <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/addProject.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addProjectOrder.jsp) =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp 2011-03-18 15:01:37 UTC (rev 34) @@ -0,0 +1,27 @@ +<%@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.projectOrder.add" /></title> + <s:head /> + </head> + <body> + <h2><s:text name="chorem.gepeto.projectOrder.add" /></h2> + <s:form action="addProjectOrder" method="post"> + <fieldset> + <legend><s:text name="chorem.gepeto.projectOrder" /></legend> + <s:textfield key="chorem.gepeto.projectOrder.type" name="type" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.projectOrder.description" name="description" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.projectOrder.beginDate" name="beginDate" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.projectOrder.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " /> + <br /> + <s:submit key="chorem.gepeto.projectOrder.add" name="submit" /> + </fieldset> + </s:form> + </body> +</html> Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp (from rev 31, trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/admin/addTask.jsp) =================================================================== --- trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp (rev 0) +++ trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp 2011-03-18 15:01:37 UTC (rev 34) @@ -0,0 +1,38 @@ +<%@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 /> + <br /> + <s:textfield key="chorem.gepeto.task.price" name="price" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.task.estimatedDays" name="estimatedDays" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.task.beginDate" name="beginDate" labelSeparator=": " /> + <br /> + <s:textfield key="chorem.gepeto.task.estimatedEndDate" name="estimatedEndDate" labelSeparator=": " /> + <br /> + <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/addTask.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain