July 2012 - Chorem-commits - mailman.cloud.codelutin.com

r209 - trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by bpoussin＠users.chorem.org 12 Jul '12

12 Jul '12

Author: bpoussin Date: 2012-07-12 19:32:01 +0200 (Thu, 12 Jul 2012) New Revision: 209 Url: http://chorem.org/repositories/revision/chorem/209 Log: fix null pointer Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-12 16:51:03 UTC (rev 208) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-12 17:32:01 UTC (rev 209) @@ -178,18 +178,20 @@ } } } - + List<String> extExcluded = client.getConfig().getOptionAsList( ChoremConfigOption.CHOREM_EXTENSION_SEARCH_EXCLUSION.key).getOption(); for (String ext : extExcluded) { map.removeAll(ext); } - for (String ext : extension) { - // The wanted extensions should be present, even without wikitties... - Set<Wikitty> wikitties = map.get(ext); - if (wikitties == null || wikitties.isEmpty() ) { - map.put(ext, null); + if (extension != null) { + for (String ext : extension) { + // The wanted extensions should be present, even without wikitties... + Set<Wikitty> wikitties = map.get(ext); + if (wikitties == null || wikitties.isEmpty() ) { + map.put(ext, null); + } } } return map;

1 0

r208 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 12 Jul '12

12 Jul '12

Author: bpoussin Date: 2012-07-12 18:51:03 +0200 (Thu, 12 Jul 2012) New Revision: 208 Url: http://chorem.org/repositories/revision/chorem/208 Log: am?\195?\169lioration du doctype (declaration xhtml5) voir https://fr.wikipedia.org/wiki/HTML5#XHTML_5 Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:29:14 UTC (rev 207) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:51:03 UTC (rev 208) @@ -23,12 +23,14 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Chorem</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> + <meta charset="UTF-8"/> <%-- JQuery --%> <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>

1 0

r207 - trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp
by bpoussin＠users.chorem.org 12 Jul '12

12 Jul '12

Author: bpoussin Date: 2012-07-12 18:29:14 +0200 (Thu, 12 Jul 2012) New Revision: 207 Url: http://chorem.org/repositories/revision/chorem/207 Log: add Contact details in Contact menu Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:24:06 UTC (rev 206) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-12 16:29:14 UTC (rev 207) @@ -85,6 +85,9 @@ <li><a href="<c:url value="/wikitty/Employee/search"/>"><i class="icon-th-list icon-black"></i> All employee</a></li> <li><a href="<c:url value="/wikitty/Employee/edit/new"/>"><i class="icon-plus icon-black"></i> Add employee</a></li> <li class="divider"></li> + <li><a href="<c:url value="/wikitty/ContactDetails/search"/>"><i class="icon-th-list icon-black"></i> All contact details</a></li> + <li><a href="<c:url value="/wikitty/ContactDetails/edit/new"/>"><i class="icon-plus icon-black"></i> Add contact details</a></li> + <li class="divider"></li> <li><a href="<c:url value="/wikitty/Touch/search"/>"><i class="icon-th-list icon-black"></i> All touch</a></li> <li><a href="<c:url value="/wikitty/Touch/edit/new"/>"><i class="icon-plus icon-black"></i> Add touch</a></li> </ul>

1 0

r206 - trunk/chorem-entities/src/main/xmi
by bpoussin＠users.chorem.org 12 Jul '12

12 Jul '12

Author: bpoussin Date: 2012-07-12 18:24:06 +0200 (Thu, 12 Jul 2012) New Revision: 206 Url: http://chorem.org/repositories/revision/chorem/206 Log: add type text/rst to Touch.digest field Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-07-03 15:22:49 UTC (rev 205) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-07-12 16:24:06 UTC (rev 206) @@ -88,6 +88,7 @@ org.chorem.entities.Touch.class.tagvalue.toString=%Interval.beginDate$tF - %Touch.type$s - %Touch.goal|nogoal$s org.chorem.entities.Touch.class.tagvalue.sortOrder=Interval.beginDate desc,Touch.type,Touch.goal org.chorem.entities.Touch.attribute.goal.tagvalue.subtype=text/rst +org.chorem.entities.Touch.attribute.digest.tagvalue.subtype=text/rst org.chorem.entities.Touch.attribute.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch org.chorem.entities.Attachment.class.tagvalue.version=6.0 org.chorem.entities.Attachment.class.tagvalue.toString=%Attachment.name|noname$s (%Attachment.mimetype|notype$s) %Attachment.date$tF

1 0

r205 - trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions
by ymartel＠users.chorem.org 03 Jul '12

03 Jul '12

Author: ymartel Date: 2012-07-03 17:22:49 +0200 (Tue, 03 Jul 2012) New Revision: 205 Url: http://chorem.org/repositories/revision/chorem/205 Log: refs #661 when list an extension, only see it, not its dependencies Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-03 12:52:32 UTC (rev 204) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-03 15:22:49 UTC (rev 205) @@ -54,6 +54,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Set; /** * @@ -171,8 +172,10 @@ // on classe par extension demande les resultats LinkedHashMultimap<String, Wikitty> map = LinkedHashMultimap.create(); for (Wikitty w : results) { - for (String ext : w.getExtensionNames()) { - map.put(ext, w); + for (WikittyExtension ext : w.getExtensions()) { + if (exts.contains(ext)) { + map.put(ext.getName(), w); + } } } @@ -182,6 +185,13 @@ map.removeAll(ext); } + for (String ext : extension) { + // The wanted extensions should be present, even without wikitties... + Set<Wikitty> wikitties = map.get(ext); + if (wikitties == null || wikitties.isEmpty() ) { + map.put(ext, null); + } + } return map; }

1 0

r204 - in trunk/chorem-webmotion/src/main: java/org/wikitty/web/jsptag webapp/WEB-INF webapp/WEB-INF/jsp/employee webapp/WEB-INF/jsp/person
by ymartel＠users.chorem.org 03 Jul '12

03 Jul '12

Author: ymartel Date: 2012-07-03 14:52:32 +0200 (Tue, 03 Jul 2012) New Revision: 204 Url: http://chorem.org/repositories/revision/chorem/204 Log: ref #674 Add label option for wikitty display tag Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-07-03 09:46:27 UTC (rev 203) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2012-07-03 12:52:32 UTC (rev 204) @@ -48,21 +48,10 @@ */ public class WikittyDisplay extends SimpleTagSupport { - - protected String name=""; - protected Object value=""; - protected Wikitty wikitty; protected String fqfield=""; + protected String label=""; - public void setName(String name) { - this.name = name; - } - - public void setValue(Object value) { - this.value = value; - } - public void setWikitty(Wikitty wikitty) { this.wikitty = wikitty; } @@ -71,12 +60,12 @@ this.fqfield = fqfield; } + public void setLabel(String label) { + this.label = label; + } + @Override public void doTag() throws JspException, IOException { - // par defaut si pas de name on utilise celui du field - if (StringUtils.isBlank(name)) { - name = fqfield; - } JspWriter output = getJspContext().getOut(); PageContext pageContext = (PageContext)getJspContext(); @@ -87,32 +76,37 @@ String fieldName = WikittyUtil.getFieldNameFromFQFieldName(fqfield); FieldType field = wikitty.getFieldType(fqfield); + // par defaut si pas de label on utilise le nom du field + if (StringUtils.isBlank(label)) { + label = fieldName; + } + if (field != null) { switch(field.getType()) { case BINARY: - viewBinary(output, contextPath, name, wikitty, field, extName, fieldName); + viewBinary(output, contextPath, label, wikitty, extName, fieldName); break; case BOOLEAN: - viewBoolean(output, contextPath, name, wikitty, field, extName, fieldName); + viewBoolean(output, contextPath, label, wikitty, extName, fieldName); break; case DATE: - viewDate(output, contextPath, name, wikitty, field, extName, fieldName); + viewDate(output, contextPath, label, wikitty, field, extName, fieldName); break; case NUMERIC: - viewNumeric(output, contextPath, name, wikitty, field, extName, fieldName); + viewNumeric(output, contextPath, label, wikitty, field, extName, fieldName); break; case STRING: if (field.isCollection()) { - viewCollectionString(output, contextPath, name, wikitty, field, extName, fieldName); + viewCollectionString(output, contextPath, label, wikitty, extName, fieldName); } else { - viewString(output, contextPath, name, wikitty, field, extName, fieldName); + viewString(output, label, wikitty, extName, fieldName); } break; case WIKITTY: if (field.isCollection()) { - viewCollectionWikitty(output, contextPath, name, wikitty, field, extName, fieldName); + viewCollectionWikitty(output, contextPath, label, wikitty, extName, fieldName); } else { - viewWikitty(output, contextPath, name, wikitty, field, extName, fieldName); + viewWikitty(output, contextPath, label, wikitty, extName, fieldName); } break; } @@ -121,26 +115,26 @@ } } - protected void viewBinary(JspWriter output, String contextPath, String name, - Wikitty wikitty, FieldType field, String extName , String fieldName) + protected void viewBinary(JspWriter output, String contextPath, String label, + Wikitty wikitty, String extName , String fieldName) throws JspException, IOException { byte[] fieldAsBytes = wikitty.getFieldAsBytes(extName, fieldName); if (fieldAsBytes != null) { String url = contextPath + "/wikitty/view/" + wikitty.getId() + "/" + extName + "/" + fieldName; - /*{<%=name%> : <a href="<%=url%>">Download</a>}*/ + /*{<%=label%> : <a href="<%=url%>">Download</a>}*/ } else { - /*{<%=name%> : }*/ + /*{<%=label%> : }*/ } } - protected void viewBoolean(JspWriter output, String contextPath, String name, - Wikitty wikitty, FieldType field, String extName , String fieldName) + protected void viewBoolean(JspWriter output, String contextPath, String label, + Wikitty wikitty, String extName , String fieldName) throws JspException, IOException { boolean value = wikitty.getFieldAsBoolean(extName, fieldName); - /*{<%=fieldName%> : <%=value%>}*/ + /*{<%=label%> : <%=value%>}*/ } - protected void viewDate(JspWriter output, String contextPath, String name, + protected void viewDate(JspWriter output, String contextPath, String label, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { Date date = wikitty.getFieldAsDate(extName, fieldName); @@ -157,10 +151,10 @@ value = DateFormatUtils.format(date, "dd/MM/yyyy"); } } - /*{<%=fieldName%> : <%=value%> }*/ + /*{<%=label%> : <%=value%> }*/ } - protected void viewNumeric(JspWriter output, String contextPath, String name, + protected void viewNumeric(JspWriter output, String contextPath, String label, Wikitty wikitty, FieldType field, String extName , String fieldName) throws JspException, IOException { BigDecimal value = wikitty.getFieldAsBigDecimal(extName, fieldName); @@ -170,18 +164,17 @@ //TODO ymartel 2012-05-02 : manage localization NumberFormat formatter = new DecimalFormat(pattern); String formattedValue = formatter.format(value); - /*{<%=fieldName%> : <%=formattedValue%> }*/ + /*{<%=label%> : <%=formattedValue%> }*/ } else { - /*{<%=fieldName%> : <%=value%>}*/ + /*{<%=label%> : <%=value%>}*/ } } - protected void viewCollectionString(JspWriter output, String contextPath, String name, - Wikitty wikitty, FieldType field, String extName , String fieldName) + protected void viewCollectionString(JspWriter output, String contextPath, String label, + Wikitty wikitty, String extName , String fieldName) throws JspException, IOException { - String id = wikitty.getId() + "-" + extName + "-" + fieldName; List<String> values = wikitty.getFieldAsList(extName, fieldName, String.class); - /*{<%=fieldName%> : <ul>}*/ + /*{<%=label%> : <ul>}*/ if (values != null) { for (String value : values) { if (value != null) { @@ -192,19 +185,18 @@ /*{</ul>}*/ } - protected void viewString(JspWriter output, String contextPath, String name, - Wikitty wikitty, FieldType field, String extName , String fieldName) + protected void viewString(JspWriter output, String label, Wikitty wikitty, String extName , String fieldName) throws JspException, IOException { String fieldAsString = wikitty.getFieldAsString(extName, fieldName); String value = fieldAsString != null ? fieldAsString : ""; - /*{<%=fieldName%> : <%=value%>}*/ + /*{<%=label%> : <%=value%>}*/ } - protected void viewCollectionWikitty(JspWriter output, String contextPath, String name, - Wikitty wikitty, FieldType field, String extName , String fieldName) + protected void viewCollectionWikitty(JspWriter output, String contextPath, String label, + Wikitty wikitty, String extName , String fieldName) throws JspException, IOException { List<Wikitty> values = wikitty.getFieldAsWikittyList(extName, fieldName, false); - /*{<%=fieldName%> : <ul>}*/ + /*{<%=label%> : <ul>}*/ if (values != null) { for (Wikitty value : values) { if (value != null) { @@ -217,15 +209,15 @@ } - protected void viewWikitty(JspWriter output, String contextPath, String name, - Wikitty wikitty, FieldType field, String extName , String fieldName) + protected void viewWikitty(JspWriter output, String contextPath, String label, + Wikitty wikitty, String extName , String fieldName) throws JspException, IOException { String value = wikitty.getFieldAsWikitty(extName, fieldName); Wikitty wikittyValue = wikitty.getFieldAsWikitty(extName, fieldName, false); if (wikittyValue != null) { String url = contextPath + "/wikitty/view/" + value; if (wikittyValue != null) { - /*{<%=fieldName%>: <a href="<%=url%>"><%=wikittyValue%></a>}*/ + /*{<%=label%>: <a href="<%=url%>"><%=wikittyValue%></a>}*/ } } } Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp 2012-07-03 09:46:27 UTC (rev 203) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp 2012-07-03 12:52:32 UTC (rev 204) @@ -35,19 +35,19 @@ <dl><dt><a href="<c:url value="/wikitty/Employee/search"/>">Employé</a> <a class="btn btn-success btn-mini" href="<c:url value="/wikitty/Employee/edit/${wikitty.id}"/>"><i class="icon-pencil icon-white"></i> Edit</a> <a class="btn btn-danger btn-mini" href="<c:url value="/wikitty/delete/${wikitty.id}?extension=Employee&wmDecoratorNo=true"/>"><i class="icon-trash icon-white"></i> Delete</a></dt> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.company"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.person"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.description"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.salary"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.paidLeave"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.rtt"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.type"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Employee.workingTime"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.company" label="Société" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.person" label="Personne" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.description" label="Description" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.salary" label="Salaire" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.paidLeave" label="Congès payés" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.rtt" label="RTT" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.type" label="Contrat" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.workingTime" label="Temps de travail" /></dd> </dl> <dl> <dt><a href="<c:url value="/wikitty/search?extension=${ext.name}"/>">${ext.name}</a> - <dd><w:display wikitty="${wikitty}" fqfield="Interval.beginDate"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Interval.endDate"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Interval.beginDate" label="Date d'embauche" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Interval.endDate" label="Date de départ" /></dd> </dl> <p> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp 2012-07-03 09:46:27 UTC (rev 203) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp 2012-07-03 12:52:32 UTC (rev 204) @@ -35,10 +35,10 @@ <dl><dt><a href="<c:url value="/wikitty/Person/search"/>">Personne</a> <a class="btn btn-success btn-mini" href="<c:url value="/wikitty/Person/edit/${wikitty.id}"/>"><i class="icon-pencil icon-white"></i> Edit</a> <a class="btn btn-danger btn-mini" href="<c:url value="/wikitty/delete/${wikitty.id}?extension=Person&wmDecoratorNo=true"/>"><i class="icon-trash icon-white"></i> Delete</a></dt> - <dd><w:display wikitty="${wikitty}" fqfield="Person.firstName"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Person.lastName"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Person.birthDate"/></dd> - <dd><w:display wikitty="${wikitty}" fqfield="Person.diploma"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Person.lastName" label="Nom" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Person.firstName" label="Prénom" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Person.birthDate" label="Date de naissance" /></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Person.diploma" label="Diplôme" /></dd> </dl> <p> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld =================================================================== (Binary files differ)

1 0

r203 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions resources webapp/WEB-INF/jsp webapp/WEB-INF/jsp/employee webapp/WEB-INF/jsp/person
by ymartel＠users.chorem.org 03 Jul '12

03 Jul '12

Author: ymartel Date: 2012-07-03 11:46:27 +0200 (Tue, 03 Jul 2012) New Revision: 203 Url: http://chorem.org/repositories/revision/chorem/203 Log: fix #673 add button in Person \& Employee view to add a Contact detail Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/resources/mapping trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-02 16:56:13 UTC (rev 202) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-03 09:46:27 UTC (rev 203) @@ -30,7 +30,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.ChoremClient; import org.chorem.ChoremConfigOption; -import org.chorem.entities.Attachment; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.UploadFile; @@ -451,30 +450,6 @@ return renderView(StringUtils.lowerCase(extension) + "/edit.jsp", "wikitty", w); } - public Render addAttachment(ChoremClient client, String wikittyId) { - log.debug("add attachment for : " + wikittyId); - Wikitty w = client.restore(wikittyId, ".*"); - - Wikitty attachment = new WikittyImpl(); - - LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); - - // Load Attachment extension, and potential dependencies - List<String> extensionNames = Arrays.asList(Attachment.EXT_ATTACHMENT); - List<WikittyExtension> newExts = - client.restoreExtensionAndDependenciesLastVesion(extensionNames); - attachment.addExtension(newExts); - - // As we want to edit a wikitty by its extensions, we should edit the required extensions too - // Add the extension and required ones in the list of extensions to display - exts.addAll(newExts); - // Show all wikitty if no extension were mentioned - exts.addAll(attachment.getExtensions()); - - attachment.setField(Attachment.EXT_ATTACHMENT, Attachment.FIELD_ATTACHMENT_TARGET, w); - return renderView("edit.jsp", "wikitty", attachment, "extensions", exts); - } - public Render save(ChoremClient client, String id, String[] extension, Call call) { log.debug("save: " + id); Wikitty w = client.restore(id); Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java (rev 0) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/LinkAction.java 2012-07-03 09:46:27 UTC (rev 203) @@ -0,0 +1,81 @@ +package org.chorem.webmotion.actions; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.ChoremClient; +import org.chorem.entities.Attachment; +import org.chorem.entities.ContactDetails; +import org.debux.webmotion.server.WebMotionController; +import org.debux.webmotion.server.render.Render; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyImpl; + +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.List; + +/** + * Regroup the action that links an object with an other + * + * @author ymartel <martel(a)codelutin.com> + */ +public class LinkAction extends WebMotionController { + + static private Log log = LogFactory.getLog(LinkAction.class); + + public Render addAttachment(ChoremClient client, String wikittyId) { + if (log.isDebugEnabled()) { + log.debug("add attachment for : " + wikittyId); + } + + // Prepare attachment + Wikitty attachment = new WikittyImpl(); + + // Load Attachment extension, and potential dependencies + List<String> extensionNames = Arrays.asList(Attachment.EXT_ATTACHMENT); + List<WikittyExtension> newExts = + client.restoreExtensionAndDependenciesLastVesion(extensionNames); + attachment.addExtension(newExts); + + // As we want to edit a wikitty by its extensions, we should edit the required extensions too + // Add the extension and required ones in the list of extensions to display + LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); + exts.addAll(newExts); + // Show all wikitty if no extension were mentioned + exts.addAll(attachment.getExtensions()); + + // Link target Wikitty + Wikitty linkedWikitty = client.restore(wikittyId, ".*"); + attachment.setField(Attachment.EXT_ATTACHMENT, Attachment.FIELD_ATTACHMENT_TARGET, linkedWikitty); + + return renderView("edit.jsp", "wikitty", attachment, "extensions", exts); + } + + public Render addContactDetails(ChoremClient client, String wikittyId) { + if (log.isDebugEnabled()) { + log.debug("add contact drtails for : " + wikittyId); + } + Wikitty w = client.restore(wikittyId, ".*"); + + Wikitty attachment = new WikittyImpl(); + + LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); + + // Load Attachment extension, and potential dependencies + List<String> extensionNames = Arrays.asList(ContactDetails.EXT_CONTACTDETAILS); + List<WikittyExtension> newExts = + client.restoreExtensionAndDependenciesLastVesion(extensionNames); + attachment.addExtension(newExts); + + // As we want to edit a wikitty by its extensions, we should edit the required extensions too + // Add the extension and required ones in the list of extensions to display + exts.addAll(newExts); + // Show all wikitty if no extension were mentioned + exts.addAll(attachment.getExtensions()); + + attachment.setField(ContactDetails.EXT_CONTACTDETAILS, ContactDetails.FIELD_CONTACTDETAILS_TARGET, w); + return renderView("edit.jsp", "wikitty", attachment, "extensions", exts); + } + +} Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2012-07-02 16:56:13 UTC (rev 202) +++ trunk/chorem-webmotion/src/main/resources/mapping 2012-07-03 09:46:27 UTC (rev 203) @@ -15,10 +15,12 @@ * / view:index.jsp * /wikitty/{extension}/search action:GenericAction.search * /wikitty/Employee/view/{id} action:GenericAction.extensionView extension=Employee +* /wikitty/Person/view/{id} action:GenericAction.extensionView extension=Person * /wikitty/{extension}/view/{id} action:GenericAction.view * /wikitty/Company/edit/{id} action:GenericAction.extensionEdit extension=Company * /wikitty/{extension}/edit/{id} action:GenericAction.edit -* /wikitty/{wikittyId}/Attachment/edit/new action:GenericAction.addAttachment +* /wikitty/{wikittyId}/Attachment/edit/new action:LinkAction.addAttachment +* /wikitty/{wikittyId}/ContactDetails/edit/new action:LinkAction.addContactDetails * /wikitty/{extension}/delete/{id} action:GenericAction.delete * /wikitty/search action:GenericAction.search * /wikitty/searchRelated?id={query} action:GenericAction.search Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp 2012-07-02 16:56:13 UTC (rev 202) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp 2012-07-03 09:46:27 UTC (rev 203) @@ -54,7 +54,7 @@ <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/Attachment/edit/new"/>"><i class="icon-plus icon-white"></i> Add Attachment</a> </p> <p> - <a class="btn btn-success" href="<c:url value="/wikitty/ContactDetails/edit/new"/>"><i class="icon-plus icon-white"></i> Add Contact Details</a> + <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/ContactDetails/edit/new"/>"><i class="icon-plus icon-white"></i> Add Contact Details</a> </p> <div class="container"> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/person/view.jsp 2012-07-03 09:46:27 UTC (rev 203) @@ -0,0 +1,53 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<p> + <c:if test="${not empty wikitty}"> + <a class="btn btn-success" href="<c:url value="/wikitty/view/${wikitty.id}"/>"><i class="icon-list icon-white"></i> View all extension</a> + <a class="btn btn-success" href="<c:url value="/wikitty/edit/${wikitty.id}"/>"><i class="icon-pencil icon-white"></i> Edit object</a> + <a class="btn btn-danger" href="<c:url value="/wikitty/delete/${wikitty.id}?wmDecoratorNo=true"/>"><i class="icon-trash icon-white"></i> Delete object</a> + </c:if> +</p> + + <dl><dt><a href="<c:url value="/wikitty/Person/search"/>">Personne</a> + <a class="btn btn-success btn-mini" href="<c:url value="/wikitty/Person/edit/${wikitty.id}"/>"><i class="icon-pencil icon-white"></i> Edit</a> + <a class="btn btn-danger btn-mini" href="<c:url value="/wikitty/delete/${wikitty.id}?extension=Person&wmDecoratorNo=true"/>"><i class="icon-trash icon-white"></i> Delete</a></dt> + <dd><w:display wikitty="${wikitty}" fqfield="Person.firstName"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Person.lastName"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Person.birthDate"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Person.diploma"/></dd> + </dl> + + <p> + <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/Attachment/edit/new"/>"><i class="icon-plus icon-white"></i> Add Attachment</a> + </p> + <p> + <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/ContactDetails/edit/new"/>"><i class="icon-plus icon-white"></i> Add Contact Details</a> + </p> + +<div class="container"> + <jsp:include page="/wikitty/searchRelated?id=${wikitty.id}"/> +</div>

1 0

r202 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions resources webapp/WEB-INF/jsp webapp/WEB-INF/jsp/company webapp/WEB-INF/jsp/employee
by ymartel＠users.chorem.org 02 Jul '12

02 Jul '12

Author: ymartel Date: 2012-07-02 18:56:13 +0200 (Mon, 02 Jul 2012) New Revision: 202 Url: http://chorem.org/repositories/revision/chorem/202 Log: add some specific pages : one for employee view & contact edit Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/company/ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/company/edit.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java trunk/chorem-webmotion/src/main/resources/mapping Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-02 10:03:29 UTC (rev 201) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2012-07-02 16:56:13 UTC (rev 202) @@ -382,6 +382,21 @@ return renderView("view.jsp", "wikitty", w, "extensions", exts); } + public Render extensionView(ChoremClient client, String id, String extension) { + log.debug("view: " + id); + Wikitty w = client.restore(id, ".*"); + + LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); + if (w != null) { + // Display the extensions and required ones for them + List<String> extensionNames = Arrays.asList(extension); + List<WikittyExtension> wikittyExtensions = client.restoreExtensionAndDependenciesLastVesion(extensionNames); + exts.addAll(wikittyExtensions); + } + + return renderView(StringUtils.lowerCase(extension) +"/view.jsp", "wikitty", w, "extensions", exts); + } + public Render edit(ChoremClient client, String id, String[] extension) { log.debug("edit: " + id); Wikitty w = client.restore(id, ".*"); @@ -413,6 +428,29 @@ return renderView("edit.jsp", "wikitty", w, "extensions", exts); } + public Render extensionEdit(ChoremClient client, String id, String extension) { + log.debug("edit: " + id); + Wikitty w = client.restore(id, ".*"); + + if (w == null) { + w = new WikittyImpl(); + } + + LinkedHashSet<WikittyExtension> exts = new LinkedHashSet<WikittyExtension>(); + + // If extension is not null, load all required extensions too + List<String> extensionNames = Arrays.asList(extension); + List<WikittyExtension> newExts = + client.restoreExtensionAndDependenciesLastVesion(extensionNames); + w.addExtension(newExts); + + // As we want to edit a wikitty by its extensions, we should edit the required extensions too + // Add the extension and required ones in the list of extensions to display + exts.addAll(newExts); + + return renderView(StringUtils.lowerCase(extension) + "/edit.jsp", "wikitty", w); + } + public Render addAttachment(ChoremClient client, String wikittyId) { log.debug("add attachment for : " + wikittyId); Wikitty w = client.restore(wikittyId, ".*"); Modified: trunk/chorem-webmotion/src/main/resources/mapping =================================================================== --- trunk/chorem-webmotion/src/main/resources/mapping 2012-07-02 10:03:29 UTC (rev 201) +++ trunk/chorem-webmotion/src/main/resources/mapping 2012-07-02 16:56:13 UTC (rev 202) @@ -14,7 +14,9 @@ [actions] * / view:index.jsp * /wikitty/{extension}/search action:GenericAction.search +* /wikitty/Employee/view/{id} action:GenericAction.extensionView extension=Employee * /wikitty/{extension}/view/{id} action:GenericAction.view +* /wikitty/Company/edit/{id} action:GenericAction.extensionEdit extension=Company * /wikitty/{extension}/edit/{id} action:GenericAction.edit * /wikitty/{wikittyId}/Attachment/edit/new action:GenericAction.addAttachment * /wikitty/{extension}/delete/{id} action:GenericAction.delete Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/company/edit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/company/edit.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/company/edit.jsp 2012-07-02 16:56:13 UTC (rev 202) @@ -0,0 +1,44 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<c:if test="${not empty wikitty}"> + <%//FIXME ymartel 2012/07/02 fix the need of iso accept charset ? %> + <form class="form-inline" method="post" accept-charset="ISO-8859-15" action="<c:url value="/wikitty/save"/>" enctype="multipart/form-data"> + <input type="hidden" name="id" value="${wikitty.id}"/> + <p> + <button class="btn btn-success" type="submit"><i class="icon-ok icon-white"></i> Save</button> + <a class="btn btn-info" href="/wikitty/view/${wikitty.id}"><i class="icon-remove icon-white"></i> Cancel</a> + </p> + + <p> + <input type="hidden" name="extension" value="Company"> + <dl><dt>Company</dt> + <dd>Nom : <w:input wikitty="${wikitty}" fqfield="Company.name"/> </dd> + <dd>Type : <w:input wikitty="${wikitty}" fqfield="Company.type"/> </dd> + </dl> + </p> + </form> +</c:if> Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp (rev 0) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employee/view.jsp 2012-07-02 16:56:13 UTC (rev 202) @@ -0,0 +1,62 @@ +<%-- + #%L + Chorem webmotion + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2011 - 2012 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> + +<p> + <c:if test="${not empty wikitty}"> + <a class="btn btn-success" href="<c:url value="/wikitty/view/${wikitty.id}"/>"><i class="icon-list icon-white"></i> View all extension</a> + <a class="btn btn-success" href="<c:url value="/wikitty/edit/${wikitty.id}"/>"><i class="icon-pencil icon-white"></i> Edit object</a> + <a class="btn btn-danger" href="<c:url value="/wikitty/delete/${wikitty.id}?wmDecoratorNo=true"/>"><i class="icon-trash icon-white"></i> Delete object</a> + </c:if> +</p> + + <dl><dt><a href="<c:url value="/wikitty/Employee/search"/>">Employé</a> + <a class="btn btn-success btn-mini" href="<c:url value="/wikitty/Employee/edit/${wikitty.id}"/>"><i class="icon-pencil icon-white"></i> Edit</a> + <a class="btn btn-danger btn-mini" href="<c:url value="/wikitty/delete/${wikitty.id}?extension=Employee&wmDecoratorNo=true"/>"><i class="icon-trash icon-white"></i> Delete</a></dt> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.company"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.person"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.description"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.salary"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.paidLeave"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.rtt"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.type"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Employee.workingTime"/></dd> + </dl> + <dl> + <dt><a href="<c:url value="/wikitty/search?extension=${ext.name}"/>">${ext.name}</a> + <dd><w:display wikitty="${wikitty}" fqfield="Interval.beginDate"/></dd> + <dd><w:display wikitty="${wikitty}" fqfield="Interval.endDate"/></dd> + </dl> + + <p> + <a class="btn btn-success" href="<c:url value="/wikitty/${wikitty.id}/Attachment/edit/new"/>"><i class="icon-plus icon-white"></i> Add Attachment</a> + </p> + <p> + <a class="btn btn-success" href="<c:url value="/wikitty/ContactDetails/edit/new"/>"><i class="icon-plus icon-white"></i> Add Contact Details</a> + </p> + +<div class="container"> + <jsp:include page="/wikitty/searchRelated?id=${wikitty.id}"/> +</div>

1 0

r201 - in trunk/chorem-webmotion/src/main: resources webapp/WEB-INF/jsp
by ymartel＠users.chorem.org 02 Jul '12

02 Jul '12

Author: ymartel Date: 2012-07-02 12:03:29 +0200 (Mon, 02 Jul 2012) New Revision: 201 Url: http://chorem.org/repositories/revision/chorem/201 Log: add a hack for the form encoding :/ should be removed as soon as possible Modified: trunk/chorem-webmotion/src/main/resources/log4j.properties trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/chorem-webmotion/src/main/resources/log4j.properties =================================================================== --- trunk/chorem-webmotion/src/main/resources/log4j.properties 2012-07-01 13:38:56 UTC (rev 200) +++ trunk/chorem-webmotion/src/main/resources/log4j.properties 2012-07-02 10:03:29 UTC (rev 201) @@ -1,3 +1,25 @@ +### +# #%L +# Chorem webmotion +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2011 - 2012 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=INFO, stdout, file Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-01 13:38:56 UTC (rev 200) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2012-07-02 10:03:29 UTC (rev 201) @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <!DOCTYPE html> @@ -28,7 +28,7 @@ <html> <head> <title>Chorem</title> - <meta charset="utf-8" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <%-- JQuery --%> <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2012-07-01 13:38:56 UTC (rev 200) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2012-07-02 10:03:29 UTC (rev 201) @@ -25,7 +25,8 @@ <%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%> <c:if test="${not empty wikitty}"> - <form class="form-inline" method="post" action="<c:url value="/wikitty/save"/>" enctype="multipart/form-data"> + <%//FIXME ymartel 2012/07/02 fix the need of iso accept charset ? %> + <form class="form-inline" method="post" accept-charset="ISO-8859-15" action="<c:url value="/wikitty/save"/>" enctype="multipart/form-data"> <input type="hidden" name="id" value="${wikitty.id}"/> <p> <button class="btn btn-success" type="submit"><i class="icon-ok icon-white"></i> Save</button>

1 0

r200 - in trunk/chorem-webmotion: . src/main/resources
by tchemit＠users.chorem.org 01 Jul '12

01 Jul '12

Author: tchemit Date: 2012-07-01 15:38:56 +0200 (Sun, 01 Jul 2012) New Revision: 200 Url: http://chorem.org/repositories/revision/chorem/200 Log: add a real log file Modified: trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/resources/log4j.properties Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2012-07-01 12:56:13 UTC (rev 199) +++ trunk/chorem-webmotion/pom.xml 2012-07-01 13:38:56 UTC (rev 200) @@ -223,6 +223,12 @@ <webAppConfig> <contextPath>/chorem</contextPath> </webAppConfig> + <systemProperties> + <systemProperty> + <name>chorem.log.dir</name> + <value>${basedir}/target</value> + </systemProperty> + </systemProperties> </configuration> </plugin> @@ -232,6 +238,9 @@ <configuration> <path>/chorem</path> <uriEncoding>UTF-8</uriEncoding> + <systemProperties> + <chorem.log.dir>${basedir}/target</chorem.log.dir> + </systemProperties> </configuration> </plugin> @@ -241,6 +250,9 @@ <configuration> <path>/chorem</path> <uriEncoding>UTF-8</uriEncoding> + <systemProperties> + <chorem.log.dir>${basedir}/target</chorem.log.dir> + </systemProperties> </configuration> </plugin> </plugins> Modified: trunk/chorem-webmotion/src/main/resources/log4j.properties =================================================================== --- trunk/chorem-webmotion/src/main/resources/log4j.properties 2012-07-01 12:56:13 UTC (rev 199) +++ trunk/chorem-webmotion/src/main/resources/log4j.properties 2012-07-01 13:38:56 UTC (rev 200) @@ -1,34 +1,19 @@ -### -# #%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=INFO, stdout +log4j.rootLogger=INFO, stdout, file # 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 +# FileAppender : need to have chorem.log.dir in system properties at application startup +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.File=${chorem.log.dir}/chorem.log +log4j.appender.file.MaxFileSize=10MB +log4j.appender.file.MaxBackupIndex=4 +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n + # package level log4j.logger.org.chorem=DEBUG log4j.logger.org.nuiton=INFO

1 0