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

r1036 - in trunk/wikitty-struts/src/main: java/org/nuiton/wikitty/struts/component java/org/nuiton/wikitty/struts/tag java/template/xhtml tld
by mfortun＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: mfortun Date: 2011-07-01 17:45:35 +0200 (Fri, 01 Jul 2011) New Revision: 1036 Url: http://nuiton.org/repositories/revision/wikitty/1036 Log: * base class + template for date tag Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java trunk/wikitty-struts/src/main/java/template/xhtml/ws-date-close.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2011-07-01 15:45:35 UTC (rev 1036) @@ -0,0 +1,76 @@ +package org.nuiton.wikitty.struts.component; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + +import com.opensymphony.xwork2.util.ValueStack; + +public class DateBean extends AbstractWikittyComponent { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(DateBean.class); + + public static final String OPEN_TEMPLATE = "ws-date"; + public static final String TEMPLATE = "ws-date-close"; + + + protected Boolean enableHour = false; + + public DateBean(ValueStack stack, HttpServletRequest request, + HttpServletResponse response) { + super(stack, request, response); + + } + + @Override + protected void evaluateExtraParams() { + super.evaluateExtraParams(); + + + + // if field defined as inclued + if (handler.isIncluded(fqFieldName)) { + // parse extname and field name + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); + // add parametters to be use by the template + addParameter("included", true); + + Object val = handler.getWikitty().getFieldAsDate(fieldsAccess[0], + fieldsAccess[1]); + val = val==null?"":val; + + + addParameter("value",val); + if ( enableHour !=null) { + addParameter("enableHour", enableHour); + } + + handler.addAddedField(fqFieldName); + } + + + + + } + + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + + public Boolean getEnableHour() { + return enableHour; + } + + public void setEnableHour(Boolean enableHour) { + this.enableHour = enableHour; + } + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java 2011-07-01 15:45:35 UTC (rev 1036) @@ -0,0 +1,48 @@ +package org.nuiton.wikitty.struts.tag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.struts2.components.Component; +import org.nuiton.wikitty.struts.component.DateBean; +import com.opensymphony.xwork2.util.ValueStack; + +public class DateTag extends AbstractWikittyTag{ + + /** + * + */ + private static final long serialVersionUID = 8514230617417184770L; + + + protected Boolean enableHour; + + @Override + public Component getBean(ValueStack stack, HttpServletRequest req, + HttpServletResponse res) { + return new DateBean(stack, req, res); + + } + + + @Override + protected void populateParams() { + super.populateParams(); + DateBean datebean = (DateBean) component; + datebean.setEnableHour(enableHour); + + } + + + public Boolean getEnableHour() { + return enableHour; + } + + public void setEnableHour(Boolean enableHour) { + this.enableHour = enableHour; + } + + + + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl (rev 0) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-date.ftl 2011-07-01 15:45:35 UTC (rev 1036) @@ -0,0 +1,5 @@ +<#if parameters.included?? && parameters.included==true > +${parameters.label} : <input id="datepicker" name="${parameters.fqFieldName}" type="text" value="${parameters.value}"> </p> +</#if><#t/> + + Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-01 15:13:56 UTC (rev 1035) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-01 15:45:35 UTC (rev 1036) @@ -157,6 +157,30 @@ <required>true</required> </attribute> </tag> + + <tag> + <name>date</name> + <tagclass>org.nuiton.wikitty.struts.tag.DateTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <description><![CDATA[the name of the field that have to be specialize]]></description> + <name>fqFieldName</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>label</name> + <rtexprvalue>true</rtexprvalue> + <required>true</required> + </attribute> + <attribute> + <description><![CDATA[the label of the field]]></description> + <name>enableHour</name> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + <tag> <name>textArea</name>

1 0

r1035 - in trunk: . wikitty-api/src/license wikitty-jdbc wikitty-jdbc/src/test/java/org/nuiton/wikitty/services wikitty-solr wikitty-solr/src/license
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 17:13:56 +0200 (Fri, 01 Jul 2011) New Revision: 1035 Url: http://nuiton.org/repositories/revision/wikitty/1035 Log: Fix dependencies. jbossjta contains a lot a useless dependencies Modified: trunk/pom.xml trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc/pom.xml trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-solr/pom.xml trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/pom.xml 2011-07-01 15:13:56 UTC (rev 1035) @@ -120,7 +120,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.6.1</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> <dependency> @@ -214,6 +214,88 @@ <artifactId>jcl-over-slf4j</artifactId> <groupId>org.slf4j</groupId> </exclusion> + <exclusion> + <artifactId>jboss-server-manager</artifactId> + <groupId>org.jboss.jbossas</groupId> + </exclusion> + <exclusion> + <artifactId>commons-httpclient</artifactId> + <groupId>commons-httpclient</groupId> + </exclusion> + <exclusion> + <artifactId>emma</artifactId> + <groupId>emma</groupId> + </exclusion> + <exclusion> + <artifactId>emma_ant</artifactId> + <groupId>emma</groupId> + </exclusion> + <exclusion> + <artifactId>jbossws-common</artifactId> + <groupId>org.jboss.ws</groupId> + </exclusion> + <exclusion> + <artifactId>jacorb</artifactId> + <groupId>jacorb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + </exclusion> + <exclusion> + <artifactId>idl</artifactId> + <groupId>jacorb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-corba-ots-spi</artifactId> + <groupId>org.jboss.integration</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-remoting</artifactId> + <groupId>org.jboss.remoting</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <groupId>org.jboss.spec.javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>ironjacamar-spec-api</artifactId> + <groupId>org.jboss.ironjacamar</groupId> + </exclusion> + <exclusion> + <artifactId>netty</artifactId> + <groupId>org.jboss.netty</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + <exclusion> + <artifactId>hornetq-core</artifactId> + <groupId>org.hornetq</groupId> + </exclusion> + <exclusion> + <artifactId>wrapper</artifactId> + <groupId>tanukisoft</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-generator</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-processor</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId> + jboss-transaction-api_1.1_spec + </artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + </exclusion> </exclusions> </dependency> Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-07-01 15:13:56 UTC (rev 1035) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 @@ -8,18 +8,23 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 +# - lgpl +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Jan 27 11:01:32 CET 2011 +#Fri Jul 01 16:43:22 CEST 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +dom4j--dom4j--1.6.1--jar=BSD License javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-jdbc/pom.xml 2011-07-01 15:13:56 UTC (rev 1035) @@ -28,6 +28,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-07-01 15:13:56 UTC (rev 1035) @@ -24,7 +24,6 @@ */ package org.nuiton.wikitty.services; - import java.io.File; import java.util.UUID; import org.apache.commons.logging.Log; Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-solr/pom.xml 2011-07-01 15:13:56 UTC (rev 1035) @@ -72,11 +72,6 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-07-01 15:06:15 UTC (rev 1034) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-07-01 15:13:56 UTC (rev 1035) @@ -3,28 +3,33 @@ # Already used licenses in project : # - Apache 2 # - Apache License +# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 +# - lgpl #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Apr 26 16:24:04 CEST 2011 +#Fri Jul 01 16:52:09 CEST 2011 antlr--antlr--2.7.2--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.1--jar=BSD License +dom4j--dom4j--1.6.1--jar=BSD License jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

r1034 - trunk/wikitty-jdbc/src/test/resources
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 17:06:15 +0200 (Fri, 01 Jul 2011) New Revision: 1034 Url: http://nuiton.org/repositories/revision/wikitty/1034 Log: Too verbose Modified: trunk/wikitty-jdbc/src/test/resources/log4j.properties Modified: trunk/wikitty-jdbc/src/test/resources/log4j.properties =================================================================== --- trunk/wikitty-jdbc/src/test/resources/log4j.properties 2011-07-01 14:36:16 UTC (rev 1033) +++ trunk/wikitty-jdbc/src/test/resources/log4j.properties 2011-07-01 15:06:15 UTC (rev 1034) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2010 CodeLutin, Benjamin Poussin +# Copyright (C) 2011 CodeLutin, Benjamin Poussin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as @@ -28,6 +28,5 @@ log4j.appender.logConsole.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n # Configuration by components -log4j.rootLogger=DEBUG, logConsole -log4j.category.org.nuiton.wikitty=DEBUG -log4j.category.org.enhydra=DEBUG +log4j.rootLogger = ERROR, logConsole +log4j.category.org.nuiton.wikitty=INFO

1 0

r1033 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts
by sletellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: sletellier Date: 2011-07-01 16:36:16 +0200 (Fri, 01 Jul 2011) New Revision: 1033 Url: http://nuiton.org/repositories/revision/wikitty/1033 Log: - Fix and reformat code Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2011-07-01 14:32:57 UTC (rev 1032) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2011-07-01 14:36:16 UTC (rev 1033) @@ -1,15 +1,18 @@ package org.nuiton.wikitty.struts; +import static org.apache.commons.lang.StringUtils.EMPTY; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; + +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.FieldType.TYPE; @@ -19,110 +22,86 @@ public abstract class AbstractWikittyEditAction extends ActionSupport { - /** - * - */ private static final long serialVersionUID = 1959245739866183821L; /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(AbstractWikittyEditAction.class); - - protected String id; - protected String redirect; - protected String delete; - protected String store; - - protected Map<String, Object> wikittyFieldMap = new HashMap<String, Object>(); - - /* - rajouter les attributs par défaut id tout ça - et ensuite on rajoute les méthodes de parsage des arguments - et qui les rajoute dans les wikitty field tout ça. - sauf les file parce que les files compliqué. - - */ + public static final String PREFIX_WIKITTY = "Wikitty"; + + /** + * rajouter les attributs par défaut id tout ça + * et ensuite on rajoute les méthodes de parsage des arguments + * et qui les rajoute dans les wikitty field tout ça. + * sauf les file parce que les files compliqué. + */ @Override public String execute() throws Exception { // restore basic element to know what to do - id = getArgument("id", ""); - redirect = getArgument("redirect", ""); + String id = getArgument("id", EMPTY); + String redirect = getArgument("redirect", EMPTY); - delete = getArgument("delete", ""); - store = getArgument("store", ""); - - + String delete = getArgument("delete", EMPTY); + String store = getArgument("store", EMPTY); + WikittyProxy proxy = getProxy(); - if (delete != "" ){ + if (!StringUtils.isEmpty(delete)) { proxy.delete(id); - } else if (store != ""){ + } else if (!StringUtils.isEmpty(store)) { Map<String, Object> param = ActionContext.getContext().getParameters(); - this.formatArgs(param); - + Map<String, Object> wikittyFieldMap = formatArgs(param); + Wikitty wikitty = proxy.restore(id); - if (wikitty != null){ - - for (Entry<String, Object> entry : wikittyFieldMap.entrySet()){ - //wikitty.setFqField(entry.getKey(), entry.getValue()); - - FieldType ftype = wikitty.getFieldType(entry.getKey()); - - Object value = entry.getValue(); - - // Patch to handle string collection - if (ftype.isCollection() - && ftype.getType() == TYPE.STRING - && value != null) { + if (wikitty != null) { - String valueString = value.toString(); + for (Entry<String, Object> entry : wikittyFieldMap.entrySet()){ + //wikitty.setFqField(entry.getKey(), entry.getValue()); - valueString = new String(valueString.substring( - 1, valueString.length() - 1)); + FieldType ftype = wikitty.getFieldType(entry.getKey()); - Collection<String> list = new ArrayList<String>(); + Object value = entry.getValue(); - String[] valuesString = StringUtil.split( - valueString, ","); + // Patch to handle string collection + if (ftype.isCollection() + && ftype.getType() == TYPE.STRING + && value != null) { - for (String element : valuesString) { - list.add(element.trim()); - } + String valueString = value.toString(); - value = list; + valueString = new String(valueString.substring( + 1, valueString.length() - 1)); + + Collection<String> list = new ArrayList<String>(); + + String[] valuesString = StringUtil.split( + valueString, ","); + + for (String element : valuesString) { + list.add(element.trim()); + } + + value = list; + } + wikitty.setFqField(entry.getKey(), value); } - - - wikitty.setFqField(entry.getKey(), value); - - - } - - } - - proxy.store(wikitty); } - - - return SUCCESS; } - public abstract WikittyProxy getProxy(); - protected Map<String, Object> formatArgs(Map<String, Object> args) { - wikittyFieldMap = new HashMap<String, Object>(); + Map<String, Object> wikittyFieldMap = new HashMap<String, Object>(); for (Entry<String, Object> en : args.entrySet()) { - if (en.getKey().startsWith("Wikitty")) { + if (en.getKey().startsWith(PREFIX_WIKITTY)) { - String value = ""; + String value = EMPTY; if (en.getValue() instanceof String[]) { for (String occu : (String[]) en.getValue()) { @@ -141,7 +120,7 @@ public String getArgument(String key, String defaultValue) { Object temp = ActionContext.getContext().getParameters().get(key); // same method used inside wikitty publication base action - String result = ""; + String result = EMPTY; // TODO mfortun-2011-06-29 fix this with something clean if (temp == null) { result = defaultValue; @@ -151,13 +130,9 @@ result += t; } } else { - result = temp.toString(); - + result = temp.toString(); } - } return result; } - - }

1 0

r1032 - in trunk: . wikitty-api wikitty-jdbc wikitty-lucene wikitty-solr
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 16:32:57 +0200 (Fri, 01 Jul 2011) New Revision: 1032 Url: http://nuiton.org/repositories/revision/wikitty/1032 Log: Fix test logging Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-lucene/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 14:09:02 UTC (rev 1031) +++ trunk/pom.xml 2011-07-01 14:32:57 UTC (rev 1032) @@ -210,6 +210,10 @@ <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-spi</artifactId> </exclusion> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> </exclusions> </dependency> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-07-01 14:09:02 UTC (rev 1031) +++ trunk/wikitty-api/pom.xml 2011-07-01 14:32:57 UTC (rev 1032) @@ -82,11 +82,22 @@ <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency> + <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> +  <dependency> <groupId>com.thoughtworks.xstream</groupId> Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-07-01 14:09:02 UTC (rev 1031) +++ trunk/wikitty-jdbc/pom.xml 2011-07-01 14:32:57 UTC (rev 1032) @@ -89,6 +89,16 @@ <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> </dependencies> Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-07-01 14:09:02 UTC (rev 1031) +++ trunk/wikitty-lucene/pom.xml 2011-07-01 14:32:57 UTC (rev 1032) @@ -38,6 +38,16 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-07-01 14:09:02 UTC (rev 1031) +++ trunk/wikitty-solr/pom.xml 2011-07-01 14:32:57 UTC (rev 1032) @@ -86,15 +86,26 @@ <artifactId>commons-lang</artifactId> </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> +  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> </dependencies>

1 0

r1031 - trunk/wikitty-lucene
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 16:09:02 +0200 (Fri, 01 Jul 2011) New Revision: 1031 Url: http://nuiton.org/repositories/revision/wikitty/1031 Log: Exclude spring and other strange deps Modified: trunk/wikitty-lucene/pom.xml Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-07-01 14:06:12 UTC (rev 1030) +++ trunk/wikitty-lucene/pom.xml 2011-07-01 14:09:02 UTC (rev 1031) @@ -56,6 +56,20 @@ <groupId>com.browseengine.bobo</groupId> <artifactId>bobo-browse</artifactId> <version>2.5.0</version> + <exclusions> + <exclusion> + <artifactId>protobuf-java</artifactId> + <groupId>com.google.protobuf</groupId> + </exclusion> + <exclusion> + <artifactId>spring-context</artifactId> + <groupId>org.springframework</groupId> + </exclusion> + <exclusion> + <artifactId>commons-cli</artifactId> + <groupId>commons-cli</groupId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0

r1030 - trunk/wikitty-lucene
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 16:06:12 +0200 (Fri, 01 Jul 2011) New Revision: 1030 Url: http://nuiton.org/repositories/revision/wikitty/1030 Log: Format pom Modified: trunk/wikitty-lucene/pom.xml Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-07-01 14:05:35 UTC (rev 1029) +++ trunk/wikitty-lucene/pom.xml 2011-07-01 14:06:12 UTC (rev 1030) @@ -42,11 +42,11 @@ <artifactId>nuiton-utils</artifactId> </dependency> -  <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> + <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers</artifactId> @@ -73,10 +73,11 @@ <artifactId>commons-lang</artifactId> </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -95,4 +96,3 @@ <inceptionYear>2011</inceptionYear> </project> -

1 0

r1029 - trunk/wikitty-lucene
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 16:05:35 +0200 (Fri, 01 Jul 2011) New Revision: 1029 Url: http://nuiton.org/repositories/revision/wikitty/1029 Log: Fix bobo dependency Modified: trunk/wikitty-lucene/pom.xml Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-07-01 13:51:39 UTC (rev 1028) +++ trunk/wikitty-lucene/pom.xml 2011-07-01 14:05:35 UTC (rev 1029) @@ -53,7 +53,7 @@ </dependency> <dependency> - <groupId>com.browseengine</groupId> + <groupId>com.browseengine.bobo</groupId> <artifactId>bobo-browse</artifactId> <version>2.5.0</version> </dependency>

1 0

r1028 - in trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts: . component
by mfortun＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: mfortun Date: 2011-07-01 15:51:39 +0200 (Fri, 01 Jul 2011) New Revision: 1028 Url: http://nuiton.org/repositories/revision/wikitty/1028 Log: * correct order * change local string by common static string Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -3,13 +3,15 @@ import java.util.Collection; import java.util.LinkedList; +import org.apache.commons.lang.StringUtils; + public class ExtensionFieldStrutsBean { protected String name; protected String type; - protected Object value =""; + protected Object value =StringUtils.EMPTY; protected String label; protected Collection<Option> listOption; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; @@ -22,11 +23,14 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ final static private Log log = LogFactory.getLog(WikittyFieldHandler.class); + static public String ALL_EXTENSION_CAR = "*"; + static public String FIELD_SEPARATOR = ","; + protected Wikitty wikitty; protected WikittyProxy proxy; - protected String include = ""; - protected String exclude = ""; - protected String order = ""; + protected String include = StringUtils.EMPTY; + protected String exclude = StringUtils.EMPTY; + protected String order = StringUtils.EMPTY; protected Boolean orderBefore = false; protected Set<String> fieldAdded; @@ -82,6 +86,7 @@ // delegate construction of map includeMap = constructIncludeExcludeMap(include); includeEnable = includeMap.size() != 0; + } public String getExclude() { @@ -105,15 +110,12 @@ /* * Method called two times by wikitty tag - * */ public Collection<ExtensionFieldStrutsBean> getWikittyField() { // if order before selected and none field add, prepare the field list // with another method - if (orderBefore && (fieldAdded.size() == 0)) { - System.out.println("chaucette"); return getFieldOrderedBefore(); } @@ -134,7 +136,7 @@ * if extension excluded or not include while include is enable jump * to the next extension */ - if (!isIncluded(extName, "*")) { + if (!isIncluded(extName, ALL_EXTENSION_CAR)) { continue; } @@ -158,7 +160,7 @@ } } - String[] fieldOrder = StringUtil.split(order, ","); + String[] fieldOrder = StringUtil.split(order, FIELD_SEPARATOR); Collection<ExtensionFieldStrutsBean> result = mapField.values(); @@ -193,23 +195,26 @@ List<ExtensionFieldStrutsBean> result = new LinkedList<ExtensionFieldStrutsBean>(); + // hack TODO mfortun-2011-06-30 need to think again this orderBefore + fieldAdded.add("DUMMY"); + log.debug("orderBefore enable with" + order); - - String[] fieldOrder = StringUtil.split(order, ","); + String[] fieldOrder = StringUtil.split(order, FIELD_SEPARATOR); + /* - * this method is used because ordering before is different. - * We parse the list of the element we want ordered.4 - * If we see a * that mean all the field have to be ordered now - * then add those field to the added field + * this method is used because ordering before is different. We parse + * the list of the element we want ordered. If we see a * that mean all + * the field have to be ordered now then add those field to the added + * field */ - + if (fieldOrder.length != 0) { for (String fieldit : fieldOrder) { - - if (!isIncluded(fieldit)){ + + if (!isIncluded(fieldit)) { continue; - } + } String extname = WikittyUtil .getExtensionNameFromFQFieldName(fieldit); String field = WikittyUtil.getFieldNameFromFQFieldName(fieldit); @@ -233,7 +238,6 @@ } } - return result; } @@ -249,13 +253,14 @@ */ protected Map<String, List<String>> constructIncludeExcludeMap(String entry) { - String[] entryTab = StringUtil.split(entry, ","); + String[] entryTab = StringUtil.split(entry, FIELD_SEPARATOR); Map<String, List<String>> result = new HashMap<String, List<String>>(); // prepare list of excluded field and extension for (String excludeIt : entryTab) { - String[] extfield = StringUtil.split(excludeIt, "."); + String[] extfield = StringUtil.split(excludeIt, + WikittyUtil.FQ_FIELD_NAME_SEPARATOR); if (extfield.length == 2) { List<String> listFields = result.get(extfield[0]); if (listFields == null) { @@ -279,7 +284,8 @@ public boolean isIncluded(String fqFieldName) { - String[] fields = StringUtil.split(fqFieldName, "."); + String[] fields = StringUtil.split(fqFieldName, + WikittyUtil.FQ_FIELD_NAME_SEPARATOR); if (fields.length != 2) { // TODO mfortun-2011-06-29 exception @@ -294,22 +300,22 @@ // check if field is specifically exluded or if all the extention is boolean excluded = excludeMap.containsKey(extName) - && (excludeMap.get(extName).contains("*") || excludeMap.get( - extName).contains(fieldName)); + && (excludeMap.get(extName).contains(ALL_EXTENSION_CAR) || excludeMap + .get(extName).contains(fieldName)); // check if field is specifically included or if all the extention is - boolean notIncluded = includeEnable - && !(includeMap.containsKey(extName) && (includeMap.get(extName) - .contains("*") || includeMap.get(extName).contains(fieldName))); + boolean notIncluded = includeEnable + && !(includeMap.containsKey(extName) && (includeMap + .get(extName).contains(ALL_EXTENSION_CAR) || includeMap + .get(extName).contains(fieldName))); // check if field allready added - boolean added = fieldAdded.contains(extName + "." + fieldName); + boolean added = fieldAdded.contains(extName + + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + fieldName); log.debug("extension: " + extName + " field: " + fieldName + "notInclude:" + notIncluded + " exclude:" + excluded + " alreadyAdd:" + added); - - if (excluded || notIncluded || added) { return false; } @@ -325,9 +331,10 @@ FieldType fieldType = wikitty.getExtension(extName).getFieldType( fieldName); - result.setName(extName + "." + fieldName); + result.setName(extName + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + + fieldName); result.setLabel(result.getName()); - result.setValue(""); + result.setValue(StringUtils.EMPTY); // set the field type. switch (fieldType.getType()) { @@ -343,7 +350,7 @@ break; default: Object valueObject = wikitty.getFieldAsObject(extName, fieldName); - String valueString = ""; + String valueString = StringUtils.EMPTY; if (valueObject != null) { valueString = String.valueOf(valueObject); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.BooleanTag", @@ -28,11 +30,12 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - handler.addAddedField(fqFieldName); + // if field defined as inclued if (handler.isIncluded(fqFieldName)) { + handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter( "included",true); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -8,7 +8,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) @@ -35,7 +38,7 @@ if (handler.isIncluded(fqFieldName)) { handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( @@ -44,7 +47,7 @@ fieldsAccess[1])); List<Option> fixlist = new LinkedList<Option>(); - String[] values = StringUtil.split(fixvalues, ","); + String[] values = StringUtil.split(fixvalues, WikittyFieldHandler.FIELD_SEPARATOR); for (String it : values) { fixlist.add(new Option(it, it)); } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", description = "", allowDynamicAttributes = false) @@ -31,7 +33,7 @@ if (handler.isIncluded(fqFieldName)) { handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", description = "", allowDynamicAttributes = false) @@ -30,7 +32,7 @@ if (handler.isIncluded(fqFieldName)) { handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -6,6 +6,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false) @@ -26,17 +28,18 @@ protected void evaluateExtraParams() { super.evaluateExtraParams(); - handler.addAddedField(fqFieldName); + // if field defined as inclued if (handler.isIncluded(fqFieldName)) { // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( "value", handler.getWikitty().getFieldAsString(fieldsAccess[0], fieldsAccess[1])); + handler.addAddedField(fqFieldName); } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-07-01 13:17:48 UTC (rev 1027) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-07-01 13:51:39 UTC (rev 1028) @@ -8,10 +8,13 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.struts.Option; +import org.nuiton.wikitty.struts.WikittyFieldHandler; + import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false) @@ -45,7 +48,7 @@ handler.addAddedField(fqFieldName); // parse extname and field name - String[] fieldsAccess = StringUtil.split(fqFieldName, "."); + String[] fieldsAccess = StringUtil.split(fqFieldName, WikittyUtil.FQ_FIELD_NAME_SEPARATOR); // add parametters to be use by the template addParameter("included", true); addParameter( @@ -59,7 +62,7 @@ PagedResult<Wikitty> wikitties = handler.getProxy() .findAllByCriteria(criteria); - String[] descriptor = StringUtil.split(descfield, ","); + String[] descriptor = StringUtil.split(descfield, WikittyFieldHandler.FIELD_SEPARATOR); // if wikitties not null contruct option result // with descriptor

1 0

r1027 - in trunk: wikitty-api/src/test/resources wikitty-jdbc/src/test/resources wikitty-lucene/src/test/resources wikitty-solr/src/test/resources
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 15:17:48 +0200 (Fri, 01 Jul 2011) New Revision: 1027 Url: http://nuiton.org/repositories/revision/wikitty/1027 Log: Update libs (jbosstja...) Modified: trunk/wikitty-api/src/test/resources/jbossts-properties.xml trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml trunk/wikitty-solr/src/test/resources/jbossts-properties.xml Modified: trunk/wikitty-api/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-api/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-api/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">  - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> <properties>  -  - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> -  <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry>  <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@  <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> +  + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> +  - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry>  - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry>  Modified: trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">  - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +--> <properties>  -  - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> -  <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry>  <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@  <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> +  + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> +  - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry>  - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry>  Modified: trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">  - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +--> <properties>  -  - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> -  <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry>  <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@  <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> +  + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> +  - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry>  - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry>  Modified: trunk/wikitty-solr/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-solr/src/test/resources/jbossts-properties.xml 2011-07-01 11:31:50 UTC (rev 1026) +++ trunk/wikitty-solr/src/test/resources/jbossts-properties.xml 2011-07-01 13:17:48 UTC (rev 1027) @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">  - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +--> <properties>  -  - <entry key="LoggingEnvironmentBean.debugLevel">0x00000000</entry> -  <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbosstm</entry> + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry>  <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> @@ -67,9 +63,14 @@  <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> +  + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> +  - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule com.arjuna.ats.internal.txoj.recovery.TORecoveryModule com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule </entry>  - <entry key="RecoveryEnvironmentBean.expiryScanners"> + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner </entry>

1 0