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

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

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

01 Jul '11

Author: echatellier Date: 2011-07-01 13:31:50 +0200 (Fri, 01 Jul 2011) New Revision: 1026 Url: http://nuiton.org/repositories/revision/wikitty/1026 Log: Update libs (jbosstja...) Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-lucene/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -58,7 +58,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> + <version>1.2.2</version> </dependency>  @@ -93,7 +93,7 @@ <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> - <version>1.5.4</version> + <version>1.5.6</version> </dependency> <dependency> @@ -105,14 +105,14 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.156</version> + <version>1.3.157</version> <scope>test</scope> </dependency> <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> + <version>8.4-702.jdbc4</version> <scope>test</scope> </dependency> @@ -133,7 +133,7 @@ <dependency> <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> - <version>4.0.6</version> + <version>4.0.7</version> <scope>compile</scope> </dependency> @@ -201,10 +201,16 @@  <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> - <version>4.9.0.GA</version> + <version>4.15.1.Final</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/wikitty-api/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -79,7 +79,7 @@  <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency> <dependency> Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/wikitty-lucene/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -33,7 +33,7 @@ </dependency> <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/wikitty-solr/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -33,7 +33,7 @@ </dependency> <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency>

1 0

r1025 - trunk/wikitty-struts
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 12:09:38 +0200 (Fri, 01 Jul 2011) New Revision: 1025 Url: http://nuiton.org/repositories/revision/wikitty/1025 Log: Fix compilation issue Modified: trunk/wikitty-struts/pom.xml Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2011-07-01 10:00:46 UTC (rev 1024) +++ trunk/wikitty-struts/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) @@ -25,12 +25,18 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <scope>provided</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency>

1 0

r1024 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 12:00:46 +0200 (Fri, 01 Jul 2011) New Revision: 1024 Url: http://nuiton.org/repositories/revision/wikitty/1024 Log: Update struts 2 jquery plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:59:10 UTC (rev 1023) +++ trunk/pom.xml 2011-07-01 10:00:46 UTC (rev 1024) @@ -450,7 +450,7 @@ <nuitonI18nVersion>2.4</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> <jettyVersion>7.4.2.v20110526</jettyVersion> - <struts2jqueryVersion>3.0.2</struts2jqueryVersion> + <struts2jqueryVersion>3.1.0</struts2jqueryVersion> <struts2Version>2.2.3</struts2Version> <javassistVersion>3.8.0.GA</javassistVersion> <jspapiversion>2.1</jspapiversion>

1 0

r1023 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 11:59:10 +0200 (Fri, 01 Jul 2011) New Revision: 1023 Url: http://nuiton.org/repositories/revision/wikitty/1023 Log: Move bbrossaud to contributors Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:57:31 UTC (rev 1022) +++ trunk/pom.xml 2011-07-01 09:59:10 UTC (rev 1023) @@ -411,8 +411,9 @@ </developer> <developer> - <name>Benoit Brossaud</name> - <id>bbrossaud</id> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -420,19 +421,19 @@ </roles> </developer> - <developer> - <name>Sylvain Letellier</name> - <id>sletellier</id> - <email>letellier(a)codelutin.com</email> + </developers> + + <contributors> + <contributor> + <name>Benoit Brossaud</name> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> <role>Developer</role> </roles> - </developer> + </contributor> + </contributors> - </developers> -

1 0

r1022 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 11:57:31 +0200 (Fri, 01 Jul 2011) New Revision: 1022 Url: http://nuiton.org/repositories/revision/wikitty/1022 Log: Update libs, remove unused. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:06:55 UTC (rev 1021) +++ trunk/pom.xml 2011-07-01 09:57:31 UTC (rev 1022) @@ -265,12 +265,12 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${strutsxworksVersion}</version> + <version>${struts2Version}</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <version>${jspapiversion}</version> </dependency> @@ -444,29 +444,19 @@ <projectId>wikitty</projectId>  - <eugeneVersion>2.3.1</eugeneVersion> - <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> - <nuitonI18nVersion>2.2</nuitonI18nVersion> + <eugeneVersion>2.3.5</eugeneVersion> + <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <nuitonI18nVersion>2.4</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> - - <springVersion>3.0.1.RELEASE</springVersion> - <jettyMorbayVersion>6.1.22</jettyMorbayVersion> - - <zkVersion>5.0.2</zkVersion> - <jettyVersion>7.2.1.v20101111</jettyVersion> - - <hbaseVersion>0.89.0-SNAPSHOT</hbaseVersion> - -  - <locales>fr,en</locales> - -  + <jettyVersion>7.4.2.v20110526</jettyVersion> <struts2jqueryVersion>3.0.2</struts2jqueryVersion> <struts2Version>2.2.3</struts2Version> <javassistVersion>3.8.0.GA</javassistVersion> - <strutsxworksVersion>2.2.3</strutsxworksVersion> + <jspapiversion>2.1</jspapiversion> - <jspapiversion>2.0</jspapiversion> +  + <locales>fr,en</locales> + </properties>

1 0

r1021 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 11:06:55 +0200 (Fri, 01 Jul 2011) New Revision: 1021 Url: http://nuiton.org/repositories/revision/wikitty/1021 Log: Link lucene module to extra modules Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:04:51 UTC (rev 1020) +++ trunk/pom.xml 2011-07-01 09:06:55 UTC (rev 1021) @@ -519,6 +519,7 @@ <modules> <module>wikitty-publication</module> <module>wikitty-struts</module> + <module>wikitty-lucene</module> </modules> </profile> </profiles>

1 0