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

r230 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 05 Aug '10

05 Aug '10

Author: echatellier Date: 2010-08-05 17:14:20 +0200 (Thu, 05 Aug 2010) New Revision: 230 Url: http://nuiton.org/repositories/revision/wikitty/230 Log: Move to to error log level Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 16:16:03 UTC (rev 229) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-05 15:14:20 UTC (rev 230) @@ -681,10 +681,12 @@ bean.setWikitty(w); } catch (NoSuchMethodException noerror) { - log.debug(String.format( + if (log.isErrorEnabled()) { + log.error(String.format( "Can't find constructor with wikitty arguement in '%s'," + "we try with setWikitty method", clazzInstanciable.getName()), noerror); + } } }

1 0

r229 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/cache
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 18:16:03 +0200 (Wed, 04 Aug 2010) New Revision: 229 Url: http://nuiton.org/repositories/revision/wikitty/229 Log: #793 cache avec politique de copie syst?\195?\169matique en option + test Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-04 15:32:36 UTC (rev 228) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-04 16:16:03 UTC (rev 229) @@ -51,11 +51,26 @@ */ static public final String WIKITTY_CACHE_LISTENEVENTS_OPTION = "wikitty.service.cache.listenevents"; + /** used as property name in props given in the constructor */ + public static final String WIKITTY_CACHE_POLICY_OPTION = "wikitty.service.cache.allwaysRestoreCopies"; + /** Cache. */ protected WikittyCache cache = null; /** Delegated wikitty service implementation. */ protected WikittyService ws; + + /** cache policy (configuration) + * + * if true the cache will always restore copies of the wikitty + * if false the cache will restore wikitties that do a lazy copy when the + * wikitty is modified ({@link WikittyCopyOnWrite} instances) + * + * default set to false. To change this value, use + * {@link WikittyServiceCached#WikittyServiceCached(WikittyService, Properties)} + * and set the good property. + */ + protected boolean allwaysRestoreCopies = false; /** * Default constructor. @@ -76,8 +91,32 @@ this.ws = ws; cache = new WikittyCache(); registerWikittyServiceListener(props); + + // reading configuration and set allwaysRestoreCopies accordingly + if (props != null && props.containsKey(WIKITTY_CACHE_POLICY_OPTION)) { + allwaysRestoreCopies = Boolean.parseBoolean( + props.getProperty(WIKITTY_CACHE_POLICY_OPTION)); + } } + /** wrap the wikitty or copy it according to allwaysRestoreCopies value */ + protected Wikitty wrapWikitty(Wikitty wikitty) { + Wikitty result = null; + if (allwaysRestoreCopies) { + try { + result = wikitty.clone(); + } catch (CloneNotSupportedException e) { + log.error("unable to clone " + wikitty, e); + } + } + + // if allwaysRestoreCopies is false and above clone failed + if (result == null) { + result = new WikittyCopyOnWrite(wikitty); + } + return result; + } + /** * Add cache as service listener if configuration request it. * @@ -297,7 +336,7 @@ } // wrap wikitty to prevent conflict in cache modification - result = new WikittyCopyOnWrite(result); + result = wrapWikitty(result); return result; } @@ -336,7 +375,7 @@ // wrap the resulting wikitties to prevent cache conflicts ArrayList<Wikitty> result = new ArrayList<Wikitty>(); for (Wikitty w : tmp) { - result.add(new WikittyCopyOnWrite(w)); + result.add(wrapWikitty(w)); } return result; @@ -379,7 +418,7 @@ // wrap the resulting wikitties to prevent cache conflicts ArrayList<Wikitty> result = new ArrayList<Wikitty>(); for (Wikitty w : tmp) { - result.add(new WikittyCopyOnWrite(w)); + result.add(wrapWikitty(w)); } return result; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java 2010-08-04 15:32:36 UTC (rev 228) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java 2010-08-04 16:16:03 UTC (rev 229) @@ -2,9 +2,12 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; +import java.util.Properties; import org.junit.Before; import org.junit.Test; @@ -37,17 +40,17 @@ /** create a service, an extension, a wikitty, login, and store wikitty */ @Before public void setUp() throws Exception { - service = new WikittyServiceCached(new WikittyServiceInMemory()); - token = service.login(null, null); - extension = ExtensionFactory.create(EXT_NAME, "1") .addField(FIELD_NAME, TYPE.STRING) .extension(); aWikitty = new WikittyImpl(); aWikitty.addExtension(extension); aWikitty.setField(EXT_NAME, FIELD_NAME, "myvalue"); - service.store(token, aWikitty); + + service = new WikittyServiceCached(new WikittyServiceInMemory()); + token = service.login(null, null); + service.store(token, aWikitty); } /** setting a field value doesn't corrupt cache */ @@ -88,4 +91,23 @@ assertEquals("myvalue", anotherWikitty.getFieldAsString(EXT_NAME, FIELD_NAME)); } + /** this test is the same but service cache policy is changed */ + @Test + public void testRestoreAllwaysCopyPolicy() throws Exception { + + Properties props = new Properties(); + props.setProperty(WikittyServiceCached.WIKITTY_CACHE_POLICY_OPTION, "true"); + + service = new WikittyServiceCached(new WikittyServiceInMemory(), props); + token = service.login(null, null); + service.store(token, aWikitty); + + // restoring two times the same wikitty should produces two different copies + Wikitty anotherWikitty = service.restore(token, aWikitty.getId()); + Wikitty yetAnotherWikitty = service.restore(token, anotherWikitty.getId()); + + assertEquals(anotherWikitty, yetAnotherWikitty); + assertNotSame(anotherWikitty, yetAnotherWikitty); // two different objects + } + }

1 0

r228 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/api test/java/org/nuiton/wikitty/cache
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 17:32:36 +0200 (Wed, 04 Aug 2010) New Revision: 228 Url: http://nuiton.org/repositories/revision/wikitty/228 Log: #793 implemented wikitty cache with copy-on-write proxies Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-08-04 12:52:36 UTC (rev 227) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-08-04 15:32:36 UTC (rev 228) @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; -public interface Wikitty { +public interface Wikitty extends Cloneable { void addPropertyChangeListener(PropertyChangeListener listener); @@ -135,5 +135,7 @@ void setFqField(String fieldName, Object value); boolean isEmpty(); + + Wikitty clone() throws CloneNotSupportedException; } \ No newline at end of file Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-08-04 12:52:36 UTC (rev 227) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-08-04 15:32:36 UTC (rev 228) @@ -40,6 +40,7 @@ static private Log log = LogFactory.getLog(WikittyCache.class); + /** keys are wikitty ids */ protected Map<String, Wikitty> wikittyCache; /** Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-08-04 15:32:36 UTC (rev 228) @@ -0,0 +1,247 @@ +package org.nuiton.wikitty; + +import java.beans.PropertyChangeListener; +import java.math.BigDecimal; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** this class wrap a wikitty in a proxy that copy the wikitty before applying any change + * + * It is used for caching purpose. This class own a reference to an actual + * wikitty, multiple instance of this class can own some references to a same + * actual wikitty. To prevent the target to be modified, a copy is created + * to prevent side-effect. + * + * So, when a wikitty restored from cache is modified, a copy is modified, so + * if change are cancelled, next restore will restore the original and not + * the modified version (until the modified version is stored). + * + * used in {@link WikittyServiceCached} + */ +public class WikittyCopyOnWrite implements Wikitty { + + private static final Log log = LogFactory.getLog(WikittyCopyOnWrite.class); + + protected Wikitty target; + + /** only WikittyService with cache should create instances */ + protected WikittyCopyOnWrite(Wikitty target) { + this.target = target; + } + + /** replace {@link #target} with a clone + * + * this method must be called to prevent any modification on target + */ + protected void substituteTargetWithCopy() { + try { + target = target.clone(); + if (log.isTraceEnabled()) { + log.trace(this + " now has for target " + target); + } + } catch (CloneNotSupportedException e) { + log.error("unable to clone wikitty " + target, e); + } + } + + public boolean equals(Object obj) { + // FIXME 20100804 bleny side-effect ? + return target.equals(obj); + } + + public int hashCode() { + // FIXME 20100804 bleny side-effect ? + return target.hashCode(); + } + + public String toString() { + return "[" + WikittyCopyOnWrite.class.getName() + "]" + target.toString(); + } + + @Override + public Wikitty clone() throws CloneNotSupportedException { + // return a clone of the target + return target.clone(); + } + + + + /* ** below are only delegation code with copy-on-write */ + + public void addPropertyChangeListener(PropertyChangeListener listener) { + target.addPropertyChangeListener(listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + target.removePropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + target.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + target.removePropertyChangeListener(propertyName, listener); + } + + public String getId() { + return target.getId(); + } + + public boolean isDeleted() { + return target.isDeleted(); + } + + public Date getDeleteDate() { + return target.getDeleteDate(); + } + + public void setDeleteDate(Date delete) { + target.setDeleteDate(delete); + } + + public void addExtension(WikittyExtension ext) { + substituteTargetWithCopy(); + target.addExtension(ext); + } + + public void addExtension(List<WikittyExtension> exts) { + substituteTargetWithCopy(); + target.addExtension(exts); + } + + public boolean hasExtension(String extName) { + return target.hasExtension(extName); + } + + public boolean hasField(String extName, String fieldName) { + return target.hasField(extName, fieldName); + } + + public WikittyExtension getExtension(String ext) { + return target.getExtension(ext); + } + + public Collection<String> getExtensionNames() { + return target.getExtensionNames(); + } + + public Collection<WikittyExtension> getExtensions() { + return target.getExtensions(); + } + + public Collection<WikittyExtension> getExtensionDependencies(String ext, + boolean recursively) { + return target.getExtensionDependencies(ext, recursively); + } + + public FieldType getFieldType(String fqfieldName) { + return target.getFieldType(fqfieldName); + } + + public void setField(String ext, String fieldName, Object value) { + substituteTargetWithCopy(); + target.setField(ext, fieldName, value); + } + + public Object getFieldAsObject(String ext, String fieldName) { + return target.getFieldAsObject(ext, fieldName); + } + + public boolean getFieldAsBoolean(String ext, String fieldName) { + return target.getFieldAsBoolean(ext, fieldName); + } + + public BigDecimal getFieldAsBigDecimal(String ext, String fieldName) { + return target.getFieldAsBigDecimal(ext, fieldName); + } + + public int getFieldAsInt(String ext, String fieldName) { + return target.getFieldAsInt(ext, fieldName); + } + + public long getFieldAsLong(String ext, String fieldName) { + return target.getFieldAsLong(ext, fieldName); + } + + public float getFieldAsFloat(String ext, String fieldName) { + return target.getFieldAsFloat(ext, fieldName); + } + + public double getFieldAsDouble(String ext, String fieldName) { + return target.getFieldAsDouble(ext, fieldName); + } + + public String getFieldAsString(String ext, String fieldName) { + return target.getFieldAsString(ext, fieldName); + } + + public Date getFieldAsDate(String ext, String fieldName) { + return target.getFieldAsDate(ext, fieldName); + } + + public String getFieldAsWikitty(String ext, String fieldName) { + return target.getFieldAsWikitty(ext, fieldName); + } + + public <E> List<E> getFieldAsList(String ext, String fieldName, + Class<E> clazz) { + return target.getFieldAsList(ext, fieldName, clazz); + } + + public <E> Set<E> getFieldAsSet(String ext, String fieldName, Class<E> clazz) { + return target.getFieldAsSet(ext, fieldName, clazz); + } + + public void addToField(String ext, String fieldName, Object value) { + substituteTargetWithCopy(); + target.addToField(ext, fieldName, value); + } + + public void removeFromField(String ext, String fieldName, Object value) { + substituteTargetWithCopy(); + target.removeFromField(ext, fieldName, value); + } + + public void clearField(String ext, String fieldName) { + substituteTargetWithCopy(); + target.clearField(ext, fieldName); + } + + public Set<String> fieldNames() { + return target.fieldNames(); + } + + public Object getFqField(String fqFieldName) { + return target.getFqField(fqFieldName); + } + + public String getVersion() { + return target.getVersion(); + } + + public void setVersion(String version) { + substituteTargetWithCopy(); + target.setVersion(version); + } + + public void clearDirty() { + target.clearDirty(); + } + + public void setFqField(String fieldName, Object value) { + target.setFqField(fieldName, value); + } + + public boolean isEmpty() { + return target.isEmpty(); + } + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-08-04 12:52:36 UTC (rev 227) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-08-04 15:32:36 UTC (rev 228) @@ -42,7 +42,7 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyImpl implements Serializable, Wikitty { +public class WikittyImpl implements Serializable, Wikitty, Cloneable { /** serialVersionUID. */ private static final long serialVersionUID = 4910886672760691052L; @@ -769,4 +769,16 @@ return str; } + @Override + public WikittyImpl clone() throws CloneNotSupportedException { + WikittyImpl clone = (WikittyImpl) super.clone(); + // deep copy of field and values + clone.fieldValue = new HashMap<String, Object>(); + for (Map.Entry<String, Object> aFieldValue : fieldValue.entrySet()) { + clone.fieldValue.put(aFieldValue.getKey(), aFieldValue.getValue()); + } + clone.clearDirty(); + return clone; + } + } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-04 12:52:36 UTC (rev 227) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-04 15:32:36 UTC (rev 228) @@ -39,7 +39,7 @@ * by : $Author$ */ public class WikittyServiceCached implements WikittyService { - + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceCached.class); @@ -290,12 +290,14 @@ if (result != null) { cache.putWikitty(result); } - } - else { + } else { if (log.isTraceEnabled()) { log.trace("Use cached wikitty " + id); } } + + // wrap wikitty to prevent conflict in cache modification + result = new WikittyCopyOnWrite(result); return result; } @@ -308,7 +310,7 @@ @Override public List<Wikitty> restore(String securityToken, List<String> ids) { ArrayList<String> notInCache = new ArrayList<String>(); - // linked to maintains the ordre + // linked to maintains the order LinkedHashMap<String, Wikitty> fromCache = new LinkedHashMap<String, Wikitty>(); for (String id : ids) { @@ -330,7 +332,12 @@ } Collection<Wikitty> tmp = fromCache.values(); - ArrayList<Wikitty> result = new ArrayList<Wikitty>(tmp); + + // wrap the resulting wikitties to prevent cache conflicts + ArrayList<Wikitty> result = new ArrayList<Wikitty>(); + for (Wikitty w : tmp) { + result.add(new WikittyCopyOnWrite(w)); + } return result; } @@ -368,8 +375,13 @@ } Collection<Wikitty> tmp = fromCache.values(); - ArrayList<Wikitty> result = new ArrayList<Wikitty>(tmp); + // wrap the resulting wikitties to prevent cache conflicts + ArrayList<Wikitty> result = new ArrayList<Wikitty>(); + for (Wikitty w : tmp) { + result.add(new WikittyCopyOnWrite(w)); + } + return result; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-08-04 12:52:36 UTC (rev 227) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-08-04 15:32:36 UTC (rev 228) @@ -308,7 +308,7 @@ m.put(StorageTest.EXTNAME + ".fieldName1", intValue); Date dateValue = new Date(); - m.put(StorageTest.EXTNAME + ".fieldName2", new Date()); + m.put(StorageTest.EXTNAME + ".fieldName2", dateValue); } long timeSetM = System.currentTimeMillis() - time; Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/cache/WikittyServiceCachedTest.java 2010-08-04 15:32:36 UTC (rev 228) @@ -0,0 +1,91 @@ +package org.nuiton.wikitty.cache; + + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Before; +import org.junit.Test; +import org.nuiton.wikitty.ExtensionFactory; +import org.nuiton.wikitty.FieldType.TYPE; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceCached; +import org.nuiton.wikitty.WikittyServiceInMemory; + +/** check that the cache */ +public class WikittyServiceCachedTest { + + /** a wikitty service (in memory) with a cache */ + protected WikittyService service; + + protected static final String EXT_NAME = "myextension"; + protected static final String FIELD_NAME = "myfield"; + + /** an extension */ + protected WikittyExtension extension; + + /** a wikitty with extension */ + protected Wikitty aWikitty; + + protected String token; + + /** create a service, an extension, a wikitty, login, and store wikitty */ + @Before + public void setUp() throws Exception { + service = new WikittyServiceCached(new WikittyServiceInMemory()); + token = service.login(null, null); + + + extension = ExtensionFactory.create(EXT_NAME, "1") + .addField(FIELD_NAME, TYPE.STRING) + .extension(); + aWikitty = new WikittyImpl(); + aWikitty.addExtension(extension); + aWikitty.setField(EXT_NAME, FIELD_NAME, "myvalue"); + service.store(token, aWikitty); + } + + /** setting a field value doesn't corrupt cache */ + @Test + public void testRestore() throws Exception { + Wikitty anotherWikitty = service.restore(token, aWikitty.getId()); + + // we set the value of a field + anotherWikitty.setField(EXT_NAME, FIELD_NAME, "myothervalue"); + + // now let's suppose, the user cancel its modification + // we don't have call store() + anotherWikitty = service.restore(token, anotherWikitty.getId()); + + // the remaining wikitty should hold old value + assertEquals("myvalue", anotherWikitty.getFieldAsString(EXT_NAME, FIELD_NAME)); + } + + /** same as testRestore() using methods that restore multiple ids */ + @Test + public void testRestoreMultipleIds() throws Exception { + // now, let's do the same test, just by using others restore() available + List<String> idsToRestore = new ArrayList<String>(); + idsToRestore.add(aWikitty.getId()); + + List<Wikitty> otherWikitties = service.restore(token, idsToRestore); + Wikitty anotherWikitty = otherWikitties.get(0); + + // we set the value of a field + anotherWikitty.setField(EXT_NAME, FIELD_NAME, "myothervalue"); + + // now let's suppose, the user cancel its modification + // we don't have call store() + otherWikitties = service.restore(token, idsToRestore); + anotherWikitty = otherWikitties.get(0); + + // the remaining wikitty should hold old value + assertEquals("myvalue", anotherWikitty.getFieldAsString(EXT_NAME, FIELD_NAME)); + } + +}

1 0

r227 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by sletellier＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: sletellier Date: 2010-08-04 14:52:36 +0200 (Wed, 04 Aug 2010) New Revision: 227 Url: http://nuiton.org/repositories/revision/wikitty/227 Log: Fix npe when restore wikitty with no existing id Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-04 12:42:17 UTC (rev 226) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-04 12:52:36 UTC (rev 227) @@ -285,7 +285,11 @@ log.trace("Wikitty " + id + " not found in cache"); } result = ws.restore(securityToken, id); - cache.putWikitty(result); + + // Dont store in cache if restored wikitty is null + if (result != null) { + cache.putWikitty(result); + } } else { if (log.isTraceEnabled()) {

1 0

r226 - in trunk/wikitty-api/src: main/resources test/resources
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 14:42:17 +0200 (Wed, 04 Aug 2010) New Revision: 226 Url: http://nuiton.org/repositories/revision/wikitty/226 Log: #788 d?\195?\169placement du fichier de conf jBoss utile seulement dans les tests Added: trunk/wikitty-api/src/test/resources/jbossts-properties.xml Removed: trunk/wikitty-api/src/main/resources/default-jbosstm-properties.xml Deleted: trunk/wikitty-api/src/main/resources/default-jbosstm-properties.xml =================================================================== --- trunk/wikitty-api/src/main/resources/default-jbosstm-properties.xml 2010-08-04 11:17:48 UTC (rev 225) +++ trunk/wikitty-api/src/main/resources/default-jbosstm-properties.xml 2010-08-04 12:42:17 UTC (rev 226) @@ -1,135 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!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.transactionSync">ON</entry> - -  - <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> - -  - <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> - - - -  - <entry key="RecoveryEnvironmentBean.recoveryExtensions"> - 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"> - com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner - </entry> - -  - -  - <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> - - <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> - -</properties> Copied: trunk/wikitty-api/src/test/resources/jbossts-properties.xml (from rev 225, trunk/wikitty-api/src/main/resources/default-jbosstm-properties.xml) =================================================================== --- trunk/wikitty-api/src/test/resources/jbossts-properties.xml (rev 0) +++ trunk/wikitty-api/src/test/resources/jbossts-properties.xml 2010-08-04 12:42:17 UTC (rev 226) @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!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.transactionSync">ON</entry> + +  + <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> + +  + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + +  + <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> + + + +  + <entry key="RecoveryEnvironmentBean.recoveryExtensions"> + 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"> + com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner + </entry> + +  + +  + <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> + + <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> + +  + <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> + +  + <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> + +  + <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> + +</properties>

1 0

r225 - in trunk/wikitty-multistorage-impl: . src/test/java/org/nuiton/wikitty/multistorage/test
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 13:17:48 +0200 (Wed, 04 Aug 2010) New Revision: 225 Url: http://nuiton.org/repositories/revision/wikitty/225 Log: wikitty-multistorage-impl : fixing import and dependencies Modified: trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-08-04 11:09:42 UTC (rev 224) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-08-04 11:17:48 UTC (rev 225) @@ -20,11 +20,6 @@ <artifactId>wikitty-api</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${project.version}</version> - </dependency>  <dependency> @@ -46,13 +41,18 @@ <version>${project.version}</version> <scope>test</scope> </dependency> -  -  + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> </dependencies>  Modified: trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java =================================================================== --- trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-08-04 11:09:42 UTC (rev 224) +++ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-08-04 11:17:48 UTC (rev 225) @@ -20,6 +20,7 @@ import java.net.URL; import java.util.Properties; +import org.apache.activemq.broker.BrokerFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -31,6 +32,9 @@ import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; +import org.nuiton.wikitty.jms.WikittyExtensionStorageJMS; +import org.nuiton.wikitty.jms.WikittyJMSUtil; +import org.nuiton.wikitty.jms.WikittyStorageJMS; import org.nuiton.wikitty.multistorage.MultiStorageConfiguration; import org.nuiton.wikitty.multistorage.MultiStorageConfiguration.BasicConfiguration; import org.nuiton.wikitty.multistorage.WikittyServiceMultiStorage;

1 0

r224 - in trunk/wikitty-jpa-impl: . src/test/java/org/nuiton/wikitty/jpa/test
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 13:09:42 +0200 (Wed, 04 Aug 2010) New Revision: 224 Url: http://nuiton.org/repositories/revision/wikitty/224 Log: jpa module : fixing pom and import Modified: trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTA.java trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTAWithSync.java Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-08-04 10:57:59 UTC (rev 223) +++ trunk/wikitty-jpa-impl/pom.xml 2010-08-04 11:09:42 UTC (rev 224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java =================================================================== --- trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java 2010-08-04 10:57:59 UTC (rev 223) +++ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/StorageJPATest.java 2010-08-04 11:09:42 UTC (rev 224) @@ -19,8 +19,8 @@ import org.junit.Before; import org.junit.runner.RunWith; +import org.nuiton.wikitty.conform.StorageTest; import org.nuiton.wikitty.jpa.WikittyServiceJPA; -import org.nuiton.wikitty.conform.StorageTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; Modified: trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTA.java =================================================================== --- trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTA.java 2010-08-04 10:57:59 UTC (rev 223) +++ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTA.java 2010-08-04 11:09:42 UTC (rev 224) @@ -36,6 +36,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.jpa.WikittyExtensionStorageJPA; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; Modified: trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTAWithSync.java =================================================================== --- trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTAWithSync.java 2010-08-04 10:57:59 UTC (rev 223) +++ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/TestJTAWithSync.java 2010-08-04 11:09:42 UTC (rev 224) @@ -31,6 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.jpa.WikittyExtensionStorageJPA; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration;

1 0

r223 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-api/src/test/java/org/nuiton/wikitty/memory wikitty-jms-impl wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test wikitty-multistorage-impl wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 12:57:59 +0200 (Wed, 04 Aug 2010) New Revision: 223 Url: http://nuiton.org/repositories/revision/wikitty/223 Log: fixing import WikittyImpl ; centralized date format in wikitty make tests pass Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 10:57:59 UTC (rev 223) @@ -67,8 +67,7 @@ protected static final Locale CANONICAL_LOCALE = Locale.US; // FastDateFormat is thread-safe - // FIXME 20100804 bleny should be protected, other module should use parseDate(), below - static final public FastDateFormat solrDateFormat = FastDateFormat.getInstance( + static final protected FastDateFormat solrDateFormat = FastDateFormat.getInstance( DATE_FORMAT, CANONICAL_TZ, CANONICAL_LOCALE); @@ -81,6 +80,10 @@ static public Date parseDate(String dateAsString) throws ParseException { return DateUtils.parseDate(dateAsString, DATE_FORMAT_ALLOWED); } + + static public String formatDate(Date date) throws ParseException { + return solrDateFormat.format(date); + } // TODO poussin 20090902 use spring configuration to add mapping in this // variable Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -198,7 +198,7 @@ // test String => Date Calendar cal = Calendar.getInstance(Locale.ROOT); cal.set(1982, 0, 23, 0, 0, 0); cal.set( Calendar.MILLISECOND, 0 ); - w.setField( StorageTest.EXTNAME, "fieldName2", WikittyUtil.solrDateFormat.format(cal.getTime()) ); + w.setField( StorageTest.EXTNAME, "fieldName2", WikittyUtil.formatDate(cal.getTime()) ); assertEquals(cal.getTime(), w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -425,12 +425,12 @@ public void testDateConsistency() throws Exception { Date date = WikittyUtil.parseDate( "30/01/2009" ); Date dateFormatedAndParsed = WikittyUtil.parseDate( - WikittyUtil.solrDateFormat.format(date)); + WikittyUtil.formatDate(date)); assertEquals(date, dateFormatedAndParsed); date = new Date(); dateFormatedAndParsed = WikittyUtil.parseDate( - WikittyUtil.solrDateFormat.format(date)); + WikittyUtil.formatDate(date)); assertEquals(date, dateFormatedAndParsed); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-08-04 10:57:59 UTC (rev 223) @@ -86,17 +86,27 @@ public static String format(String dateTestFormat) { try { - return WikittyUtil.solrDateFormat.format( + return WikittyUtil.formatDate( dateTestFormat == null || dateTestFormat.isEmpty() ? new Date() - : WikittyUtil.parseDate(dateTestFormat) + : parse(dateTestFormat) ); } catch (ParseException e) { - Assert.fail( "Error parsing date : " + dateTestFormat ); + Assert.fail( "Error format date : " + dateTestFormat ); e.printStackTrace(); return null; } } + + public static Date parse(String dateAsString) { + try { + return WikittyUtil.parseDate(dateAsString); + } catch (ParseException e) { + Assert.fail( "Error parsing date : " + dateAsString ); + e.printStackTrace(); + return null; + } + } protected static ArrayList<Wikitty> createSampleWikitty( WikittyService ws ) { ArrayList<Wikitty> result = new ArrayList<Wikitty>(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -50,7 +50,7 @@ Wikitty w = createWikitty( "MyExtName.fieldName0 = 123," + "MyExtName.fieldName1 = 12.3," + - "MyExtName.fieldName2 = " + WikittyUtil.solrDateFormat.format(date), + "MyExtName.fieldName2 = " + WikittyUtil.formatDate(date), ext ); String id = w.getId(); Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-jms-impl/pom.xml 2010-08-04 10:57:59 UTC (rev 223) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java =================================================================== --- trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java 2010-08-04 10:57:59 UTC (rev 223) @@ -30,6 +30,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.jms.WikittyExtensionStorageJMS; Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-08-04 10:57:59 UTC (rev 223) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java =================================================================== --- trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-08-04 10:27:48 UTC (rev 222) +++ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-08-04 10:57:59 UTC (rev 223) @@ -26,6 +26,7 @@ import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC;

1 0

r222 - in trunk/wikitty-hbase-impl: . src/main/java/org/nuiton/wikitty/hbase src/test/java/org/nuiton/wikitty/hbase/test
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 12:27:48 +0200 (Wed, 04 Aug 2010) New Revision: 222 Url: http://nuiton.org/repositories/revision/wikitty/222 Log: making wikitty-hbase-impl module buildable ; fix tests Modified: trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/HBaseConnectorTest.java Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-08-04 10:26:33 UTC (rev 221) +++ trunk/wikitty-hbase-impl/pom.xml 2010-08-04 10:27:48 UTC (rev 222) @@ -1,170 +1,183 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>2.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.1-SNAPSHOT</version> + </parent> -  -  -  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-hbase-impl</artifactId> +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hbase-impl</artifactId> - <dependencies> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> + <dependencies> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>${jetty.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty.version}</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - <version>r785019-hbase-1329</version> -  - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.hadoop</groupId> - <artifactId>hadoop</artifactId> - <version>0.20.0-plus4681-core</version> -  - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.hadoop</groupId> - <artifactId>hbase</artifactId> - <version>0.20.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.hadoop</groupId> - <artifactId>hbase-test</artifactId> - <version>0.20.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>0.20.0</version> -  - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> -  -  -  +  +  - <name>Wikitty :: wikitty-hbase-impl</name> - <description>hbase impl of wikitty</description> - <inceptionYear>2009</inceptionYear> +  + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>0.89.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <version>0.89.0-SNAPSHOT</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> +  + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>0.20.3-SNAPSHOT</version> + <scope>test</scope> + </dependency> -  -  -  + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.1</version> + <scope>test</scope> + </dependency> + </dependencies> - <packaging>jar</packaging> +  +  +  - <properties> -  - <maven.test.skip>true</maven.test.skip> - </properties> + <name>Wikitty :: wikitty-hbase-impl</name> -  -  -  + <description>hbase impl of wikitty</description> + <inceptionYear>2009</inceptionYear> - <build> - <plugins> -  - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> +  +  +  + <packaging>jar</packaging> + + <properties> +  + <maven.test.skip>false</maven.test.skip> + </properties> + +  +  +  + + <build> + <plugins> +  + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java =================================================================== --- trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-08-04 10:26:33 UTC (rev 221) +++ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-08-04 10:27:48 UTC (rev 222) @@ -44,6 +44,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.WikittyStorage; import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; Modified: trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/HBaseConnectorTest.java =================================================================== --- trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/HBaseConnectorTest.java 2010-08-04 10:26:33 UTC (rev 221) +++ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/HBaseConnectorTest.java 2010-08-04 10:27:48 UTC (rev 222) @@ -99,7 +99,7 @@ for (int j = 0; j < 10; j++) { Put put = new Put(rowId); - put.setTimeStamp(getTime()); + // put.setTimeStamp(getTime()); put.add(Bytes.toBytes("data"), Bytes.toBytes("1:" + j), Bytes.toBytes(j)); hTable.put(put); } @@ -119,7 +119,7 @@ for (int j = 0; j < 10; j++) { Put put = new Put(rowId); - put.setTimeStamp(getTime()); + // put.setTimeStamp(getTime()); put.add(Bytes.toBytes("data"), Bytes.toBytes("2:" + j), Bytes.toBytes(j)); hTable.put(put); }

1 0

r221 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/api test/java/org/nuiton/wikitty/conform
by bleny＠users.nuiton.org 04 Aug '10

04 Aug '10

Author: bleny Date: 2010-08-04 12:26:33 +0200 (Wed, 04 Aug 2010) New Revision: 221 Url: http://nuiton.org/repositories/revision/wikitty/221 Log: fixing date issues Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-08-04 10:26:33 UTC (rev 221) @@ -67,6 +67,7 @@ protected static final Locale CANONICAL_LOCALE = Locale.US; // FastDateFormat is thread-safe + // FIXME 20100804 bleny should be protected, other module should use parseDate(), below static final public FastDateFormat solrDateFormat = FastDateFormat.getInstance( DATE_FORMAT, CANONICAL_TZ, CANONICAL_LOCALE); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-08-04 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-08-04 10:26:33 UTC (rev 221) @@ -427,5 +427,11 @@ Date dateFormatedAndParsed = WikittyUtil.parseDate( WikittyUtil.solrDateFormat.format(date)); assertEquals(date, dateFormatedAndParsed); + + date = new Date(); + dateFormatedAndParsed = WikittyUtil.parseDate( + WikittyUtil.solrDateFormat.format(date)); + assertEquals(date, dateFormatedAndParsed); + } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-08-04 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-08-04 10:26:33 UTC (rev 221) @@ -84,12 +84,12 @@ return new WikittyExtension(extName, "1", requires, fieldsMap); } - public static SimpleDateFormat dateFormater = new SimpleDateFormat("d/M/y"); public static String format(String dateTestFormat) { try { return WikittyUtil.solrDateFormat.format( dateTestFormat == null || dateTestFormat.isEmpty() - ? new Date() : dateFormater.parse(dateTestFormat) + ? new Date() + : WikittyUtil.parseDate(dateTestFormat) ); } catch (ParseException e) { Assert.fail( "Error parsing date : " + dateTestFormat ); @@ -97,15 +97,6 @@ return null; } } - public static Date parse(String date) { - try { - return dateFormater.parse(date); - } catch (ParseException e) { - Assert.fail( "Error parsing date : " + date); - e.printStackTrace(); - return null; - } - } protected static ArrayList<Wikitty> createSampleWikitty( WikittyService ws ) { ArrayList<Wikitty> result = new ArrayList<Wikitty>(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-08-04 08:04:58 UTC (rev 220) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-08-04 10:26:33 UTC (rev 221) @@ -124,7 +124,7 @@ break; case 2: // check fieldName2 assertEquals( errorMsg, - WikittyUtil.solrDateFormat.parseObject(keyValuePair.getValue()), + WikittyUtil.parseDate(keyValuePair.getValue()), w.getFieldAsDate(EXTNAME, fieldName) ); break; default:

1 0