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

r214 - in trunk: . wikitty-hessian-server
by echatellier＠users.nuiton.org July 30, 2010

July 30, 2010

Author: echatellier Date: 2010-07-30 16:37:05 +0200 (Fri, 30 Jul 2010) New Revision: 214 Url: http://nuiton.org/repositories/revision/wikitty/214 Log: Add h2 and postgresql support on hessian server Modified: trunk/pom.xml trunk/wikitty-hessian-server/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-30 14:18:02 UTC (rev 213) +++ trunk/pom.xml 2010-07-30 14:37:05 UTC (rev 214) @@ -81,6 +81,13 @@ </dependency> <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.4-701.jdbc4</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.6.1</version> Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-07-30 14:18:02 UTC (rev 213) +++ trunk/wikitty-hessian-server/pom.xml 2010-07-30 14:37:05 UTC (rev 214) @@ -46,6 +46,16 @@ <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> </dependencies>

1 0

r213 - trunk/src/site/rst
by echatellier＠users.nuiton.org July 30, 2010

July 30, 2010

Author: echatellier Date: 2010-07-30 16:18:02 +0200 (Fri, 30 Jul 2010) New Revision: 213 Url: http://nuiton.org/repositories/revision/wikitty/213 Log: Fix rst infinite loop Modified: trunk/src/site/rst/hessian.rst Modified: trunk/src/site/rst/hessian.rst =================================================================== --- trunk/src/site/rst/hessian.rst 2010-07-30 14:02:27 UTC (rev 212) +++ trunk/src/site/rst/hessian.rst 2010-07-30 14:18:02 UTC (rev 213) @@ -5,6 +5,7 @@ client serveur basé sur hessian. Il est composé : + * d'une application war qui, en lisant une configuration, est capable de fournir un service sur n'importe quel type de stockage wikitty * d'une factory revoyant un proxy sur un service distant @@ -66,4 +67,4 @@ WikittyService service = getWikittyService("http://localhost/wikitty"); -Le ``service`` s'utilise ensuite comme un service local. \ No newline at end of file +Le ``service`` s'utilise ensuite comme un service local.

1 0

r212 - trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian
by echatellier＠users.nuiton.org July 30, 2010

July 30, 2010

Author: echatellier Date: 2010-07-30 16:02:27 +0200 (Fri, 30 Jul 2010) New Revision: 212 Url: http://nuiton.org/repositories/revision/wikitty/212 Log: Register import Modified: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java Modified: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java =================================================================== --- trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java 2010-07-30 14:02:04 UTC (rev 211) +++ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/hessian/WikittyServiceHessianDelegator.java 2010-07-30 14:02:27 UTC (rev 212) @@ -18,7 +18,6 @@ package org.nuiton.wikitty.hessian; -import java.lang.reflect.Method; import java.util.Properties; import org.nuiton.util.ApplicationConfig;

1 0

r211 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by echatellier＠users.nuiton.org July 30, 2010

July 30, 2010

Author: echatellier Date: 2010-07-30 16:02:04 +0200 (Fri, 30 Jul 2010) New Revision: 211 Url: http://nuiton.org/repositories/revision/wikitty/211 Log: Wikitty solr search engin can now register himself system env properties. Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-07-29 19:38:32 UTC (rev 210) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-07-30 14:02:04 UTC (rev 211) @@ -76,6 +76,9 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittySearchEnginSolr.class); + /** Solr data dir config option name. */ + static final protected String SOLR_DATA_DIR_CONFIG = "solr.data.dir"; + /** id field in solr */ static final protected String SOLR_ID = "id"; @@ -464,6 +467,15 @@ * @param properties properties (can be null) */ public WikittySearchEnginSolr(WikittyExtensionStorage extensionStorage, Properties properties) { + + // init system env solr.data.dir + if (properties != null) { + String solrDataDir = properties.getProperty(SOLR_DATA_DIR_CONFIG); + if (solrDataDir != null) { + System.setProperty(SOLR_DATA_DIR_CONFIG, solrDataDir); + } + } + try { CoreContainer.Initializer initializer = new CoreContainer.Initializer(); CoreContainer coreContainer = initializer.initialize();

1 0

r210 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-generators/src/main/java/org/nuiton/wikitty/generator wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test
by echatellier＠users.nuiton.org July 29, 2010

July 29, 2010

Author: echatellier Date: 2010-07-29 21:38:32 +0200 (Thu, 29 Jul 2010) New Revision: 210 Url: http://nuiton.org/repositories/revision/wikitty/210 Log: #784 : Change static field name for field name in generated BusinessEntity #785 : constant is not used in generated code Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-29 19:38:32 UTC (rev 210) @@ -519,7 +519,7 @@ // Store node with have deleted node as parent Criteria criteria = - Search.query().eq(TreeNode.FQ_FIELD_PARENT, id).criteria(); + Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, id).criteria(); List<String> wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { @@ -532,7 +532,7 @@ } // Store node with have deleted child - criteria = Search.query().eq(TreeNode.FQ_FIELD_CHILDREN, id).criteria(); + criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_CHILDREN, id).criteria(); wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-07-29 19:38:32 UTC (rev 210) @@ -554,7 +554,7 @@ */ protected boolean isAdmin(String securityToken, String userId, Wikitty w) { boolean result = isMember( - securityToken, userId, w, WikittyAuthorisation.FIELD_ADMIN); + securityToken, userId, w, WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_ADMIN); return result; } @@ -568,7 +568,7 @@ */ protected boolean isWriter(String securityToken, String userId, Wikitty w) { boolean result = isMember( - securityToken, userId, w, WikittyAuthorisation.FIELD_WRITER); + securityToken, userId, w, WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_WRITER); return result; } @@ -597,7 +597,7 @@ // il y a des readers sur l'objet actuel, il faut donc checker // comme pour les autres droits en parent aussi les parents result = isMember( - securityToken, userId, w, WikittyAuthorisation.FIELD_READER); + securityToken, userId, w, WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_READER); } } return result; @@ -614,7 +614,7 @@ if (appAdminGroupId == null) { // 1er fois, on le recherche group = ws.findByCriteria(securityToken, Search.query().eq( - WikittyGroup.FQ_FIELD_NAME, WIKITTY_APPADMIN_GROUP_NAME).criteria()); + WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, WIKITTY_APPADMIN_GROUP_NAME).criteria()); // group peut-etre null s'il n'existe pas } else { // on a deja fait la recherche precedement, on essaie de reutilise Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-07-29 19:38:32 UTC (rev 210) @@ -145,8 +145,8 @@ if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { /*{ if (result) { - Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); - Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); + Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); result = f1 == f2 || (f1 != null && f1.equals(f2)); } }*/ @@ -171,9 +171,9 @@ && (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); + generateCollectionAttributeAccessors(output, clazz, attr); } else { - generateWikittyAttributeAccessors(output, attr); + generateWikittyAttributeAccessors(output, clazz, attr); } } } @@ -321,7 +321,7 @@ } protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -342,13 +342,13 @@ /*{ public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { - Object oldValue = getField(<%=EXT_NAME%>, "<%=attrName%>"); - getWikitty().setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", oldValue, <%=attrName%>); + Object oldValue = getField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + getWikitty().setField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=attrName%>); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, oldValue, <%=attrName%>); } public <%=attrType%> get<%=attrNameCapitalized%>() { - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); return result; } @@ -393,7 +393,7 @@ } protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -412,23 +412,23 @@ 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); + <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=getClassAndGeneric(attrType)[1]%>.class); return result; } public void add<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().addToField(<%=EXT_NAME%>, "<%=attrName%>", element); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + getWikitty().addToField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); } public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + getWikitty().removeFromField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); } public void clear<%=attrNameCapitalized%>() { - getWikitty().clearField(<%=EXT_NAME%>, "<%=attrName%>"); - getPropertyChangeSupport().firePropertyChange("<%=attrName%>", null, get<%=attrNameCapitalized%>()); + getWikitty().clearField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); } }*/ 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-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-07-29 19:38:32 UTC (rev 210) @@ -96,8 +96,8 @@ for (ObjectModelAttribute attr : clazz.getAttributes()) { if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { -/*{ static final public String FIELD_<%=attr.getName().toUpperCase()%> = "<%=attr.getName()%>"; - static final public String FQ_FIELD_<%=attr.getName().toUpperCase()%> = <%=EXT_NAME%> + ".<%=attr.getName()%>"; +/*{ static final public String FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%> = "<%=attr.getName()%>"; + static final public String FQ_FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%> = <%=EXT_NAME%> + ".<%=attr.getName()%>"; }*/ } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-07-29 19:38:32 UTC (rev 210) @@ -133,8 +133,8 @@ if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { /*{ if (result) { - Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); - Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=attr.getName().toUpperCase()%>); + Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); + Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); result = f1 == f2 || (f1 != null && f1.equals(f2)); } }*/ @@ -159,9 +159,9 @@ && (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); + generateCollectionAttributeAccessors(output, clazz, attr); } else { - generateWikittyAttributeAccessors(output, attr); + generateWikittyAttributeAccessors(output, clazz, attr); } } } @@ -182,7 +182,7 @@ } protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -192,7 +192,7 @@ } else { return; } - + // FIXME EC-20100421 cette methode peut retourner List<String> // et generer la methode getWikitty().getFieldAsList<String>() // qui ne peut pas compiler @@ -203,11 +203,11 @@ /*{ static public void set<%=attrNameCapitalized%>(Wikitty w, <%=attrType%> <%=attrName%>) { - w.setField(<%=EXT_NAME%>, "<%=attrName%>", <%=attrName%>); + w.setField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=attrName%>); } static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { - <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>"); + <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); return result; } @@ -252,7 +252,7 @@ } protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { + ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); @@ -271,20 +271,20 @@ String attrName = attr.getName(); String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); /*{ static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { - <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, "<%=attrName%>", <%=getClassAndGeneric(attrType)[1]%>.class); + <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=getClassAndGeneric(attrType)[1]%>.class); return result; } static public void add<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { - w.addToField(<%=EXT_NAME%>, "<%=attrName%>", element); + w.addToField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); } static public void remove<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { - w.removeFromField(<%=EXT_NAME%>, "<%=attrName%>", element); + w.removeFromField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); } static public void clear<%=attrNameCapitalized%>(Wikitty w) { - w.clearField(<%=EXT_NAME%>, "<%=attrName%>"); + w.clearField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); } }*/ Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-07-29 19:38:32 UTC (rev 210) @@ -237,7 +237,7 @@ // is root return null; } - parentId = (String) doc.getFieldValue(TreeNode.FQ_FIELD_PARENT); + parentId = (String) doc.getFieldValue(TreeNode.FQ_FIELD_TREENODE_PARENT); parents.put(nodeId, parentId); } @@ -295,7 +295,7 @@ Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); // Find all node contain child - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_CHILDREN + "_s:" + id); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_CHILDREN + "_s:" + id); QueryResponse response = solrServer.query(query); SolrDocumentList updateDocs = response.getResults(); @@ -497,13 +497,13 @@ if(w.hasExtension(TreeNode.EXT_TREENODE)) { - Set<String> children = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, String.class); + Set<String> children = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); reindexChildTreeNode.putIncludedChildren(id, children); // Search deleted children SolrDocument treeNodeDoc = findById(id); if(treeNodeDoc != null) { - Collection oldChildren = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_CHILDREN + "_s"); + Collection oldChildren = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_CHILDREN + "_s"); if(oldChildren != null) { // if no more children, remove all old children if(children == null) { @@ -520,7 +520,7 @@ } // Get new parent id (may be the same old parent) - String parentId = w.getFieldAsString(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); + String parentId = w.getFieldAsString(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); reindexChildTreeNode.putParent(id, parentId); } @@ -713,7 +713,7 @@ public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); + String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -734,7 +734,7 @@ public Map<String, Integer> findAllChildrenCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); + String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -761,7 +761,7 @@ log.debug("Facet result " + counts); // Find all children, add the other node not found with facet - criteria = Search.query().eq(TreeNode.FQ_FIELD_PARENT, wikittyId).criteria() + criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, wikittyId).criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); search = findAllByCriteria(transaction, criteria); Modified: 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/TreeTest.java 2010-07-29 18:54:32 UTC (rev 209) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-07-29 19:38:32 UTC (rev 210) @@ -132,7 +132,7 @@ Wikitty node = findNode(nodeName); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leaf.getId()); ws.store(null, node); } @@ -140,7 +140,7 @@ * Find node by name */ protected Wikitty findNode(String nodeName) { - Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_NAME, nodeName).criteria(); + Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_NAME, nodeName).criteria(); Wikitty wikitty = ws.findByCriteria(null, criteria); return wikitty; } @@ -162,7 +162,7 @@ // Sum value in node Set<String> values = node.getFieldAsSet(TreeNode.EXT_TREENODE, - TreeNode.FIELD_CHILDREN, String.class); + TreeNode.FIELD_TREENODE_CHILDREN, String.class); if(values != null) { sum = values.size(); } @@ -291,7 +291,7 @@ // Add it in the node2 (now: two values in it) Wikitty node = findNode("node2"); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leaf.getId()); ws.store(null, node); // now, there is one more value for the root node @@ -342,8 +342,8 @@ // Remove a value on node2 Wikitty node = findNode("node11"); - List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, String.class); - node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, leafs.get(0)); + List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); + node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leafs.get(0)); ws.store(null, node); // now, there is one more value for the root node @@ -382,7 +382,7 @@ int childSum2 = sum(node2); // Move node 1 in mode 2 - node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT, node2); + node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT, node2); ws.store(null, node121); // now, there is less value node 121 for the node 1 @@ -404,11 +404,11 @@ String valueId = value.getId(); Wikitty node31 = findNode("node31"); - node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId); + node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); ws.store(null, node31); Wikitty node32 = findNode("node32"); - node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, valueId); + node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); ws.store(null, node32); Wikitty node3 = findNode("node3");

1 0

r209 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org July 29, 2010

July 29, 2010

Author: echatellier Date: 2010-07-29 20:54:32 +0200 (Thu, 29 Jul 2010) New Revision: 209 Url: http://nuiton.org/repositories/revision/wikitty/209 Log: #787 : Delete function check aleady deleted wikitties but don't use it Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-29 18:52:50 UTC (rev 208) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-29 18:54:32 UTC (rev 209) @@ -545,8 +545,8 @@ } } - getWikittyStorage().delete(transaction, ids); - getSearchEngin().delete(transaction, ids); + getWikittyStorage().delete(transaction, idList); + getSearchEngin().delete(transaction, idList); store(securityToken, transaction, storedWikitties, false); }

1 0

r208 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org July 29, 2010

July 29, 2010

Author: echatellier Date: 2010-07-29 20:52:50 +0200 (Thu, 29 Jul 2010) New Revision: 208 Url: http://nuiton.org/repositories/revision/wikitty/208 Log: #781 : Bad extensions list modification during store Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-07-29 18:46:25 UTC (rev 207) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-07-29 18:52:50 UTC (rev 208) @@ -278,20 +278,8 @@ } if (extensionList.length() > 0) { - extensionList = extensionList.substring(1); - - String extensionList2 = ""; - String[] splits = extensionList.split(","); - - // update extensions to the lastest versions - for (String split : splits) { - String extName = WikittyExtension.computeName(split); - String lastVersion = extensionStorage.getLastVersion(transaction, extName); - extensionList2 += "," + WikittyExtension.computeId(extName, lastVersion); - } - // delete first ',' - extensionList = extensionList2.substring(1); + extensionList = extensionList.substring(1); } // update extensions in wikitty object

1 0

r207 - trunk
by echatellier＠users.nuiton.org July 29, 2010

July 29, 2010

Author: echatellier Date: 2010-07-29 20:46:25 +0200 (Thu, 29 Jul 2010) New Revision: 207 Url: http://nuiton.org/repositories/revision/wikitty/207 Log: #716 : Update to solr 1.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-28 09:27:34 UTC (rev 206) +++ trunk/pom.xml 2010-07-29 18:46:25 UTC (rev 207) @@ -76,7 +76,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.139</version> + <version>1.2.140</version> <scope>test</scope> </dependency> @@ -104,7 +104,7 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>1.4.0</version> + <version>1.4.1</version> </dependency> <dependency>

1 0

r206 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bbrossaud＠users.nuiton.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 11:27:34 +0200 (Wed, 28 Jul 2010) New Revision: 206 Url: http://nuiton.org/repositories/revision/wikitty/206 Log: changed cast method comments in PagedResult Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-07-28 09:12:57 UTC (rev 205) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-07-28 09:27:34 UTC (rev 206) @@ -91,19 +91,11 @@ } /** - * Convert all result to the wanted type and return new PagedResult with - * this new result list. If some result don't have the right extension (clazz) - * this extension is automatically added if autoconvert is true. Else - * an exception is thrown when result without extension is found. + * Convert all result to the wikitty type and return new PagedResult with + * this new result list. * - * When you used autoconvert = false, you have a potentially problem when - * you have modified a BusinessEntity to have new extension and all your - * wikitty object are not uptodate in database. - * - * @param <E> class to cast into - * @param proxy used to retrieve securityToken and WikittyService - * @param autoconvert if autoconvert is false and object don't all needed - * extension, object is not put in the result + * @param securityToken security token + * @param ws wikitty service * @return new PagedResult, this result can have less elements that original * for some reason (security, ...) */ @@ -130,7 +122,7 @@ } /** - * Convert all result to the wanted type and return new PagedResult with + * Convert all result to the wikitty type and return new PagedResult with * this new result list. * * @param securityToken security token

1 0

r205 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bbrossaud＠users.nuiton.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 11:12:57 +0200 (Wed, 28 Jul 2010) New Revision: 205 Url: http://nuiton.org/repositories/revision/wikitty/205 Log: addition findAllByCriteria and findByCriteria proxy methods which return wikitty object(s) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-07-21 12:07:42 UTC (rev 204) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-07-28 09:12:57 UTC (rev 205) @@ -310,6 +310,12 @@ return result; } + public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { + PagedResult<String> resultId = wikittyService.findAllByCriteria(securityToken, criteria); + PagedResult<Wikitty> result = resultId.cast(securityToken, wikittyService); + return result; + } + public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) { BusinessEntityWikitty sample = (BusinessEntityWikitty)WikittyUtil.newInstance(clazz); @@ -327,6 +333,11 @@ return result; } + public Wikitty findByCriteria(Criteria criteria) { + Wikitty wikitty = wikittyService.findByCriteria(securityToken, criteria); + return wikitty; + } + public void addLabel(String wikittyId, String label) { wikittyService.addLabel(securityToken, wikittyId, label); }

1 0