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

r574 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by jcouteau＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: jcouteau Date: 2010-12-07 17:09:37 +0100 (Tue, 07 Dec 2010) New Revision: 574 Url: http://nuiton.org/repositories/revision/wikitty/574 Log: Correctly generate copyFrom method (get *all* super classes attribute one time and *only one* time) Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-07 15:56:22 UTC (rev 573) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-07 16:09:37 UTC (rev 574) @@ -605,19 +605,15 @@ protected String addCopyFromAttributes(ObjectModelClass businessEntity, String methodBody){ - methodBody=copyFromAttributesOfClass(businessEntity, methodBody); - - // add attributes inherited from super classes + // process super classes first (for multi-level inheritance) for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { - // process super classes first (for multi-level inheritance) - methodBody=copyFromAttributesOfClass(superClass, methodBody); - if (WikittyTransformerUtil.isBusinessEntity(superClass)) { - - methodBody=copyFromAttributesOfClass(businessEntity, methodBody); + methodBody=addCopyFromAttributes(superClass, methodBody); } } + + methodBody=copyFromAttributesOfClass(businessEntity, methodBody); return methodBody;

1 0

r573 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 16:56:22 +0100 (Tue, 07 Dec 2010) New Revision: 573 Url: http://nuiton.org/repositories/revision/wikitty/573 Log: fix bug for generation of list Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-07 02:30:39 UTC (rev 572) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-07 15:56:22 UTC (rev 573) @@ -237,8 +237,6 @@ + "]"; } -// // generate a string line like " unique=true" or "" -// String unique = attribute.isUnique() ? " unique=true" : ""; // // generate a string line like " deprecated=true" or "" // String deprecated = attribute.hasTagValue("deprecated") ? " deprecated=" + attribute.getTagValue("deprecated") : ""; // // generate a string line like ' documentation="my documentation"' or "" @@ -250,12 +248,18 @@ // String notNull = attribute.hasTagValue("notNull") ? " notNull=" + attribute.getTagValue("notNull") : ""; // buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""' ///* { "<%=wikittyType%> <%=attribute.getName()%><%=multiplicity%><%=unique%><%=deprecated%><%=notNull%><%=attributeDocumentation%>"}* /); + + // generate a string line like " unique=true" if not already + // present in tag/value + if (attribute.isUnique() && !attribute.getTagValues().containsKey("unique")) { + attribute.getTagValues().put("unique", "true"); + } String tagvalue = ""; for (Map.Entry<String, String> tv : attribute.getTagValues().entrySet()) { tagvalue += " " + tv.getKey() + "=\\\"" + StringEscapeUtils.escapeJava(tv.getValue()) + "\\\""; } buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""' -/*{ "<%=wikittyType%> <%=attribute.getName()%><%=tagvalue%>"}*/); +/*{ "<%=wikittyType%> <%=attribute.getName()%><%=multiplicity%><%=tagvalue%>"}*/); } }

1 0

r572 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 03:30:39 +0100 (Tue, 07 Dec 2010) New Revision: 572 Url: http://nuiton.org/repositories/revision/wikitty/572 Log: fix bug in tag/value generation. now attribute support all tag/value not only some Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-07 00:49:39 UTC (rev 571) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-07 02:30:39 UTC (rev 572) @@ -237,19 +237,25 @@ + "]"; } - // generate a string line like " unique=true" or "" - String unique = attribute.isUnique() ? " unique=true" : ""; - // generate a string line like " deprecated=true" or "" - String deprecated = attribute.hasTagValue("deprecated") ? " deprecated=" + attribute.getTagValue("deprecated") : ""; - // generate a string line like ' documentation="my documentation"' or "" - String attributeDocumentation = - attribute.hasTagValue("documentation") ? " documentation=\\\"" - + StringEscapeUtils.escapeJava(attribute.getTagValue("documentation")) - + "\\\"": ""; - // generate a string like " notNull=true" or "" - String notNull = attribute.hasTagValue("notNull") ? " notNull=" + attribute.getTagValue("notNull") : ""; +// // generate a string line like " unique=true" or "" +// String unique = attribute.isUnique() ? " unique=true" : ""; +// // generate a string line like " deprecated=true" or "" +// String deprecated = attribute.hasTagValue("deprecated") ? " deprecated=" + attribute.getTagValue("deprecated") : ""; +// // generate a string line like ' documentation="my documentation"' or "" +// String attributeDocumentation = +// attribute.hasTagValue("documentation") ? " documentation=\\\"" +// + StringEscapeUtils.escapeJava(attribute.getTagValue("documentation")) +// + "\\\"": ""; +// // generate a string like " notNull=true" or "" +// String notNull = attribute.hasTagValue("notNull") ? " notNull=" + attribute.getTagValue("notNull") : ""; +// buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""' +///* { "<%=wikittyType%> <%=attribute.getName()%><%=multiplicity%><%=unique%><%=deprecated%><%=notNull%><%=attributeDocumentation%>"}* /); + String tagvalue = ""; + for (Map.Entry<String, String> tv : attribute.getTagValues().entrySet()) { + tagvalue += " " + tv.getKey() + "=\\\"" + StringEscapeUtils.escapeJava(tv.getValue()) + "\\\""; + } buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""' -/*{ "<%=wikittyType%> <%=attribute.getName()%><%=multiplicity%><%=unique%><%=deprecated%><%=notNull%><%=attributeDocumentation%>"}*/); +/*{ "<%=wikittyType%> <%=attribute.getName()%><%=tagvalue%>"}*/); } }

1 0

r571 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:49:39 +0100 (Tue, 07 Dec 2010) New Revision: 571 Url: http://nuiton.org/repositories/revision/wikitty/571 Log: add test for new method extractExtensionName and extractFieldName Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyExtensionTest.java Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyExtensionTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyExtensionTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyExtensionTest.java 2010-12-07 00:49:39 UTC (rev 571) @@ -0,0 +1,41 @@ +package org.nuiton.wikitty.entities; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyExtensionTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyExtensionTest.class); + + @Test + public void extractExtensionName() throws Exception { + String extName = "MonExtension"; + String fieldName = "monField"; + String fq = extName + "." + fieldName; + + String extNameToTest = WikittyExtension.extractExtensionName(fq); + Assert.assertEquals(extName, extNameToTest); + } + + @Test + public void extractFieldName() throws Exception { + String extName = "MonExtension"; + String fieldName = "monField"; + String fq = extName + "." + fieldName; + + String fieldNameToTest = WikittyExtension.extractFieldName(fq); + Assert.assertEquals(fieldName, fieldNameToTest); + } +}

1 0

r570 - trunk/wikitty-api/src/main/resources
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:48:49 +0100 (Tue, 07 Dec 2010) New Revision: 570 Url: http://nuiton.org/repositories/revision/wikitty/570 Log: use new wikitty.data.directory configuration facility Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,6 +22,7 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver wikitty.storage.jdbc.host=jdbc:h2:mem:db @@ -43,5 +44,5 @@ wikitty.service.event.propagate=false wikitty.service.event.listen=false wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty/ +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,16 +22,17 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:/var/lib/wikitty/data/db +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db wikitty.storage.jdbc.login=sa wikitty.storage.jdbc.password= wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=/var/lib/wikitty/data/solr +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceSlave,\ @@ -54,5 +55,5 @@ wikitty.service.slave.master.xmpp.server=im.codelutin.com wikitty.service.slave.master.xmpp.room=master(a)conference.im.codelutin.com wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty/ +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,16 +22,17 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:/var/lib/wikitty/data/db +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db wikitty.storage.jdbc.login=sa wikitty.storage.jdbc.password= wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=/var/lib/wikitty/data/solr +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ @@ -50,5 +51,5 @@ wikitty.service.event.transporter.xmpp.server=im.codelutin.com wikitty.service.event.transporter.xmpp.room=master(a)conference.im.codelutin.com wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,16 +22,17 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:/var/lib/wikitty/data/db +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db wikitty.storage.jdbc.login=sa wikitty.storage.jdbc.password= wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=/var/lib/wikitty/data/solr +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ @@ -45,5 +46,5 @@ wikitty.service.event.propagate=false wikitty.service.event.listen=false wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/

1 0

r569 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:48:07 +0100 (Tue, 07 Dec 2010) New Revision: 569 Url: http://nuiton.org/repositories/revision/wikitty/569 Log: delete < and > in toString representation (more readeable in html or xml page Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-12-07 00:46:40 UTC (rev 568) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2010-12-07 00:48:07 UTC (rev 569) @@ -928,10 +928,10 @@ String str = "[" + getId() + ":" + getVersion() + "] {"; for ( String extName : getExtensionNames() ) { WikittyExtension ext = getExtension(extName); - str += (cr ? "\n" : "") + "\t<" + extName + ">\n"; + str += (cr ? "\n" : "") + "\t* " + extName + "\n"; cr = false; for ( String fieldName : ext.getFieldNames() ) { - str += "\t\t" + fieldName + " = " + getFieldAsString(extName, fieldName) + "\n"; + str += "\t\t* " + fieldName + " = " + getFieldAsString(extName, fieldName) + "\n"; } } str += "}";

1 0

r568 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org Dec. 7, 2010

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:46:40 +0100 (Tue, 07 Dec 2010) New Revision: 568 Url: http://nuiton.org/repositories/revision/wikitty/568 Log: add static method to easily extract extension name and field name from fully qualified field name Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2010-12-07 00:45:28 UTC (rev 567) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2010-12-07 00:46:40 UTC (rev 568) @@ -179,6 +179,12 @@ return result; } + /** + * Extract name from extension id + * + * @param id id like MonExtension[3.0] + * @return extension name. Example 'MonExtension' + */ static public String computeName(String id) { int i = id.lastIndexOf("["); String result = id; @@ -187,7 +193,14 @@ } return result; } - + + /** + * Extract extension version from extension id. If id contains no version + * this method return '0.0'. + * + * @param id id like MonExtension[3.0] + * @return extension version. Example '3.0' + */ static public String computeVersion(String id) { int b = id.lastIndexOf("["); int e = id.lastIndexOf("]"); @@ -199,6 +212,41 @@ return result; } + /** + * Extract extension name from fully qualified field name + * + * @param fqFieldName fully qualified field name like 'WikittyUser.login' + * @return return extension name. Example 'WikittyUser' + * @throws WikittyException if bad fqFieldName format + */ + static public String extractExtensionName(String fqFieldName) { + int i = fqFieldName.indexOf('.'); + if (i > 0) { + String result = fqFieldName.substring(0, i); + return result; + } else { + throw new IllegalArgumentException(String.format( + "Your argument '%s' is not fully qualified field name", fqFieldName)); + } + } + + /** + * Extract field name from fully qualified field name + * + * @param fqFieldName fully qualified field name like 'WikittyUser.login' + * @return return field name. Example 'login' + */ + static public String extractFieldName(String fqFieldName) { + int i = fqFieldName.indexOf('.'); + if (i > 0) { + String result = fqFieldName.substring(i+1); + return result; + } else { + throw new IllegalArgumentException(String.format( + "Your argument '%s' is not fully qualified field name", fqFieldName)); + } + } + public String getId() { String result = computeId(getName(), getVersion()); return result;

1 0

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

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:45:28 +0100 (Tue, 07 Dec 2010) New Revision: 567 Url: http://nuiton.org/repositories/revision/wikitty/567 Log: change WikittyConfig argument to ApplicationConfig 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-12-07 00:43:56 UTC (rev 566) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-12-07 00:45:28 UTC (rev 567) @@ -43,10 +43,10 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.mutable.MutableLong; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.search.operators.Element; @@ -109,7 +109,7 @@ public WikittyProxy() { } - public WikittyProxy(WikittyConfig config) { + public WikittyProxy(ApplicationConfig config) { if (config != null) { timeToLogInfo = config.getOptionAsInt(WikittyConfig.WikittyOption. WIKITTY_PROXY_TIME_TO_LOG_INFO.getKey()); @@ -128,7 +128,7 @@ setWikittyService(wikittyService); } - public WikittyProxy(WikittyConfig config, WikittyService wikittyService) { + public WikittyProxy(ApplicationConfig config, WikittyService wikittyService) { this(config); setWikittyService(wikittyService); }

1 0

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

Dec. 7, 2010

Author: bpoussin Date: 2010-12-07 01:43:56 +0100 (Tue, 07 Dec 2010) New Revision: 566 Url: http://nuiton.org/repositories/revision/wikitty/566 Log: add configuration variable wikitty.data.directory, this permit to change easily all data file storage in one line Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-03 18:01:20 UTC (rev 565) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-07 00:43:56 UTC (rev 566) @@ -126,6 +126,11 @@ _("Main configuration wikitty file"), "wikitty-config.properties", String.class, true, true), + WIKITTY_DATA_DIR( + "wikitty.data.directory", + _("Data directory where wikitty store data"), + "./target/data", String.class, false, false), + WIKITTY_STORAGE_JDBC_QUERY_FILE( "wikitty.storage.jdbc.queryfile", _("JDBC query configuration file"), @@ -138,7 +143,7 @@ WIKITTY_STORAGE_JDBC_URL( "wikitty.storage.jdbc.host", _("JDBC url"), - "jdbc:h2:file:./target/data/db", String.class, false, false), + "jdbc:h2:file:${" + WIKITTY_DATA_DIR + "}/db", String.class, false, false), WIKITTY_STORAGE_JDBC_LOGIN( "wikitty.storage.jdbc.login", _("JDBC login name"), @@ -170,7 +175,7 @@ WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( "wikitty.searchengine.solr.directory.data", _("Solr data directory"), - "./target/data/solr", File.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/solr", File.class, false, false), WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( "wikitty.searchengine.solr.directory.factory", _("SolR storage type possible value: solr.StandardDirectoryFactory" @@ -192,7 +197,7 @@ WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( "wikitty.WikittyServiceInMemory.persistence.file", _("Fichier ou les donnees sont stocker"), - "/tmp/wikitty-inmemory.ser", File.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/wikitty-inmemory.ser", File.class, false, false), WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( @@ -232,11 +237,11 @@ WIKITTY_EXPORT_DIRECTORY( "wikitty.addon.export.directory", _("directory path where export asynchronous file are stored"), - "/tmp", String.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/export", String.class, false, false), WIKITTY_EXPORT_PUBLICURL( "wikitty.addon.export.publicurl", _("url used by client to retrieve export file when job is ended"), - "file:///tmp/", String.class, false, false), + "file://${" + WIKITTY_DATA_DIR + "}/export/", String.class, false, false), WIKITTY_CACHE_RESTORE_COPIES( "wikitty.service.cache.allwaysRestoreCopies", @@ -274,7 +279,7 @@ WIKITTY_SLAVE_SYNC_STATE_FILE( "wikitty.service.slave.sync.state.file", _("File path to store synchronisation state"), - "./target/data/syncState", String.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/syncState", String.class, false, false), WIKITTY_SLAVE_MASTER_URL( "wikitty.service.slave.master.hessian.endpoint", _("Master url service, where to delegate modification action"),

1 0

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

Dec. 3, 2010

Author: bpoussin Date: 2010-12-03 19:01:20 +0100 (Fri, 03 Dec 2010) New Revision: 565 Url: http://nuiton.org/repositories/revision/wikitty/565 Log: fix big bug in toWikitty that call toString on WikittyCopyOnWrite and not getId (bad instanceof) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-12-03 17:58:41 UTC (rev 564) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-12-03 18:01:20 UTC (rev 565) @@ -529,7 +529,7 @@ if (value != null) { if (value instanceof String) { result = (String) value; - } else if (value instanceof WikittyImpl) { + } else if (value instanceof Wikitty) { result = ((Wikitty) value).getId(); } else if (value instanceof BusinessEntity) { result = ((BusinessEntity) value).getWikittyId();

1 0