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

r616 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org Dec. 16, 2010

Dec. 16, 2010

Author: bpoussin Date: 2010-12-16 23:47:20 +0100 (Thu, 16 Dec 2010) New Revision: 616 Url: http://nuiton.org/repositories/revision/wikitty/616 Log: make copy of wikitty before modification to put in event Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-12-16 00:02:14 UTC (rev 615) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-12-16 22:47:20 UTC (rev 616) @@ -142,6 +142,7 @@ //if the data is not already recorded if (!versionResultSet.next()) { + // FIXME poussin 20101216 make copy before add to result to prevent side effect result.addExtension(ext); WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty(QUERY_INSERT_EXTENSION_ADMIN), Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-12-16 00:02:14 UTC (rev 615) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-12-16 22:47:20 UTC (rev 616) @@ -343,13 +343,15 @@ WikittyJDBCUtil.doQuery(connection, q, newVersion, extensionList, null, wikitty.getId()); - wikitty.setVersion(newVersion); - wikitty.clearDirty(); - result.addWikitty(wikitty); + // make a clone to prevent side effect + Wikitty newWikitty = wikitty.clone(); + newWikitty.setVersion(newVersion); + newWikitty.clearDirty(); + result.addWikitty(newWikitty); } return result; - } catch (SQLException eee) { + } catch (Exception eee) { throw new WikittyException("Can't store wikitty", eee); } finally { WikittyJDBCUtil.closeQuietly(connection);

1 0

r615 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by bpoussin＠users.nuiton.org Dec. 16, 2010

Dec. 16, 2010

Author: bpoussin Date: 2010-12-16 01:02:14 +0100 (Thu, 16 Dec 2010) New Revision: 615 Url: http://nuiton.org/repositories/revision/wikitty/615 Log: add toString representation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java 2010-12-15 14:49:44 UTC (rev 614) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java 2010-12-16 00:02:14 UTC (rev 615) @@ -62,5 +62,14 @@ public int getCount() { return count; } + + @Override + public String toString() { + String result = String.format( + "FacetTopic(facet: '%s' topic: '%s' count: '%s')", + getFacetName(), getTopicName(), getCount()); + return result; + } + }

1 0

r614 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/entities wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org Dec. 15, 2010

Dec. 15, 2010

Author: bpoussin Date: 2010-12-15 15:49:44 +0100 (Wed, 15 Dec 2010) New Revision: 614 Url: http://nuiton.org/repositories/revision/wikitty/614 Log: Anomalie #1149: Generator Helper set method implementation for collection is buggus - generate addAll method for collection - user LinkedHashSet as default Set implementation - fix bug in getFieldAsSet in wikittyImpl that don't copy collection before return it (prevent bad side effect) - fix small bug in generator Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-12-15 11:58:08 UTC (rev 613) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-12-15 14:49:44 UTC (rev 614) @@ -37,6 +37,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -658,20 +659,12 @@ * @see org.nuiton.wikitty.Wikitty#getFieldAsList(java.lang.String, java.lang.String, java.lang.Class) */ @Override - public <E> List<E> getFieldAsList(String ext, String fieldName, final Class<E> clazz) { + public <E> List<E> getFieldAsList(String ext, String fieldName, Class<E> clazz) { try { - final Collection<E> collection = (Collection<E>) getFieldAsObject(ext, fieldName); + Collection<E> collection = (Collection<E>) getFieldAsObject(ext, fieldName); if (collection != null) { // return unmodiable collection that check type of element - return new AbstractList<E>() { - List<E> contained = new ArrayList<E>(collection); - @Override public E get(int index) { - return WikittyUtil.cast( contained.get(index), clazz ); - } - @Override public int size() { - return contained.size(); - } - }; + return new UnModifiableCopyList<E>(clazz, collection); } return null; } catch (Exception eee) { @@ -685,38 +678,14 @@ * @see org.nuiton.wikitty.Wikitty#getFieldAsSet(java.lang.String, java.lang.String, java.lang.Class) */ @Override - public <E> Set<E> getFieldAsSet(String ext, String fieldName, final Class<E> clazz) { + public <E> Set<E> getFieldAsSet(String ext, String fieldName, Class<E> clazz) { try { - final Set<E> result = (Set<E>) getFieldAsObject(ext, fieldName); - if (result != null) { + Collection<E> collection = (Collection<E>) getFieldAsObject(ext, fieldName); + if (collection != null) { // return unmodifable Set - return new AbstractSet<E>() { - Set<E> contained = result; - @Override public int size() { - return contained.size(); - } - @Override - public Iterator<E> iterator() { - return new Iterator<E>() { - Iterator containedIterator = contained.iterator(); - public boolean hasNext() { - return containedIterator.hasNext(); - } - - public E next() { - Object o = containedIterator.next(); - return WikittyUtil.cast(o, clazz); - } - - public void remove() { - throw new UnsupportedOperationException("Not supported operation"); - } - }; - - } - }; + return new UnModifiableCopySet<E>(clazz, collection); } - return result; + return null; } catch (Exception eee) { throw new WikittyException(String.format( "Can't get value to field '%s'", @@ -734,7 +703,8 @@ Collection col = (Collection) getFieldAsObject(ext, fieldName); if (col == null) { if (fieldType.isUnique()) { - col = new HashSet(); + // LinkedHashSet to try to maintains order + col = new LinkedHashSet(); } else { col = new ArrayList(); } @@ -966,4 +936,68 @@ return result; } + /** + * unmodifiable collection, source is copied to prevent source modification + * after creation. + */ + static class UnModifiableCopyList<E> extends AbstractList<E> { + protected Class<E> clazz; + protected List<E> contained; + + public UnModifiableCopyList(Class<E> clazz, Collection<E> source) { + this.clazz = clazz; + // make copy to prevent modification of source collection + contained = new ArrayList<E>(source); + } + + @Override + public E get(int index) { + return WikittyUtil.cast(contained.get(index), clazz); + } + @Override + public int size() { + return contained.size(); + } + // no need to Override iterator, because AbstractList based all iterator + // operation on AbstractList aperation + } + + + /** + * unmodifiable collection, source is copied to prevent source modification + * after creation. + */ + static class UnModifiableCopySet<E> extends AbstractSet<E> { + protected Class<E> clazz; + protected Set<E> contained; + public UnModifiableCopySet(Class<E> clazz, Collection<E> source) { + this.clazz = clazz; + // make copy to prevent modification of source collection + contained = new LinkedHashSet<E>(source); + } + + @Override + public int size() { + return contained.size(); + } + @Override + public Iterator<E> iterator() { + return new Iterator<E>() { + Iterator containedIterator = contained.iterator(); + public boolean hasNext() { + return containedIterator.hasNext(); + } + + public E next() { + Object o = containedIterator.next(); + return WikittyUtil.cast(o, clazz); + } + + public void remove() { + throw new UnsupportedOperationException("Not supported operation"); + } + }; + } + } + } 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-12-15 11:58:08 UTC (rev 613) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-12-15 14:49:44 UTC (rev 614) @@ -33,6 +33,7 @@ import java.util.Date; import java.util.HashSet; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import org.apache.commons.beanutils.BeanUtils; @@ -618,7 +619,7 @@ protected String wikittyId; protected String wikittyVersion = "0.0"; @WikittyField(fqn="WikittyLabel.labels") - protected Set<String> labels = new HashSet<String>(); + protected Set<String> labels = new LinkedHashSet<String>(); public LabelDTO(String wikittyId) { this.wikittyId = wikittyId; @@ -648,10 +649,16 @@ return labels; } + @Override public void setLabels(Set<String> labels) { - this.labels = labels; + this.labels = new LinkedHashSet<String>(labels); } + @Override + public void addAllLabels(Set<String> labels) { + this.labels.addAll(labels); + } + /** * addLabels : * @param element Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-15 11:58:08 UTC (rev 613) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-15 14:49:44 UTC (rev 614) @@ -360,7 +360,19 @@ getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%= getter.getName() %>()); }*/; setOperationBody(setter, setterBody); - + + String addAllName = "addAll" + capitalizedAttributeName; + ObjectModelOperation addAll = addOperation(abstractClass, addAllName, "void"); + addAnnotation(abstractClass, addAll, "Override"); + addParameter(addAll, attributeTypeSimpleNameInSet, attributeName); + String addAllBody = "" +/*{ + <%=attributeTypeSimpleNameInSet%> oldValue = get<%=capitalizedAttributeName%>(); + <%=helperClassName%>.<%=addAllName%>(getWikitty(), <%=attributeName%>); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%= getter.getName() %>()); +}*/; + setOperationBody(addAll, addAllBody); + String addName = "add" + capitalizedAttributeName; ObjectModelOperation adder = addOperation(abstractClass, addName, "void"); addAnnotation(abstractClass, adder, "Override"); @@ -622,17 +634,37 @@ String setterName = "set" + attributeNameCapitalized; ObjectModelOperation setter = addOperation(abstractClassForThisMetaExtension, setterName, "void"); addAnnotation(abstractClassForThisMetaExtension, setter, "Override"); - addParameter(setter,"Set<String>","values"); + addParameter(setter, attributeTypeSimpleNameInSet, "values"); String setterBody = "" /*{ - for (String value:values){ - add<%=attributeNameCapitalized%>(value); + if (extensionForMetaExtension == null) { + <%=helperClassName%>.<%=setterName%>(getWikitty(), values); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); + } else { + <%=helperClassName%>.<%=setterName%>(extensionForMetaExtension.getName(), getWikitty(), values); + String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); + getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); } }*/; setOperationBody(setter, setterBody); + String addAllName = "addAll" + attributeNameCapitalized; + ObjectModelOperation addAll = addOperation(abstractClassForThisMetaExtension, addAllName, "void"); + addAnnotation(abstractClassForThisMetaExtension, addAll, "Override"); + addParameter(addAll, attributeTypeSimpleNameInSet, "values"); + String addAllBody = "" +/*{ + if (extensionForMetaExtension == null) { + <%=helperClassName%>.<%=addAllName%>(getWikitty(), values); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); + } else { + <%=helperClassName%>.<%=addAllName%>(extensionForMetaExtension.getName(), getWikitty(), values); + String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); + getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); + } +}*/; + setOperationBody(addAll, addAllBody); - String addName = "add" + attributeNameCapitalized; ObjectModelOperation adder = addOperation(abstractClassForThisMetaExtension, addName, "void"); addAnnotation(abstractClassForThisMetaExtension, adder, "Override"); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-12-15 11:58:08 UTC (rev 613) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-12-15 14:49:44 UTC (rev 614) @@ -229,6 +229,10 @@ ObjectModelOperation setter = addOperation(contract, setterName, "void"); addParameter(setter, attributeTypeSimpleNameInSet, attributeName); + String addAllName = "addAll" + StringUtils.capitalize(attributeName); + ObjectModelOperation addAll = addOperation(contract, addAllName, "void"); + addParameter(addAll, attributeTypeSimpleNameInSet, attributeName); + String addName = "add" + StringUtils.capitalize(attributeName); ObjectModelOperation adder = addOperation(contract, addName, "void"); addParameter(adder, "String", "element"); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-15 11:58:08 UTC (rev 613) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-15 14:49:44 UTC (rev 614) @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Random; @@ -195,8 +196,8 @@ String collectionType = WikittyTransformerUtil.getCollectionTypeName(attribute); if (Set.class.getSimpleName().equals(collectionType)){ addImport(abstractClass, Set.class); - addImport(abstractClass, HashSet.class); - attributeTypeInSetImpl = "HashSet<String>"; + addImport(abstractClass, LinkedHashSet.class); + attributeTypeInSetImpl = "LinkedHashSet<String>"; } if (List.class.getSimpleName().equals(collectionType)){ addImport(abstractClass, List.class); @@ -234,12 +235,28 @@ if (<%=attributeName%> == null){ this.<%=attributeName%> = new <%=attributeTypeInSetImpl%>(); } else { - this.<%=attributeName%>=<%=attributeName%>; + // make copy to prevent modification of source collection + this.<%=attributeName%>=new <%=attributeTypeInSetImpl%>(<%=attributeName%>); } modificationCount++; }*/; setOperationBody(setter, setterBody); + // adding the addAll + String addAllName = "addAll" + StringUtils.capitalize(attributeName); + ObjectModelOperation addAll = addOperation(abstractClass, addAllName, "void"); + addAnnotation(abstractClass, addAll, "Override"); + addParameter(addAll, attributeTypeInSet, attributeName); + String addAllBody = "" +/*{ + if (this.<%=attributeName%> == null){ + this.<%=attributeName%> = new <%=attributeTypeInSetImpl%>(); + } + this.<%=attributeName%>.addAll(<%=attributeName%>); + modificationCount++; +}*/; + setOperationBody(addAll, addAllBody); + //adding the add method String addName = "add" + StringUtils.capitalize(attributeName); ObjectModelOperation adder = addOperation(abstractClass, addName, "void"); @@ -247,10 +264,10 @@ addParameter(adder, attributeType, "element"); String adderBody = "" /*{ - if (<%=attributeName%> == null){ + if (this.<%=attributeName%> == null){ this.<%=attributeName%> = new <%=attributeTypeInSetImpl%>(); } - <%=attributeName%>.add(element); + this.<%=attributeName%>.add(element); modificationCount++; }*/; setOperationBody(adder, adderBody); @@ -634,7 +651,7 @@ String collectionType = WikittyTransformerUtil.getCollectionTypeName(attribute); if (Set.class.getSimpleName().equals(collectionType)) { attributeTypeInSet = "Set<String>"; - attributeTypeInSetImpl = "HashSet<String>"; + attributeTypeInSetImpl = "LinkedHashSet<String>"; } if (List.class.getSimpleName().equals(collectionType)) { attributeTypeInSet = "List<String>"; Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-12-15 11:58:08 UTC (rev 613) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-12-15 14:49:44 UTC (rev 614) @@ -143,13 +143,24 @@ addParameter(setter, attributeTypeSimpleNameInSet, attributeName); String setterBody = "" /*{ + clear<%=attributeNameCapitalized%>(wikitty); + addAll<%=attributeNameCapitalized%>(wikitty, <%=attributeName%>); +}*/; + setOperationBody(setter, setterBody); + + String addAllName = "addAll" + attributeNameCapitalized; + ObjectModelOperation addAll = addOperation(helper, addAllName, "void", ObjectModelModifier.STATIC); + addParameter(addAll, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + addParameter(addAll, attributeTypeSimpleNameInSet, attributeName); + String addAllBody = "" +/*{ if(<%=attributeName%> != null){ for (String id:<%=attributeName%>){ add<%=attributeNameCapitalized%>(wikitty, id); } } }*/; - setOperationBody(setter, setterBody); + setOperationBody(addAll, addAllBody); String addName = "add" + attributeNameCapitalized; ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC); @@ -382,16 +393,30 @@ String setterName = "set" + capitalizedAttributeName; ObjectModelOperation setter = addOperation(helper, setterName, "void", ObjectModelModifier.STATIC); addParameter(setter, "String", "extensionName"); + addParameter(setter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); addParameter(setter, attributeTypeSimpleNameInSet, attributeName); - addParameter(setter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); String setterBody = "" /*{ - for (String id:<%=attributeName%>){ - add<%=capitalizedAttributeName%>(extensionName, wikitty, id); - } + clear<%=capitalizedAttributeName%>(extensionName, wikitty); + addAll<%=capitalizedAttributeName%>(extensionName, wikitty, <%=attributeName%>); }*/; setOperationBody(setter, setterBody); + String addAllName = "addAll" + capitalizedAttributeName; + ObjectModelOperation addAll = addOperation(helper, addAllName, "void", ObjectModelModifier.STATIC); + addParameter(addAll, "String", "extensionName"); + addParameter(addAll, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + addParameter(addAll, attributeTypeSimpleNameInSet, attributeName); + String addAllBody = "" +/*{ + if(<%=attributeName%> != null){ + for (String id:<%=attributeName%>){ + add<%=capitalizedAttributeName%>(extensionName, wikitty, id); + } + } +}*/; + setOperationBody(addAll, addAllBody); + String addName = "add" + capitalizedAttributeName; ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC); addParameter(adder, "String", "extensionName");

1 0

r613 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org Dec. 15, 2010

Dec. 15, 2010

Author: bpoussin Date: 2010-12-15 12:58:08 +0100 (Wed, 15 Dec 2010) New Revision: 613 Url: http://nuiton.org/repositories/revision/wikitty/613 Log: mark class as deprecated Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-12-15 10:46:14 UTC (rev 612) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-12-15 11:58:08 UTC (rev 613) @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.services.WikittyServiceStorage; import org.nuiton.wikitty.solr.WikittySearchEngineSolr; @@ -37,6 +38,8 @@ * * Last update: $Date$ * by : $Author$ + * @deprecated use WikittyServiceFactory is good config file + * @see WikittyServiceFactory */ public class WikittyServiceJDBC extends WikittyServiceStorage {

1 0

r612 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty: . services
by bpoussin＠users.nuiton.org Dec. 15, 2010

Dec. 15, 2010

Author: bpoussin Date: 2010-12-15 11:46:14 +0100 (Wed, 15 Dec 2010) New Revision: 612 Url: http://nuiton.org/repositories/revision/wikitty/612 Log: add check on extension name, version and field name Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.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-12-15 10:44:19 UTC (rev 611) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-12-15 10:46:14 UTC (rev 612) @@ -79,6 +79,11 @@ */ public class WikittyUtil { + /** Pattern que doivent respecter les noms des extensions */ + public static final String extensionNamePattern = "\\w+"; + /** Pattern que doivent respecter les noms des champs des extensions */ + public static final String extensionFieldNamePattern = "\\w+"; + public static final String DEFAULT_MAJOR_VERSION = "0"; public static final String DEFAULT_MINOR_VERSION = "0"; public static final String DEFAULT_MAJOR_VERSION_PREFIX = DEFAULT_MAJOR_VERSION + "."; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-15 10:44:19 UTC (rev 611) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-15 10:46:14 UTC (rev 612) @@ -283,6 +283,41 @@ } } + /** + * Check some constraint on extension + * <li> extension name (ex: '#--AAA' is invalide name) + * <li> extension version (ex: '-1.0' is invalide version) + * <li> extension field name (ex: '=na' is invalide name) + * + * @see WikittyUtil#extensionNamePattern + * @see WikittyUtil#extensionFieldNamePattern + * @param exts + */ + protected void checkExtension(Collection<WikittyExtension> exts) { + for (WikittyExtension ext : exts) { + // if extension version is invalide, raise exception + if (WikittyUtil.versionGreaterThan("0", ext.getVersion())) { + throw new WikittyException(String.format( + "Invalide extension version %s", ext.getVersion())); + } + + // if extension name is invalide, raise exception + if (!ext.getName().matches(WikittyUtil.extensionNamePattern)) { + throw new WikittyException(String.format( + "Invalide extension name %s", ext.getName())); + } + + // if field name is invalide, raise exception + for(String fieldName : ext.getFieldNames()) { + if (!fieldName.matches(WikittyUtil.extensionFieldNamePattern)) { + throw new WikittyException(String.format( + "Invalide extension field name '%s' for extension '%s'", + fieldName, ext.getName())); + } + } + } + } + @Override public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { @@ -294,6 +329,8 @@ txBeginHere = true; } + // check extension + checkExtension(exts); WikittyEvent result = getExtensionStorage().store(tx, exts);

1 0

r611 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Dec. 15, 2010

Dec. 15, 2010

Author: bpoussin Date: 2010-12-15 11:44:19 +0100 (Wed, 15 Dec 2010) New Revision: 611 Url: http://nuiton.org/repositories/revision/wikitty/611 Log: fix boggus ${WIKITTY_DATA_DIR} directory creation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-14 21:41:35 UTC (rev 610) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-15 10:44:19 UTC (rev 611) @@ -146,7 +146,7 @@ WIKITTY_STORAGE_JDBC_URL( "wikitty.storage.jdbc.host", _("JDBC url"), - "jdbc:h2:file:${" + WIKITTY_DATA_DIR + "}/db", String.class, false, false), + "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", String.class, false, false), WIKITTY_STORAGE_JDBC_LOGIN( "wikitty.storage.jdbc.login", _("JDBC login name"), @@ -178,7 +178,7 @@ WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( "wikitty.searchengine.solr.directory.data", _("Solr data directory"), - "${" + WIKITTY_DATA_DIR + "}/solr", File.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/solr", File.class, false, false), WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( "wikitty.searchengine.solr.directory.factory", _("SolR storage type possible value: solr.StandardDirectoryFactory" @@ -200,7 +200,7 @@ WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( "wikitty.WikittyServiceInMemory.persistence.file", _("Fichier ou les donnees sont stocker"), - "${" + WIKITTY_DATA_DIR + "}/wikitty-inmemory.ser", File.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/wikitty-inmemory.ser", File.class, false, false), WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( @@ -250,11 +250,11 @@ WIKITTY_EXPORT_DIRECTORY( "wikitty.addon.export.directory", _("directory path where export asynchronous file are stored"), - "${" + WIKITTY_DATA_DIR + "}/export", String.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/export", String.class, false, false), WIKITTY_EXPORT_PUBLICURL( "wikitty.addon.export.publicurl", _("url used by client to retrieve export file when job is ended"), - "file://${" + WIKITTY_DATA_DIR + "}/export/", String.class, false, false), + "file://${" + WIKITTY_DATA_DIR.getKey() + "}/export/", String.class, false, false), WIKITTY_CACHE_RESTORE_COPIES( "wikitty.service.cache.allwaysRestoreCopies", @@ -292,7 +292,7 @@ WIKITTY_SLAVE_SYNC_STATE_FILE( "wikitty.service.slave.sync.state.file", _("File path to store synchronisation state"), - "${" + WIKITTY_DATA_DIR + "}/syncState", String.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/syncState", String.class, false, false), WIKITTY_SLAVE_MASTER_URL( "wikitty.service.slave.master.hessian.endpoint", _("Master url service, where to delegate modification action"),

1 0

Dec. 14, 2010

Author: tchemit Date: 2010-12-14 22:41:35 +0100 (Tue, 14 Dec 2010) New Revision: 610 Url: http://nuiton.org/repositories/revision/wikitty/610 Log: svn keywords again, wha'ts happening on wikitty ? :) + begin of integration test of generation (none of them are working actually, must fix it in eugene) Added: trunk/wikitty-api/src/it/ trunk/wikitty-api/src/it/generation/ trunk/wikitty-api/src/it/generation/README.txt trunk/wikitty-api/src/it/generation/invoker.properties trunk/wikitty-api/src/it/generation/pom.xml trunk/wikitty-api/src/it/generation/src/ trunk/wikitty-api/src/it/generation/src/main/ trunk/wikitty-api/src/it/generation/src/main/models/ trunk/wikitty-api/src/it/generation/src/main/models/mymodel.objectmodel trunk/wikitty-api/src/it/generation/src/main/models/mymodel2.objectmodel trunk/wikitty-api/src/it/generation/src/main/models/mymodel3.objectmodel trunk/wikitty-api/src/it/generation/src/main/models/mymodel4.objectmodel trunk/wikitty-api/src/it/generation/src/main/models/mymodel5.objectmodel trunk/wikitty-api/src/it/generation/src/test/ trunk/wikitty-api/src/it/generation/src/test/java/ trunk/wikitty-api/src/it/generation/src/test/java/org/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities/TestEntities.java trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities3/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities3/TestEntities.java trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java trunk/wikitty-api/src/it/generation/verify.groovy trunk/wikitty-api/src/it/settings.xml Modified: trunk/wikitty-api/LICENSE.txt trunk/wikitty-api/README.txt trunk/wikitty-api/changelog.txt trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Package.html trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportMethod.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyMetaExtensionUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Null.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCache.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorageInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java trunk/wikitty-api/src/main/resources/META-INF/hessian/deserializers trunk/wikitty-api/src/main/resources/META-INF/hessian/serializers trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties trunk/wikitty-api/src/main/xmi/wikitty.properties trunk/wikitty-api/src/main/xmi/wikitty.zargo trunk/wikitty-api/src/site/en/rst/index.rst trunk/wikitty-api/src/site/rst/index.rst trunk/wikitty-api/src/site/site_en.xml trunk/wikitty-api/src/site/site_fr.xml trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyCopyOnWriteTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyExtensionTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java trunk/wikitty-api/src/test/resources/csv/importclient.csv trunk/wikitty-api/src/test/resources/csv/importtree.csv trunk/wikitty-api/src/test/resources/csv/importtree2.csv trunk/wikitty-api/src/test/resources/jbossts-properties.xml trunk/wikitty-api/src/test/resources/log4j.properties Property changes on: trunk/wikitty-api/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/README.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/changelog.txt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-12-14 17:30:59 UTC (rev 609) +++ trunk/wikitty-api/pom.xml 2010-12-14 21:41:35 UTC (rev 610) @@ -39,7 +39,13 @@ <artifactId>spring-beans</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> +   <dependency> @@ -234,6 +240,46 @@ </build> </profile> + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <pomIncludes> + <pomInclude>generation/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath> + ${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <debug>${maven.verbose}</debug> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Property changes on: trunk/wikitty-api/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/it/generation/README.txt =================================================================== --- trunk/wikitty-api/src/it/generation/README.txt (rev 0) +++ trunk/wikitty-api/src/it/generation/README.txt 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,45 @@ +On teste ici le goal smart-generate avec un fichier model dans le class-path : + +Le résultat désiré est : + +maven-eugene-plugin/target/its/evol-879/model/model-impl/target/ +|-- extracted-sources1 +| `-- model +| `-- models +| |-- topiatest.objectmodel +| `-- topiatest.properties +|-- extracted-sources2 +| `-- model +| `-- models2 +| `-- topiatest2.objectmodel +|-- extracted-sources3 +| `-- model +| `-- topiatest3.objectmodel +|-- generated-sources1 +| `-- java +| `-- org +| `-- nuiton +| `-- topia +| `-- test +| `-- entities +|-- generated-sources2 +| `-- java +| `-- org +| `-- nuiton +| `-- topia +| `-- test +| `-- entities +|-- generated-sources3 +| `-- java +| `-- org +| `-- nuiton +| `-- topia +| `-- test +| `-- entities +`-- generated-sources4 + `-- java + `-- org + `-- nuiton + `-- topia + `-- test + `-- entities Property changes on: trunk/wikitty-api/src/it/generation/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/invoker.properties =================================================================== --- trunk/wikitty-api/src/it/generation/invoker.properties (rev 0) +++ trunk/wikitty-api/src/it/generation/invoker.properties 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,45 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean test + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-fast + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/wikitty-api/src/it/generation/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml (rev 0) +++ trunk/wikitty-api/src/it/generation/pom.xml 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,170 @@ +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>test-purifier</artifactId> + <version>3.0</version> + + <dependencies> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>@pom.version@</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.2</version> + </dependency> + </dependencies> + + <name>Wikitty Test :: test-purifier</name> + + <properties> + + <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> + +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + +  + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + + </properties> + + <build> + + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <fullPackagePath>org.nuiton.wikitty.test</fullPackagePath> + <defaultPackage>org.nuiton.wikitty.test</defaultPackage> + <generatedPackages>org.nuiton.wikitty.test</generatedPackages> + <extractedPackages> + org.nuiton.wikitty.test,org.nuiton.wikitty + </extractedPackages> + <templates> + org.nuiton.wikitty.generator.WikittyMetaGenerator + </templates> + </configuration> + <executions> + <execution> + <id>entities generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>src/main/models:mymodel.objectmodel</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <execution> + <id>entities2 generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>src/main/models:mymodel2.objectmodel</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <execution> + <id>entities3 generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>src/main/models:mymodel3.objectmodel</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <execution> + <id>entities4 generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>src/main/models:mymodel4.objectmodel</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + + <execution> + <id>entities5 generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>src/main/models:mymodel5.objectmodel</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>@pom.version@</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + + </build> +</project> + + Property changes on: trunk/wikitty-api/src/it/generation/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel.objectmodel =================================================================== --- trunk/wikitty-api/src/it/generation/src/main/models/mymodel.objectmodel (rev 0) +++ trunk/wikitty-api/src/it/generation/src/main/models/mymodel.objectmodel 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<objectModel xmlns="http://nuiton.org/eugene/objectModel/v1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd" + name="wikittyTest" version="1.0"> + <class name="User" package="org.nuiton.wikitty.test.entities"> + <stereotype name="entity"/> + <attribute name="lastName" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <class name="Agent" package="org.nuiton.wikitty.test.entities"> +  + <stereotype name="entity"/> + <superclass name="org.nuiton.wikitty.test.entities.User" discriminator=""/> + <attribute name="lastName" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"> + <tagValue name="alternativeName" value="toto"/> + </attribute> + </class> +</objectModel> \ No newline at end of file Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel2.objectmodel =================================================================== --- trunk/wikitty-api/src/it/generation/src/main/models/mymodel2.objectmodel (rev 0) +++ trunk/wikitty-api/src/it/generation/src/main/models/mymodel2.objectmodel 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<objectModel xmlns="http://nuiton.org/eugene/objectModel/v1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd" + name="wikittyTest" version="1.0"> + + <class name="Agent" package="org.nuiton.wikitty.test.entities2"> +  + <stereotype name="entity"/> + <superclass name="org.nuiton.wikitty.test.entities2.User2" discriminator=""/> + <superclass name="org.nuiton.wikitty.test.entities2.User" discriminator=""/> + </class> + <class name="User2" package="org.nuiton.wikitty.test.entities2"> + <stereotype name="entity"/> + <attribute name="lastName" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <class name="User" package="org.nuiton.wikitty.test.entities2"> + <stereotype name="entity"/> + <attribute name="lastName" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> +</objectModel> \ No newline at end of file Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel2.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel3.objectmodel =================================================================== --- trunk/wikitty-api/src/it/generation/src/main/models/mymodel3.objectmodel (rev 0) +++ trunk/wikitty-api/src/it/generation/src/main/models/mymodel3.objectmodel 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<objectModel xmlns="http://nuiton.org/eugene/objectModel/v1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd" + name="wikittyTest" version="1.0"> + <class name="Agent" package="org.nuiton.wikitty.test.entities3"> +  + <stereotype name="entity"/> + <superclass name="org.nuiton.wikitty.test.entities3.User2" discriminator=""/> + </class> + <class name="User2" package="org.nuiton.wikitty.test.entities3"> + <stereotype name="entity"/> + <superclass name="org.nuiton.wikitty.test.entities3.User" discriminator=""/> + <attribute name="firstName" associationType="composite" visibility="public" type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <class name="User" package="org.nuiton.wikitty.test.entities3"> + <stereotype name="entity"/> + <attribute name="lastName" associationType="composite" visibility="public" type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> +</objectModel> \ No newline at end of file Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel3.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel4.objectmodel =================================================================== --- trunk/wikitty-api/src/it/generation/src/main/models/mymodel4.objectmodel (rev 0) +++ trunk/wikitty-api/src/it/generation/src/main/models/mymodel4.objectmodel 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<objectModel xmlns="http://nuiton.org/eugene/objectModel/v1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd" + name="wikittyTest" version="1.0"> + + <class name="Agent" package="org.nuiton.wikitty.test.entities4"> +  + <stereotype name="entity"/> + <superclass name="org.nuiton.wikitty.test.entities4.User2" discriminator=""/> + <superclass name="org.nuiton.wikitty.test.entities4.User" discriminator=""/> + </class> + <class name="User2" package="org.nuiton.wikitty.test.entities4"> + <stereotype name="entity"/> + <attribute name="lastName" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"> + <tagValue name="alternativeName" value="toto"/> + </attribute> + </class> + <class name="User" package="org.nuiton.wikitty.test.entities4"> + <stereotype name="entity"/> + <attribute name="lastName" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> +</objectModel> \ No newline at end of file Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel4.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel5.objectmodel =================================================================== --- trunk/wikitty-api/src/it/generation/src/main/models/mymodel5.objectmodel (rev 0) +++ trunk/wikitty-api/src/it/generation/src/main/models/mymodel5.objectmodel 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<objectModel xmlns="http://nuiton.org/eugene/objectModel/v1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd" + name="wikittyTest" version="1.0"> + + <class name="Agent" package="org.nuiton.wikitty.test.entities5"> +  + <stereotype name="entity"/> + <superclass name="org.nuiton.wikitty.test.entities5.User" discriminator=""/> + <attribute name="refNumber" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <class name="User" package="org.nuiton.wikitty.test.entities5"> + <stereotype name="entity"/> + <superclass name="org.nuiton.wikitty.entities.WikittyUser" + discriminator=""/> + <attribute name="lastName" associationType="composite" visibility="public" + type="String" minMultiplicity="1" maxMultiplicity="1"/> + </class> +</objectModel> \ No newline at end of file Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel5.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities/TestEntities.java (rev 0) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities/TestEntities.java 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,29 @@ +package org.nuiton.wikitty.test.entities; + +import org.junit.Test; + +/** + * Test the generation of the model. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TestEntities { + + @Test + public void testUser() { + User u = new UserImpl(); + + u.getLastName(); + u.setLastName("lastName"); + } + + @Test + public void testAgent() { + Agent a = new AgentImpl(); + a.getToto(); + a.setToto("toto"); + a.getLastName(); + a.setLastName("lastName"); + } +} Property changes on: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities/TestEntities.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java (rev 0) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,36 @@ +package org.nuiton.wikitty.test.entities2; + +import org.junit.Test; + +/** + * Test the generation of the model. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TestEntities { + + @Test + public void testUser() { + User u = new UserImpl(); + + u.getLastName(); + u.setLastName("lastName"); + } + + @Test + public void testUser2() { + User2 u = new User2Impl(); + + u.getLastName(); + u.setLastName("lastName"); + } + + @Test + public void testAgent() { + Agent a = new AgentImpl(); + a.getLastName(); + a.setLastName("lastName"); + //TODO Should have specialized metho to access lastName from User and User2 ? + } +} Property changes on: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities2/TestEntities.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities3/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities3/TestEntities.java (rev 0) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities3/TestEntities.java 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,42 @@ +package org.nuiton.wikitty.test.entities3; + +import org.junit.Test; + +/** + * Test the generation of the model. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TestEntities { + + @Test + public void testUser() { + User u = new UserImpl(); + + u.getLastName(); + u.setLastName("lastName"); + } + + @Test + public void testUser2() { + User2 u = new User2Impl(); + + u.getLastName(); + u.setLastName("lastName"); + + u.getFirstName(); + u.setFirstName("firstName"); + } + + @Test + public void testAgent() { + Agent a = new AgentImpl(); + + a.getLastName(); + a.setLastName("lastName"); + + a.getFirstName(); + a.setFirstName("firstName"); + } +} Property changes on: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities3/TestEntities.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java (rev 0) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,42 @@ +package org.nuiton.wikitty.test.entities4; + +import org.junit.Test; + +/** + * Test the generation of the model. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TestEntities { + + @Test + public void testUser() { + User u = new UserImpl(); + + u.getLastName(); + u.setLastName("lastName"); + } + + @Test + public void testUser2() { + User2 u = new User2Impl(); + + u.getLastName(); + u.setLastName("lastName"); + + u.getToto(); + u.setToto("toto"); + } + + @Test + public void testAgent() { + Agent a = new AgentImpl(); + + a.getLastName(); + a.setLastName("lastName"); + + a.getToto(); + a.setToto("toto"); + } +} Property changes on: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities4/TestEntities.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java (rev 0) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,37 @@ +package org.nuiton.wikitty.test.entities4; + +import org.junit.Test; + +/** + * Test the generation of the model. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.0 + */ +public class TestEntities { + + @Test + public void testUser() { + User u = new UserImpl(); + + u.getLastName(); + u.setLastName("lastName"); + } + + @Test + public void testAgent() { + Agent a = new AgentImpl(); + + a.getLastName(); + a.setLastName("lastName"); + + a.getRefNumber(); + a.setRefNumber("refNumber"); + + a.getLogin(); + a.setLogin("login"); + + a.getPassword(); + a.setPassword("password"); + } +} Property changes on: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/generation/verify.groovy =================================================================== --- trunk/wikitty-api/src/it/generation/verify.groovy (rev 0) +++ trunk/wikitty-api/src/it/generation/verify.groovy 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,28 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* + +return true; + Property changes on: trunk/wikitty-api/src/it/generation/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wikitty-api/src/it/settings.xml =================================================================== --- trunk/wikitty-api/src/it/settings.xml (rev 0) +++ trunk/wikitty-api/src/it/settings.xml 2010-12-14 21:41:35 UTC (rev 610) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<settings> + + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + +  + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/ + </url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/ + </url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + + + </profile> + </profiles> +</settings> Property changes on: trunk/wikitty-api/src/it/settings.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Package.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportTask.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportMethod.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyField.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyMetaExtensionUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/Null.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCache.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorageInMemory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/META-INF/hessian/deserializers ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/META-INF/hessian/serializers ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/xmi/wikitty.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/xmi/wikitty.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/site/en/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyCopyOnWriteTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyExtensionTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/resources/csv/importclient.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/resources/csv/importtree.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/resources/csv/importtree2.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/resources/jbossts-properties.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r609 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/search main/java/org/nuiton/wikitty/services test/java/org/nuiton/wikitty/conform test/java/org/nuiton/wikitty/entities
by sletellier＠users.nuiton.org Dec. 14, 2010

Dec. 14, 2010

Author: sletellier Date: 2010-12-14 18:30:59 +0100 (Tue, 14 Dec 2010) New Revision: 609 Url: http://nuiton.org/repositories/revision/wikitty/609 Log: - Clean imports - Fix bug #1148 (http://www.nuiton.org/issues/show/1148) - Add test for no regression Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2010-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2010-12-14 17:30:59 UTC (rev 609) @@ -53,7 +53,6 @@ * by : $Author$ */ public class Criteria implements Serializable { - /** serialVersionUID. */ private static final long serialVersionUID = 2590223960861630283L; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2010-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2010-12-14 17:30:59 UTC (rev 609) @@ -273,7 +273,10 @@ } else { if (type.contains(WikittyEventType.PUT_WIKITTY)) { Wikitty newWikitty = getWikitties().get(id); - e.replaceWith(newWikitty); + // can be null if wikitty is already saved (uptodate), then this wikitty is not re-saved + if (newWikitty != null) { + e.replaceWith(newWikitty); + } } if (type.contains(WikittyEventType.REMOVE_WIKITTY)) { Date date = getRemoveDate().get(id); 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-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-12-14 17:30:59 UTC (rev 609) @@ -45,6 +45,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.search.PagedResult; @@ -57,8 +58,6 @@ import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.addons.WikittyLabelUtil; import org.nuiton.wikitty.WikittyObsoleteException; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; @@ -671,4 +670,22 @@ Assert.assertEquals("LeBin", restoredWikitty.getFieldAsString(extName, "name")); Assert.assertEquals(bytes, restoredWikitty.getFieldAsBytes(extName, "content")); } + + @Test + public void testStoreUnmodifiedEntity() { + WikittyLabel wikitty1 = new WikittyLabelImpl(); + WikittyLabel wikitty2 = new WikittyLabelImpl(); + + List<WikittyLabel> toStore = new ArrayList<WikittyLabel>(); + Collections.addAll(toStore, wikitty1, wikitty2); + List<WikittyLabel> stored = getProxy().store(toStore); + + stored.get(0).addLabels("lbl"); + + try { + getProxy().store(toStore); + } catch (Exception eee) { + Assert.fail(); + } + } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java 2010-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java 2010-12-14 17:30:59 UTC (rev 609) @@ -1,17 +1,9 @@ package org.nuiton.wikitty.entities; - -import java.beans.PropertyDescriptor; -import java.util.Arrays; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.entities.WikittyLabelImpl; /** *

1 0

r608 - in trunk/src/site: . rst
by jcouteau＠users.nuiton.org Dec. 13, 2010

Dec. 13, 2010

Author: jcouteau Date: 2010-12-13 18:12:21 +0100 (Mon, 13 Dec 2010) New Revision: 608 Url: http://nuiton.org/repositories/revision/wikitty/608 Log: Add doc about Wikitty generation. need to add some images to explain better Added: trunk/src/site/rst/generation.rst Modified: trunk/src/site/site_fr.xml Added: trunk/src/site/rst/generation.rst =================================================================== --- trunk/src/site/rst/generation.rst (rev 0) +++ trunk/src/site/rst/generation.rst 2010-12-13 17:12:21 UTC (rev 608) @@ -0,0 +1,87 @@ +====================================== +Générer son modèle métier vers Wikitty +====================================== + +Modélisation +============ + +Vous pouvez modéliser votre modèle métier en utilisant n'importe quel modéliseur +UML pouvant enregistrer le modèle au format xmi (ArgoUML, Topcased,...). Les +entités que vous souhaiter générer doivent avoir le stéréotype *entity*. + +Configuration Maven +=================== + +Pour générer le code, nous utilisons EUGene_ et son plugin Maven. + +Dans le pom de votre projet, rajoutez la définition du plugin:: + +<plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>2.2/version> + <executions> + <execution> + <id>api generator</id> + <phase>process-sources</phase> + <configuration> + <inputs> + <input>zargo:src/main/xmi/:*.zargo</input> + <input>classpath:model:/:wikitty.objectmodel + </input> + </inputs> + <fullPackagePath>your.app.package</fullPackagePath> + <defaultPackage>your.app.package</defaultPackage> + <extractedPackages> + your.app.package,org.nuiton.wikitty + </extractedPackages> + <generatedPackages>your.app.package</generatedPackages> + <templates> + org.nuiton.wikitty.generator.WikittyMetaGenerator, + org.nuiton.wikitty.generator.WikittyDTOGenerator + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> +</plugin> + +Dans la section *inputs*, on spécifie le(s) modèle(s) métier:: + +zargo:src/main/xmi/:*.zargo + +ainsi que le modèle Wikitty (en cas de dépendance de votre modèle métier vers le +modèle Wikitty). + +Dans la section *templates*, vous pouvez spécifier quoi générer : +*org.nuiton.wikitty.generator.WikittyMetaGenerator* pour la génération Wikitty +standard et *org.nuiton.wikitty.generator.WikittyDTOGenerator* pour la +génération des DTOs si besoin. + +Génération +========== + +La génération est effectuée ensuite à chaque fois que vous lancez un build. + +Subtilités de modélisation +========================== + +Dépendances vers l'API de Wikitty +--------------------------------- + +Il est possible de rajouter une dépendance vers un objet de l'API Wikitty (par +example WikittyUser) en rajoutant simplement la classe dans votre modèle dans le +package* org.nuiton.wikitty.api*. Elle ne sera pas générée mais interviendra +comme une autre classe de votre modèle (héritage,...). + +Arbres +------ + +Si vous souhaitez qu'une entité crée un arbre, vous avez juste à faire hériter +cette entité de WikittyTreeNode (pas besoin de référence sur elle-même). De +cette manière, la gestion de l'arbre est assurée par Wikity, de même que +l'indexation et la recherche. + +.. _EUGene::http://maven-site.nuiton.org/eugene/ \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-12-13 14:11:14 UTC (rev 607) +++ trunk/src/site/site_fr.xml 2010-12-13 17:12:21 UTC (rev 608) @@ -54,6 +54,7 @@ </menu> <menu name="User"> + <item name="Generation" href="generation.html"/> <item name="Migration" href="migration.html"/> <item name="Hessian" href="hessian.html"/> </menu>

1 0

r607 - trunk/wikitty-publication/src/main/resources
by bpoussin＠users.nuiton.org Dec. 13, 2010

Dec. 13, 2010

Author: bpoussin Date: 2010-12-13 15:11:14 +0100 (Mon, 13 Dec 2010) New Revision: 607 Url: http://nuiton.org/repositories/revision/wikitty/607 Log: change bad classe name string syntaxe (for inner class) Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2010-12-13 14:00:20 UTC (rev 606) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2010-12-13 14:11:14 UTC (rev 607) @@ -51,4 +51,4 @@ wikitty.addon.export.directory=${wikitty.data.directory}/export wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ wikitty.WikittyServiceAccessStat.components=\ -org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageWikitty +org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog

1 0