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

r1005 - trunk/wikitty-struts/src/main/java/template/xhtml
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 15:28:23 +0200 (Wed, 29 Jun 2011) New Revision: 1005 Url: http://nuiton.org/repositories/revision/wikitty/1005 Log: * improve template Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-commons.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,24 +1,18 @@ - <#assign aKeys = parameters.wikittyfields><#t/> <#list aKeys as aKey><#t/> - <#if aKey.type=="file"> <input type="hidden" name="${aKey.name}" value="BINARY" /> ${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" > ${aKey.label} : <textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea> </#if> <#if aKey.type=="textfield" > ${aKey.label} : <input type="text" name="${aKey.name}" value="${aKey.value}" > </#if> - <#if aKey.type=="boolean" > ${aKey.label} : <input type="checkbox" name="${aKey.name}" value="true" <#if aKey.value=="true" > @@ -40,7 +34,6 @@ </#if> > ${optionKey.description} </option> </#list><#t/> - </select> </#if> </br> Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,12 +1,8 @@ <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> +</#if><#t/> <#if parameters.orderBefore?? && parameters.orderBefore==true > <#include "/${parameters.templateDir}/xhtml/wikitty-commons.ftl" /> -</#if> - - +</#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-boolean.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,7 +1,7 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <input type="checkbox" name="${parameters.name}" value="true" - <#if aKey.value=="true" > - checked='true' +${parameters.label} : <input type="checkbox" name="${parameters.name}" value="true" <#t/> + <#if aKey.value=="true" > <#t/> + checked='true'<#t/> </#if> /> </#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-hidden.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,3 +1,3 @@ <#if parameters.included?? && parameters.included==true > -<input type="hidden" name="${parameters.name}" value="${parameters.value}" /> +<input type="hidden" name="${parameters.name}" value="${parameters.value}" /><#t/> </#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textarea.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,3 +1,3 @@ <#if parameters.included?? && parameters.included==true > -${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea> -</#if> \ No newline at end of file +${parameters.label} : <textarea id="${parameters.name}" cols="80" rows="20" name="${parameters.name}">${parameters.value}</textarea><#t/> +</#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-textfield.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,3 +1,3 @@ -<#if parameters.included?? && parameters.included==true ><#t/> +<#if parameters.included?? && parameters.included==true > ${parameters.label} : <input type="text" name="${parameters.name}" value="${parameters.value}" ><#t/> </#if><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl =================================================================== --- trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-29 13:07:54 UTC (rev 1004) +++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-wikittyselect.ftl 2011-06-29 13:28:23 UTC (rev 1005) @@ -1,12 +1,12 @@ <#if parameters.included?? && parameters.included==true > ${parameters.label} :<select name="${parameters.name}" size="1"> -<#assign optionKeys = parameters.wikittiesvalues><#t/> - <#list optionKeys as optionKey><#t/> - <option value="${optionKey.valeur}" +<#assign optionKeys = parameters.wikittiesvalues> + <#list optionKeys as optionKey> + <option value="${optionKey.valeur}"<#t/> <#if optionKey.valeur==parameters.value > - selected - </#if> + selected <#t/> + </#if> <#t/> > ${optionKey.description} </option> - </#list><#t/> -</select> + </#list> +</select><#t/> </#if> \ No newline at end of file

1 0

r1004 - trunk/wikitty-struts/src/main/resources
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 15:07:54 +0200 (Wed, 29 Jun 2011) New Revision: 1004 Url: http://nuiton.org/repositories/revision/wikitty/1004 Log: * correct dtd version Modified: trunk/wikitty-struts/src/main/resources/struts-plugin.xml Modified: trunk/wikitty-struts/src/main/resources/struts-plugin.xml =================================================================== --- trunk/wikitty-struts/src/main/resources/struts-plugin.xml 2011-06-29 13:02:11 UTC (rev 1003) +++ trunk/wikitty-struts/src/main/resources/struts-plugin.xml 2011-06-29 13:07:54 UTC (rev 1004) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN" - "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + "http://struts.apache.org/dtds/struts-2.3.dtd"> \ No newline at end of file

1 0

r1003 - in trunk/wikitty-struts/src/main: resources tld
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 15:02:11 +0200 (Wed, 29 Jun 2011) New Revision: 1003 Url: http://nuiton.org/repositories/revision/wikitty/1003 Log: * correct the name of the struts-plugin xml * change encoding type for the tld Added: trunk/wikitty-struts/src/main/resources/struts-plugin.xml Removed: trunk/wikitty-struts/src/main/resources/wikitty-struts.xml Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Copied: trunk/wikitty-struts/src/main/resources/struts-plugin.xml (from rev 979, trunk/wikitty-struts/src/main/resources/wikitty-struts.xml) =================================================================== --- trunk/wikitty-struts/src/main/resources/struts-plugin.xml (rev 0) +++ trunk/wikitty-struts/src/main/resources/struts-plugin.xml 2011-06-29 13:02:11 UTC (rev 1003) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + \ No newline at end of file Property changes on: trunk/wikitty-struts/src/main/resources/struts-plugin.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/wikitty-struts/src/main/resources/wikitty-struts.xml =================================================================== --- trunk/wikitty-struts/src/main/resources/wikitty-struts.xml 2011-06-29 13:01:25 UTC (rev 1002) +++ trunk/wikitty-struts/src/main/resources/wikitty-struts.xml 2011-06-29 13:02:11 UTC (rev 1003) @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN" - "http://struts.apache.org/dtds/struts-2.1.7.dtd"> - \ No newline at end of file Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-29 13:01:25 UTC (rev 1002) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-29 13:02:11 UTC (rev 1003) @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?><taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<?xml version="1.0" encoding="UTF-8" ?> +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" version="2.0"> <display-name>"wikitty-struts"</display-name>

1 0

r1002 - in trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts: . component
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 15:01:25 +0200 (Wed, 29 Jun 2011) New Revision: 1002 Url: http://nuiton.org/repositories/revision/wikitty/1002 Log: * add log element Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.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-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -54,6 +54,12 @@ opt.setValeur(val); this.listOption.add(opt); } + @Override + public String toString() { + return "ExtensionFieldStrutsBean [name=" + name + ", type=" + type + + ", value=" + value + ", label=" + label + ", listOption=" + + listOption + "]"; + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java 2011-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -24,6 +24,12 @@ this.valeur = valeur; this.description = description; } + + @Override + public String toString() { + return "Option [valeur=" + valeur + ", description=" + description + + "]"; + } 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-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -121,6 +121,8 @@ if ((excludeMap.containsKey(extName) && excludeMap.get(extName) .contains("*")) || (includeEnable && !includeMap.containsKey(extName))) { + log.debug("extension: "+extName + " Skipped"); + continue; } @@ -136,6 +138,7 @@ .contains(fieldName)) || (includeEnable && !includeMap.get(extName).contains( fieldName)) || fieldAdded.contains(extName+"."+fieldName)) { + log.debug("field: "+extName+"."+fieldName + " Skipped"); continue; } @@ -183,6 +186,7 @@ } } + log.debug("Add field : " + temp ); mapField.put(temp.getName(), temp); } } @@ -195,7 +199,9 @@ * of the wikitty field and when it close the wikitty field */ if( orderBefore ){ - fieldAdded.addAll(mapField.keySet()); + log.debug("Order before select, add field to addedfield set: " + + mapField.keySet()); + fieldAdded.addAll(mapField.keySet()); } @@ -260,6 +266,7 @@ } public void addAddedField(String field) { + log.debug("Field added : " +field); fieldAdded.add(field); } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -26,6 +26,7 @@ .get(WikittyTagBean.WIKITTY_STACK_KEY); if (handler == null) { + log.info("Handler not found in the stack"); // TODO mfortun-2011-06-29 throw exception if handler not in the stack } 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-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -48,6 +48,17 @@ super.evaluateExtraParams(); + /* this methode is called two times: + * - first when the wikitty open tag is red + * - second when the wikitty closing tag is red + * + * for the first called this create an object wikittyfieldhandler + * that will be store inside the stack and used by the included tag ( + * inside the wikitty tags to store) + * + * + */ + if (action != null) { addParameter("action", findString(action)); } @@ -75,7 +86,13 @@ Object temp = stack.getContext().get(WIKITTY_STACK_KEY); WikittyFieldHandler handler; if (temp == null) { + + // construct wikitty field handler withh + // all required param and put it in the stack handler = new WikittyFieldHandler(); + + log.info(handler + " Added to the stack"); + stack.getContext().put(WIKITTY_STACK_KEY, handler); handler.setExclude(exclude); @@ -88,18 +105,10 @@ } else { handler = (WikittyFieldHandler) temp; } + // add field that have to be write inside the page + log.info("add wikitty fields to the parametters"); addParameter("wikittyfields", handler.getWikittyField()); - /* - * - * si l'élément key est null on l'initialise en y mettant tout les - * éléments du wikitty que l'on veut affiché avec type et tout. - * seulemement dans le contexte on met tout dans un super objet qui - * s'occupe de tout - * - * si il est pas null c'est que on est à la fin donc on va add les - * parametters à écrire dans le template on va correctement ajouter le - * tout. - */ + } public String getDefaultOpenTemplate() {

1 0

r1001 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 29, 2011

June 29, 2011

Author: echatellier Date: 2011-06-29 14:35:42 +0200 (Wed, 29 Jun 2011) New Revision: 1001 Url: http://nuiton.org/repositories/revision/wikitty/1001 Log: Fix finally (insteadof catch) Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 11:30:34 UTC (rev 1000) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 12:35:42 UTC (rev 1001) @@ -62,6 +62,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.IndexSearcher; @@ -149,9 +150,7 @@ try { IndexWriterConfig indexWriterConfig = new IndexWriterConfig(WIKITTY_LUCENE_VERSION, indexAnalyzer); writer = new IndexWriter(indexDirectory, indexWriterConfig); - writer.deleteAll(); // dummy action, othermize fail - writer.commit(); - } catch (IOException ex) { + } finally { IOUtils.closeQuietly(writer); } }

1 0

r1000 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 29, 2011

June 29, 2011

Author: echatellier Date: 2011-06-29 13:30:34 +0200 (Wed, 29 Jun 2011) New Revision: 1000 Url: http://nuiton.org/repositories/revision/wikitty/1000 Log: Nothing, just to get commit #1000 ;) Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 11:30:01 UTC (rev 999) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 11:30:34 UTC (rev 1000) @@ -141,7 +141,7 @@ try { indexDirectory = getIndexDirectory(config); indexAnalyzer = getIndexAnalyzer(config); - + // hack to create lucene index // new IndexSearcher fails with no index if (!IndexReader.indexExists(indexDirectory)) {

1 0

r999 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 29, 2011

June 29, 2011

Author: echatellier Date: 2011-06-29 13:30:01 +0200 (Wed, 29 Jun 2011) New Revision: 999 Url: http://nuiton.org/repositories/revision/wikitty/999 Log: Add dummy action to init lucene index Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 10:36:38 UTC (rev 998) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 11:30:01 UTC (rev 999) @@ -149,6 +149,7 @@ try { IndexWriterConfig indexWriterConfig = new IndexWriterConfig(WIKITTY_LUCENE_VERSION, indexAnalyzer); writer = new IndexWriter(indexDirectory, indexWriterConfig); + writer.deleteAll(); // dummy action, othermize fail writer.commit(); } catch (IOException ex) { IOUtils.closeQuietly(writer);

1 0

r998 - in trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts: . component
by mfortun＠users.nuiton.org June 29, 2011

June 29, 2011

Author: mfortun Date: 2011-06-29 12:36:38 +0200 (Wed, 29 Jun 2011) New Revision: 998 Url: http://nuiton.org/repositories/revision/wikitty/998 Log: * cosmetic change * add log attribute Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.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 trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 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-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-29 10:36:38 UTC (rev 998) @@ -8,6 +8,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; +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.entities.FieldType; @@ -17,6 +19,10 @@ public class WikittyFieldHandler { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(WikittyFieldHandler.class); + + protected Wikitty wikitty; protected WikittyProxy proxy; protected String include = ""; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-29 10:36:38 UTC (rev 998) @@ -3,6 +3,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.ClosingUIBean; import org.nuiton.wikitty.struts.WikittyFieldHandler; @@ -11,6 +13,8 @@ public abstract class AbstractWikittyComponent extends ClosingUIBean { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(AbstractWikittyComponent.class); protected WikittyFieldHandler handler; 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-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2011-06-29 10:36:38 UTC (rev 998) @@ -2,6 +2,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; @@ -10,14 +12,17 @@ description = "", allowDynamicAttributes = false) public class BooleanBean extends AbstractWikittyComponent { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(BooleanBean.class); + + public static final String OPEN_TEMPLATE = "ws-boolean"; + public static final String TEMPLATE = "ws-boolean-close"; + + public BooleanBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } - - public static final String OPEN_TEMPLATE = "ws-boolean"; - public static final String TEMPLATE = "ws-boolean-close"; - @Override protected void evaluateExtraParams() { 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-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java 2011-06-29 10:36:38 UTC (rev 998) @@ -4,6 +4,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.struts.Option; @@ -12,6 +14,12 @@ @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false) public class FixedSelectBean extends AbstractWikittyComponent { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(FixedSelectBean.class); + + public static final String OPEN_TEMPLATE = "ws-fixedselect"; + public static final String TEMPLATE = "ws-fixedselect-close"; + protected String fixvalues; public FixedSelectBean(ValueStack stack, HttpServletRequest request, @@ -19,9 +27,6 @@ super(stack, request, response); } - public static final String OPEN_TEMPLATE = "ws-fixedselect"; - public static final String TEMPLATE = "ws-fixedselect-close"; - @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); 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-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2011-06-29 10:36:38 UTC (rev 998) @@ -2,6 +2,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; import com.opensymphony.xwork2.util.ValueStack; @@ -9,13 +11,17 @@ @StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", description = "", allowDynamicAttributes = false) public class HiddenBean extends AbstractWikittyComponent { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(HiddenBean.class); + + public static final String OPEN_TEMPLATE = "ws-hidden"; + public static final String TEMPLATE = "ws-hidden-close"; + public HiddenBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } - public static final String OPEN_TEMPLATE = "ws-hidden"; - public static final String TEMPLATE = "ws-hidden-close"; @Override protected void evaluateExtraParams() { 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-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2011-06-29 10:36:38 UTC (rev 998) @@ -2,22 +2,26 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; - import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", description = "", allowDynamicAttributes = false) public class TextAreaBean extends AbstractWikittyComponent { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(TextAreaBean.class); + + public static final String OPEN_TEMPLATE = "ws-textarea"; + public static final String TEMPLATE = "ws-textarea-close"; + public TextAreaBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } - public static final String OPEN_TEMPLATE = "ws-textarea"; - public static final String TEMPLATE = "ws-textarea-close"; - @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); 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-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2011-06-29 10:36:38 UTC (rev 998) @@ -2,23 +2,26 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; - import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false) public class TextFieldBean extends AbstractWikittyComponent { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(TextFieldBean.class); + + public static final String OPEN_TEMPLATE = "ws-textfield"; + public static final String TEMPLATE = "ws-textfield-close"; + public TextFieldBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } - public static final String OPEN_TEMPLATE = "ws-textfield"; - public static final String TEMPLATE = "ws-textfield-close"; - @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); 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-06-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java 2011-06-29 10:36:38 UTC (rev 998) @@ -4,6 +4,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; @@ -11,13 +13,17 @@ import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.struts.Option; - - import com.opensymphony.xwork2.util.ValueStack; @StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false) public class WikittySelectBean extends AbstractWikittyComponent { + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(WikittySelectBean.class); + + public static final String OPEN_TEMPLATE = "ws-wikittyselect"; + public static final String TEMPLATE = "ws-wikittyselect-close"; + protected String criteria; protected String descfield; @@ -26,17 +32,6 @@ super(stack, request, response); } - public static final String OPEN_TEMPLATE = "ws-wikittyselect"; - public static final String TEMPLATE = "ws-wikittyselect-close"; - - public String getDefaultOpenTemplate() { - return OPEN_TEMPLATE; - } - - protected String getDefaultTemplate() { - return TEMPLATE; - } - @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); @@ -95,6 +90,14 @@ } + public String getDefaultOpenTemplate() { + return OPEN_TEMPLATE; + } + + protected String getDefaultTemplate() { + return TEMPLATE; + } + public String getCriteria() { return criteria; } 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-29 10:24:37 UTC (rev 997) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-29 10:36:38 UTC (rev 998) @@ -2,6 +2,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.components.ClosingUIBean; import org.apache.struts2.views.annotations.StrutsTag; import org.nuiton.wikitty.WikittyProxy; @@ -13,6 +15,10 @@ @StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag", description = "", allowDynamicAttributes = false) public class WikittyTagBean extends ClosingUIBean { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + final static private Log log = LogFactory.getLog(WikittyTagBean.class); + public static final String OPEN_TEMPLATE = "wikitty"; public static final String TEMPLATE = "wikitty-close"; @@ -31,24 +37,7 @@ protected Boolean orderBefore; protected Boolean allowDelete; - - - public Boolean getOrderBefore() { - return orderBefore; - } - - public void setOrderBefore(Boolean orderBefore) { - this.orderBefore = orderBefore; - } - - public Boolean getAllowDelete() { - return allowDelete; - } - - public void setAllowDelete(Boolean allowDelete) { - this.allowDelete = allowDelete; - } - + public WikittyTagBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -77,9 +66,10 @@ if (wikitty != null) { addParameter("wikittyid", findString(wikitty.getId())); - addParameter("wikittyversion", findString(wikitty.getVersion())); - addParameter("wikittyextensions", findString(wikitty - .getExtensionNames().toString())); + //no uses finally: + //addParameter("wikittyversion", findString(wikitty.getVersion())); + //addParameter("wikittyextensions", findString(wikitty + // .getExtensionNames().toString())); } Object temp = stack.getContext().get(WIKITTY_STACK_KEY); @@ -184,4 +174,20 @@ this.allowDelete = allowDelete; } + public Boolean getOrderBefore() { + return orderBefore; + } + + public void setOrderBefore(Boolean orderBefore) { + this.orderBefore = orderBefore; + } + + public Boolean getAllowDelete() { + return allowDelete; + } + + public void setAllowDelete(Boolean allowDelete) { + this.allowDelete = allowDelete; + } + }

1 0

r997 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 29, 2011

June 29, 2011

Author: echatellier Date: 2011-06-29 12:24:37 +0200 (Wed, 29 Jun 2011) New Revision: 997 Url: http://nuiton.org/repositories/revision/wikitty/997 Log: #extensions is a multi valued field Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 10:23:27 UTC (rev 996) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 10:24:37 UTC (rev 997) @@ -721,10 +721,9 @@ document.add(luceneIdField); // wikitty extension - String extAsString = StringUtils.join(w.getExtensionNames(), ","); - if (!extAsString.isEmpty()) { + for (String extName : w.getExtensionNames()) { Field luceneExtField = new Field(WikittyLuceneConstants.LUCENE_EXTENSIONS, - extAsString, Store.YES, Index.NOT_ANALYZED); + extName, Store.YES, Index.NOT_ANALYZED); document.add(luceneExtField); }

1 0

r996 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org June 29, 2011

June 29, 2011

Author: echatellier Date: 2011-06-29 12:23:27 +0200 (Wed, 29 Jun 2011) New Revision: 996 Url: http://nuiton.org/repositories/revision/wikitty/996 Log: Init lucene index when build lucene storage service Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 09:54:51 UTC (rev 995) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-06-29 10:23:27 UTC (rev 996) @@ -104,7 +104,6 @@ import com.browseengine.bobo.api.FacetSpec; import com.browseengine.bobo.facets.FacetHandler; import com.browseengine.bobo.facets.impl.MultiValueFacetHandler; -import com.browseengine.bobo.facets.impl.SimpleFacetHandler; /** * Wikitty search engine implementation based on Lucene for storage and search @@ -142,6 +141,19 @@ try { indexDirectory = getIndexDirectory(config); indexAnalyzer = getIndexAnalyzer(config); + + // hack to create lucene index + // new IndexSearcher fails with no index + if (!IndexReader.indexExists(indexDirectory)) { + IndexWriter writer = null; + try { + IndexWriterConfig indexWriterConfig = new IndexWriterConfig(WIKITTY_LUCENE_VERSION, indexAnalyzer); + writer = new IndexWriter(indexDirectory, indexWriterConfig); + writer.commit(); + } catch (IOException ex) { + IOUtils.closeQuietly(writer); + } + } } catch (IOException ex) { throw new WikittyException("Can't init lucene directory", ex); } @@ -225,10 +237,12 @@ writer.deleteAll(); writer.commit(); } catch (IOException ex) { - try { - writer.rollback(); - } catch (IOException e) { - throw new WikittyException("Can't rollback index", ex); + if (writer != null) { + try { + writer.rollback(); + } catch (IOException e) { + throw new WikittyException("Can't rollback index", ex); + } } throw new WikittyException("Can't clear index", ex); } finally { @@ -244,7 +258,7 @@ public void store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { long startTime = TimeLog.getTime(); - + IndexWriter writer = null; IndexSearcher searcher = null; try {

1 0