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

r56 - trunk/wikitty-jdbc-impl
by echatellier＠users.nuiton.org May 17, 2010

May 17, 2010

Author: echatellier Date: 2010-05-17 12:13:56 +0200 (Mon, 17 May 2010) New Revision: 56 Url: http://nuiton.org/repositories/revision/wikitty/56 Log: Move jetty to provided scope Modified: trunk/wikitty-jdbc-impl/pom.xml Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-05-17 10:05:07 UTC (rev 55) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-05-17 10:13:56 UTC (rev 56) @@ -60,6 +60,7 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>${jetty.version}</version> + <scope>provided</scope> </dependency> <dependency>

1 0

r55 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org May 17, 2010

May 17, 2010

Author: echatellier Date: 2010-05-17 12:05:07 +0200 (Mon, 17 May 2010) New Revision: 55 Url: http://nuiton.org/repositories/revision/wikitty/55 Log: Reset it deprecated Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-17 08:38:51 UTC (rev 54) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-17 10:05:07 UTC (rev 55) @@ -24,7 +24,10 @@ * Generate pure Bean Object (no wikitty object internaly stored) * * @author poussin + * + * @deprecated since 2.0 will be removed soon */ +@Deprecated public class BusinessEntityBeanGenerator extends WikengoCommonGenerator { private static final Log log = LogFactory.getLog(BusinessEntityBeanGenerator.class);

1 0

r54 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org May 17, 2010

May 17, 2010

Author: echatellier Date: 2010-05-17 10:38:51 +0200 (Mon, 17 May 2010) New Revision: 54 Url: http://nuiton.org/repositories/revision/wikitty/54 Log: Add interface/abstract/impl generation. Add property change support. Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java Removed: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java 2010-05-12 15:08:48 UTC (rev 53) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java 2010-05-17 08:38:51 UTC (rev 54) @@ -17,6 +17,7 @@ package org.nuiton.wikitty; +import java.beans.PropertyChangeListener; import java.io.Serializable; import java.util.Collection; @@ -77,5 +78,35 @@ * @return */ public FieldType getFieldType(String ext, String fieldName); + + /** + * Ajoute un listener gloable + * + * @param listener le listener à ajouter + */ + void addPropertyChangeListener(PropertyChangeListener listener); + /** + * Supprime un listener globable. + * + * @param listener le listener à supprimer + */ + void removePropertyChangeListener(PropertyChangeListener listener); + + /** + * Ajoute un listener sur la propriété {@code propertyName} + * + * @param propertyName le nom de la propriété + * @param listener le listener à ajouter + */ + void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); + + /** + * Supprime un listener sur la propriété {@code propertyName} + * + * @param propertyName le nom de la propriété + * @param listener le listener à supprimer + */ + void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); + } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java 2010-05-12 15:08:48 UTC (rev 53) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java 2010-05-17 08:38:51 UTC (rev 54) @@ -17,6 +17,8 @@ package org.nuiton.wikitty; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; @@ -32,8 +34,11 @@ */ public class BusinessEntityBean implements BusinessEntity { - private static final long serialVersionUID = 1L; + /** serialVersionUID. */ + private static final long serialVersionUID = 5245199905431320116L; + protected transient PropertyChangeSupport propertyChangeSupport; + protected String id; protected String version; @@ -89,4 +94,37 @@ throw new UnsupportedOperationException("Not supported yet."); } + /* + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener) + */ + @Override + public void addPropertyChangeListener(PropertyChangeListener listener) { + propertyChangeSupport.addPropertyChangeListener(listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.beans.PropertyChangeListener) + */ + @Override + public void removePropertyChangeListener(PropertyChangeListener listener) { + propertyChangeSupport.removePropertyChangeListener(listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + */ + @Override + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + propertyChangeSupport.addPropertyChangeListener(propertyName, listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + */ + @Override + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + propertyChangeSupport.removePropertyChangeListener(propertyName, listener); + } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-05-12 15:08:48 UTC (rev 53) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-05-17 08:38:51 UTC (rev 54) @@ -17,6 +17,8 @@ package org.nuiton.wikitty; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; import java.util.Collection; import java.util.Collections; @@ -32,16 +34,20 @@ */ public class BusinessEntityWikitty implements BusinessEntity { - private static final long serialVersionUID = 1L; + /** serialVersionUID. */ + private static final long serialVersionUID = -4399752739887114180L; + protected transient PropertyChangeSupport propertyChangeSupport; + protected Wikitty wikitty; public BusinessEntityWikitty(Wikitty wi) { + propertyChangeSupport = new PropertyChangeSupport(this); setWikitty(wi); } public BusinessEntityWikitty() { - setWikitty(new Wikitty()); + this(new Wikitty()); } public String getWikittyId() { @@ -98,4 +104,38 @@ public Collection<WikittyExtension> getStaticExtensions() { return Collections.emptyList(); } + + /* + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener) + */ + @Override + public void addPropertyChangeListener(PropertyChangeListener listener) { + propertyChangeSupport.addPropertyChangeListener(listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.beans.PropertyChangeListener) + */ + @Override + public void removePropertyChangeListener(PropertyChangeListener listener) { + propertyChangeSupport.removePropertyChangeListener(listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + */ + @Override + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + propertyChangeSupport.addPropertyChangeListener(propertyName, listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + */ + @Override + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + propertyChangeSupport.removePropertyChangeListener(propertyName, listener); + } } Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-05-17 08:38:51 UTC (rev 54) @@ -0,0 +1,445 @@ +package org.nuiton.wikitty.generator; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; + +/** + * Possible enhancement: + * - generateParentMethod can generate attribut method access that call + * the same method on parent instance class. For that we must have one attribut + * instance by parent. This attribut we must be created in setWikitty method + * and used same wikitty object. + * + * @author poussin + */ +public class BusinessEntityAbstractGenerator extends WikengoCommonGenerator { + + private static final Log log = LogFactory.getLog(BusinessEntityAbstractGenerator.class); + + static protected Pattern extractTypeOnCollection = Pattern.compile("\\w*<(\\w+)>"); + + protected String EXT_NAME; + + @Override + public String getFilenameForClass(ObjectModelClass clazz) { + String fqn = clazz.getQualifiedName(); + log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); + return fqn.replace('.', File.separatorChar) + "Abstract.java"; + } + + public void generateFromClass(Writer output, ObjectModelClass clazz) + throws IOException { + if (!EugengoUtils.isBusinessEntity(clazz)) { + log.info( clazz.getName() + " is not a business entity"); + return; + } + + log.info("Generate Business entity abstract" + clazz.getName() + "... "); + generateCopyright(output); + + EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); + + String packageName = clazz.getPackageName(); + String name = clazz.getName() + "Abstract"; +/*{package <%=packageName%>; + +}*/ + ObjectModelClass superClass = findSuperClass(clazz); + + clearImports(); + addImport(clazz); + addImport(superClass); + addImport("org.nuiton.wikitty.WikittyUtil"); + addImport("org.nuiton.wikitty.Wikitty"); + addImport("org.nuiton.wikitty.BusinessEntityWikitty"); + addImport("org.nuiton.wikitty.WikittyExtension"); + addImport(Collection.class); + addImport(Collections.class); + addImport(List.class); + addImport(ArrayList.class); + String parentImpl = null; + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + addImport(parent); + parentImpl = parent.getQualifiedName() + "Impl"; + addImport( parentImpl ); + } + } + lookForAttributeImports(clazz); + generateImports(output, packageName); + + generateClazzDocumentation(output, clazz); + String extendsString = " extends " + ( parentImpl != null ? parentImpl : getType("org.nuiton.wikitty.BusinessEntityWikitty") ); + + String implementsString = "implements " + getType(clazz.getQualifiedName()); + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + implementsString += ", " + getType(parent.getQualifiedName()); + } + } + +/*{public abstract class <%=name%><%=extendsString%> <%=implementsString%> { + +}*/ + + String svUID = GeneratorUtil.computeSerialVersionUID(clazz); +/*{ private static final long serialVersionUID = <%=svUID%>; + +}*/ + + generateWikittyExtension(output, clazz); + + generateStaticAttributes(output, clazz); + +/*{ + public <%=name%>() { + super(); + } + + public <%=name%>(BusinessEntityWikitty wi) { + super(wi.getWikitty()); + } + + public <%=name%>(Wikitty wi) { + super(wi); + } + +}*/ + + generateAttributeAccessMethod(output, clazz); + + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + generateParentMethod(output, parent); + } + } + +/*{ @Override + public Collection<WikittyExtension> getStaticExtensions() { + return extensions; + } + + +} //<%=name%> +}*/ + + } + + + + // Utilitarian methods + + public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (attr.isNavigable() && !attr.isStatic() + && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { + if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { + //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! + generateCollectionAttributeAccessors(output, attr); + } else { + generateWikittyAttributeAccessors(output, attr); + } + } + } + } + + private void generateWikittyExtension(Writer output, + ObjectModelClass clazz) throws IOException { + String version = clazz.getTagValue("version"); + + // Since wikitty 1.3, version need to be dotted + if ( version == null ) { + version = "1.0"; + } + + // get requires from parent + String requires = null; + String separator = ""; + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + String parentExtName = "EXT_" + parent.getName().toUpperCase(); + + if (requires == null) { + requires = ""; + } + + requires += separator + parent.getName() + "." + parentExtName; + // dans le cas où on aurait un heritage multiple :) + // FIXME EC-20100420 gerer les extensions multiples + separator = " + \",\" /* FIXME Multiples extentions are not yet supported */ + "; + } + } + +/*{ static final protected List<WikittyExtension> extensions; + static final public WikittyExtension extension<%=clazz.getName()%> = + new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", <%=requires%>, + WikittyUtil.buildFieldMapExtension(}*/ + + separator = ""; + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (attr.isNavigable() && !attr.isStatic() && + (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { +/*{<%=separator%> + }*/ + generateAttribute(output, attr); + separator = ","; + } + } +/*{)); + static { + ArrayList<WikittyExtension> exts = new ArrayList<WikittyExtension>(); +}*/ + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { +/*{ + exts.addAll(<%=parent.getName()%>Abstract.extensions); +}*/ + } + } +/*{ + // EC-20100420 add current extension after parent ones + // if current is loaded before required extension + // load failed because required extension is missing + exts.add(extension<%=clazz.getName()%>); + + extensions = Collections.unmodifiableList(exts); + } +}*/ + } + + private void generateAttribute(Writer output, ObjectModelAttribute attr) + throws IOException { + String attrType = computeType(attr); + if (EugengoUtils.notEmpty(attrType)) { + attrType = getType(attrType); + } else { + return; + } + + String attrName = attr.getName(); + String card = ""; + + //TODO ymartel 20090812: a better way to manage those DataTypes in the model? + if (attrType.contains("Collection") || attrType.contains("List") || attrType.contains("Set")) { + card = "[0-*]"; + // List<String> + Matcher match = extractTypeOnCollection.matcher(attrType); + if (match.matches()) { + attrType = match.group(1); + } + } + + if (!commonTypes.contains(attrType)) { + attrType = "Wikitty"; + } else if(commonNumerics.contains(attrType)) { + attrType = "Numeric"; + } else if(commonStrings.contains(attrType)) { + attrType = "String"; + } + + + int maxMultiplicity = attr.getMaxMultiplicity(); + if ((maxMultiplicity != 0 && maxMultiplicity != 1)){ + card = "[" + attr.getMinMultiplicity() + "-"; + if (maxMultiplicity == -1) { + card += "*]"; + } else { + card += maxMultiplicity + "]"; + } + } + + // FIXME EC-20100420 attr.isUnique() always return true for + // attributes (maybe use tagValue instead) + String unique = attr.isUnique() ? " unique" : ""; + + String tagValues = ""; + if ("designation".equals(attr.getName())) { + System.out.println("+++ DEBUG +++ " + attr.getName() + " " + attr.getTagValues()); + } + for (String tag : attr.getTagValues().keySet()) { + String value = attr.getTagValue(tag); + tagValues += " " + tag + "=" + value; + } + +/*{"<%=attrType%> <%=attrName%><%=card%><%=unique%><%=tagValues%>"}*/ + } + + private void generateParentMethod(Writer output, + ObjectModelClass clazz) throws IOException { + + // we must generate method for parent of parent + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + generateParentMethod(output, parent); + } + } + + // generate method acces for parent attribut + generateAttributeAccessMethod(output, clazz); + } + + protected void generateWikittyAttributeAccessors(Writer output, + ObjectModelAttribute attr) throws IOException { + + EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); + + String attrType = computeType(attr); + if (EugengoUtils.notEmpty(attrType)) { + attrType = getType(attrType, true); + } else { + return; + } + + // FIXME EC-20100421 cette methode peut retourner List<String> + // et generer la methode getWikitty().getFieldAsList<String>() + // qui ne peut pas compiler + String methodAccessName = getFieldAccessMethodName(attr); + + String attrName = attr.getName(); + String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); + +/*{ + public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { + Object oldValue = getField(<%=EXT_NAME%>, "<%=attrName%>"); + getWikitty().setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); + propertyChangeSupport.firePropertyChange("<%=attrName%>", oldValue, <%=attrName%>); + } + + public <%=attrType%> get<%=attrNameCapitalized%>() { + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); + return result; + } + +}*/ + } + + /** + * Give the string to put after getFieldAs???, only some type is accepted + * and we must convert BusinessEntity to Wikitty string + * @param type + * @return + */ + protected String getFieldAccessMethodName(ObjectModelAttribute attr) { + String result = computeType(attr); + result = getType(result, true); + + boolean isCollection = (attr.getMaxMultiplicity() != 0 + && attr.getMaxMultiplicity() != 1); + if (isCollection) { + if (attr.isUnique()) { + result = "Set"; + } else { + result = "List"; + } + } else { + // test for Date + if ("java.util.Date".equals(result) || "Date".equals(result)) { + result = "Date"; + } else if (getModel().hasClass(result)) { // test for Wikitty object + ObjectModelClass fieldClass = getModel().getClass(result); + if (EugengoUtils.isBusinessEntity(fieldClass)) { + // for wikittyDto we use String for Id + result = "Wikitty"; + } + } else if (null != getModel().getEnumeration(result)) { + result = "String"; + } + } + result = EugengoUtils.toUpperCaseFirstLetter(result); + + return result; + } + + protected void generateCollectionAttributeAccessors(Writer output, + ObjectModelAttribute attr) throws IOException { + + EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); + + String attrType = computeType(attr); + if (EugengoUtils.notEmpty(attrType)) { + attrType = getType(attrType, true); + } else { + return; + } + + // get collection element type for add and remove method arguement type + String elementType = getType(attr.getType(), true); + + String methodAccessName = getFieldAccessMethodName(attr); + + String attrName = attr.getName(); + String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); +/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); + return result; + } + + public void add<%=attrNameCapitalized%>(<%=elementType%> element) { + getWikitty().addToField(<%=EXT_NAME%>, "<%=attrName%>", element); + propertyChangeSupport.firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + } + + public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { + getWikitty().removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); + propertyChangeSupport.firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + } + + public void clear<%=attrNameCapitalized%>() { + getWikitty().clearField(<%=EXT_NAME%>, "<%=attrName%>"); + propertyChangeSupport.firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + } + +}*/ + } + + private static Set<String> commonNumerics; + static { + commonNumerics = new HashSet<String>(); + commonNumerics.add("byte"); + commonNumerics.add("Byte"); + commonNumerics.add("short"); + commonNumerics.add("Short"); + commonNumerics.add("int"); + commonNumerics.add("Integer"); + commonNumerics.add("long"); + commonNumerics.add("Long"); + commonNumerics.add("float"); + commonNumerics.add("Float"); + commonNumerics.add("double"); + commonNumerics.add("Double"); + } + + private static Set<String> commonStrings; + static { + commonStrings = new HashSet<String>(); + commonStrings.add("char"); + commonStrings.add("Char"); + commonStrings.add("String"); + } + + private static Set<String> commonTypes; + static { + commonTypes = new HashSet<String>(); + commonTypes.addAll(commonNumerics); + commonTypes.addAll(commonStrings); + commonTypes.add("boolean"); + commonTypes.add("Boolean"); + commonTypes.add("Date"); + } + +} Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-12 15:08:48 UTC (rev 53) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-17 08:38:51 UTC (rev 54) @@ -24,10 +24,7 @@ * Generate pure Bean Object (no wikitty object internaly stored) * * @author poussin - * - * @deprecated since 2.0 will be removed soon */ -@Deprecated public class BusinessEntityBeanGenerator extends WikengoCommonGenerator { private static final Log log = LogFactory.getLog(BusinessEntityBeanGenerator.class); @@ -88,7 +85,9 @@ generateClazzDocumentation(output, clazz); String extendsString = " extends " + ( parentBean != null ? parentBean : getType("org.nuiton.wikitty.BusinessEntityBean") ); String abstractString = ""; - if (clazz.isAbstract()) { + + // Temp fix, if operation, set it as abstract + if (clazz.isAbstract() || !clazz.getOperations().isEmpty()) { abstractString += "abstract "; } @@ -99,11 +98,7 @@ } } -/*{/** - * @deprecated since 2.0 will be removed soon - *) -@Deprecated -public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { +/*{public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { }*/ Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java 2010-05-12 15:08:48 UTC (rev 53) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java 2010-05-17 08:38:51 UTC (rev 54) @@ -1,444 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/** - * Possible enhancement: - * - generateParentMethod can generate attribut method access that call - * the same method on parent instance class. For that we must have one attribut - * instance by parent. This attribut we must be created in setWikitty method - * and used same wikitty object. - * - * @author poussin - */ -public class BusinessEntityGenerator extends WikengoCommonGenerator { - - private static final Log log = LogFactory.getLog(BusinessEntityGenerator.class); - - static protected Pattern extractTypeOnCollection = Pattern.compile("\\w*<(\\w+)>"); - - protected String EXT_NAME; - - @Override - public String getFilenameForClass(ObjectModelClass clazz) { - String fqn = clazz.getQualifiedName(); - log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); - return fqn.replace('.', File.separatorChar) + "Impl.java"; - } - - public void generateFromClass(Writer output, ObjectModelClass clazz) - throws IOException { - if (!EugengoUtils.isBusinessEntity(clazz)) { - log.info( clazz.getName() + " is not a business entity"); - return; - } - - log.info("Generate Business entity " + clazz.getName() + "... "); - generateCopyright(output); - - EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); - - String packageName = clazz.getPackageName(); - String name = clazz.getName() + "Impl"; -/*{package <%=packageName%>; - -}*/ - ObjectModelClass superClass = findSuperClass(clazz); - - clearImports(); - addImport(clazz); - addImport(superClass); - addImport("org.nuiton.wikitty.WikittyUtil"); - addImport("org.nuiton.wikitty.Wikitty"); - addImport("org.nuiton.wikitty.BusinessEntityWikitty"); - addImport("org.nuiton.wikitty.WikittyExtension"); - addImport(Collection.class); - addImport(Collections.class); - addImport(List.class); - addImport(ArrayList.class); - String parentImpl = null; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - addImport(parent); - parentImpl = parent.getQualifiedName() + "Impl"; - addImport( parentImpl ); - } - } - lookForAttributeImports(clazz); - generateImports(output, packageName); - - generateClazzDocumentation(output, clazz); - String extendsString = " extends " + ( parentImpl != null ? parentImpl : getType("org.nuiton.wikitty.BusinessEntityWikitty") ); - String abstractString = ""; - if (clazz.isAbstract()) { - abstractString += "abstract "; - } - - String implementsString = "implements " + getType(clazz.getQualifiedName()); - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - implementsString += ", " + getType(parent.getQualifiedName()); - } - } - -/*{public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { - -}*/ - - String svUID = GeneratorUtil.computeSerialVersionUID(clazz); -/*{ private static final long serialVersionUID = <%=svUID%>; - -}*/ - - generateWikittyExtension(output, clazz); - - generateStaticAttributes(output, clazz); - -/*{ - public <%=name%>() { - super(); - } - - public <%=name%>(BusinessEntityWikitty wi) { - super(wi.getWikitty()); - } - - public <%=name%>(Wikitty wi) { - super(wi); - } - -}*/ - - generateAttributeAccessMethod(output, clazz); - - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - generateParentMethod(output, parent); - } - } - -/*{ @Override - public Collection<WikittyExtension> getStaticExtensions() { - return extensions; - } - - -} //<%=name%> -}*/ - - } - - - - // Utilitarian methods - - public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() - && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { - //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! - generateCollectionAttributeAccessors(output, attr); - } else { - generateWikittyAttributeAccessors(output, attr); - } - } - } - } - - private void generateWikittyExtension(Writer output, - ObjectModelClass clazz) throws IOException { - String version = clazz.getTagValue("version"); - - // Since wikitty 1.3, version need to be dotted - if ( version == null ) { - version = "1.0"; - } - - // get requires from parent - String requires = null; - String separator = ""; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - String parentExtName = "EXT_" + parent.getName().toUpperCase(); - - if (requires == null) { - requires = ""; - } - - requires += separator + parent.getName() + "." + parentExtName; - // dans le cas où on aurait un heritage multiple :) - // FIXME EC-20100420 gerer les extensions multiples - separator = " + \",\" /* FIXME Multiples extentions are not yet supported */ + "; - } - } - -/*{ static final protected List<WikittyExtension> extensions; - static final public WikittyExtension extension<%=clazz.getName()%> = - new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", <%=requires%>, - WikittyUtil.buildFieldMapExtension(}*/ - - separator = ""; - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && - (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { -/*{<%=separator%> - }*/ - generateAttribute(output, attr); - separator = ","; - } - } -/*{)); - static { - ArrayList<WikittyExtension> exts = new ArrayList<WikittyExtension>(); -}*/ - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { -/*{ - exts.addAll(<%=parent.getName()%>Impl.extensions); -}*/ - } - } -/*{ - // EC-20100420 add current extension after parent ones - // if current is loaded before required extension - // load failed because required extension is missing - exts.add(extension<%=clazz.getName()%>); - - extensions = Collections.unmodifiableList(exts); - } -}*/ - } - - private void generateAttribute(Writer output, ObjectModelAttribute attr) - throws IOException { - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType); - } else { - return; - } - - String attrName = attr.getName(); - String card = ""; - - //TODO ymartel 20090812: a better way to manage those DataTypes in the model? - if (attrType.contains("Collection") || attrType.contains("List") || attrType.contains("Set")) { - card = "[0-*]"; - // List<String> - Matcher match = extractTypeOnCollection.matcher(attrType); - if (match.matches()) { - attrType = match.group(1); - } - } - - if (!commonTypes.contains(attrType)) { - attrType = "Wikitty"; - } else if(commonNumerics.contains(attrType)) { - attrType = "Numeric"; - } else if(commonStrings.contains(attrType)) { - attrType = "String"; - } - - - int maxMultiplicity = attr.getMaxMultiplicity(); - if ((maxMultiplicity != 0 && maxMultiplicity != 1)){ - card = "[" + attr.getMinMultiplicity() + "-"; - if (maxMultiplicity == -1) { - card += "*]"; - } else { - card += maxMultiplicity + "]"; - } - } - - // FIXME EC-20100420 attr.isUnique() always return true for - // attributes (maybe use tagValue instead) - String unique = attr.isUnique() ? " unique" : ""; - - String tagValues = ""; - if ("designation".equals(attr.getName())) { - System.out.println("+++ DEBUG +++ " + attr.getName() + " " + attr.getTagValues()); - } - for (String tag : attr.getTagValues().keySet()) { - String value = attr.getTagValue(tag); - tagValues += " " + tag + "=" + value; - } - -/*{"<%=attrType%> <%=attrName%><%=card%><%=unique%><%=tagValues%>"}*/ - } - - private void generateParentMethod(Writer output, - ObjectModelClass clazz) throws IOException { - - // we must generate method for parent of parent - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - generateParentMethod(output, parent); - } - } - - // generate method acces for parent attribut - generateAttributeAccessMethod(output, clazz); - } - - protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { - - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // FIXME EC-20100421 cette methode peut retourner List<String> - // et generer la methode getWikitty().getFieldAsList<String>() - // qui ne peut pas compiler - String methodAccessName = getFieldAccessMethodName(attr); - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); - -/*{ - public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { - getWikitty().setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); - } - - public <%=attrType%> get<%=attrNameCapitalized%>() { - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); - return result; - } - -}*/ - } - - /** - * Give the string to put after getFieldAs???, only some type is accepted - * and we must convert BusinessEntity to Wikitty string - * @param type - * @return - */ - protected String getFieldAccessMethodName(ObjectModelAttribute attr) { - String result = computeType(attr); - result = getType(result, true); - - boolean isCollection = (attr.getMaxMultiplicity() != 0 - && attr.getMaxMultiplicity() != 1); - if (isCollection) { - if (attr.isUnique()) { - result = "Set"; - } else { - result = "List"; - } - } else { - // test for Date - if ("java.util.Date".equals(result) || "Date".equals(result)) { - result = "Date"; - } else if (getModel().hasClass(result)) { // test for Wikitty object - ObjectModelClass fieldClass = getModel().getClass(result); - if (EugengoUtils.isBusinessEntity(fieldClass)) { - // for wikittyDto we use String for Id - result = "Wikitty"; - } - } else if (null != getModel().getEnumeration(result)) { - result = "String"; - } - } - result = EugengoUtils.toUpperCaseFirstLetter(result); - - return result; - } - - protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { - - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // get collection element type for add and remove method arguement type - String elementType = getType(attr.getType(), true); - - String methodAccessName = getFieldAccessMethodName(attr); - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); -/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); - return result; - } - - public void add<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().addToField(<%=EXT_NAME%>, "<%=attrName%>", element); - } - - public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); - } - - public void clear<%=attrNameCapitalized%>() { - getWikitty().clearField(<%=EXT_NAME%>, "<%=attrName%>"); - } - -}*/ - } - - private static Set<String> commonNumerics; - static { - commonNumerics = new HashSet<String>(); - commonNumerics.add("byte"); - commonNumerics.add("Byte"); - commonNumerics.add("short"); - commonNumerics.add("Short"); - commonNumerics.add("int"); - commonNumerics.add("Integer"); - commonNumerics.add("long"); - commonNumerics.add("Long"); - commonNumerics.add("float"); - commonNumerics.add("Float"); - commonNumerics.add("double"); - commonNumerics.add("Double"); - } - - private static Set<String> commonStrings; - static { - commonStrings = new HashSet<String>(); - commonStrings.add("char"); - commonStrings.add("Char"); - commonStrings.add("String"); - } - - private static Set<String> commonTypes; - static { - commonTypes = new HashSet<String>(); - commonTypes.addAll(commonNumerics); - commonTypes.addAll(commonStrings); - commonTypes.add("boolean"); - commonTypes.add("Boolean"); - commonTypes.add("Date"); - } - -} Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java 2010-05-17 08:38:51 UTC (rev 54) @@ -0,0 +1,150 @@ +package org.nuiton.wikitty.generator; + +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; + +/** + * Possible enhancement: + * - generateParentMethod can generate attribut method access that call + * the same method on parent instance class. For that we must have one attribut + * instance by parent. This attribut we must be created in setWikitty method + * and used same wikitty object. + * + * @author poussin + */ +public class BusinessEntityImplGenerator extends WikengoCommonGenerator { + + private static final Log log = LogFactory.getLog(BusinessEntityImplGenerator.class); + + @Override + public String getFilenameForClass(ObjectModelClass clazz) { + String fqn = clazz.getQualifiedName(); + log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); + return fqn.replace('.', File.separatorChar) + "Impl.java"; + } + + public void generateFromClass(Writer output, ObjectModelClass clazz) + throws IOException { + if (!EugengoUtils.isBusinessEntity(clazz)) { + log.info( clazz.getName() + " is not a business entity"); + return; + } + + // On ne génère pas le impl si l'entité a des opérations + if (clazz.getOperations().size() > 0) { + return; + } + + log.info("Generate Business entity impl" + clazz.getName() + "... "); + generateCopyright(output); + + String packageName = clazz.getPackageName(); + String className = clazz.getName(); + String name = className + "Impl"; +/*{package <%=packageName%>; + +}*/ + ObjectModelClass superClass = findSuperClass(clazz); + + clearImports(); + addImport(clazz); + addImport(superClass); + addImport("org.nuiton.wikitty.WikittyUtil"); + addImport("org.nuiton.wikitty.Wikitty"); + addImport("org.nuiton.wikitty.BusinessEntityWikitty"); + addImport("org.nuiton.wikitty.WikittyExtension"); + addImport(Collection.class); + addImport(Collections.class); + addImport(List.class); + addImport(ArrayList.class); + String parentImpl = null; + for (ObjectModelClass parent : clazz.getSuperclasses()) { + if (EugengoUtils.isBusinessEntity(parent)) { + addImport(parent); + parentImpl = parent.getQualifiedName() + "Impl"; + addImport( parentImpl ); + } + } + lookForAttributeImports(clazz); + generateImports(output, packageName); + + generateClazzDocumentation(output, clazz); + String abstractString = ""; + if (clazz.isAbstract()) { + abstractString += "abstract "; + } + +/*{public <%=abstractString%>class <%=className%>Impl extends <%=className%>Abstract { + +}*/ + + String svUID = GeneratorUtil.computeSerialVersionUID(clazz); +/*{ private static final long serialVersionUID = <%=svUID%>; + + public <%=name%>() { + super(); + } + + public <%=name%>(BusinessEntityWikitty wi) { + super(wi.getWikitty()); + } + + public <%=name%>(Wikitty wi) { + super(wi); + } + +} //<%=name%> +}*/ + } + + private static Set<String> commonNumerics; + static { + commonNumerics = new HashSet<String>(); + commonNumerics.add("byte"); + commonNumerics.add("Byte"); + commonNumerics.add("short"); + commonNumerics.add("Short"); + commonNumerics.add("int"); + commonNumerics.add("Integer"); + commonNumerics.add("long"); + commonNumerics.add("Long"); + commonNumerics.add("float"); + commonNumerics.add("Float"); + commonNumerics.add("double"); + commonNumerics.add("Double"); + } + + private static Set<String> commonStrings; + static { + commonStrings = new HashSet<String>(); + commonStrings.add("char"); + commonStrings.add("Char"); + commonStrings.add("String"); + } + + private static Set<String> commonTypes; + static { + commonTypes = new HashSet<String>(); + commonTypes.addAll(commonNumerics); + commonTypes.addAll(commonStrings); + commonTypes.add("boolean"); + commonTypes.add("Boolean"); + commonTypes.add("Date"); + } + +} Property changes on: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-05-12 15:08:48 UTC (rev 53) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-05-17 08:38:51 UTC (rev 54) @@ -3,11 +3,16 @@ import java.io.File; import java.io.IOException; import java.io.Writer; +import java.util.Collection; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; /** * Interface for BusinessEntity, interfaces are needed for multiple inheritance @@ -74,6 +79,8 @@ generateStaticAttributes(output, clazz); generateAttributeAccessMethod(output, clazz); + + generateInterfaceOperations(output, clazz); /*{ } //<%=name%> @@ -149,4 +156,45 @@ }*/ } + private void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { + for (ObjectModelOperation op : classifier.getOperations()) { + String opName = op.getName(); +/*{ /** +}*/ + if (EugengoUtils.hasDocumentation(op)) { + String opDocumentation = op.getDocumentation(); +/*{ * <%=opName%> : <%=opDocumentation%> +}*/ + } + Collection<ObjectModelParameter> params = op.getParameters(); + for (ObjectModelParameter param : params) { + String paramName = param.getName(); + String paramDocumentation = param.getDocumentation(); +/*{ * @param <%=paramName%> <%=paramDocumentation%> + }*/ + } + String opVisibility = op.getVisibility(); + String opType = op.getReturnType(); +/*{ *) + <%=opVisibility%> <%=opType%> <%=opName%>(}*/ + String comma = ""; + for (ObjectModelParameter param : params) { + String paramName = param.getName(); + String paramType = param.getType(); +/*{<%=comma%><%=paramType%> <%=paramName%>}*/ + comma = ", "; + } +/*{)}*/ + Set<String> exceptions = op.getExceptions(); + comma = " throws "; + for (String exception : exceptions) { +/*{<%=comma%><%=exception%>}*/ + comma = ", "; + } +/*{; + +}*/ + } + } + } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-05-12 15:08:48 UTC (rev 53) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-05-17 08:38:51 UTC (rev 54) @@ -31,7 +31,8 @@ // Wikitty (Interface, impl...) BusinessEntityInterfaceGenerator.class, - BusinessEntityGenerator.class, + BusinessEntityAbstractGenerator.class, + BusinessEntityImplGenerator.class, BusinessEntityBeanGenerator.class ));

2 1

r53 - in trunk: wikitty-api wikitty-api/src/main/java/org wikitty-api/src/main/java/org/nuiton wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/main/java/org/sharengo/wikitty wikitty-api/src/main/resources/org wikitty-api/src/main/uml/wikitty-api wikitty-api/src/test/java/org wikitty-api/src/test/java/org/nuiton wikitty-api/src/test/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/test wikitty-api/src/test/
by echatellier＠users.nuiton.org May 12, 2010

May 12, 2010

Author: echatellier Date: 2010-05-12 17:08:48 +0200 (Wed, 12 May 2010) New Revision: 53 Url: http://nuiton.org/repositories/revision/wikitty/53 Log: Refactor package name to org.nuiton Added: trunk/wikitty-api/src/main/java/org/nuiton/ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/AbstractWikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Criteria.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ExtensionFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FacetTopic.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JobState.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Package.html trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyDAO.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySearchEngin.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/ trunk/wikitty-api/src/main/resources/org/nuiton/ trunk/wikitty-api/src/test/java/org/nuiton/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/api/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/conform/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/memory/ trunk/wikitty-generators/src/main/java/org/nuiton/ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java trunk/wikitty-hbase-impl/src/main/java/org/nuiton/ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/ trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/ trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/ trunk/wikitty-jms-impl/src/main/java/org/nuiton/ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/ trunk/wikitty-jms-impl/src/test/java/org/nuiton/ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/ trunk/wikitty-jpa-impl/src/test/java/org/nuiton/wikitty/jpa/test/ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/ trunk/wikitty-solr-impl/src/main/java/org/nuiton/ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/ trunk/wikitty-solr-impl/src/test/java/org/nuiton/ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/ Removed: trunk/wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntity.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityBean.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/BusinessEntityWikitty.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/Criteria.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/ExtensionFactory.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/FacetTopic.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/FieldFactory.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/FieldType.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/JobState.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/Package.html trunk/wikitty-api/src/main/java/org/sharengo/wikitty/PagedResult.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/Tree.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/UpdateResponse.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyDAO.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyException.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtension.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionMigrationRename.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyExtensionStorage.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngin.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyStorage.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyTransaction.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/sharengo/wikitty/search/ trunk/wikitty-api/src/main/resources/org/sharengo/ trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/api/ trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/conform/ trunk/wikitty-api/src/test/java/org/sharengo/wikitty/test/memory/ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/ trunk/wikitty-hbase-impl/src/main/java/org/sharengo/wikitty/hbase/ trunk/wikitty-hbase-impl/src/test/java/org/sharengo/wikitty/hbase/test/ trunk/wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/ trunk/wikitty-jdbc-impl/src/test/java/org/sharengo/wikitty/jdbc/test/ trunk/wikitty-jms-impl/src/main/java/org/sharengo/wikitty/jms/ trunk/wikitty-jms-impl/src/test/java/org/sharengo/wikitty/jms/test/ trunk/wikitty-jpa-impl/src/main/java/org/sharengo/wikitty/jpa/ trunk/wikitty-jpa-impl/src/test/java/org/sharengo/wikitty/jpa/test/ trunk/wikitty-multistorage-impl/src/main/java/org/sharengo/wikitty/multistorage/ trunk/wikitty-multistorage-impl/src/test/java/org/sharengo/wikitty/multistorage/test/ trunk/wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/ trunk/wikitty-solr-impl/src/test/java/org/sharengo/wikitty/solr/test/ Modified: trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/AssociatedRestriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Like.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Unlike.java trunk/wikitty-api/src/main/uml/wikitty-api/wikitty-api.uml trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/api/AbstractTestApi.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/api/ExtensionFactoryTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/api/SearchCriteriaTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/conform/PerformanceTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/memory/InMemoryStorageTest.java trunk/wikitty-api/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-api/src/test/resources/log4j.properties trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EnumGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoConstants.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoUtils.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/InterfaceGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyExtensionStorageHBase.java trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyHBaseUtil.java trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyServiceHBase.java 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/AbstractTestHbase.java 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/ServiceFactory.java trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StandAloneServer.java trunk/wikitty-hbase-impl/src/test/java/org/nuiton/wikitty/hbase/test/StorageHbaseTest.java trunk/wikitty-hbase-impl/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-hbase-impl/src/test/resources/log4j.properties trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-jdbc-impl/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java trunk/wikitty-jdbc-impl/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-jdbc-impl/src/test/resources/log4j.properties trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyActionMessage.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyBrokerFactory.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyExtensionStorageJMS.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyExtensionSubscriberJMS.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java trunk/wikitty-jms-impl/src/main/resources/META-INF/services/org/apache/activemq/broker/wikitty trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTCPTest.java 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/TopicSendReceiveVMTest.java trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyExtensionStorageAdapter.java trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java trunk/wikitty-jms-impl/src/test/resources/log4j.properties trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/JBossTMFactoryBean.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/JBossUTFactoryBean.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/JtaPersistenceUnitPostProcessor.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/TransactionManagerLookup.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyExtensionStorageJPA.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyJPAUtil.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyServiceJPA.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java trunk/wikitty-jpa-impl/src/main/resources/META-INF/orm.xml trunk/wikitty-jpa-impl/src/main/resources/META-INF/persistence.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 trunk/wikitty-jpa-impl/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-jpa-impl/src/test/resources/log4j.properties trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/MultiStorageConfiguration.java trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyExtensionMultiStorage.java trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyServiceMultiStorage.java trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java trunk/wikitty-multistorage-impl/src/test/resources/log4j.properties trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java trunk/wikitty-solr-impl/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-solr-impl/src/test/resources/log4j.properties Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-05-12 10:19:55 UTC (rev 52) +++ trunk/wikitty-api/pom.xml 2010-05-12 15:08:48 UTC (rev 53) @@ -174,10 +174,10 @@ <phase>generate-sources</phase>  - <bean id="jbosstm" class="org.sharengo.wikitty.jpa.JBossTMFactoryBean"/> - <bean id="jbossut" class="org.sharengo.wikitty.jpa.JBossUTFactoryBean"/> + <bean id="jbosstm" class="org.nuiton.wikitty.jpa.JBossTMFactoryBean"/> + <bean id="jbossut" class="org.nuiton.wikitty.jpa.JBossUTFactoryBean"/>  <bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"> @@ -68,7 +68,7 @@ specify further Hibernate specific configuration properties --> <property name="jpaPropertyMap"> <map> - <entry key="hibernate.transaction.manager_lookup_class" value="org.sharengo.wikitty.jpa.TransactionManagerLookup"/> + <entry key="hibernate.transaction.manager_lookup_class" value="org.nuiton.wikitty.jpa.TransactionManagerLookup"/> <entry key="hibernate.transaction.flush_before_completion" value="true"/> <entry key="hibernate.transaction.auto_close_session" value="true"/> <entry key="hibernate.current_session_context_class" value="jta"/> @@ -87,7 +87,7 @@ datasource instead of using a JNDI name as requied by the jta-data-source setting in the persistence.xml file --> <property name="persistenceUnitPostProcessors"> - <bean class="org.sharengo.wikitty.jpa.JtaPersistenceUnitPostProcessor"> + <bean class="org.nuiton.wikitty.jpa.JtaPersistenceUnitPostProcessor"> <property name="jtaDataSource" ref="dataSource"/> </bean> </property> @@ -98,14 +98,14 @@ <tx:annotation-driven transaction-manager="jtaTransactionManager" proxy-target-class="false"/>  - <bean name="wikittyService" class="org.sharengo.wikitty.jpa.WikittyServiceJPA"/> - <bean name="wikittyStorage" class="org.sharengo.wikitty.jpa.WikittyStorageJPA" /> - <bean name="extensionStorage" class="org.sharengo.wikitty.jpa.WikittyExtensionStorageJPA"/> - <bean name="searchEngin" class="org.sharengo.wikitty.solr.WikittySearchEnginSolr"> + <bean name="wikittyService" class="org.nuiton.wikitty.jpa.WikittyServiceJPA"/> + <bean name="wikittyStorage" class="org.nuiton.wikitty.jpa.WikittyStorageJPA" /> + <bean name="extensionStorage" class="org.nuiton.wikitty.jpa.WikittyExtensionStorageJPA"/> + <bean name="searchEngin" class="org.nuiton.wikitty.solr.WikittySearchEnginSolr"> <constructor-arg ref="extensionStorage"/> </bean> <context:annotation-config/> - <context:component-scan base-package="org.sharengo.wikitty"/> + <context:component-scan base-package="org.nuiton.wikitty"/> </beans> Modified: trunk/wikitty-jpa-impl/src/test/resources/log4j.properties =================================================================== --- trunk/wikitty-jpa-impl/src/test/resources/log4j.properties 2010-05-12 10:19:55 UTC (rev 52) +++ trunk/wikitty-jpa-impl/src/test/resources/log4j.properties 2010-05-12 15:08:48 UTC (rev 53) @@ -5,6 +5,6 @@ # Configuration by components log4j.rootLogger=ERROR, logConsole -log4j.category.org.sharengo.wikitty=DEBUG +log4j.category.org.nuiton.wikitty=DEBUG log4j.category.org.hibernate=DEBUG log4j.category.org.enhydra=DEBUG Modified: trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/MultiStorageConfiguration.java =================================================================== --- trunk/wikitty-multistorage-impl/src/main/java/org/sharengo/wikitty/multistorage/MultiStorageConfiguration.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/MultiStorageConfiguration.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,14 +15,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.multistorage; +package org.nuiton.wikitty.multistorage; import java.util.ArrayList; import java.util.List; -import org.sharengo.wikitty.WikittyException; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittyStorage; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyStorage; + /** * * @author ruchaud Modified: trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyExtensionMultiStorage.java =================================================================== --- trunk/wikitty-multistorage-impl/src/main/java/org/sharengo/wikitty/multistorage/WikittyExtensionMultiStorage.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyExtensionMultiStorage.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,18 +15,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.multistorage; +package org.nuiton.wikitty.multistorage; import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.UpdateResponse; -import org.sharengo.wikitty.WikittyException; -import org.sharengo.wikitty.WikittyExtension; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittyTransaction; +import org.nuiton.wikitty.UpdateResponse; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyTransaction; /** * Modified: trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java =================================================================== --- trunk/wikitty-multistorage-impl/src/main/java/org/sharengo/wikitty/multistorage/WikittyMultiStorage.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,20 +15,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.multistorage; +package org.nuiton.wikitty.multistorage; import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.UpdateResponse; -import org.sharengo.wikitty.Wikitty; -import org.sharengo.wikitty.WikittyException; -import org.sharengo.wikitty.WikittyExtension; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittyStorage; -import org.sharengo.wikitty.WikittyTransaction; +import org.nuiton.wikitty.UpdateResponse; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyStorage; +import org.nuiton.wikitty.WikittyTransaction; /** * Modified: trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyServiceMultiStorage.java =================================================================== --- trunk/wikitty-multistorage-impl/src/main/java/org/sharengo/wikitty/multistorage/WikittyServiceMultiStorage.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyServiceMultiStorage.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,13 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.multistorage; +package org.nuiton.wikitty.multistorage; -import org.sharengo.wikitty.AbstractWikittyService; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittySearchEngin; -import org.sharengo.wikitty.WikittyStorage; -import org.sharengo.wikitty.solr.WikittySearchEnginSolr; +import org.nuiton.wikitty.AbstractWikittyService; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittySearchEngin; +import org.nuiton.wikitty.WikittyStorage; +import org.nuiton.wikitty.solr.WikittySearchEnginSolr; /** * Modified: trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java =================================================================== --- trunk/wikitty-multistorage-impl/src/test/java/org/sharengo/wikitty/multistorage/test/MultiStorageTest.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-multistorage-impl/src/test/java/org/nuiton/wikitty/multistorage/test/MultiStorageTest.java 2010-05-12 15:08:48 UTC (rev 53) @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.multistorage.test; +package org.nuiton.wikitty.multistorage.test; import java.io.InputStream; import java.net.URL; @@ -24,19 +24,19 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; -import org.sharengo.wikitty.Wikitty; -import org.sharengo.wikitty.WikittyExtension; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittyService; -import org.sharengo.wikitty.WikittyStorage; -import org.sharengo.wikitty.jdbc.WikittyExtensionStorageJDBC; -import org.sharengo.wikitty.jdbc.WikittyStorageJDBC; -import org.sharengo.wikitty.jms.WikittyExtensionStorageJMS; -import org.sharengo.wikitty.jms.WikittyJMSUtil; -import org.sharengo.wikitty.jms.WikittyStorageJMS; -import org.sharengo.wikitty.multistorage.MultiStorageConfiguration; -import org.sharengo.wikitty.multistorage.MultiStorageConfiguration.BasicConfiguration; -import org.sharengo.wikitty.multistorage.WikittyServiceMultiStorage; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittyService; +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.WikittyServiceMultiStorage; +import org.nuiton.wikitty.multistorage.MultiStorageConfiguration.BasicConfiguration; /** * MultiStorageTest build a multi-storage configuration using jdbc and jms Modified: trunk/wikitty-multistorage-impl/src/test/resources/log4j.properties =================================================================== --- trunk/wikitty-multistorage-impl/src/test/resources/log4j.properties 2010-05-12 10:19:55 UTC (rev 52) +++ trunk/wikitty-multistorage-impl/src/test/resources/log4j.properties 2010-05-12 15:08:48 UTC (rev 53) @@ -6,10 +6,10 @@ log4j.appender.stdout.layout.ConversionPattern=%-5p %-46.46c %4L - %m%n # wikitty -log4j.logger.org.sharengo.wikitty=ERROR -log4j.logger.org.sharengo.wikitty.solr.WikittySearchEngineSolr=DEBUG -log4j.logger.org.sharengo.wikitty.solr.SolrQParser=DEBUG -log4j.logger.org.sharengo.wikitty.jdbc.WikittyJDBCUtil=INFO +log4j.logger.org.nuiton.wikitty=ERROR +log4j.logger.org.nuiton.wikitty.solr.WikittySearchEngineSolr=DEBUG +log4j.logger.org.nuiton.wikitty.solr.SolrQParser=DEBUG +log4j.logger.org.nuiton.wikitty.jdbc.WikittyJDBCUtil=INFO # solr log4j.logger.org.apache.solr=WARN Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/Restriction2Solr.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-05-12 15:08:48 UTC (rev 53) @@ -1,4 +1,4 @@ -package org.sharengo.wikitty.solr; +package org.nuiton.wikitty.solr; import java.util.ArrayList; import java.util.Arrays; @@ -10,30 +10,30 @@ import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; -import org.sharengo.wikitty.WikittyException; -import org.sharengo.wikitty.WikittyTransaction; -import org.sharengo.wikitty.search.And; -import org.sharengo.wikitty.search.AssociatedRestriction; -import org.sharengo.wikitty.search.Between; -import org.sharengo.wikitty.search.Contains; -import org.sharengo.wikitty.search.Element; -import org.sharengo.wikitty.search.EndsWith; -import org.sharengo.wikitty.search.Equals; -import org.sharengo.wikitty.search.Greater; -import org.sharengo.wikitty.search.GreaterOrEqual; -import org.sharengo.wikitty.search.In; -import org.sharengo.wikitty.search.Keyword; -import org.sharengo.wikitty.search.Less; -import org.sharengo.wikitty.search.LessOrEqual; -import org.sharengo.wikitty.search.Like; -import org.sharengo.wikitty.search.Not; -import org.sharengo.wikitty.search.NotEquals; -import org.sharengo.wikitty.search.Or; -import org.sharengo.wikitty.search.Restriction; -import org.sharengo.wikitty.search.RestrictionHelper; -import org.sharengo.wikitty.search.StartsWith; -import org.sharengo.wikitty.search.Unlike; -import org.sharengo.wikitty.search.Like.SearchAs; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyTransaction; +import org.nuiton.wikitty.search.And; +import org.nuiton.wikitty.search.AssociatedRestriction; +import org.nuiton.wikitty.search.Between; +import org.nuiton.wikitty.search.Contains; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.EndsWith; +import org.nuiton.wikitty.search.Equals; +import org.nuiton.wikitty.search.Greater; +import org.nuiton.wikitty.search.GreaterOrEqual; +import org.nuiton.wikitty.search.In; +import org.nuiton.wikitty.search.Keyword; +import org.nuiton.wikitty.search.Less; +import org.nuiton.wikitty.search.LessOrEqual; +import org.nuiton.wikitty.search.Like; +import org.nuiton.wikitty.search.Not; +import org.nuiton.wikitty.search.NotEquals; +import org.nuiton.wikitty.search.Or; +import org.nuiton.wikitty.search.Restriction; +import org.nuiton.wikitty.search.RestrictionHelper; +import org.nuiton.wikitty.search.StartsWith; +import org.nuiton.wikitty.search.Unlike; +import org.nuiton.wikitty.search.Like.SearchAs; /** * @author "Nicolas Chapurlat" <nicolas.chapurlat(a)logica.com> Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittyQueryParser.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java 2010-05-12 15:08:48 UTC (rev 53) @@ -1,4 +1,4 @@ -package org.sharengo.wikitty.solr; +package org.nuiton.wikitty.solr; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEnginSolr.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.solr; +package org.nuiton.wikitty.solr; import java.io.IOException; import java.util.ArrayList; @@ -39,21 +39,21 @@ import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.CoreContainer; -import org.sharengo.wikitty.Criteria; -import org.sharengo.wikitty.FacetTopic; -import org.sharengo.wikitty.FieldType; -import org.sharengo.wikitty.PagedResult; -import org.sharengo.wikitty.TreeNode; -import org.sharengo.wikitty.UpdateResponse; -import org.sharengo.wikitty.Wikitty; -import org.sharengo.wikitty.WikittyException; -import org.sharengo.wikitty.WikittyExtension; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittySearchEngin; -import org.sharengo.wikitty.WikittyTransaction; -import org.sharengo.wikitty.FieldType.TYPE; -import org.sharengo.wikitty.search.Element; -import org.sharengo.wikitty.search.Search; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.FacetTopic; +import org.nuiton.wikitty.FieldType; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.UpdateResponse; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittySearchEngin; +import org.nuiton.wikitty.WikittyTransaction; +import org.nuiton.wikitty.FieldType.TYPE; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.TreeNode; import com.arjuna.ats.arjuna.coordinator.BasicAction; import com.arjuna.ats.arjuna.coordinator.OnePhaseResource; Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-05-12 10:19:55 UTC (rev 52) +++ trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-05-12 15:08:48 UTC (rev 53) @@ -678,7 +678,7 @@ </queryResponseWriter> - <queryParser name="wikitty" class="org.sharengo.wikitty.solr.WikittyQueryParser"/> + <queryParser name="wikitty" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> <!-- example of registering a query parser <queryParser name="lucene" class="org.apache.solr.search.LuceneQParserPlugin"/> Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/sharengo/wikitty/solr/test/AbstractTestSolr.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-05-12 15:08:48 UTC (rev 53) @@ -1,12 +1,12 @@ -package org.sharengo.wikitty.solr.test; +package org.nuiton.wikitty.solr.test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.junit.Before; -import org.sharengo.wikitty.WikittySearchEngin; -import org.sharengo.wikitty.WikittyService; +import org.nuiton.wikitty.WikittySearchEngin; +import org.nuiton.wikitty.WikittyService; import org.springframework.beans.factory.annotation.Autowired; @RunWith(SpringJUnit4ClassRunner.class) Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/sharengo/wikitty/solr/test/SolrSearchTest.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-05-12 15:08:48 UTC (rev 53) @@ -1,8 +1,7 @@ -package org.sharengo.wikitty.solr.test; +package org.nuiton.wikitty.solr.test; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; -import org.sharengo.wikitty.FacetTopic; import java.util.ArrayList; import java.util.List; @@ -11,18 +10,19 @@ import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.junit.Before; -import org.sharengo.wikitty.Criteria; -import org.sharengo.wikitty.PagedResult; -import org.sharengo.wikitty.Wikitty; -import org.sharengo.wikitty.WikittyExtension; -import org.sharengo.wikitty.WikittyUtil; -import org.sharengo.wikitty.search.Element; -import org.sharengo.wikitty.search.Like; -import org.sharengo.wikitty.search.RestrictionHelper; -import org.sharengo.wikitty.search.Search; -import org.sharengo.wikitty.search.Like.SearchAs; -import org.sharengo.wikitty.test.conform.AbstractTestConformance; -import org.sharengo.wikitty.test.conform.StorageTest; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.FacetTopic; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.search.Element; +import org.nuiton.wikitty.search.Like; +import org.nuiton.wikitty.search.RestrictionHelper; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.search.Like.SearchAs; +import org.nuiton.wikitty.test.conform.AbstractTestConformance; +import org.nuiton.wikitty.test.conform.StorageTest; public class SolrSearchTest extends AbstractTestSolr { Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/sharengo/wikitty/solr/test/SolrServerTest.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.solr.test; +package org.nuiton.wikitty.solr.test; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/sharengo/wikitty/solr/test/TreeTest.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,7 +15,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.solr.test; +package org.nuiton.wikitty.solr.test; import java.util.Map.Entry; import java.util.Set; @@ -30,17 +30,16 @@ import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; -import org.sharengo.wikitty.TreeNodeImpl; -import org.sharengo.wikitty.Criteria; -import org.sharengo.wikitty.ExtensionFactory; -import org.sharengo.wikitty.Tree; -import org.sharengo.wikitty.TreeNode; -import org.sharengo.wikitty.Wikitty; -import org.sharengo.wikitty.WikittyExtension; -import org.sharengo.wikitty.FieldType.TYPE; -import org.sharengo.wikitty.TreeNode; -import org.sharengo.wikitty.search.Search; -import org.sharengo.wikitty.test.conform.StorageTest; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.ExtensionFactory; +import org.nuiton.wikitty.Tree; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.FieldType.TYPE; +import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.test.conform.StorageTest; +import org.nuiton.wikitty.TreeNodeImpl; +import org.nuiton.wikitty.TreeNode; /** * Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/sharengo/wikitty/solr/test/WikittyServiceSolr.java 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java 2010-05-12 15:08:48 UTC (rev 53) @@ -15,16 +15,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -package org.sharengo.wikitty.solr.test; +package org.nuiton.wikitty.solr.test; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.AbstractWikittyService; -import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittySearchEngin; -import org.sharengo.wikitty.WikittyServiceInMemory; -import org.sharengo.wikitty.WikittyStorage; -import org.sharengo.wikitty.solr.WikittySearchEnginSolr; +import org.nuiton.wikitty.AbstractWikittyService; +import org.nuiton.wikitty.WikittyExtensionStorage; +import org.nuiton.wikitty.WikittySearchEngin; +import org.nuiton.wikitty.WikittyServiceInMemory; +import org.nuiton.wikitty.WikittyStorage; +import org.nuiton.wikitty.solr.WikittySearchEnginSolr; /** * Modified: trunk/wikitty-solr-impl/src/test/resources/META-INF/spring/wikitty-test.xml =================================================================== --- trunk/wikitty-solr-impl/src/test/resources/META-INF/spring/wikitty-test.xml 2010-05-12 10:19:55 UTC (rev 52) +++ trunk/wikitty-solr-impl/src/test/resources/META-INF/spring/wikitty-test.xml 2010-05-12 15:08:48 UTC (rev 53) @@ -6,9 +6,9 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - <bean name="wikittyService" class="org.sharengo.wikitty.solr.test.WikittyServiceSolr"/> + <bean name="wikittyService" class="org.nuiton.wikitty.solr.test.WikittyServiceSolr"/> <context:annotation-config/> - <context:component-scan base-package="org.sharengo.wikitty"/> + <context:component-scan base-package="org.nuiton.wikitty"/> </beans> \ No newline at end of file Modified: trunk/wikitty-solr-impl/src/test/resources/log4j.properties =================================================================== --- trunk/wikitty-solr-impl/src/test/resources/log4j.properties 2010-05-12 10:19:55 UTC (rev 52) +++ trunk/wikitty-solr-impl/src/test/resources/log4j.properties 2010-05-12 15:08:48 UTC (rev 53) @@ -5,5 +5,5 @@ # Configuration by components log4j.rootLogger=DEBUG, logConsole -log4j.category.org.sharengo.wikitty=DEBUG +log4j.category.org.nuiton.wikitty=DEBUG #log4j.category.org.apache.solr=DEBUG

1 0

r52 - trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator
by echatellier＠users.nuiton.org May 12, 2010

May 12, 2010

Author: echatellier Date: 2010-05-12 12:19:55 +0200 (Wed, 12 May 2010) New Revision: 52 Url: http://nuiton.org/repositories/revision/wikitty/52 Log: Make bean generator deprecated and generated classes deprecated too. Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-12 10:12:03 UTC (rev 51) +++ trunk/wikitty-generators/src/main/java/org/sharengo/wikitty/generator/BusinessEntityBeanGenerator.java 2010-05-12 10:19:55 UTC (rev 52) @@ -24,7 +24,10 @@ * Generate pure Bean Object (no wikitty object internaly stored) * * @author poussin + * + * @deprecated since 2.0 will be removed soon */ +@Deprecated public class BusinessEntityBeanGenerator extends WikengoCommonGenerator { private static final Log log = LogFactory.getLog(BusinessEntityBeanGenerator.class); @@ -96,7 +99,11 @@ } } -/*{public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { +/*{/** + * @deprecated since 2.0 will be removed soon + *) +@Deprecated +public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { }*/

1 0

r51 - in trunk: . wikitty-api wikitty-generators wikitty-hbase-impl wikitty-jdbc-impl wikitty-jms-impl wikitty-jpa-impl wikitty-multistorage-impl wikitty-solr-impl wikitty-ui-gwt
by echatellier＠users.nuiton.org May 12, 2010

May 12, 2010

Author: echatellier Date: 2010-05-12 12:12:03 +0200 (Wed, 12 May 2010) New Revision: 51 Url: http://nuiton.org/repositories/revision/wikitty/51 Log: Move all wikitty project to org.nuiton.wikitty (just pom done). Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-solr-impl/pom.xml trunk/wikitty-ui-gwt/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -3,13 +3,19 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.1.4</version> + </parent> +    - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> <modules> <module>wikitty-generators</module> @@ -23,96 +29,97 @@  </modules> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> -  - </parent> - <dependencyManagement> - <dependencies> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugene.version}</version> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.135</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.0</version> + <scope>test</scope> + </dependency> + +  + + </dependencies> -  + </dependencyManagement> -  - - </dependencies> - - </dependencyManagement> - -  -  <scm> <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> @@ -124,9 +131,9 @@   - <name>org.sharengo.wikengo.core-wikitty</name> + <name>Wikitty</name> - <description>wikitty multi-module project</description> + <description>Wikitty multi-module project</description> <inceptionYear>2009</inceptionYear>  @@ -136,20 +143,21 @@ <packaging>pom</packaging> <properties> -  -  -  <projectId>wikitty</projectId>   - <junit.version>4.7</junit.version> + <eugene.version>1.0.1</eugene.version> <spring.version>3.0.1.RELEASE</spring.version> <hessian.version>3.1.6</hessian.version> <jetty.version>6.1.22</jetty.version> </properties> +  +  +  + <build> <pluginManagement> @@ -169,12 +177,7 @@ </build> -  -  -  - -  - + <repository> + <id>jboss</id> + <url>http://repository.jboss.com/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> </project> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-api/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,20 +1,20 @@ -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> +    - - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty</artifactId> - <version>2.0</version> - </parent> - <dependencies>  <dependency> @@ -58,7 +58,6 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.5</version> </dependency> <dependency> @@ -85,23 +84,19 @@   - <name>org.sharengo.wikengo.core-wikitty-api</name> + <name>Wikitty :: api</name> - <description>public api of wikitty</description> + <description>Public wikitty API</description> <inceptionYear>2009</inceptionYear>  -  -  +  +  <packaging>jar</packaging> <properties> - <eugene.version>1.0.0</eugene.version> -  - <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> -   <maven.test.failure.ignore>false</maven.test.failure.ignore> @@ -136,8 +131,8 @@ <version>${eugene.version}</version> <dependencies> <dependency> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-generators</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> <version>${project.version}</version> </dependency>  @@ -154,35 +149,39 @@ </dependency> </dependencies> </plugin> +  + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> <plugins> -  <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> - <id>api generator</id> -  - <phase>process-sources</phase> - -  + <id>api-generation</id> + <phase>generate-sources</phase> +  <configuration> <addCompileDirectory>true</addCompileDirectory> <zargoResources> @@ -227,30 +226,4 @@   - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </project> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-generators/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,25 +1,25 @@ -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> +    - - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-generators</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty</artifactId> - <version>2.0</version> - </parent> - <dependencies> <dependency> <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <artifactId>eugene</artifactId> + <scope>provided</scope> </dependency> </dependencies> @@ -27,7 +27,7 @@   - <name>org.sharengo.wikengo.core-wikitty-generators</name> + <name>Wikitty :: generators</name> <description>Wikitty generators</description> <inceptionYear>2009</inceptionYear> @@ -38,13 +38,6 @@ <packaging>jar</packaging> - <properties> - <eugene.version>1.0.0</eugene.version> - -  - <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> - </properties> - <build> <plugins> Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-hbase-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,20 +1,21 @@ -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> -  -  -  - - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-hbase-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> +  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hbase-impl</artifactId> + <dependencies>  <dependency> @@ -61,24 +62,11 @@ <scope>compile</scope> </dependency> -  <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency> - -  - - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>${jetty.version}</version> + <scope>test</scope> </dependency> <dependency> @@ -100,12 +88,14 @@ <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> @@ -124,6 +114,7 @@ <groupId>org.hadoop</groupId> <artifactId>hadoop-test</artifactId> <version>0.20.0</version> +  <scope>test</scope> </dependency> <dependency> @@ -135,17 +126,17 @@ </dependencies>  -  -  +  +  - <name>org.sharengo.wikengo.core-wikitty-hbase-impl</name> + <name>Wikitty :: wikitty-hbase-impl</name> <description>hbase impl of wikitty</description> <inceptionYear>2009</inceptionYear>  -  -  +  +  <packaging>jar</packaging> @@ -156,8 +147,8 @@ </properties>  -  -  +  +  <build> <plugins> @@ -176,21 +167,5 @@ </plugins> </build> - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,15 +1,16 @@ +<?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"> -<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.sharengo.wikengo</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> <dependencies>  @@ -42,12 +43,6 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency>  <dependency> @@ -61,11 +56,6 @@ <version>${project.version}</version> </dependency> -  - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> @@ -89,8 +79,6 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.experlog</groupId> @@ -98,41 +86,19 @@ <version>1.5.0</version> </dependency> </dependencies> -  -  -  - <name>org.sharengo.wikengo.core-wikitty-jdbc-impl</name> - - <description>public api of wikitty</description> +  +  +  + <name>Wikitty :: wikitty-jdbc-impl</name> + <description>Wikitty jdbc storage</description> <inceptionYear>2009</inceptionYear>  -  -  +  +  <packaging>jar</packaging> - <properties> -  - </properties> - - <repositories> - - <repository> - <id>sharengo-maven-repository</id> - <name>Repo Sharengo</name> - <url>http://repository.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-jms-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,16 +1,16 @@ - -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-jms-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jms-impl</artifactId> + <dependencies>  <dependency> @@ -39,42 +39,21 @@ </dependencies> -  -  -  +  +  +  - <name>org.sharengo.wikengo.core-wikitty-jms-impl</name> + <name>Wikitty :: wikitty-jms-impl</name> <description>jms storage implementation</description> <inceptionYear>2010</inceptionYear>  -  -  +  +  <packaging>jar</packaging> - <properties> -  - </properties> - - <repositories> - - <repository> - <id>sharengo-maven-repository</id> - <name>Repo Sharengo</name> - <url>http://repository.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-jpa-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,20 +1,21 @@ -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> -  -  -  - - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-jpa-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> +  +  +  + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jpa-impl</artifactId> + <dependencies>  <dependency> @@ -29,13 +30,6 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency>  <dependency> @@ -150,24 +144,22 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.128</version> - <scope>test</scope> </dependency> </dependencies>  -  -  +  +  - <name>org.sharengo.wikengo.core-wikitty-jpa-impl</name> + <name>Wikitty :: wikitty-jpa-impl</name> <description>jpa impl of wikitty</description> <inceptionYear>2009</inceptionYear>  -  -  +  +  <packaging>jar</packaging> @@ -176,34 +168,8 @@ </properties>  -  -  +  +  - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - </project> Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,15 +1,16 @@ -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-multistorage-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> + <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.0</version> + <version>2.0-SNAPSHOT</version> </parent> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-multistorage-impl</artifactId> + <dependencies>  <dependency> @@ -31,14 +32,10 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.127</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.11</version> - <scope>test</scope> </dependency> <dependency> @@ -59,7 +56,7 @@   - <name>org.sharengo.wikengo.core-wikitty-multistorage-impl</name> + <name>Wikitty :: wikitty-multistorage-impl</name> <description>manage multi storage</description> <inceptionYear>2010</inceptionYear> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-solr-impl/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,128 +1,111 @@ -<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"> +<?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"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty-solr-impl</artifactId> +  +  +  - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>wikitty</artifactId> - <version>2.0</version> - </parent> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> -  - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <version>1.4.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.11</version> - <scope>test</scope> - </dependency> +  + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <version>1.4.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </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> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - </dependencies> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </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> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>org.sharengo.wikengo.core-wikitty-solr-impl</name> + <name>Wikitty :: wikitty-solr-impl</name> - <description>hbase impl of wikitty</description> - <inceptionYear>2009</inceptionYear> + <description>Wikiity solr search engine</description> + <inceptionYear>2009</inceptionYear> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> -  - </properties> + <properties> +  + </properties> -  -  -  +  +  +  - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - </project> Modified: trunk/wikitty-ui-gwt/pom.xml =================================================================== --- trunk/wikitty-ui-gwt/pom.xml 2010-05-12 08:20:06 UTC (rev 50) +++ trunk/wikitty-ui-gwt/pom.xml 2010-05-12 10:12:03 UTC (rev 51) @@ -1,24 +1,29 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> +<?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"> + <modelVersion>4.0.0</modelVersion> - <groupId>org.sharengo</groupId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-ui-gwt</artifactId> - <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> - <name>wikitty-ui-gwt</name> + <name>Wikitty :: wikitty-ui-gwt</name> <dependencies> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> </dependency> <dependency> - <groupId>org.sharengo</groupId> + <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> <version>${current.version}</version> <scope>compile</scope>

1 0

r50 - in trunk: . wikitty-api wikitty-generators wikitty-hbase-impl wikitty-jdbc-impl wikitty-jms-impl wikitty-jpa-impl wikitty-multistorage-impl wikitty-solr-impl
by echatellier＠users.nuiton.org May 12, 2010

May 12, 2010

Author: echatellier Date: 2010-05-12 10:20:06 +0200 (Wed, 12 May 2010) New Revision: 50 Url: http://nuiton.org/repositories/revision/wikitty/50 Log: Fix parent reference (remove 'core' !!!) Modified: trunk/ trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-solr-impl/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - .settings .project + .settings .project target Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-api/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -11,7 +11,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-generators/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -11,7 +11,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent> Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-hbase-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -11,7 +11,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -7,7 +7,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent> Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-jms-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -7,7 +7,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-jpa-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -11,7 +11,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent> Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -6,7 +6,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-05-11 17:31:27 UTC (rev 49) +++ trunk/wikitty-solr-impl/pom.xml 2010-05-12 08:20:06 UTC (rev 50) @@ -11,7 +11,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> </parent>

1 0

r49 - trunk
by echatellier＠users.nuiton.org May 11, 2010

May 11, 2010

Author: echatellier Date: 2010-05-11 19:31:27 +0200 (Tue, 11 May 2010) New Revision: 49 Url: http://nuiton.org/repositories/revision/wikitty/49 Log: Fix actifactId not corresponding to module names Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 16:41:44 UTC (rev 48) +++ trunk/pom.xml 2010-05-11 17:31:27 UTC (rev 49) @@ -8,7 +8,7 @@  <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> + <artifactId>wikitty</artifactId> <version>2.0</version> <modules>

1 0

r48 - in trunk: . wikitty-api wikitty-generators wikitty-hbase-impl wikitty-jdbc-impl wikitty-jms-impl wikitty-jpa-impl wikitty-multistorage-impl wikitty-solr-impl
by echatellier＠users.nuiton.org May 11, 2010

May 11, 2010

Author: echatellier Date: 2010-05-11 18:41:44 +0200 (Tue, 11 May 2010) New Revision: 48 Url: http://nuiton.org/repositories/revision/wikitty/48 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-solr-impl/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -9,7 +9,7 @@ <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> <modules> <module>wikitty-generators</module> @@ -115,9 +115,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/core-wikitty-1.5</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/core-wikitty-1.5</developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/core-wikitty-1.5</url> + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-api/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-generators/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies> Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-hbase-impl/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies> Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -8,7 +8,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies> Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-jms-impl/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -8,7 +8,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-jpa-impl/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies> Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -7,7 +7,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies> Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-05-11 16:41:42 UTC (rev 47) +++ trunk/wikitty-solr-impl/pom.xml 2010-05-11 16:41:44 UTC (rev 48) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.5</version> + <version>2.0</version> </parent> <dependencies>

1 0

r47 - tags
by echatellier＠users.nuiton.org May 11, 2010

May 11, 2010

Author: echatellier Date: 2010-05-11 18:41:42 +0200 (Tue, 11 May 2010) New Revision: 47 Url: http://nuiton.org/repositories/revision/wikitty/47 Log: [maven-release-plugin] copy for tag core-wikitty-1.5 Added: tags/core-wikitty-1.5/

1 0