June 2011 - Wikitty-commits - mailman.cloud.codelutin.com

r975 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag tld
by mfortun＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: mfortun Date: 2011-06-24 17:13:20 +0200 (Fri, 24 Jun 2011) New Revision: 975 Url: http://nuiton.org/repositories/revision/wikitty/975 Log: * change wikitty field model * update logic within field specialization Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-24 13:51:08 UTC (rev 974) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-24 15:13:20 UTC (rev 975) @@ -7,6 +7,9 @@ protected String type; protected Object value; protected String label; + + + public String getLabel() { return label; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java 2011-06-24 13:51:08 UTC (rev 974) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java 2011-06-24 15:13:20 UTC (rev 975) @@ -7,7 +7,26 @@ protected String criteria; protected String subtype; protected String label; + protected String descfields; + protected String fixvalues; + + public String getDescfields() { + return descfields; + } + + public void setDescfields(String descfields) { + this.descfields = descfields; + } + + public String getFixvalues() { + return fixvalues; + } + + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + public String getName() { return name; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-24 13:51:08 UTC (rev 974) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-24 15:13:20 UTC (rev 975) @@ -19,10 +19,10 @@ protected String include = ""; protected String exclude = ""; protected String order = ""; - protected List<FieldSpecialisation> field; + protected Map<String,FieldSpecialisation> field; public WikittyFieldHandler() { - field = new LinkedList<FieldSpecialisation>(); + field = new HashMap<String,FieldSpecialisation>(); } public Wikitty getWikitty() { @@ -65,17 +65,18 @@ this.order = order; } - public List<FieldSpecialisation> getField() { + + public Map<String, FieldSpecialisation> getField() { return field; } - public void setField(List<FieldSpecialisation> field) { + public void setField(Map<String, FieldSpecialisation> field) { this.field = field; } public void specialiseField(FieldSpecialisation fieldSpe) { - field.add(fieldSpe); + field.put(fieldSpe.getName(),fieldSpe); } public Collection<ExtensionFieldStrutsBean> getWikittyField() { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-24 13:51:08 UTC (rev 974) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-24 15:13:20 UTC (rev 975) @@ -10,35 +10,11 @@ @StrutsTag(name = "field", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyFieldTag", description = "Renders an input form", allowDynamicAttributes = false) public class WikittyFieldTagBean extends ClosingUIBean { - protected String subtype; - protected String criteria; - protected String type; - protected String label; + + protected FieldSpecialisation specialize; + + - public String getSubtype() { - return subtype; - } - - public void setSubtype(String subtype) { - this.subtype = subtype; - } - - public String getCriteria() { - return criteria; - } - - public void setCriteria(String criteria) { - this.criteria = criteria; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public WikittyFieldTagBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -60,53 +36,19 @@ super.evaluateExtraParams(); WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext() - .get(WikittyTagBean.WIKITTY_STACK_KEY); - - FieldSpecialisation spe = new FieldSpecialisation(); - spe.setCriteria(criteria); - spe.setName(name); - spe.setSubtype(subtype); - spe.setType(type); - spe.setLabel(label); + .get(WikittyTagBean.WIKITTY_STACK_KEY); + handler.specialiseField(specialize); - handler.specialiseField(spe); - - - /* - * if (validate != null) { addParameter("validate", findValue(validate, - * Boolean.class)); } - * - * if (name == null) { //make the name the same as the id String id = - * (String) getParameters().get("id"); if (StringUtils.isNotEmpty(id)) { - * addParameter("name", id); } } - * - * if (onsubmit != null) { addParameter("onsubmit", - * findString(onsubmit)); } - * - * if (onreset != null) { addParameter("onreset", findString(onreset)); - * } - * - * if (target != null) { addParameter("target", findString(target)); } - * - * if (enctype != null) { addParameter("enctype", findString(enctype)); - * } - * - * if (method != null) { addParameter("method", findString(method)); } - * - * if (acceptcharset != null) { addParameter("acceptcharset", - * findString(acceptcharset)); } - * - * // keep a collection of the tag names for anything special the - * templates might want to do (such as pure client // side validation) - * if (!parameters.containsKey("tagNames")) { // we have this if check - * so we don't do this twice (on open and close of the template) - * addParameter("tagNames", new ArrayList()); } - * - * if (focusElement != null) { addParameter("focusElement", - * findString(focusElement)); } - */ } + public FieldSpecialisation getSpecialize() { + return specialize; + } + + public void setSpecialize(FieldSpecialisation specialize) { + this.specialize = specialize; + } + public String getLabel() { return label; } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java 2011-06-24 13:51:08 UTC (rev 974) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/WikittyFieldTag.java 2011-06-24 15:13:20 UTC (rev 975) @@ -5,6 +5,7 @@ import org.apache.struts2.components.Component; import org.apache.struts2.views.jsp.ui.AbstractClosingTag; +import org.nuiton.wikitty.struts.component.FieldSpecialisation; import org.nuiton.wikitty.struts.component.WikittyFieldTagBean; import com.opensymphony.xwork2.util.ValueStack; @@ -19,7 +20,25 @@ protected String subtype; protected String criteria; protected String type; + protected String fixvalues; + protected String descfields; + + public String getFixvalues() { + return fixvalues; + } + public void setFixvalues(String fixvalues) { + this.fixvalues = fixvalues; + } + + public String getDescfields() { + return descfields; + } + + public void setDescfields(String descfields) { + this.descfields = descfields; + } + public String getSubtype() { return subtype; } @@ -55,11 +74,15 @@ protected void populateParams() { super.populateParams(); WikittyFieldTagBean fieldtag = ((WikittyFieldTagBean) component); - fieldtag.setName(name); - fieldtag.setType(type); - fieldtag.setSubtype(subtype); - fieldtag.setCriteria(criteria); - + + FieldSpecialisation spe = new FieldSpecialisation(); + spe.setName(name); + spe.setType(type); + spe.setSubtype(subtype); + spe.setCriteria(criteria); + spe.setFixvalues(fixvalues); + spe.setDescfields(descfields); + fieldtag.setSpecialize(spe); } public String getName() { Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-24 13:51:08 UTC (rev 974) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-24 15:13:20 UTC (rev 975) @@ -76,9 +76,18 @@ <name>criteria</name> <rtexprvalue>true</rtexprvalue> </attribute> + + <attribute> + <name>fixvalues</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + + <attribute> + <name>descfields</name> + <rtexprvalue>true</rtexprvalue> + </attribute> </tag> - </taglib>

1 0

r974 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component tld
by mfortun＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: mfortun Date: 2011-06-24 15:51:08 +0200 (Fri, 24 Jun 2011) New Revision: 974 Url: http://nuiton.org/repositories/revision/wikitty/974 Log: * taglib descriptor forgot by the previous commit. * remove unused constructor Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-24 13:41:11 UTC (rev 973) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-24 13:51:08 UTC (rev 974) @@ -32,15 +32,5 @@ public void setValue(Object value) { this.value = value; } - - public ExtensionFieldStrutsBean() { - super(); - - } - - - - - - + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-24 13:41:11 UTC (rev 973) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-24 13:51:08 UTC (rev 974) @@ -5,9 +5,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; - import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.FieldType; @@ -24,7 +22,6 @@ protected List<FieldSpecialisation> field; public WikittyFieldHandler() { - super(); field = new LinkedList<FieldSpecialisation>(); } Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-24 13:41:11 UTC (rev 973) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-24 13:51:08 UTC (rev 974) @@ -55,11 +55,16 @@ <tag> <name>field</name> <tagclass>org.nuiton.wikitty.struts.tag.WikittyFieldTag</tagclass> + <bodycontent>empty</bodycontent> <attribute> <name>name</name> <rtexprvalue>true</rtexprvalue> </attribute> <attribute> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> <name>subtype</name> <rtexprvalue>true</rtexprvalue> </attribute>

1 0

r973 - in trunk/wikitty-struts/src/main/java: org/nuiton/wikitty/struts/component template/xhtml
by mfortun＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: mfortun Date: 2011-06-24 15:41:11 +0200 (Fri, 24 Jun 2011) New Revision: 973 Url: http://nuiton.org/repositories/revision/wikitty/973 Log: * add ordering * complete model for field tag Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-24 12:20:56 UTC (rev 972) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-24 13:41:11 UTC (rev 973) @@ -6,8 +6,14 @@ protected String name; protected String type; protected Object value; - - + protected String label; + + public String getLabel() { + return label; + } + public void setLabel(String label) { + this.label = label; + } public String getName() { return name; } @@ -31,13 +37,8 @@ super(); } - public ExtensionFieldStrutsBean(String name, String type, Object value) { - super(); - this.name = name; - this.type = type; - this.value = value; - } + Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java 2011-06-24 12:20:56 UTC (rev 972) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldSpecialisation.java 2011-06-24 13:41:11 UTC (rev 973) @@ -6,6 +6,7 @@ protected String type; protected String criteria; protected String subtype; + protected String label; public String getName() { return name; @@ -39,4 +40,12 @@ this.subtype = subtype; } + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-24 12:20:56 UTC (rev 972) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-24 13:41:11 UTC (rev 973) @@ -1,5 +1,6 @@ package org.nuiton.wikitty.struts.component; +import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -17,13 +18,14 @@ protected Wikitty wikitty; protected WikittyProxy proxy; - protected String include; - protected String exclude; - protected String order; + protected String include = ""; + protected String exclude = ""; + protected String order = ""; protected List<FieldSpecialisation> field; public WikittyFieldHandler() { super(); + field = new LinkedList<FieldSpecialisation>(); } public Wikitty getWikitty() { @@ -76,12 +78,12 @@ } public void specialiseField(FieldSpecialisation fieldSpe) { - + field.add(fieldSpe); } - public List<ExtensionFieldStrutsBean> getWikittyField() { + public Collection<ExtensionFieldStrutsBean> getWikittyField() { - List<ExtensionFieldStrutsBean> result = new LinkedList<ExtensionFieldStrutsBean>(); + Map<String, ExtensionFieldStrutsBean> mapField = new HashMap<String, ExtensionFieldStrutsBean>(); /* * if no include defined, by default will select all wikitty field @@ -171,6 +173,7 @@ ExtensionFieldStrutsBean temp = new ExtensionFieldStrutsBean(); temp.setName(extName + "." + fieldName); + temp.setLabel(temp.getName()); temp.setValue(""); switch (fieldType.getType()) { @@ -210,11 +213,33 @@ } } - result.add(temp); + mapField.put(temp.getName(), temp); } } - return result; + String[] fieldOrder = StringUtil.split(order, ","); + + /* + * if an order is define parse order and construct ordering result + * if all the field are not defined in the order juste add the rest + * at the end of the result list. + */ + if (fieldOrder.length != 0) { + + List<ExtensionFieldStrutsBean> orderedResult = new LinkedList<ExtensionFieldStrutsBean>(); + + for (String orderIt : fieldOrder) { + + if (mapField.containsKey(orderIt)) { + orderedResult.add(mapField.remove(orderIt)); + } + + } + orderedResult.addAll(mapField.values()); + return orderedResult; + } + + return mapField.values(); } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-24 12:20:56 UTC (rev 972) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldTagBean.java 2011-06-24 13:41:11 UTC (rev 973) @@ -13,6 +13,7 @@ protected String subtype; protected String criteria; protected String type; + protected String label; public String getSubtype() { return subtype; @@ -66,6 +67,7 @@ spe.setName(name); spe.setSubtype(subtype); spe.setType(type); + spe.setLabel(label); handler.specialiseField(spe); @@ -105,4 +107,12 @@ */ } + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + } Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-24 12:20:56 UTC (rev 972) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-24 13:41:11 UTC (rev 973) @@ -4,29 +4,29 @@ <#if aKey.type=="file"> <input type="hidden" name="${aKey.name}" value="BINARY" /> -<input type="file" name="File" label ="File"/> +${aKey.label} : <input type="file" name="File" label ="File"/> </#if> + +<#if aKey.type=="hidden"> +<input type="hidden" name="${aKey.name}" value="${aKey.value}" /> +</#if> + + <#if aKey.type=="textarea" > -<textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> +${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> </#if> <#if aKey.type=="textfield" > -<input type="text" name="${aKey.name}" value="${aKey.value}" > +${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" > </#if> <#if aKey.type=="boolean" > -<input type="checkbox" name="${aKey.name}" value="true" +${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true" <#if aKey.value=="true" > checked='true' </#if> /> </#if> -<#-- -/*<#if parameters.nullable?? > -*<input type="checkbox" name="isNull- ${aKey.name}" -* value="true" " checkedNull "/>(null)" -*</#if>*/ ---> </br> </#list><#t/>

1 0

r972 - in trunk/wikitty-jdbc: . src/test/java/org/nuiton/wikitty/services
by echatellier＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: echatellier Date: 2011-06-24 14:20:56 +0200 (Fri, 24 Jun 2011) New Revision: 972 Url: http://nuiton.org/repositories/revision/wikitty/972 Log: Need to be in compile scope for deprecated stuff issue Modified: trunk/wikitty-jdbc/pom.xml trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-06-24 12:15:57 UTC (rev 971) +++ trunk/wikitty-jdbc/pom.xml 2011-06-24 12:20:56 UTC (rev 972) @@ -25,7 +25,7 @@ <groupId>${project.groupId}</groupId> <artifactId>wikitty-solr</artifactId> <version>${project.version}</version> - <scope>test</scope> +  </dependency> <dependency> <groupId>${project.groupId}</groupId> Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2011-06-24 12:15:57 UTC (rev 971) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2011-06-24 12:20:56 UTC (rev 972) @@ -1,6 +1,6 @@ /* * #%L - * Wikitty :: wikitty-jdbc-impl + * Wikitty :: wikitty-jdbc * * $Id$ * $HeadURL$ @@ -22,13 +22,12 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ + package org.nuiton.wikitty.services; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyConfigOption; /**

1 0

r971 - in trunk/wikitty-jdbc/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/services
by echatellier＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: echatellier Date: 2011-06-24 14:15:57 +0200 (Fri, 24 Jun 2011) New Revision: 971 Url: http://nuiton.org/repositories/revision/wikitty/971 Log: Deplacement du service dans les test (pas de raison qu'il soit dans le main) Added: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java Removed: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/ Copied: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java (from rev 959, trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java) =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java (rev 0) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-06-24 12:15:57 UTC (rev 971) @@ -0,0 +1,81 @@ +/* + * #%L + * Wikitty :: wikitty-jdbc-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.wikitty.services; + + +import java.io.File; +import java.util.UUID; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.solr.core.RAMDirectoryFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; +import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; +import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; +import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; + +/** + * In memory implementation that use in memory h2 and in memory solr + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceInMemoryJdbcSolr extends WikittyServiceStorage { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyServiceInMemoryJdbcSolr.class); + + public WikittyServiceInMemoryJdbcSolr() { + super(null, null, null); + + // we use unique db name (this permit to use simultaneously many + // WikittyServiceInMemoryJdbcSolr) + String dbName = "wikitty-tx-" + UUID.randomUUID().toString(); + ApplicationConfig config = WikittyConfig.getConfig(); + config.setOption(WikittyConfigOption. + WIKITTY_STORAGE_JDBC_URL.getKey(), + "jdbc:h2:mem:" + dbName); + // solr meme en RAMDirectoryFactory peut creer des fichiers si + // la config est mauvaise, pour prevenir tous problemes on fixe un + // repertoire unique si jamais ca arrive pour eviter les problemes + config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), + config.getOption("java.io.tmpdir") + File.separator + dbName); + config.setOption(WikittyConfigOption. + WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(), + RAMDirectoryFactory.class.getName()); + // others defaults value in config normaly is correct + // - WIKITTY_STORAGE_JDBC* + // - WIKITTY_STORAGE_JDBC_XADATASOURCE* + + extensionStorage = new WikittyExtensionStorageJDBC(config); + wikittyStorage = new WikittyStorageJDBC(config, extensionStorage); + searchEngine = new WikittySearchEngineSolr(config, extensionStorage); + } + +}

1 0

r970 - in trunk/wikitty-struts/src/main/java: org/nuiton/wikitty/struts/component template/xhtml
by mfortun＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: mfortun Date: 2011-06-24 13:39:42 +0200 (Fri, 24 Jun 2011) New Revision: 970 Url: http://nuiton.org/repositories/revision/wikitty/970 Log: * include/exclude mechanism works Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-23 16:16:58 UTC (rev 969) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-24 11:39:42 UTC (rev 970) @@ -6,6 +6,8 @@ protected String name; protected String type; protected Object value; + + public String getName() { return name; } @@ -24,17 +26,19 @@ public void setValue(Object value) { this.value = value; } + + public ExtensionFieldStrutsBean() { + super(); + + } public ExtensionFieldStrutsBean(String name, String type, Object value) { + super(); this.name = name; this.type = type; this.value = value; } - public ExtensionFieldStrutsBean() { - super(); - } - Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-23 16:16:58 UTC (rev 969) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-24 11:39:42 UTC (rev 970) @@ -1,10 +1,17 @@ package org.nuiton.wikitty.struts.component; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; +import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; public class WikittyFieldHandler { @@ -74,18 +81,140 @@ public List<ExtensionFieldStrutsBean> getWikittyField() { - List<ExtensionFieldStrutsBean> list = new LinkedList<ExtensionFieldStrutsBean>(); + List<ExtensionFieldStrutsBean> result = new LinkedList<ExtensionFieldStrutsBean>(); - for (String fielNa : wikitty.getAllFieldNames()) { - ExtensionFieldStrutsBean temp = new ExtensionFieldStrutsBean( - fielNa, "textfield", null); - // TODO mfortun-2011-06-23 handle field with specific wikitty class - // ? + /* + * if no include defined, by default will select all wikitty field + * except ones which are exclude + * + * excluded fields are more important than included, if a field is + * included and excluded, it will not appear in the result + */ - list.add(temp); + // parse include and exclude + String[] excludeTab = StringUtil.split(exclude, ","); + String[] includeTab = StringUtil.split(include, ","); + + // if include is enable it change how to construct result + boolean includeEnable = includeTab.length != 0; + + Map<String, List<String>> excludeMap = new HashMap<String, List<String>>(); + Map<String, List<String>> includeMap = new HashMap<String, List<String>>(); + + // prepare list of excluded field and extension + for (String excludeIt : excludeTab) { + String[] extfield = StringUtil.split(excludeIt, "."); + if (extfield.length == 2) { + List<String> listFields = excludeMap.get(extfield[0]); + if (listFields == null) { + listFields = new LinkedList<String>(); + } + listFields.add(extfield[1]); + excludeMap.put(extfield[0], listFields); + + } else { + // TODO mfortun-2011-06-24 exception + } + } - return list; + // prepare list of included field and extension + if (includeEnable) { + + for (String includeIt : includeTab) { + String[] extfield = StringUtil.split(includeIt, "."); + if (extfield.length == 2) { + List<String> listFields = includeMap.get(extfield[0]); + if (listFields == null) { + listFields = new LinkedList<String>(); + } + listFields.add(extfield[1]); + includeMap.put(extfield[0], listFields); + + } else { + // TODO mfortun-2011-06-24 exception + } + + } + + } + + for (WikittyExtension ext : wikitty.getExtensions()) { + String extName = ext.getName(); + + /* + * if extension excluded or not include while include is enable jump + * to the next extension + */ + if ((excludeMap.containsKey(extName) && excludeMap.get(extName) + .contains("*")) + || (includeEnable && !includeMap.containsKey(extName))) { + continue; + + } + + for (String fieldName : ext.getFieldNames()) { + FieldType fieldType = wikitty.getExtension(extName) + .getFieldType(fieldName); + /* + * if field is excluded or field not included while include mode + * jump to the next field + */ + if ((excludeMap.containsKey(extName) && excludeMap.get(extName) + .contains(fieldName)) + || (includeEnable && !includeMap.get(extName).contains( + fieldName))) { + continue; + + } + + ExtensionFieldStrutsBean temp = new ExtensionFieldStrutsBean(); + + temp.setName(extName + "." + fieldName); + temp.setValue(""); + + switch (fieldType.getType()) { + case BINARY: + temp.setType("file"); + + break; + case BOOLEAN: + boolean valueBool = wikitty.getFieldAsBoolean( + ext.getName(), fieldName); + temp.setType("boolean"); + temp.setValue(valueBool); + + break; + default: + Object valueObject = wikitty.getFieldAsObject( + ext.getName(), fieldName); + String valueString = ""; + String checkedNull = ""; + if (valueObject != null) { + valueString = String.valueOf(valueObject); + } else { + checkedNull = "checked='true'"; + } + + temp.setValue(valueString); + + valueString = StringEscapeUtils.escapeHtml(valueString); + if (valueString.contains("\n") + || "true" + .equals(fieldType.getTagValue("multiline"))) { + temp.setType("textarea"); + + } else { + temp.setType("textfield"); + + } + + } + result.add(temp); + } + } + + return result; } } Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-23 16:16:58 UTC (rev 969) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-24 11:39:42 UTC (rev 970) @@ -14,13 +14,20 @@ </#if> <#if aKey.type=="boolean" > -<input type="checkbox" name="${aKey.name}" value="true" "checked " /> +<input type="checkbox" name="${aKey.name}" value="true" + <#if aKey.value=="true" > + checked='true' + </#if> + /> </#if> -<#if parametters.nulle?? > - <input type="checkbox" name="isNull- ${aKey.name}" - value="true" " checkedNull "/>(null)" -</#if> - + +<#-- +/*<#if parameters.nullable?? > +*<input type="checkbox" name="isNull- ${aKey.name}" +* value="true" " checkedNull "/>(null)" +*</#if>*/ +--> +</br> </#list><#t/>

1 0

r969 - in trunk/wikitty-struts/src/main/java: org/nuiton/wikitty/struts/component template/xhtml
by mfortun＠users.nuiton.org 23 Jun '11

23 Jun '11

Author: mfortun Date: 2011-06-23 18:16:58 +0200 (Thu, 23 Jun 2011) New Revision: 969 Url: http://nuiton.org/repositories/revision/wikitty/969 Log: * complete partially wikitty template Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-23 15:24:40 UTC (rev 968) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java 2011-06-23 16:16:58 UTC (rev 969) @@ -5,7 +5,7 @@ protected String name; protected String type; - protected Object Value; + protected Object value; public String getName() { return name; } @@ -19,16 +19,20 @@ this.type = type; } public Object getValue() { - return Value; + return value; } public void setValue(Object value) { - Value = value; + this.value = value; } public ExtensionFieldStrutsBean(String name, String type, Object value) { this.name = name; this.type = type; - Value = value; + this.value = value; } + public ExtensionFieldStrutsBean() { + super(); + + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-23 15:24:40 UTC (rev 968) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java 2011-06-23 16:16:58 UTC (rev 969) @@ -1,5 +1,6 @@ package org.nuiton.wikitty.struts.component; +import java.util.LinkedList; import java.util.List; import org.nuiton.wikitty.WikittyProxy; @@ -12,82 +13,79 @@ protected String include; protected String exclude; protected String order; - protected List<FieldSpecialisation> field; - + protected List<FieldSpecialisation> field; + public WikittyFieldHandler() { super(); } - public Wikitty getWikitty() { return wikitty; } - public void setWikitty(Wikitty wikitty) { this.wikitty = wikitty; } - public WikittyProxy getProxy() { return proxy; } - public void setProxy(WikittyProxy proxy) { this.proxy = proxy; } - public String getInclude() { return include; } - public void setInclude(String include) { this.include = include; } - public String getExclude() { return exclude; } - public void setExclude(String exclude) { this.exclude = exclude; } - public String getOrder() { return order; } - public void setOrder(String order) { this.order = order; } - public List<FieldSpecialisation> getField() { + return field; } - public void setField(List<FieldSpecialisation> field) { this.field = field; } + public void specialiseField(FieldSpecialisation fieldSpe) { - public void specialiseField(FieldSpecialisation fieldSpe){ - } - - - public List<ExtensionFieldStrutsBean> getWikittyField(){ - return null; + + public List<ExtensionFieldStrutsBean> getWikittyField() { + + List<ExtensionFieldStrutsBean> list = new LinkedList<ExtensionFieldStrutsBean>(); + + for (String fielNa : wikitty.getAllFieldNames()) { + ExtensionFieldStrutsBean temp = new ExtensionFieldStrutsBean( + fielNa, "textfield", null); + // TODO mfortun-2011-06-23 handle field with specific wikitty class + // ? + + list.add(temp); + } + + return list; } - - - + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-23 15:24:40 UTC (rev 968) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-23 16:16:58 UTC (rev 969) @@ -24,7 +24,7 @@ protected String include; protected String exclude; protected String order; - protected boolean allowDelete; + protected Boolean allowDelete; public WikittyTagBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -43,27 +43,34 @@ addParameter("redirect", findString(redirect)); } + if (allowDelete != null) { + addParameter("allowDelete", allowDelete); + } + + if (wikitty != null) { + addParameter("wikittyid", findString(wikitty.getId())); + addParameter("wikittyversion", findString(wikitty.getVersion())); + addParameter("wikittyextensions", findString(wikitty + .getExtensionNames().toString())); + } + Object temp = stack.getContext().get(WIKITTY_STACK_KEY); WikittyFieldHandler handler; if (temp == null) { handler = new WikittyFieldHandler(); stack.getContext().put(WIKITTY_STACK_KEY, handler); - + handler.setExclude(exclude); handler.setInclude(include); handler.setOrder(order); handler.setWikitty(wikitty); handler.setProxy(proxy); - + } else { handler = (WikittyFieldHandler) temp; - handler.getField(); + addParameter("wikittyfields", handler.getWikittyField()); } - - - - /* * * si l'élément key est null on l'initialise en y mettant tout les Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-23 15:24:40 UTC (rev 968) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl 2011-06-23 16:16:58 UTC (rev 969) @@ -1 +1,31 @@ -</wikitty > + +<#assign aKeys = parameters.wikittyfields><#t/> + <#list aKeys as aKey><#t/> + +<#if aKey.type=="file"> +<input type="hidden" name="${aKey.name}" value="BINARY" /> +<input type="file" name="File" label ="File"/> +</#if> +<#if aKey.type=="textarea" > +<textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> +</#if> +<#if aKey.type=="textfield" > +<input type="text" name="${aKey.name}" value="${aKey.value}" > +</#if> + +<#if aKey.type=="boolean" > +<input type="checkbox" name="${aKey.name}" value="true" "checked " /> +</#if> +<#if parametters.nulle?? > + <input type="checkbox" name="isNull- ${aKey.name}" + value="true" " checkedNull "/>(null)" +</#if> + +</#list><#t/> + + +<input type="submit" name="store" value="Store" /> +<#if parameters.allowDelete?? && parameters.allowDelete==true > +<input type="submit" name="delete" value="Delete" /> +</#if> +</form> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-23 15:24:40 UTC (rev 968) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-23 16:16:58 UTC (rev 969) @@ -1 +1,7 @@ -<wikitty > +<form class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" > +<input type="hidden" name="id" value="${parameters.wikittyid}" /> +<input type="hidden" name="version" value="${parameters.wikittyversion}" /> +<input type="hidden" name="extensions" value="${parameters.wikittyextensions}"/> +<#if parameters.redirect??> +<input type="hidden" name="redirect" value="${parameters.redirect}" /> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl 2011-06-23 15:24:40 UTC (rev 968) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl 2011-06-23 16:16:58 UTC (rev 969) @@ -1 +0,0 @@ -</field > Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl 2011-06-23 15:24:40 UTC (rev 968) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl 2011-06-23 16:16:58 UTC (rev 969) @@ -1,3 +0,0 @@ -<field > -${parameters.name}<#rt/> -${parameters.truc.ig}<#rt/> \ No newline at end of file

1 0

r968 - trunk/wikitty-solr
by echatellier＠users.nuiton.org 23 Jun '11

23 Jun '11

Author: echatellier Date: 2011-06-23 17:24:40 +0200 (Thu, 23 Jun 2011) New Revision: 968 Url: http://nuiton.org/repositories/revision/wikitty/968 Log: Add doc about exclude Modified: trunk/wikitty-solr/pom.xml Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-06-23 15:16:05 UTC (rev 967) +++ trunk/wikitty-solr/pom.xml 2011-06-23 15:24:40 UTC (rev 968) @@ -48,6 +48,7 @@ <artifactId>solr-core</artifactId> <exclusions> <exclusion> +  <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> </exclusion>

1 0

r967 - trunk/wikitty-jdbc
by echatellier＠users.nuiton.org 23 Jun '11

23 Jun '11

Author: echatellier Date: 2011-06-23 17:16:05 +0200 (Thu, 23 Jun 2011) New Revision: 967 Url: http://nuiton.org/repositories/revision/wikitty/967 Log: Ca a rien n'a faire l?\195?\160 Modified: trunk/wikitty-jdbc/pom.xml Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-06-23 15:14:56 UTC (rev 966) +++ trunk/wikitty-jdbc/pom.xml 2011-06-23 15:16:05 UTC (rev 967) @@ -34,20 +34,8 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - </exclusion> - </exclusions> - </dependency> - -  +  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>

1 0

r966 - trunk/wikitty-jdbc
by echatellier＠users.nuiton.org 23 Jun '11

23 Jun '11

Author: echatellier Date: 2011-06-23 17:14:56 +0200 (Thu, 23 Jun 2011) New Revision: 966 Url: http://nuiton.org/repositories/revision/wikitty/966 Log: For jdbc, solr must be in test scope Modified: trunk/wikitty-jdbc/pom.xml Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-06-23 15:09:20 UTC (rev 965) +++ trunk/wikitty-jdbc/pom.xml 2011-06-23 15:14:56 UTC (rev 966) @@ -25,6 +25,7 @@ <groupId>${project.groupId}</groupId> <artifactId>wikitty-solr</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId>

1 0