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

r1546 - trunk
by bpoussin＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: bpoussin Date: 2013-02-24 02:51:13 +0100 (Sun, 24 Feb 2013) New Revision: 1546 Url: http://nuiton.org/projects/wikitty/repository/revisions/1546 Log: use nuiton-utils release Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-24 01:41:10 UTC (rev 1545) +++ trunk/pom.xml 2013-02-24 01:51:13 UTC (rev 1546) @@ -53,7 +53,7 @@  <eugeneVersion>2.4.2</eugeneVersion> - <nuitonUtilsVersion>2.6.9-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.9</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> <jettyVersion>7.4.2.v20110526</jettyVersion>

1 0

r1545 - in trunk: src/site/rst/user wikitty-api/src/it/generation/src/main/models wikitty-api/src/main/java/org/nuiton/wikitty/query wikitty-api/src/main/java/org/nuiton/wikitty/query/function
by bpoussin＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: bpoussin Date: 2013-02-24 02:41:10 +0100 (Sun, 24 Feb 2013) New Revision: 1545 Url: http://nuiton.org/projects/wikitty/repository/revisions/1545 Log: preparation pour la release (header, svn prop) Modified: trunk/src/site/rst/user/generation.rst trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/ListObjectOrMap.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionCount.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionDistinct.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFieldValue.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFusion.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMax.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMin.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionSum.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionValue.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunctionWrapper.java Modified: trunk/src/site/rst/user/generation.rst =================================================================== --- trunk/src/site/rst/user/generation.rst 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/src/site/rst/user/generation.rst 2013-02-24 01:41:10 UTC (rev 1545) @@ -2,8 +2,8 @@ .. * #%L .. * Wikitty .. * -.. * $Id: generation.rst.vm 1442 2012-03-05 19:01:08Z bpoussin $ -.. * $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/src/site/rst/user/generation.rst.vm $ +.. * $Id$ +.. * $HeadURL$ .. * %% .. * Copyright (C) 2009 - 2010 CodeLutin .. * %% Property changes on: trunk/src/site/rst/user/generation.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/ListObjectOrMap.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/ListObjectOrMap.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/ListObjectOrMap.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.query; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/ListObjectOrMap.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.query; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,5 +1,29 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Collection; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionCount.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionCount.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionCount.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,5 +1,29 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Collection; import java.util.Collections; import java.util.List; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionCount.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionDistinct.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionDistinct.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionDistinct.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionDistinct.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFieldValue.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFieldValue.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFieldValue.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFieldValue.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFusion.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFusion.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFusion.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.ArrayList; import java.util.Arrays; import java.util.List; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionFusion.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMax.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMax.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMax.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,5 +1,29 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Collection; import java.util.Collections; import java.util.List; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMax.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMin.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMin.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMin.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,5 +1,29 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Collection; import java.util.Collections; import java.util.List; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionMin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionSum.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionSum.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionSum.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,5 +1,29 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.math.BigDecimal; import java.util.Collection; import java.util.Collections; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionSum.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionValue.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionValue.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionValue.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.util.Collections; import java.util.List; import java.util.Map; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionValue.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.lang.reflect.Method; import java.util.ArrayList; import java.util.LinkedHashMap; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunctionWrapper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunctionWrapper.java 2013-02-24 01:29:16 UTC (rev 1544) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunctionWrapper.java 2013-02-24 01:41:10 UTC (rev 1545) @@ -1,5 +1,29 @@ package org.nuiton.wikitty.query.function; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunctionWrapper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1544 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/query/function test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: bpoussin Date: 2013-02-24 02:29:16 +0100 (Sun, 24 Feb 2013) New Revision: 1544 Url: http://nuiton.org/projects/wikitty/repository/revisions/1544 Log: correction des tests suites au differente modif pour avg si la division ne tombe pas juste on garde 20 chiffres apres la virgule Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java 2013-02-24 00:07:23 UTC (rev 1543) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/FunctionAvg.java 2013-02-24 01:29:16 UTC (rev 1544) @@ -1,6 +1,7 @@ package org.nuiton.wikitty.query.function; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -77,7 +78,12 @@ } } } - BigDecimal avg = total.divide(new BigDecimal(cpt)); + BigDecimal avg; + if (cpt == 0) { + avg = new BigDecimal(0); + } else { + avg = total.divide(new BigDecimal(cpt), 20, RoundingMode.HALF_UP); + } ListObjectOrMap result = new ListObjectOrMap(); result.add(getName(), avg); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2013-02-24 00:07:23 UTC (rev 1543) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2013-02-24 01:29:16 UTC (rev 1544) @@ -1777,45 +1777,59 @@ // test aggregate { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionAvg(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionAvg(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); System.out.println("q: " + result); Assert.assertEquals("3", result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionCount(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionCount(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(q); System.out.println("q: " + result); Assert.assertEquals("4", result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(10), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))).end() + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMax(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end() .addSortDescending(new ElementField("Test", "number")); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(10), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(-4.0), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))).end() + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionMin(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end() .addSortDescending(new ElementField("Test", "number")); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(-4.0), result.peek()); } { - WikittyQuery q = new WikittyQueryMaker().select(new FunctionSum(null, new FunctionFieldValue(null, "Test.number"))).end(); + WikittyQuery q = new WikittyQueryMaker() + .select(new FunctionSum(null, new FunctionFieldValue(null, "Test.number"))) + .where().exteq("Test").end(); WikittyQueryResult<Double> result = wikittyClient.findAllByQuery(Double.class, q); System.out.println("q: " + result); Assert.assertEquals(Double.valueOf(12), result.peek()); @@ -1955,7 +1969,7 @@ @Test public void testQueryMarkerSelect() throws Exception { - // for id for easy debugging + // force id for easy debugging WikittyImpl w = new WikittyImpl("g1"); WikittyGroupImpl g1 = new WikittyGroupImpl(w); g1.setName("Group1"); @@ -1972,6 +1986,8 @@ { WikittyQuery query = new WikittyQueryMaker() .select(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME) + .where() + .exteq(WikittyGroup.EXT_WIKITTYGROUP) .end(); WikittyQueryResult<String> result = wikittyClient.findAllByQuery(query);

1 0

r1543 - trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org 24 Feb '13

24 Feb '13

Author: bpoussin Date: 2013-02-24 01:07:23 +0100 (Sun, 24 Feb 2013) New Revision: 1543 Url: http://nuiton.org/projects/wikitty/repository/revisions/1543 Log: rename conf to config 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 2013-02-23 14:20:54 UTC (rev 1542) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2013-02-24 00:07:23 UTC (rev 1543) @@ -34,9 +34,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -239,25 +237,25 @@ * * This connection must be close be the asker after used * - * @param conf configuration + * @param config configuration * @return a new Connection (db transaction) */ public static synchronized Connection getConnectionUnconfigured( - WikittyTransaction tx, ApplicationConfig conf) { + WikittyTransaction tx, ApplicationConfig config) { if (tx == null) { throw new IllegalArgumentException("WikittyTransaction must not be null"); } - String driver = conf.getOption( + String driver = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); - String host = conf.getOption( + String host = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_URL.getKey()); - String username = conf.getOption( + String username = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); - String password = conf.getOption( + String password = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); - String xaDataSourceClassName = conf.getOption( + String xaDataSourceClassName = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); try { String jdbcUrl = String.format("%s:%s@%s", username, password, host); @@ -284,7 +282,7 @@ + "." + xaDataSourceClassName + "."; // Inject properties in xadatasource - for(Entry<Object, Object> properties : conf.getFlatOptions().entrySet()) { + for(Entry<Object, Object> properties : config.getFlatOptions().entrySet()) { String propertyName = (String) properties.getKey(); if (propertyName.startsWith(keyStart)) { propertyName = propertyName.replaceFirst(keyStart, "");

1 0

r1542 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 15:20:54 +0100 (Sat, 23 Feb 2013) New Revision: 1542 Url: http://nuiton.org/projects/wikitty/repository/revisions/1542 Log: ajout de la possibilite de faire de fonction qui herite de WikittyQueryFunction Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java 2013-02-23 14:20:02 UTC (rev 1541) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/function/WikittyQueryFunction.java 2013-02-23 14:20:54 UTC (rev 1542) @@ -7,11 +7,16 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ObjectUtil; +import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryVisitor; @@ -82,7 +87,21 @@ } else if ("toDate".equalsIgnoreCase(methodName)) { result = new WikittyQueryFunctionWrapper(WikittyUtil.class.getName() + "#toDate", name, args); } else { - result = new WikittyQueryFunctionWrapper(methodName, name, args); + if (StringUtils.contains(methodName, ObjectUtil.CLASS_METHOD_SEPARATOR)) { + // c'est une methode quelconque. + result = new WikittyQueryFunctionWrapper(methodName, name, args); + } else { + try { + // c'est peut-etre une classe qui herite de WikittyQueryFunction + Class c = Class.forName(methodName); + result = (WikittyQueryFunction)ConstructorUtils.invokeConstructor(c, + new Object[]{methodName, name, args}, + new Class[]{String.class, String.class, List.class}); + } catch (Exception eee) { + throw new WikittyException(String.format( + "Can't instantiate function '%s'", methodName), eee); + } + } } return result;

1 0

r1541 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 15:20:02 +0100 (Sat, 23 Feb 2013) New Revision: 1541 Url: http://nuiton.org/projects/wikitty/repository/revisions/1541 Log: simplification de la methode de migration (la complexite n'avait que peu d'interet (voir ne marchait pas dans certain cas :()) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2013-02-23 14:19:09 UTC (rev 1540) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2013-02-23 14:20:02 UTC (rev 1541) @@ -648,6 +648,9 @@ /** * Upgrade wikitty but not saved it. + * On passe directement de la version du wikitty a la derniere version connue + * car une installation pourrait faire un upgrade de plusieurs version + * et donc certaine version de l'extension pourrait ne pas exister en local * * @param securityToken security token previously returned by login. If * securityToken is not valid, this method do nothing @@ -673,7 +676,8 @@ String lastExtensionVersion = lastExtension.getVersion(); if (log.isDebugEnabled()) { - log.debug("lastExtensionVersion=" + lastExtensionVersion); + log.debug(String.format("Migrate extension '%s' from '%s' to '%s'", + extensionName, currentExtensionVersion, lastExtensionVersion)); } @@ -691,31 +695,9 @@ migration = defaultExtensionMigration; } - // Loop on between extension in wikitty and last version - while(WikittyUtil.versionGreaterThan(lastExtensionVersion, currentExtensionVersion)) { - - // Get extension after the current version - String nextExtensionVersion = - WikittyUtil.incrementMajorRevision(currentExtensionVersion); - String nextExtensionId = - WikittyExtension.computeId(extensionName, nextExtensionVersion); - WikittyExtension nextExtension = restoreExtension( - securityToken, nextExtensionId); - - if (log.isDebugEnabled()) { - log.debug("currentExtensionVersion=" + currentExtensionVersion); - log.debug("nextExtensionVersion=" + nextExtensionVersion); - } - - // Test if extension is never use in this version - if(nextExtension != null) { - result = migration.migrate(this, result, - currentExtension, nextExtension); - currentExtension = nextExtension; - } - - // Follow - currentExtensionVersion = nextExtensionVersion; + if(WikittyUtil.versionGreaterThan(lastExtensionVersion, currentExtensionVersion)) { + result = migration.migrate(this, result, + currentExtension, lastExtension); } }

1 0

r1540 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 15:19:09 +0100 (Sat, 23 Feb 2013) New Revision: 1540 Url: http://nuiton.org/projects/wikitty/repository/revisions/1540 Log: suppression de concatenation avec +"."+ 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 2013-02-23 02:48:47 UTC (rev 1539) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2013-02-23 14:19:09 UTC (rev 1540) @@ -371,7 +371,7 @@ */ protected void setFieldDirty(String ext, String fieldName, Object oldValue, Object newValue) { - String key = ext + "." + fieldName; + String key = WikittyUtil.getFQFieldName(ext, fieldName); incrementVersion(key); getPropertyChangeSupport().firePropertyChange(key, oldValue, newValue); } @@ -417,10 +417,12 @@ public void removeExtension(String ext) { Collection<WikittyExtension> exts = getExtensionDependencies(ext, true); + exts.add(extensions.get(ext)); for (WikittyExtension e : exts) { - extensions.remove(e.getName()); + String extName = e.getName(); + extensions.remove(extName); for (String field : e.getFieldNames()) { - fieldValue.remove(field); + fieldValue.remove(WikittyUtil.getFQFieldName(extName, field)); } } } @@ -667,9 +669,9 @@ } throw new WikittyException(String.format( "field '%s' is not a valid field. acceptable %s are: %s", - ext + "." + fieldName, type, list)); + WikittyUtil.getFQFieldName(ext, fieldName), type, list)); } - String key = ext + "." + fieldName; + String key = WikittyUtil.getFQFieldName(ext, fieldName); Object result = fieldValue.get(key); return result; } @@ -686,7 +688,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid byte[]", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -702,7 +704,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid boolean", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -718,7 +720,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid numeric", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -734,7 +736,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid int", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -750,7 +752,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid int", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -766,7 +768,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid float", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -782,7 +784,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid float", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -798,7 +800,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid String", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -814,7 +816,7 @@ } catch (WikittyException eee) { throw new WikittyException(String.format( "field '%s' is not a valid Date", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -857,7 +859,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't get value to field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -901,7 +903,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't get value to field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -960,7 +962,7 @@ // if upper bound reached, throw an exception throw new WikittyException(String.format( "Can't add value for field '%s', upper bound is reached", - ext + "." + fieldName)); + WikittyUtil.getFQFieldName(ext, fieldName))); } col.add(validValue); // if user pass in argument object that permit to take wikitty, @@ -975,7 +977,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't add value to field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -993,7 +995,7 @@ if (col.size() - 1 < type.getLowerBound()) { throw new WikittyException(String.format( "Can't remove value for field '%s', lower bound is reached", - ext + "." + fieldName)); + WikittyUtil.getFQFieldName(ext, fieldName))); } else { if (col.remove(validValue)) { // field is dirty only if remove is done @@ -1005,7 +1007,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't remove value for field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } } @@ -1018,7 +1020,7 @@ if (type.getLowerBound() > 0) { throw new WikittyException(String.format( "Can't clear values for field '%s', lower bound is > 0", - ext + "." + fieldName)); + WikittyUtil.getFQFieldName(ext, fieldName))); } try { Collection col = (Collection) getFieldAsObject(ext, fieldName); @@ -1029,7 +1031,7 @@ } catch (Exception eee) { throw new WikittyException(String.format( "Can't clear value for field '%s'", - ext + "." + fieldName), eee); + WikittyUtil.getFQFieldName(ext, fieldName)), eee); } }

1 0

r1539 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 03:48:47 +0100 (Sat, 23 Feb 2013) New Revision: 1539 Url: http://nuiton.org/projects/wikitty/repository/revisions/1539 Log: lancement de H2 en AUTO_SERVER=TRUE par defaut Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2013-02-23 02:47:49 UTC (rev 1538) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2013-02-23 02:48:47 UTC (rev 1539) @@ -70,7 +70,7 @@ WIKITTY_STORAGE_JDBC_URL( "wikitty.storage.jdbc.host", n_("JDBC url"), - "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", + "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db;AUTO_SERVER=TRUE", String.class, false, false), WIKITTY_STORAGE_JDBC_LOGIN( "wikitty.storage.jdbc.login",

1 0

r1538 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org 23 Feb '13

23 Feb '13

Author: bpoussin Date: 2013-02-23 03:47:49 +0100 (Sat, 23 Feb 2013) New Revision: 1538 Url: http://nuiton.org/projects/wikitty/repository/revisions/1538 Log: amelioration des logs 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 2013-02-22 22:06:13 UTC (rev 1537) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2013-02-23 02:47:49 UTC (rev 1538) @@ -388,9 +388,9 @@ if (currentExt != null && VersionUtil.greaterThan(currentExt.getVersion(), ext.getVersion())) { throw new WikittyException(String.format( - "You try to put extension '%s' in older version (%s) than" + "In wikitty '%s' You try to put extension '%s' in older version (%s) than" + " current version (%s). You must update your software.", - ext.getName(), ext.getVersion(), currentExt.getVersion())); + getWikittyId(), ext.getName(), ext.getVersion(), currentExt.getVersion())); } // on check les dependances

1 0

r1537 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 22 Feb '13

22 Feb '13

Author: bpoussin Date: 2013-02-22 23:06:13 +0100 (Fri, 22 Feb 2013) New Revision: 1537 Url: http://nuiton.org/projects/wikitty/repository/revisions/1537 Log: si on ajoute des variables d'environnement pour configurer SolR, on les supprime une fois solr initialise (sinon, on laisse des choses qui ne permette pas de reinitialise un autre solr convenablement plus tard) Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 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 2013-02-22 22:04:56 UTC (rev 1536) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2013-02-22 22:06:13 UTC (rev 1537) @@ -116,20 +116,26 @@ public WikittySearchEngineSolr( ApplicationConfig config, WikittyExtensionStorage extensionStorage) { + boolean removeSystemSolrDirFactoryKey = false; + String solrDirFactoryKey = null; + boolean removeSystemSolrDataDirKey = false; + String solrDataDirKey = null; + // init system env solr.data.dir if (config != null) { this.config = config; // choix du storage (file or Ram) - String solrDirFactoryKey = + solrDirFactoryKey = WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); String solrDirFactory = config.getOption(solrDirFactoryKey); if (solrDirFactory != null) { + removeSystemSolrDirFactoryKey = null == System.getProperty(solrDirFactoryKey); System.setProperty(solrDirFactoryKey, solrDirFactory); } // on utilise le directory que si on est pas en Ram if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { - String solrDataDirKey = + solrDataDirKey = WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); String solrDataDir = config.getOption(solrDataDirKey); // make sure that dir exists @@ -140,6 +146,7 @@ "Can't create directory '%s'", solrDataDir)); } log.info(String.format("Use SolR directory '%s'", solrDataDir)); + removeSystemSolrDataDirKey = null == System.getProperty(solrDataDirKey); System.setProperty(solrDataDirKey, solrDataDir); } } @@ -157,6 +164,14 @@ } catch (Exception eee) { throw new WikittyException("SolR initialization error", eee); } + + if (removeSystemSolrDirFactoryKey) { + System.clearProperty(solrDirFactoryKey); + } + if (removeSystemSolrDataDirKey) { + System.clearProperty(solrDataDirKey); + } + } public ApplicationConfig getConfig() {

1 0