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

r1155 - trunk/src/site/rst/user
by jcouteau＠users.nuiton.org Aug. 16, 2011

Aug. 16, 2011

Author: jcouteau Date: 2011-08-16 11:23:21 +0200 (Tue, 16 Aug 2011) New Revision: 1155 Url: http://nuiton.org/repositories/revision/wikitty/1155 Log: Improve doc Modified: trunk/src/site/rst/user/faq.rst trunk/src/site/rst/user/search.rst trunk/src/site/rst/user/security.rst Modified: trunk/src/site/rst/user/faq.rst =================================================================== --- trunk/src/site/rst/user/faq.rst 2011-08-16 09:21:41 UTC (rev 1154) +++ trunk/src/site/rst/user/faq.rst 2011-08-16 09:23:21 UTC (rev 1155) @@ -38,11 +38,11 @@ Exemple ~~~~~~~ -Dans cet exemple, le droit de lecture est accordé au privateGroup. On vérifie -donc que l'utilisateur authentifié fait soit partie du privateGroup soit on -restreint les résultats aux objets dont le reader n'est pas le privateGroup:: +Dans cet exemple, le droit de lecture est accordé soit au privateGroup, soit à +tout le monde. On vérifie donc que l'utilisateur authentifié fait soit partie du +privateGroup soit on restreint les résultats aux objets dont le reader n'est pas +le privateGroup:: - // Récupère le privateGroup (méthode métier) WikittyGroup privateGroup = getPrivateGroup(); Modified: trunk/src/site/rst/user/search.rst =================================================================== --- trunk/src/site/rst/user/search.rst 2011-08-16 09:21:41 UTC (rev 1154) +++ trunk/src/site/rst/user/search.rst 2011-08-16 09:23:21 UTC (rev 1155) @@ -72,7 +72,7 @@ * Contient : contains - Vérifie si un champ multivalué contient une valeur. -* Dans : in - Vérifie si un champ est une valeur +* Dans : in - Vérifie si un champ est compris dans une liste de valeurs. * Egalité d'extension : exteq - Vérifie si un Wikitty possède une extension Modified: trunk/src/site/rst/user/security.rst =================================================================== --- trunk/src/site/rst/user/security.rst 2011-08-16 09:21:41 UTC (rev 1154) +++ trunk/src/site/rst/user/security.rst 2011-08-16 09:23:21 UTC (rev 1155) @@ -180,20 +180,20 @@ Pour chaque extension, on a la même hiérachie de droit qui donnent des possibilités différentes : -+----------+----------------------+----------+-------------+----------------------+ -| Type | Lecture/ | Ecriture | Suppression | Changement de droits | -| | Création d'instances | | | | -+==========+======================+==========+=============+======================+ -| Reader | X | | | | -+----------+----------------------+----------+-------------+----------------------+ -| Writer | X | X | | | -+----------+----------------------+----------+-------------+----------------------+ -| Owner | X | X | X | | -+----------+----------------------+----------+-------------+----------------------+ -| Admin | X | X | X | X | -+----------+----------------------+----------+-------------+----------------------+ -| AppAdmin | X | X | X | X | -+----------+----------------------+----------+-------------+----------------------+ ++----------+----------------------+----------+-------------+---------------+ +| Type | Lecture- | Ecriture | Suppression | Changement de | +| | Création d'instances | | | droits | ++==========+======================+==========+=============+===============+ +| Reader | X | | | | ++----------+----------------------+----------+-------------+---------------+ +| Writer | X | X | | | ++----------+----------------------+----------+-------------+---------------+ +| Owner | X | X | X | | ++----------+----------------------+----------+-------------+---------------+ +| Admin | X | X | X | X | ++----------+----------------------+----------+-------------+---------------+ +| AppAdmin | X | X | X | X | ++----------+----------------------+----------+-------------+---------------+ Si le reader est vide, tout le monde peut créer des instances de l'extension. Pour que seuls les AppAdmin et le owner puissent créer des instances, il faut

1 0

r1154 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by jcouteau＠users.nuiton.org Aug. 16, 2011

Aug. 16, 2011

Author: jcouteau Date: 2011-08-16 11:21:41 +0200 (Tue, 16 Aug 2011) New Revision: 1154 Url: http://nuiton.org/repositories/revision/wikitty/1154 Log: Improve javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-08-16 09:21:25 UTC (rev 1153) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-08-16 09:21:41 UTC (rev 1154) @@ -37,13 +37,21 @@ import org.nuiton.wikitty.WikittyUtil; /** - * Helper to create a criteria with a restriction - * <p/> + * Helper to create a criteria with restrictions. + * + * To create a search, use Search.query() and add restrictions to that + * query. In the end, create the criteria from the query and use it on find + * methods. + * * Element : - * <extensionName>.<fieldName>[.<fieldType>] : search on an extension and field with specific type (optional) - * Criteria.ALL_EXTENSIONS.<fieldName>.<fieldType> : search on all extension and field name with specific type - * <p/> + * * <extensionName>.<fieldName>[.<fieldType>] : search on an extension and field with specific type (optional) + * * Criteria.ALL_EXTENSIONS.<fieldName>.<fieldType> : search on all extension and field name with specific type + * * <fieldType> specify search on field as NUMERIC, STRING, WIKITTY, BOOLEAN, DATE. Use Element.ElementType to specify type. + * + * Some patterns might be available depending on the restriction used. They are : + * * '*' replace any number of characters + * * '?' replace one character */ public class Search { @@ -122,11 +130,11 @@ } /** - * Create new query on existent criteria to add new constraint to existent - * criteria. + * Create a new query on an existing criteria to add new constraints to + * the existing criteria. * - * @param criteria - * @return + * @param criteria the existing criteria + * @return a new query to add constraints to the criteria. */ public static Search query(Criteria criteria) { Search search = query(); @@ -145,9 +153,17 @@ /** * Contains. * - * @param element - * @param values - * @return + * Search on lists (multivalued fields) that a field contains all the values + * of the list given in parameter. + * + * Ex : The field with value [toto,titi,tutu] contains [titi,tutu] but not + * [titi,tutu,tata] + * + * Ps : Use wildcards if you search for substrings. + * + * @param element the element on which the restriction is put + * @param values the values to search in the element + * @return {@code this} with the {@code contains} restriction added. */ public Search contains(String element, Collection<String> values) { restrictions.add(RestrictionHelper.contains(elt(element), @@ -158,10 +174,18 @@ /** * Contains. * - * @param element - * @param value1 - * @param values - * @return + * Search on lists (multivalued fields) that a field contains all the values + * given in parameter. + * + * Ex : The field with value [toto,titi,tutu] contains [titi,tutu] but not + * [titi,tutu,tata] + * + * Ps : Use wildcards if you search for substrings. + * + * @param element the element on which the restriction is put + * @param value1 first value to search in the field + * @param values list of values to search in the field + * @return {@code this} with the {@code contains} restriction added. */ public Search contains(String element, String value1, String ... values) { restrictions.add(RestrictionHelper.contains(elt(element), @@ -170,11 +194,18 @@ } /** - * Contains. + * In. * - * @param element - * @param values - * @return + * Search if a field is contained in the list of values in parameter + * + * Ex : The field with value titi is in [titi,tutu] but not in + * [tutu,tata] + * + * Ps : Use wildcards in the values if you search for substrings. + * + * @param element the element on which the restriction is put + * @param values list of values the field must be in + * @return {@code this} with the {@code in} restriction added. */ public Search in(String element, Collection<String> values) { restrictions.add(RestrictionHelper.in(elt(element), @@ -183,12 +214,19 @@ } /** - * Contains. + * In. * - * @param element - * @param value1 - * @param values - * @return + * Search if a field is contained in the list of values in parameter + * + * Ex : The field with value titi is in [titi,tutu] but not in + * [tutu,tata] + * + * Ps : Use wildcards in the values if you search for substrings. + * + * @param element the element on which the restriction is put + * @param value1 first value the field must be in + * @param values list of values the field must be in + * @return {@code this} with the {@code in} restriction added. */ public Search in(String element, String value1, String ... values) { restrictions.add(RestrictionHelper.in(elt(element), @@ -199,8 +237,12 @@ /** * Equals. * - * @param element - * @param value + * Restrict search so that the field value equals the parameter. + * + * You might use patterns in your equality. + * + * @param element the field on which the search is made + * @param value the value the element must be equals to * @return {@code this} */ public Search eq(String element, String value) { @@ -209,10 +251,12 @@ } /** - * Looking find specific extension + * Extension equals. * - * @param value - * @return {@code this} + * Restrict search to wikitties that got the extension in parameter. + * + * @param value the extension to restrict the results to + * @return {@code this} with the {@code exteq} restriction added. */ public Search exteq(String value) { restrictions.add(RestrictionHelper.eq(elt(Element.ELT_EXTENSION), value)); @@ -220,10 +264,12 @@ } /** - * Looking find specific id + * Id equals. * - * @param value - * @return {@code this} + * Restrict search to wikitties that got the id in parameter. + * + * @param value the id to restrict the results to + * @return {@code this} with the {@code ideq} restriction added. */ public Search ideq(String value) { restrictions.add(RestrictionHelper.eq(elt(Element.ELT_ID), value)); @@ -231,11 +277,14 @@ } /** - * Equals each collection elements. + * Equals. * - * @param element - * @param values - * @return {@code this} + * Restrict search so that the field value equals all the members of the + * list in parameters. + * + * @param element the element on which the restriction is put + * @param values list of values that the element must be equals to + * @return {@code this} with the {@code ideq} restriction added. */ public Search eq(String element, Collection<String> values) { for (String value : values) { @@ -245,10 +294,12 @@ } /** - * Equals each collection elements. + * Extension equals. * - * @param values - * @return {@code this} + * Restrict search to wikitties that got all the extensions in parameter. + * + * @param values list of the extension to restrict the results to + * @return {@code this} with the {@code exteq} restriction added. */ public Search exteq(Collection<String> values) { for (String value : values) { @@ -259,10 +310,13 @@ /** * Not equals. + * + * Restrict search to elements that are not equals to the value given in + * parameter. * - * @param element - * @param value - * @return {@code this} + * @param element the element on which the restriction is put + * @param value the value the element must not be equals to. + * @return {@code this} with the {@code neq} restriction added. */ public Search neq(String element, String value) { restrictions.add(RestrictionHelper.neq(elt(element), value)); @@ -270,10 +324,13 @@ } /** - * Not equals. + * Extension not equals. * - * @param value - * @return {@code this} + * Restrict search to wikitties that do not get the extension given in + * parameter. + * + * @param value the extension that the wikitties must not have. + * @return {@code this} with the {@code extneq} restriction added. */ public Search extneq(String value) { restrictions.add(RestrictionHelper.neq(elt(Element.ELT_EXTENSION), value)); @@ -281,10 +338,12 @@ } /** - * Not equals. + * Id not equals. * - * @param value - * @return {@code this} + * Restrict search to wikitties that do not have the id given in parameter. + * + * @param value the id the wikitties must not have. + * @return {@code this} with the {@code idneq} restriction added. */ public Search idneq(String value) { restrictions.add(RestrictionHelper.neq(elt(Element.ELT_ID), value)); @@ -293,10 +352,12 @@ /** * Greater than. + * + * Search if an element value is greater than the parameter. * - * @param element - * @param value - * @return {@code this} + * @param element the element on which the restriction is put + * @param value the value to be compared to + * @return {@code this} with the {@code gt} restriction added. */ public Search gt(String element, String value) { restrictions.add(RestrictionHelper.great(elt(element), value)); @@ -304,11 +365,13 @@ } /** - * Greater or equals. + * Greater than or equals. + * + * Search if an element value is greater than or equals to the parameter. * - * @param element - * @param value - * @return {@code this} + * @param element the field on which the search is made + * @param value the value to be compared to + * @return {@code this} with the {@code ge} restriction added. */ public Search ge(String element, String value) { restrictions.add(RestrictionHelper.greatEq(elt(element), value)); @@ -317,10 +380,12 @@ /** * Less than. + * + * Search if an element value is less than the parameter. * - * @param element - * @param value - * @return {@code this} + * @param element the element on which the restriction is put + * @param value the value to be compared to + * @return {@code this} with the {@code lt} restriction added. */ public Search lt(String element, String value) { restrictions.add(RestrictionHelper.less(elt(element), value)); @@ -328,11 +393,13 @@ } /** - * Less or equals. + * Less than or equals. + * + * Search if an element value is less than or equals to the parameter. * - * @param element - * @param value - * @return {@code this} + * @param element the element on which the restriction is put. + * @param value the value to be compared to. + * @return {@code this} with the {@code le} restriction added. */ public Search le(String element, String value) { restrictions.add(RestrictionHelper.lessEq(elt(element), value)); @@ -340,13 +407,15 @@ } /** - * Restrict search so that the element value is between lower and upper - * values (it can also be equals) + * Between. + * + * Restrict search so that the element value is between the lower and upper + * values (it can also be equals). * - * @param element the element you put the restriction on - * @param lowerValue the lower bound - * @param upperValue the upper bound - * @return {@code this} + * @param element the element on which the restriction is put. + * @param lowerValue the lower bound. + * @param upperValue the upper bound. + * @return {@code this} with the {@code le} restriction added. */ public Search bw(String element, String lowerValue, String upperValue) { restrictions.add(RestrictionHelper.between(elt(element), lowerValue, upperValue)); @@ -355,10 +424,12 @@ /** * Starts with. - * - * @param element - * @param value - * @return {@code this} + * + * Search if an element starts with the value in parameter. + * + * @param element the element on which the restriction is put. + * @param value the value the element must start with. + * @return {@code this} with the {@code sw} restriction added. */ public Search sw(String element, String value) { restrictions.add(RestrictionHelper.start(elt(element), value)); @@ -367,10 +438,12 @@ /** * Not starts with. + * + * Search if an element does not starts with the value in parameter. * - * @param element - * @param value - * @return {@code this} + * @param element the element on which the restriction is put. + * @param value the value the element must not start with. + * @return {@code this} with the {@code nsw} restriction added. */ public Search nsw(String element, String value) { restrictions.add(RestrictionHelper.not( @@ -380,10 +453,12 @@ /** * Ends with. + * + * Search if an element ends with the value in parameter. * - * @param element - * @param value - * @return {@code this} + * @param element the element on which the restriction is put + * @param value the value the element must ends with. + * @return {@code this} with the {@code ew} restriction added. */ public Search ew(String element, String value) { restrictions.add(RestrictionHelper.end(elt(element), value)); @@ -392,10 +467,12 @@ /** * Not ends with. - * - * @param element - * @param value - * @return {@code this} + * + * Search if an element does not ends with the value in parameter. + * + * @param element the element on which the restriction is put + * @param value the value the element must not ends with. + * @return {@code this} with the {@code notew} restriction added. */ public Search notew(String element, String value) { restrictions.add(RestrictionHelper.not( @@ -405,9 +482,12 @@ /** * Keyword. + * + * Search if the value in parameter is present in any field of any + * extension. * - * @param value - * @return {@code this} + * @param value the value to find. + * @return {@code this} with the {@code keyword} restriction added. */ public Search keyword(String value) { restrictions.add(RestrictionHelper.keyword(value)); @@ -417,8 +497,10 @@ /** * Is null. * - * @param fieldName - * @return {@code this} + * Check that a field is null. + * + * @param fieldName the field that must be null. + * @return {@code this} with the {@code isNull} restriction added. */ public Search isNull(String fieldName) { restrictions.add(RestrictionHelper.isNull(fieldName)); @@ -428,8 +510,10 @@ /** * Is not null. * - * @param fieldName - * @return {@code this} + * Check that a field is not null. + * + * @param fieldName the field that must not be null. + * @return {@code this} with the {@code isNotNull} restriction added. */ public Search isNotNull(String fieldName) { restrictions.add(RestrictionHelper.isNotNull(fieldName)); @@ -439,7 +523,9 @@ /** * False. * - * @return {@code this} + * Add a restriction that always return false. + * + * @return {@code this} with the {@code rFalse} restriction added. */ public Search rFalse() { restrictions.add(RestrictionHelper.rFalse()); @@ -449,7 +535,9 @@ /** * True. * - * @return {@code this} + * Add a restriction that always return true. + * + * @return {@code this} with the {@code rTrue} restriction added. */ public Search rTrue() { restrictions.add(RestrictionHelper.rTrue()); @@ -459,7 +547,10 @@ /** * Like. * - * @param element + * Check that a string is present in a field. For example "tric" is present + * in "Restriction". + * + * @param element the element on which the restriction is put * @param value * @param searchAs * @return {@code this} @@ -478,7 +569,7 @@ /** * Unlike. * - * @param element + * @param element the element on which the restriction is put * @param value * @param searchAs * @return {@code this} @@ -531,6 +622,11 @@ return search; } + /** + * + * @param foreignFieldName + * @return + */ public Search associated(String foreignFieldName) { Search search = new SubSearch(foreignFieldName, this); return search;

1 0

r1153 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by jcouteau＠users.nuiton.org Aug. 16, 2011

Aug. 16, 2011

Author: jcouteau Date: 2011-08-16 11:21:25 +0200 (Tue, 16 Aug 2011) New Revision: 1153 Url: http://nuiton.org/repositories/revision/wikitty/1153 Log: Prevent NPE Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java 2011-08-16 09:17:37 UTC (rev 1152) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityUtil.java 2011-08-16 09:21:25 UTC (rev 1153) @@ -67,7 +67,9 @@ if (WikittyGroupHelper.hasExtension(group)) { Set<String> members = WikittyGroupHelper.getMembers(group); - return members.contains(userId); + if (members != null) { + return members.contains(userId); + } } }

1 0

r1152 - in trunk/wikitty-solr/src: main/java/org/nuiton/wikitty/storage/solr test/java/org/nuiton/wikitty/storage/solr
by jcouteau＠users.nuiton.org Aug. 16, 2011

Aug. 16, 2011

Author: jcouteau Date: 2011-08-16 11:17:37 +0200 (Tue, 16 Aug 2011) New Revision: 1152 Url: http://nuiton.org/repositories/revision/wikitty/1152 Log: #1220 - Strange errors during tests - Possible resource leak ! Close resource in tests. Adding the possibility to do it in the WikittySearchEngineSolr, need to propagate that to other services/search engines ? No error shown anymore Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java 2011-08-15 16:06:36 UTC (rev 1151) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java 2011-08-16 09:17:37 UTC (rev 1152) @@ -80,6 +80,10 @@ BasicAction.Current().add(lastResourceRecord); } + protected void close() { + + } + public Map<String, SolrInputDocument> getAddedDocs() { Map<String, SolrInputDocument> result = addedDocs.get(); if (result == null) { Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-08-15 16:06:36 UTC (rev 1151) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-08-16 09:17:37 UTC (rev 1152) @@ -92,6 +92,9 @@ /** JTA resource */ protected SolrResource solrResource; + /** CoreContainer used to init the server and close it when finished **/ + protected CoreContainer solrCore; + /** * Init wikitty search engine on solr embedded server. * @@ -131,8 +134,8 @@ try { CoreContainer.Initializer initializer = new CoreContainer.Initializer(); - CoreContainer coreContainer = initializer.initialize(); - solrServer = new EmbeddedSolrServer(coreContainer, ""); + solrCore = initializer.initialize(); + solrServer = new EmbeddedSolrServer(solrCore, ""); fieldModifier = new FieldModifier(extensionStorage); solrResource = new SolrResource(solrServer); @@ -467,6 +470,8 @@ } } catch (Exception eee) { throw new WikittyException("Can't delete wikitty in index", eee); + } finally { + solrResource.close(); } timeLog.log(startTime, "delete", String.format( "nb %s", ids.size())); @@ -994,4 +999,11 @@ return doc; } + /** + * Method to destroy properly the search engine. Mainly used in tests + */ + protected void destroy() { + solrCore.shutdown(); + } + } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java 2011-08-15 16:06:36 UTC (rev 1151) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java 2011-08-16 09:17:37 UTC (rev 1152) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.storage.solr; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; @@ -36,7 +37,7 @@ */ public class SolrSearchInMemoryTest extends AbstractSearchTest { - WikittyService service; + static protected WikittyService service; static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); @@ -45,6 +46,11 @@ SolrTestHelper.initTests(config); } + @AfterClass + public static void closeTests() { + SolrTestHelper.closeTests((WikittyServiceSolr)service); + } + @Override public WikittyService getWikittyService() { Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java 2011-08-15 16:06:36 UTC (rev 1151) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java 2011-08-16 09:17:37 UTC (rev 1152) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.storage.solr; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; @@ -35,15 +36,20 @@ */ public class SolrSearchServerTest extends AbstractSearchTest { - WikittyService service; + protected static WikittyService service; - static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-server.properties"); + protected static ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-server.properties"); @BeforeClass public static void initTests() { SolrTestHelper.initTests(config); } + @AfterClass + public static void closeTests() { + SolrTestHelper.closeTests((WikittyServiceSolr) service); + } + @Override public WikittyService getWikittyService() { Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-08-15 16:06:36 UTC (rev 1151) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-08-16 09:17:37 UTC (rev 1152) @@ -56,4 +56,8 @@ config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.key, dataDirectory.getAbsolutePath()); } + + public static void closeTests(WikittyServiceSolr service) { + service.close(); + } } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java 2011-08-15 16:06:36 UTC (rev 1151) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java 2011-08-16 09:17:37 UTC (rev 1152) @@ -44,4 +44,8 @@ wikittyStorage = new WikittyStorageInMemory(); searchEngine = new WikittySearchEngineSolr(config, extensionStorage); } + + public void close(){ + ((WikittySearchEngineSolr)searchEngine).destroy(); + } }

1 0

r1151 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by bpoussin＠users.nuiton.org Aug. 15, 2011

Aug. 15, 2011

Author: bpoussin Date: 2011-08-15 18:06:36 +0200 (Mon, 15 Aug 2011) New Revision: 1151 Url: http://nuiton.org/repositories/revision/wikitty/1151 Log: Evolution #1675: Permit to set the minimum entry to permit value become a facet setFacetMinCount must return criteria Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-08-15 10:45:13 UTC (rev 1150) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-08-15 16:06:36 UTC (rev 1151) @@ -180,8 +180,9 @@ return facetMinCount; } - public void setFacetMinCount(int facetMinCount) { + public Criteria setFacetMinCount(int facetMinCount) { this.facetMinCount = facetMinCount; + return this; } public List<Criteria> getFacetCriteria() {

1 0

r1150 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Aug. 15, 2011

Aug. 15, 2011

Author: bpoussin Date: 2011-08-15 12:45:13 +0200 (Mon, 15 Aug 2011) New Revision: 1150 Url: http://nuiton.org/repositories/revision/wikitty/1150 Log: Evolution #1675: Permit to set the minimum entry to permit value become a facet Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-08-15 09:34:12 UTC (rev 1149) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-08-15 10:45:13 UTC (rev 1150) @@ -82,6 +82,12 @@ /** Last index to get result. */ protected int endIndex = ALL_ELEMENTS; + /** + * nombre minimum de valeur pour qu'une valeur apparaisse dans les facets. + * par defaut, il doit y avoir plus que 1 valeur. + */ + protected int facetMinCount = 1; + /** Facet on criteria. */ protected List<Criteria> facetCriteria; /** Facet on field. */ @@ -170,6 +176,14 @@ return this; } + public int getFacetMinCount() { + return facetMinCount; + } + + public void setFacetMinCount(int facetMinCount) { + this.facetMinCount = facetMinCount; + } + public List<Criteria> getFacetCriteria() { return facetCriteria; } Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-08-15 09:34:12 UTC (rev 1149) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-08-15 10:45:13 UTC (rev 1150) @@ -688,7 +688,7 @@ if ((facetField != null && !facetField.isEmpty()) || (facetCriteria != null && !facetCriteria.isEmpty())) { query.setFacet(true); - query.setFacetMinCount(1); + query.setFacetMinCount(criteria.getFacetMinCount()); // query.setFacetLimit(8); // no limit actualy // field facetisation

1 0

r1149 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by bpoussin＠users.nuiton.org Aug. 15, 2011

Aug. 15, 2011

Author: bpoussin Date: 2011-08-15 11:34:12 +0200 (Mon, 15 Aug 2011) New Revision: 1149 Url: http://nuiton.org/repositories/revision/wikitty/1149 Log: change setOrder et addOrder to have varargs argument and not only one argument Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-08-15 05:52:59 UTC (rev 1148) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2011-08-15 09:34:12 UTC (rev 1149) @@ -213,15 +213,15 @@ return sortAscending; } - public Criteria addSortAscending(String field) { + public Criteria addSortAscending(String ... field) { if (sortAscending == null) { sortAscending = new ArrayList<String>(); } - sortAscending.add(field); + sortAscending.addAll(Arrays.asList(field)); return this; } - public Criteria setSortAscending(String[] sortAscending) { + public Criteria setSortAscending(String ... sortAscending) { this.sortAscending = Arrays.asList(sortAscending); return this; } @@ -235,15 +235,15 @@ return sortDescending; } - public Criteria addSortDescending(String field) { + public Criteria addSortDescending(String ... field) { if (sortDescending == null) { sortDescending = new ArrayList<String>(); } - sortDescending.add(field); + sortDescending.addAll(Arrays.asList(field)); return this; } - public Criteria setSortDescending(String[] sortDescending) { + public Criteria setSortDescending(String ... sortDescending) { this.sortDescending = Arrays.asList(sortDescending); return this; }

1 0

r1148 - in trunk: wikitty-api/src/test/resources wikitty-jdbc/src/test/resources wikitty-lucene/src/test/resources wikitty-solr/src/test/resources
by bpoussin＠users.nuiton.org Aug. 15, 2011

Aug. 15, 2011

Author: bpoussin Date: 2011-08-15 07:52:59 +0200 (Mon, 15 Aug 2011) New Revision: 1148 Url: http://nuiton.org/repositories/revision/wikitty/1148 Log: fix Anomalie #1673: Directory ObjectStore and PutObjectStoreDirHere is created during wikitty utilisation suppression de fichier jbossts-properties.xml dans les ressources de tests car plus utile, il y en a un dans le repertoire des ressources de l'api qui fixe les problemes Removed: trunk/wikitty-api/src/test/resources/jbossts-properties.xml trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml trunk/wikitty-solr/src/test/resources/jbossts-properties.xml Deleted: trunk/wikitty-api/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-api/src/test/resources/jbossts-properties.xml 2011-08-15 05:48:47 UTC (rev 1147) +++ trunk/wikitty-api/src/test/resources/jbossts-properties.xml 2011-08-15 05:52:59 UTC (rev 1148) @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties> -  - -  - <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> - -  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> - -  - <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> - -  - <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> - - <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> - com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter - com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter - </entry> - -  - <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> - - - -  - <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> - com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule - com.arjuna.ats.internal.txoj.recovery.TORecoveryModule - com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule - </entry> - -  - <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> - com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner - </entry> - -  - -  - <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> - - <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> - -</properties> Deleted: trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml 2011-08-15 05:48:47 UTC (rev 1147) +++ trunk/wikitty-jdbc/src/test/resources/jbossts-properties.xml 2011-08-15 05:52:59 UTC (rev 1148) @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties> -  - -  - <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> - -  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> - -  - <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> - -  - <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> - - <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> - com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter - com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter - </entry> - -  - <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> - - - -  - <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> - com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule - com.arjuna.ats.internal.txoj.recovery.TORecoveryModule - com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule - </entry> - -  - <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> - com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner - </entry> - -  - -  - <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> - - <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> - -</properties> Deleted: trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml 2011-08-15 05:48:47 UTC (rev 1147) +++ trunk/wikitty-lucene/src/test/resources/jbossts-properties.xml 2011-08-15 05:52:59 UTC (rev 1148) @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties> -  - -  - <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> - -  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> - -  - <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> - -  - <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> - - <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> - com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter - com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter - </entry> - -  - <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> - - - -  - <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> - com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule - com.arjuna.ats.internal.txoj.recovery.TORecoveryModule - com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule - </entry> - -  - <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> - com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner - </entry> - -  - -  - <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> - - <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> - -</properties> Deleted: trunk/wikitty-solr/src/test/resources/jbossts-properties.xml =================================================================== --- trunk/wikitty-solr/src/test/resources/jbossts-properties.xml 2011-08-15 05:48:47 UTC (rev 1147) +++ trunk/wikitty-solr/src/test/resources/jbossts-properties.xml 2011-08-15 05:52:59 UTC (rev 1148) @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties> -  - -  - <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> - -  - <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target${/}jbossts</entry> - -  - <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> - -  - <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> - -  - <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> - - <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> - com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter - com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter - </entry> - -  - <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> - - - -  - <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> - com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule - com.arjuna.ats.internal.txoj.recovery.TORecoveryModule - com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule - </entry> - -  - <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> - com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner - </entry> - -  - -  - <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> - - <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> - -  - <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> - -  - <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> - -</properties>

1 0

r1147 - in trunk/wikitty-api/src/main: java/org/nuiton/wikitty/services resources
by bpoussin＠users.nuiton.org Aug. 15, 2011

Aug. 15, 2011

Author: bpoussin Date: 2011-08-15 07:48:47 +0200 (Mon, 15 Aug 2011) New Revision: 1147 Url: http://nuiton.org/repositories/revision/wikitty/1147 Log: fix Anomalie #1673: Directory ObjectStore and PutObjectStoreDirHere is created during wikitty utilisation Added: trunk/wikitty-api/src/main/resources/jbossts-properties.xml Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyTransaction.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyTransaction.java 2011-08-14 13:57:57 UTC (rev 1146) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyTransaction.java 2011-08-15 05:48:47 UTC (rev 1147) @@ -24,14 +24,11 @@ */ package org.nuiton.wikitty.services; -import java.sql.Connection; -import java.sql.SQLException; +import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean; +import com.arjuna.ats.internal.arjuna.objectstore.VolatileStore; +import com.arjuna.common.internal.util.propertyservice.BeanPopulator; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.transaction.Status; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; @@ -64,6 +61,15 @@ }; private WikittyTransaction() { + // pour regler le probleme de repertoire ObjectStore qui apparaisse + // en conjonction avec le fichier de config jbossts-properties.xml + // voir: + // - http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Application_Platform/4.2… + // - https://issues.jboss.org/browse/JBTM-852 + BeanPopulator.getNamedInstance( + ObjectStoreEnvironmentBean.class, "communicationStore") + .setObjectStoreType(VolatileStore.class.getName()); + tagValues = new HashMap<Object, Object>(); } Copied: trunk/wikitty-api/src/main/resources/jbossts-properties.xml (from rev 1140, trunk/wikitty-api/src/test/resources/jbossts-properties.xml) =================================================================== --- trunk/wikitty-api/src/main/resources/jbossts-properties.xml (rev 0) +++ trunk/wikitty-api/src/main/resources/jbossts-properties.xml 2011-08-15 05:48:47 UTC (rev 1147) @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> + +<properties> +  + +  + <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry> + +  + <entry key="ObjectStoreEnvironmentBean.objectStoreType">${wikittyJBosstsStore:com.arjuna.ats.internal.arjuna.objectstore.VolatileStore}</entry> + +  + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">${wikittyJBosstsStoreDir:target${/}wikitty-jbossts}</entry> + +  + <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry> + +  + <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry> + +  + <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry> + + <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames"> + com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter + com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter + </entry> + +  + <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry> + + + +  + <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames"> + com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule + com.arjuna.ats.internal.txoj.recovery.TORecoveryModule + com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule + </entry> + +  + <entry key="RecoveryEnvironmentBean.expiryScannerClassNames"> + com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner + </entry> + +  + +  + <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry> + + <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry> + +  + <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry> + +  + <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry> + +  + <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry> + +</properties>

1 0

r1146 - trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org Aug. 14, 2011

Aug. 14, 2011

Author: bpoussin Date: 2011-08-14 15:57:57 +0200 (Sun, 14 Aug 2011) New Revision: 1146 Url: http://nuiton.org/repositories/revision/wikitty/1146 Log: don't log password information (replace with *********) Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-08-14 13:29:13 UTC (rev 1145) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-08-14 13:57:57 UTC (rev 1146) @@ -263,7 +263,10 @@ String jdbcUrl = String.format("%s:%s@%s", username, password, host); if (!dataSources.containsKey(jdbcUrl)) { - log.info("Creating BasicManagedDataSource for: " + jdbcUrl); + if (log.isInfoEnabled()) { + String jdbcUrlForLog = String.format("%s:%s@%s", username, "********", host); + log.info("Creating BasicManagedDataSource for: " + jdbcUrlForLog); + } // Create datasource WikittyManagedDataSource dataSource = new WikittyManagedDataSource();

1 0