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

r1306 - in trunk: . src/site/rst/user wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/test/java/org/nuiton/wikitty/services wikitty-generators/src/license wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr wikitty-struts wikitty-struts/src wikitty-struts/src/license wikitty-struts/src/main/java/org/nuiton/wikitty/struts wikitty-struts/src/ma
by echatellier＠users.nuiton.org Jan. 9, 2012

Jan. 9, 2012

Author: echatellier Date: 2012-01-09 14:24:33 +0100 (Mon, 09 Jan 2012) New Revision: 1306 Url: http://nuiton.org/repositories/revision/wikitty/1306 Log: Fix build (header, licenses, dependencies) Added: trunk/wikitty-struts/src/license/ trunk/wikitty-struts/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml trunk/src/site/rst/user/query.rst trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/AbstractCondition.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValue.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValueString.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerNaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerUnaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/package-info.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java trunk/wikitty-generators/src/license/THIRD-PARTY.properties trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java trunk/wikitty-struts/pom.xml trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyClosingTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java trunk/wikitty-struts/src/main/resources/struts-plugin.xml trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-empty.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl trunk/wikitty-struts/src/main/webapps/example.jsp trunk/wikitty-struts/src/site/rst/doc.rst Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/pom.xml 2012-01-09 13:24:33 UTC (rev 1306) @@ -113,6 +113,12 @@ <version>1.2.2</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> +  <dependency> <groupId>org.eclipse.jetty</groupId> @@ -400,6 +406,12 @@ </dependency> <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> @@ -420,13 +432,6 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${struts2Version}</version> - </dependency> - - - <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <version>${jspapiversion}</version> Modified: trunk/src/site/rst/user/query.rst =================================================================== --- trunk/src/site/rst/user/query.rst 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/src/site/rst/user/query.rst 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2012 CodeLutin, Benjamin Poussin +.. * %% +.. * 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% +.. - ====================== Recherche avec Wikitty ====================== Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/AbstractCondition.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/AbstractCondition.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/AbstractCondition.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; import java.io.Serializable; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValue.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValue.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValue.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValueString.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValueString.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ConditionValueString.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; import org.apache.commons.lang.ObjectUtils; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerNaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerNaryOperator.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerNaryOperator.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; import java.util.LinkedList; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerOperator.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerOperator.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; import org.apache.commons.logging.Log; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerUnaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerUnaryOperator.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainerUnaryOperator.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; import org.apache.commons.lang.ClassUtils; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; import java.util.ArrayList; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.query.conditions; import org.apache.commons.lang.ObjectUtils; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/package-info.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/package-info.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/package-info.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ /** * Hierarchie * <ul> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.services; import org.apache.commons.logging.Log; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.services; import java.util.Date; Modified: trunk/wikitty-generators/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2012-01-09 13:24:33 UTC (rev 1306) @@ -9,16 +9,16 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - Mozilla Public License Version 1.0 # - The Apache Software License, Version 2.0 # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:18:10 CEST 2011 +#Fri Jan 06 18:10:34 CET 2012 commons-digester--commons-digester--2.0=Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html jdom--jdom--1.0=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0=The Apache Software License, Version 2.0 Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: wikitty-solr + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.storage.solr; import org.apache.commons.lang.ClassUtils; Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: wikitty-solr + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.storage.solr; import java.util.ArrayList; Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: wikitty-solr + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.storage.solr; import java.util.Collections; Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/pom.xml 2012-01-09 13:24:33 UTC (rev 1306) @@ -35,18 +35,34 @@ <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency> - </dependencies> - - -    @@ -74,9 +90,7 @@ <targetPath>META-INF/tld</targetPath> </resource> - </resources> </build> - </project> Added: trunk/wikitty-struts/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-struts/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-struts/src/license/THIRD-PARTY.properties 2012-01-09 13:24:33 UTC (rev 1306) @@ -0,0 +1,33 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License, Version 2.0 +# - Apache Software License, version 1.1 +# - BSD License +# - BSD style +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - INRIA, France Telecom +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Public Domain +# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 09 12:51:28 CET 2012 +asm--asm--3.1=INRIA, France Telecom +asm--asm-commons--3.1=INRIA, France Telecom +commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +javassist--javassist--3.8.0.GA=Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +javax.servlet.jsp--jsp-api--2.1=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,6 +1,30 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.struts; -import static org.apache.commons.lang.StringUtils.EMPTY; +import static org.apache.commons.lang3.StringUtils.EMPTY; import java.util.ArrayList; import java.util.Collection; @@ -8,7 +32,7 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.struts; import java.util.Collection; @@ -3,5 +27,5 @@ import java.util.LinkedList; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.struts; public class Option { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/TagUseException.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.struts; public class TagUseException extends RuntimeException { Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.struts; import java.util.Collection; @@ -7,8 +31,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; @@ -384,7 +408,7 @@ result.setValue(valueString); - valueString = StringEscapeUtils.escapeHtml(valueString); + valueString = StringEscapeUtils.escapeHtml4(valueString); if (valueString.contains("\n") || "true".equals(fieldType.getTagValue("multiline"))) { result.setType("textarea"); Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyClosingUIBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 CodeLutin, Benjamin Poussin + * %% + * 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; @@ -3,5 +27,5 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponentBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/DateBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FieldBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FormTagBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; @@ -3,5 +27,5 @@ import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import java.util.LinkedList; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import java.util.Collection; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectCriteriaBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import java.util.LinkedList; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectFixedBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import java.util.LinkedList; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.component; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyClosingTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyClosingTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyClosingTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import org.apache.struts2.views.jsp.ui.AbstractClosingTag; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import org.nuiton.wikitty.WikittyProxy; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/AbstractWikittyTagComponent.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import org.nuiton.wikitty.struts.component.AbstractWikittyComponentBean; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/BooleanTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/DateTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FieldTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/FormTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/HiddenTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectAssociationTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectCriteriaTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectFixedTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import java.util.Collection; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextAreaTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/TextFieldTag.java 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: struts + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 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% + */ package org.nuiton.wikitty.struts.tag; import javax.servlet.http.HttpServletRequest; Modified: trunk/wikitty-struts/src/main/resources/struts-plugin.xml =================================================================== --- trunk/wikitty-struts/src/main/resources/struts-plugin.xml 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/struts-plugin.xml 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8" ?> + + <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN" "http://struts.apache.org/dtds/struts-2.3.dtd"> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/theme.properties 2012-01-09 13:24:33 UTC (rev 1306) @@ -1 +1,25 @@ +### +# #%L +# Wikitty :: struts +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2011 - 2012 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% +### parent = css_xhtml Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-boolean.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <input Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-commons.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> name="${parameters.name}" <#if parameters.id?? ><#t/> id="${parameters.id}"<#t/> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-date.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <input Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-empty.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-empty.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-empty.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -0,0 +1,24 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-field.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > ${parameters.value} </#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-close.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#include "/${parameters.templateDir}/${parameters.theme}/ws-form-commons.ftl" /> <input type="submit" name="store" value="Store" /> <#if parameters.allowDelete?? && parameters.allowDelete==true > Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form-commons.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#assign aKeys = parameters.wikittyfields><#t/> <#list aKeys as aKey><#t/> <#--<#if aKey.type=="file"> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-form.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <form <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" > Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-hidden.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <input <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-label-commons.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.label??> <label for="${parameters.id}">${parameters.label}</label> </#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <select <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <select Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectcriteria.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <select Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectfixed.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <select Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textarea.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <textarea Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-textfield.ftl 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<#-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% +--> <#if parameters.included?? && parameters.included==true > <#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <input Modified: trunk/wikitty-struts/src/main/webapps/example.jsp =================================================================== --- trunk/wikitty-struts/src/main/webapps/example.jsp 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/main/webapps/example.jsp 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +<%-- + #%L + Wikitty :: struts + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2012 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% + --%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> Modified: trunk/wikitty-struts/src/site/rst/doc.rst =================================================================== --- trunk/wikitty-struts/src/site/rst/doc.rst 2012-01-09 11:23:35 UTC (rev 1305) +++ trunk/wikitty-struts/src/site/rst/doc.rst 2012-01-09 13:24:33 UTC (rev 1306) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty :: struts +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 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% +.. - ========================= Documentation Utilisateur =========================

1 0

r1305 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by echatellier＠users.nuiton.org Jan. 9, 2012

Jan. 9, 2012

Author: echatellier Date: 2012-01-09 12:23:35 +0100 (Mon, 09 Jan 2012) New Revision: 1305 Url: http://nuiton.org/repositories/revision/wikitty/1305 Log: Fix doc 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 2012-01-09 09:11:24 UTC (rev 1304) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-01-09 11:23:35 UTC (rev 1305) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * Copyright (C) 2009 - 2012 CodeLutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -90,9 +90,7 @@ * TODO poussin 20101027 remove it when all used WikittyServiceHelper.build * * Used by specific child - * {@link org.nuiton.wikitty.jdbc.WikittyStorageJDBC} - * {@link org.nuiton.wikitty.jdbc.WikittyServiceJPA} - * {@link org.nuiton.wikitty.jdbc.WikittyServiceHbase} + * {@link org.nuiton.wikitty.storage.solr.WikittyServiceSolr} */ protected WikittyServiceStorage(ApplicationConfig config) { this.config = config;

1 0

r1304 - trunk/src/site/rst/user
by bpoussin＠users.nuiton.org Jan. 9, 2012

Jan. 9, 2012

Author: bpoussin Date: 2012-01-09 10:11:24 +0100 (Mon, 09 Jan 2012) New Revision: 1304 Url: http://nuiton.org/repositories/revision/wikitty/1304 Log: maj de la doc secu Modified: trunk/src/site/rst/user/security.rst Modified: trunk/src/site/rst/user/security.rst =================================================================== --- trunk/src/site/rst/user/security.rst 2012-01-07 23:23:26 UTC (rev 1303) +++ trunk/src/site/rst/user/security.rst 2012-01-09 09:11:24 UTC (rev 1304) @@ -98,9 +98,9 @@ doit fournir ce token à chaque opération pour montrer qu'il a les droits. Pour un token donné, on peut savoir à quel utilisateur il appartient. Pour le développeur, cela n'implique pas de changement car le token de sécurité est -conservé par le **WikittyProxy**. Il faut juste faire attention à bien avoir un -WikittyProxy par utilisateur. Dans le cas d'applications web, il est conseillé -de conserver le proxy dans la session de l'utilisateur. +conservé par le **WikittyClient**. Il faut juste faire attention à bien avoir un +WikittyClient par utilisateur. Dans le cas d'applications web, il est conseillé +de conserver le client dans la session de l'utilisateur. Les tokens sont stockés en base et supprimés au logout de l'utilisateur. @@ -118,7 +118,7 @@ WikittyUser admin = new WikittyUserImpl(); admin.setLogin("admin"); admin.setPassword("admin"); - admin = proxy.store(admin); + admin = client.store(admin); WikittyGroup adminGroup = WikittySecurityUtil.createAppAdminGroup(admin); @@ -135,13 +135,13 @@ admin est déjà identifié) sur un wikitty:: //On commence par charger les wikitties concernés - WikittyAuthorisation skill = proxy.restore(WikittyAuthorisation.class, id); + WikittyAuthorisation skill = client.restore(WikittyAuthorisation.class, id); //On ajoute en reader notre utilisateur skill.addReader(user.getWikittyId()); //On enregistre - proxy.store(skill); + client.store(skill); On peut de la même manière ajouter un groupe en tant que reader/writer/owner/admin d'une entité. @@ -155,10 +155,10 @@ +----------+---------+----------+-------------+----------------------+ | Writer | X | X | | | +----------+---------+----------+-------------+----------------------+ -| Owner | X | X | X | | -+----------+---------+----------+-------------+----------------------+ | Admin | X | X | X | X | +----------+---------+----------+-------------+----------------------+ +| Owner | X | X | X | X | ++----------+---------+----------+-------------+----------------------+ | AppAdmin | X | X | X | X | +----------+---------+----------+-------------+----------------------+ @@ -174,11 +174,6 @@ pas de gestion des droits par champs. Avoir le droit *reader* sur une extension d'un wikitty donne le droit de lecture sur tous les champs de cette extension. -La granularité des droits se situe donc au niveau de chaque instance. On doit -pouvoir définir le droit pour chaque extension, de chaque wikitty. Il n'y a -pas de gestion des droits par champs. Avoir le droit *reader* sur une extension -d'un wikitty donne le droit de lecture sur tous les champs de cette extension. - Différence entre Admin et AppAdmin ---------------------------------- @@ -212,10 +207,10 @@ +----------+----------------------+----------+-------------+---------------+ | Writer | X | X | | | +----------+----------------------+----------+-------------+---------------+ -| Owner | X | X | X | | -+----------+----------------------+----------+-------------+---------------+ | Admin | X | X | X | X | +----------+----------------------+----------+-------------+---------------+ +| Owner | X | X | X | X | ++----------+----------------------+----------+-------------+---------------+ | AppAdmin | X | X | X | X | +----------+----------------------+----------+-------------+---------------+

1 0

r1303 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query: . conditions
by bpoussin＠users.nuiton.org Jan. 7, 2012

Jan. 7, 2012

Author: bpoussin Date: 2012-01-08 00:23:26 +0100 (Sun, 08 Jan 2012) New Revision: 1303 Url: http://nuiton.org/repositories/revision/wikitty/1303 Log: move String transformation to Element static method Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2012-01-07 21:36:11 UTC (rev 1302) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2012-01-07 23:23:26 UTC (rev 1303) @@ -236,20 +236,7 @@ * @return */ protected Element toElement(String v) { - Element result; - if (Element.ID.getValue().equalsIgnoreCase(v)) { - result = Element.ID; - } else if (Element.EXTENSION.getValue().equalsIgnoreCase(v)) { - result = Element.EXTENSION; - } else if (Element.NODE_ROOT.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_ROOT; - } else if (Element.NODE_PATH.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_PATH; - } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_DEPTH; - } else { - result = new ElementField(v); - } + Element result = Element.get(v); return result; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-07 21:36:11 UTC (rev 1302) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-07 23:23:26 UTC (rev 1303) @@ -66,6 +66,24 @@ this.value = value; } + public static Element get(String v) { + Element result; + if (Element.ID.getValue().equalsIgnoreCase(v)) { + result = Element.ID; + } else if (Element.EXTENSION.getValue().equalsIgnoreCase(v)) { + result = Element.EXTENSION; + } else if (Element.NODE_ROOT.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_ROOT; + } else if (Element.NODE_PATH.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_PATH; + } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_DEPTH; + } else { + result = new ElementField(v); + } + return result; + } + public String getValue() { return value; }

1 0

r1302 - trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Jan. 7, 2012

Jan. 7, 2012

Author: bpoussin Date: 2012-01-07 22:36:11 +0100 (Sat, 07 Jan 2012) New Revision: 1302 Url: http://nuiton.org/repositories/revision/wikitty/1302 Log: maj documentation migration et ajout de methode utile dans le client Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-07 21:34:07 UTC (rev 1301) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-07 21:36:11 UTC (rev 1302) @@ -46,7 +46,7 @@ protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); - protected WikittyClient client = new WikittyClient(ws); + protected WikittyClient client = new WikittyClient(instance, ws); @Before public void deleteAll() throws Exception {

1 0

r1301 - in trunk: src/site/rst/user wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org Jan. 7, 2012

Jan. 7, 2012

Author: bpoussin Date: 2012-01-07 22:34:07 +0100 (Sat, 07 Jan 2012) New Revision: 1301 Url: http://nuiton.org/repositories/revision/wikitty/1301 Log: maj documentation migration et ajout de methode utile dans le client Modified: trunk/src/site/rst/user/migration.rst trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java Modified: trunk/src/site/rst/user/migration.rst =================================================================== --- trunk/src/site/rst/user/migration.rst 2012-01-07 20:40:21 UTC (rev 1300) +++ trunk/src/site/rst/user/migration.rst 2012-01-07 21:34:07 UTC (rev 1301) @@ -57,7 +57,7 @@ Si vous avez des migrations spécifiques à effectuer, ajoutez au registre toutes les migrations spécifiques des extensions:: - WikittyExtensionMigration.migrationRegistry.put("myExtension", myMigrationClass); + wikittyClient.getMigrationRegistry().put("myExtension", myMigrationClass); Vous pouvez maintenant utiliser vos données simplement, elles seront migrées au chargement. @@ -92,8 +92,35 @@ ou renommés (dans ce cas, il faut ajouter un tag renameFrom sur le champ). Pour toutes les autre migrations, vous devrez créer votre propre classe de -migration qui implémente WikittyExtensionMigration. Cette classe n'a besoin de +migration qui implante WikittyExtensionMigration. Cette classe n'a besoin de faire la migration d'une version à l'autre, par exemple de la version 1 à la version 2. Dans le cas d'une migration de la version 1 à la version 4, Wikitty appellera automatiquement les classes pour migrer de la version 1 à la version 2 -puis de la version 2 à la version 3 et ainsi de suite. \ No newline at end of file +puis de la version 2 à la version 3 et ainsi de suite. + +Le plus simple pour imlanter votre propre migration est le plus souvent d'étendre +la classe WikittyExtensionMigrationRename qui va permettre de géré le plus de +chose possible. Il ne vous restera ensuite que les modifications que vous +souhaitez réellement faire à implanter.:: + + public static class MyMigration extends WikittyExtensionMigrationRename { + public Wikitty migrate(WikittyService service, Wikitty wikitty, + WikittyExtension oldExt, WikittyExtension newExt) { + // ici le wikitty contient l'ancienne extension et les anciens champs + Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + // ici result est la version migre de l'objet (nouvelle extension) + // Vous pouvez faire ici des traitement spécifique + return result; + } + } + +Utilisation du fichier de configuration +======================================= + +Pour simplifier l'enregistrement des classes de migration et évité de devoir +passer par de la programmation vous pouvez ajouter des entrées dans le fichier +de configuration, par exemple pour utilier la classe **monpackage.MyMigration** +pour la migration de l'extension **MyExtensionName**, ajoutez dans le fichier:: + + wikitty.migration.class.MyExtensionName=monpackage.MyMigration + Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-07 20:40:21 UTC (rev 1300) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-07 21:34:07 UTC (rev 1301) @@ -64,6 +64,7 @@ import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; import org.nuiton.wikitty.query.conditions.ElementField; import org.nuiton.wikitty.query.conditions.Select; +import org.nuiton.wikitty.services.WikittyExtensionMigrationRegistry; /** * Wikitty client is object used in client side to access WikittyService. @@ -88,6 +89,7 @@ final static private Log log = LogFactory.getLog(WikittyClient.class); final static private TimeLog timeLog = new TimeLog(WikittyClient.class); + protected ApplicationConfig config = null; /** Delegated wikitty service. */ protected WikittyServiceEnhanced wikittyService; @@ -101,35 +103,39 @@ /** * Empty constructor (uninitialized wikittyService). */ - public WikittyClient() { + protected WikittyClient() { } + /** + * Creation du client, le wikittyService est instancier grace au information + * trouve dans la configuration. + * + * @param config + */ public WikittyClient(ApplicationConfig config) { + this(config, WikittyServiceFactory.buildWikittyService(config)); + } + + /** + * Creation du client en forcant le wikittyService + * + * @param config + * @param wikittyService + */ + public WikittyClient(ApplicationConfig config, WikittyService wikittyService) { if (config != null) { + this.config = config; long timeToLogInfo = config.getOptionAsInt(WikittyConfigOption. WIKITTY_CLIENT_TIME_TO_LOG_INFO.getKey()); long timeToLogWarn = config.getOptionAsInt(WikittyConfigOption. WIKITTY_CLIENT_TIME_TO_LOG_WARN.getKey()); timeLog.setTimeToLogInfo(timeToLogInfo); timeLog.setTimeToLogWarn(timeToLogWarn); + } - } - - /** - * Constructor with wikittyService. - * - * @param wikittyService wikitty service - */ - public WikittyClient(WikittyService wikittyService) { - this(); setWikittyService(wikittyService); } - public WikittyClient(ApplicationConfig config, WikittyService wikittyService) { - this(config); - setWikittyService(wikittyService); - } - static public TimeLog getTimeTrace() { return timeLog; } @@ -138,6 +144,12 @@ return timeLog.getCallCount(); } + public WikittyExtensionMigrationRegistry getMigrationRegistry() { + WikittyExtensionMigrationRegistry result = + config.getObject(WikittyExtensionMigrationRegistry.class); + return result; + } + public void login(String login, String password) { long start = TimeLog.getTime(); String result = wikittyService.login(login, password); @@ -198,6 +210,10 @@ this.wikittyService = new WikittyServiceEnhanced(wikittyService); } + public ApplicationConfig getConfig() { + return config; + } + //////////////////////////////////////////////////////////////////////////// // // STORE

1 0

r1300 - in trunk: . wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/test/java/org/nuiton/wikitty/services wikitty-jdbc/src/test/java/org/nuiton/wikitty/services wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Jan. 7, 2012

Jan. 7, 2012

Author: bpoussin Date: 2012-01-07 21:40:21 +0100 (Sat, 07 Jan 2012) New Revision: 1300 Url: http://nuiton.org/repositories/revision/wikitty/1300 Log: Evolution #1126: Add migration class definition configurable in config file modification du WikittyServiceStorage pour que les commits de transaction soient tous fait dans un finally Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/pom.xml 2012-01-07 20:40:21 UTC (rev 1300) @@ -53,7 +53,7 @@  <eugeneVersion>2.4.2</eugeneVersion> - <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> <jettyVersion>7.4.2.v20110526</jettyVersion> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -305,6 +305,12 @@ n_("maximum time before send log warn with time consumed"), "3000", Integer.class, false, false), + WIKITTY_MIGRATION_CLASS( + "wikitty.migration.class.", + n_("prefix utilise pour indique les classes a utiliser pour la migration d'extension. Par exemple " + + "wikitty.migration.class.WikittyUser=org.nuiton.wikitty.entities.MigrationUser"), + "", + Class.class, false, false), WIKITTY_SECURITY_TIME_TO_LOG_INFO( "wikitty.security.timeToLog.info", n_("maximum time before send log info with time consumed"), Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -34,6 +34,8 @@ * Interface used to migrate Wikitty data from one WikittyExtension version * to another version * + * Your implementation can have constructor with ApplicationConfig as argument. + * * @author poussin * @version $Revision$ * @@ -42,11 +44,13 @@ */ public interface WikittyExtensionMigration { - // TODO poussin 20090902 permit configuration of migrationRegistry by spring + // TODO poussin 20090902 permit configuration of migrationRegistry /** * use to put migration class for extension. * key: extensionName, value: migration class + * @deprecated use new {@link WikittyExtensionMigrationRegistry} */ + @Deprecated static public Map<String, WikittyExtensionMigration> migrationRegistry = new HashMap<String, WikittyExtensionMigration>(); Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRegistry.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -0,0 +1,56 @@ +package org.nuiton.wikitty.services; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfigOption; +import org.nuiton.wikitty.WikittyException; + +/** + * Permet de gerer les objets permettant les migrations d'extension. Il est + * possible d'ajouter programmatiquement des objects de migration ou bien en + * utilisant la configuration. Si les deux sont utilises l'ajout par programmation + * est toujours preponderant sur l'utilisation du fichier de configuration. + * + * Pour recuperer l'objet WikittyExtensionMigrationRegistry il faut utiliser + * <pre> + * ApplicationConfig config = ...; + * WikittyExtensionMigrationRegistry registry = + * config.getObject(WikittyExtensionMigrationRegistry.class); + * WikittyExtensionMigration migration = registry.get(WikittyUser.EXT_WIKITTYUSER); + * </pre> + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyExtensionMigrationRegistry { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyExtensionMigrationRegistry.class); + + protected ApplicationConfig config; + + public WikittyExtensionMigrationRegistry(ApplicationConfig config) { + this.config = config; + } + + public WikittyExtensionMigration get(String extensionName) { + try { + String key = WikittyConfigOption.WIKITTY_MIGRATION_CLASS.getKey() + extensionName; + WikittyExtensionMigration result = + config.getOptionAsSingleton(WikittyExtensionMigration.class, key); + return result; + } catch (Exception eee) { + throw new WikittyException("Can't get migration class in configuration", eee); + } + } + + public void put(String extensionName, WikittyExtensionMigration o) { + String key = WikittyConfigOption.WIKITTY_MIGRATION_CLASS.getKey() + extensionName; + config.putObject(key, o); + } + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -69,7 +69,8 @@ protected File persistenceFile = null; public WikittyServiceInMemory(ApplicationConfig config) { - super(new WikittyExtensionStorageInMemory(), + super(config, + new WikittyExtensionStorageInMemory(), new WikittyStorageInMemory(), null); searchEngine = new WikittySearchEngineInMemory( 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 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -42,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.FieldType; @@ -80,6 +81,7 @@ protected WikittyExtensionMigration defaultExtensionMigration = new WikittyExtensionMigrationRename(); + protected ApplicationConfig config; protected WikittySearchEngine searchEngine; protected WikittyExtensionStorage extensionStorage; protected WikittyStorage wikittyStorage; @@ -92,12 +94,15 @@ * {@link org.nuiton.wikitty.jdbc.WikittyServiceJPA} * {@link org.nuiton.wikitty.jdbc.WikittyServiceHbase} */ - protected WikittyServiceStorage() { + protected WikittyServiceStorage(ApplicationConfig config) { + this.config = config; } - public WikittyServiceStorage(WikittyExtensionStorage extensionStorage, + public WikittyServiceStorage(ApplicationConfig config, + WikittyExtensionStorage extensionStorage, WikittyStorage wikittyStorage, WikittySearchEngine searchEngine) { + this.config = config; this.extensionStorage = extensionStorage; this.wikittyStorage = wikittyStorage; this.searchEngine = searchEngine; @@ -212,9 +217,6 @@ result.add(extUpdate); result.add(wikUpdate); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -226,6 +228,10 @@ tx.rollback(); } throw new WikittyException("Can't store wikitty", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -241,9 +247,6 @@ List<String> result = getExtensionStorage().getAllExtensionIds(tx); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -255,6 +258,10 @@ tx.rollback(); } throw new WikittyException("Can't retrieve all extension's ids", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -272,9 +279,6 @@ List<String> result = getExtensionStorage() .getAllExtensionsRequires(tx, extensionName); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -287,6 +291,10 @@ } throw new WikittyException(String.format( "Can't retrieve all required extension for %s", extensionName), eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -341,9 +349,6 @@ WikittyEvent result = getExtensionStorage().store(tx, exts); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -355,6 +360,10 @@ tx.rollback(); } throw new WikittyException("Can't store extensions", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -388,9 +397,6 @@ WikittyEvent result = getExtensionStorage().delete(tx, extNames); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -402,6 +408,10 @@ tx.rollback(); } throw new WikittyException("Can't delete extensions", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -422,9 +432,6 @@ WikittyExtension result = getExtensionStorage().restore(tx, name, version); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -436,6 +443,10 @@ tx.rollback(); } throw new WikittyException("Can't restore extensions", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -461,9 +472,6 @@ WikittyExtension result = getExtensionStorage().restore(tx, name, version); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -475,6 +483,10 @@ tx.rollback(); } throw new WikittyException("Can't restore extensions", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -508,9 +520,6 @@ } } - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -522,6 +531,10 @@ tx.rollback(); } throw new WikittyException("Can't restore extensions", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -537,14 +550,15 @@ WikittyTransaction tx = WikittyTransaction.get(); boolean txBeginHere = false; try { + if (id == null) { + return null; + } + if (!tx.isStarted()) { tx.begin(); txBeginHere = true; } - if (id == null) { - return null; - } if (!getWikittyStorage().exists(tx, id)) { // object doesn't exist, we return null return null; @@ -559,9 +573,6 @@ result = upgradeData(securityToken, result); } - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -573,17 +584,21 @@ tx.rollback(); } throw new WikittyException("Can't store extensions", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @Override public List<Wikitty> restore(String securityToken, List<String> ids) { List<Wikitty> result = new ArrayList<Wikitty>(); - WikittyTransaction transaction = WikittyTransaction.get(); + WikittyTransaction tx = WikittyTransaction.get(); boolean txBeginHere = false; try { - if (!transaction.isStarted()) { - transaction.begin(); + if (!tx.isStarted()) { + tx.begin(); txBeginHere = true; } @@ -595,20 +610,21 @@ // avec la demande result.add(w); } - if (txBeginHere) { - transaction.commit(); - } return result; } catch (WikittyException ex) { - if (transaction != null) { - transaction.rollback(); + if (tx != null) { + tx.rollback(); } throw ex; } catch (Exception eee) { - if (transaction != null) { - transaction.rollback(); + if (tx != null) { + tx.rollback(); } throw new WikittyException("Can't restore wikitty", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -642,9 +658,18 @@ log.debug("lastExtensionVersion=" + lastExtensionVersion); } - WikittyExtensionMigration migration = - WikittyExtensionMigration.migrationRegistry.get(extensionName); + + WikittyExtensionMigration migration = null; + + WikittyExtensionMigrationRegistry registry = + config.getObject(WikittyExtensionMigrationRegistry.class); + migration = registry.get(extensionName); + // @deprecated a supprimer lorsque ce sera supprime de l'api if (migration == null) { + migration = WikittyExtensionMigration.migrationRegistry.get(extensionName); + } + + if (migration == null) { migration = defaultExtensionMigration; } @@ -755,9 +780,6 @@ result.add(eventDelete); result.add(eventStore); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -769,6 +791,10 @@ tx.rollback(); } throw new WikittyException("Can't delete wikitty", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -794,9 +820,6 @@ result.add(eventWik); result.add(eventExt); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -808,6 +831,10 @@ tx.rollback(); } throw new WikittyException("Can't clear all data", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -838,9 +865,6 @@ } } - if (txBeginHere) { - tx.commit(); - } if (criteria.size() != result.size()) { log.error(String.format("Criteria input list (%s) has not same size that result list (%s)", criteria.size(), result.size())); @@ -856,6 +880,10 @@ tx.rollback(); } throw new WikittyException("Error during find", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -888,9 +916,6 @@ } } - if (txBeginHere) { - tx.commit(); - } if (criteria.size() != result.size()) { log.error(String.format("Criteria input list (%s) has not same size that result list (%s)", criteria.size(), result.size())); @@ -906,6 +931,10 @@ tx.rollback(); } throw new WikittyException("Error during find", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -936,9 +965,6 @@ } } - if (txBeginHere) { - tx.commit(); - } if (queries.size() != result.size()) { log.error(String.format("Query input list (%s) has not same size that result list (%s)", queries.size(), result.size())); @@ -954,6 +980,10 @@ tx.rollback(); } throw new WikittyException("Error during find", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -985,9 +1015,6 @@ } } - if (txBeginHere) { - tx.commit(); - } if (queries.size() != result.size()) { log.error(String.format("Query input list (%s) has not same size that result list (%s)", queries.size(), result.size())); @@ -1003,6 +1030,10 @@ tx.rollback(); } throw new WikittyException("Error during find", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -1020,9 +1051,6 @@ securityToken, thesaurusId); WikittyEvent result = delete(securityToken, allTreeNodeId); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -1034,6 +1062,10 @@ tx.rollback(); } throw new WikittyException("Can't delete tree", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -1077,9 +1109,6 @@ tx, wikittyId, depth, count, filter); } - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -1091,6 +1120,10 @@ tx.rollback(); } throw new WikittyException("Can't restore children", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -1112,9 +1145,6 @@ tx, wikittyId, depth, count, filter); } - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -1126,6 +1156,10 @@ tx.rollback(); } throw new WikittyException("Can't restore children", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -1226,9 +1260,6 @@ // Last wikitties searchEngine.store(tx, wikitties, true); - if (txBeginHere) { - tx.commit(); - } log.info("Reindexation finished"); } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -1240,6 +1271,10 @@ tx.rollback(); } throw new WikittyException("Can't sync searchable index with data", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -1333,9 +1368,6 @@ delete(securityToken, toRemoveWikitty.keySet()); result.add(eventDeleteWikitty); - if(txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -1347,6 +1379,10 @@ tx.rollback(); } throw new WikittyException("Can't replay data", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -1363,9 +1399,6 @@ boolean result = getWikittyStorage().exists(tx, wikittyId); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -1377,6 +1410,10 @@ tx.rollback(); } throw new WikittyException("Can't test existance", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } @@ -1391,9 +1428,6 @@ } boolean result = getWikittyStorage().isDeleted(tx, wikittyId); - if (txBeginHere) { - tx.commit(); - } return result; } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { @@ -1405,6 +1439,10 @@ tx.rollback(); } throw new WikittyException("Can't test existance", eee); + } finally { + if (txBeginHere && tx != null && tx.isStarted()) { + tx.commit(); + } } } Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -0,0 +1,91 @@ +package org.nuiton.wikitty.services; + +import java.util.Date; +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyClient; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyImpl; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyExtensionMigrationTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyExtensionMigrationTest.class); + + static protected String extensionName = "Dummy"; + + @Test + public void testMigration() throws Exception { + + WikittyExtension ext1 = new WikittyExtension(extensionName, + "1.0", // version + WikittyUtil.tagValuesToMap(" version=\"1.0\""), // tag/values + (List)null, + WikittyUtil.buildFieldMapExtension( // building field map + "Numeric number", + "String string", + "Date date")); + + WikittyExtension ext2 = new WikittyExtension(extensionName, + "2.0", // version + WikittyUtil.tagValuesToMap(" version=\"1.0\""), // tag/values + (List<String>)null, + WikittyUtil.buildFieldMapExtension( // building field map + "Numeric number", + "String string", + "Date date")); + + ApplicationConfig config = WikittyConfig.getConfig(); + String key = WikittyConfigOption.WIKITTY_MIGRATION_CLASS.getKey() + extensionName; + config.setOption(key, DummyMigration.class.getName()); + WikittyService service = new WikittyServiceInMemory(config); + WikittyClient client = new WikittyClient(config, service); + + WikittyImpl w1 = new WikittyImpl("w1"); + w1.addExtension(ext1); + w1.setField(extensionName, "string", "coucou"); + + client.store(w1); + + client.storeExtension(ext2); + + Wikitty w2 = client.restore(w1.getId()); + Assert.assertEquals("hello", w2.getFieldAsString(extensionName, "string")); + } + + public static class DummyMigration extends WikittyExtensionMigrationRename { + + public Wikitty migrate(WikittyService service, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { + System.out.println(String.format("migrate %s(%s) oldExt %s newExt %s", + wikitty.getId(), wikitty.getExtension(extensionName).getId(), + oldExt.getId(), newExt.getId())); + + Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + result.setField(extensionName, "string", "hello"); + result.setField(extensionName, "date", new Date()); + + System.out.println(String.format("done %s(%s)", + result.getId(), result.getExtension(extensionName).getId())); + + return result; + } + + } +} Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -51,12 +51,11 @@ static private Log log = LogFactory.getLog(WikittyServiceInMemoryJdbcSolr.class); public WikittyServiceInMemoryJdbcSolr() { - super(null, null, null); + super(WikittyConfig.getConfig(), null, null, null); // we use unique db name (this permit to use simultaneously many // WikittyServiceInMemoryJdbcSolr) String dbName = "wikitty-tx-" + UUID.randomUUID().toString(); - ApplicationConfig config = WikittyConfig.getConfig(); config.setOption(WikittyConfigOption. WIKITTY_STORAGE_JDBC_URL.getKey(), "jdbc:h2:mem:" + dbName); Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -26,7 +26,6 @@ import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.conditions.Aggregate; -import org.nuiton.wikitty.query.conditions.Element; import org.nuiton.wikitty.query.conditions.ElementField; /** 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 2012-01-07 16:50:21 UTC (rev 1299) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java 2012-01-07 20:40:21 UTC (rev 1300) @@ -40,6 +40,7 @@ */ public class WikittyServiceSolr extends WikittyServiceStorage { public WikittyServiceSolr(ApplicationConfig config) { + super(config); extensionStorage = new WikittyExtensionStorageInMemory(); wikittyStorage = new WikittyStorageInMemory(); searchEngine = new WikittySearchEngineSolr(config, extensionStorage);

1 0

r1299 - in trunk/wikitty-solr/src: main/java/org/nuiton/wikitty/storage/solr test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Jan. 7, 2012

Jan. 7, 2012

Author: bpoussin Date: 2012-01-07 17:50:21 +0100 (Sat, 07 Jan 2012) New Revision: 1299 Url: http://nuiton.org/repositories/revision/wikitty/1299 Log: petit hack pour que le like/unlike/keyword fonctionne comme on le souhaite Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-01-07 16:23:47 UTC (rev 1298) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-01-07 16:50:21 UTC (rev 1299) @@ -342,7 +342,17 @@ @Override public boolean visitEnter(Keyword o) { - solrQuery += evalConditionValue(o.getValue()); + String value = evalConditionValue(o.getValue()); + // TODO poussin 20120107 impossible de comprendre pourquoi il faut force + // la chaine en lower case, ca devrait etre le role de solr/lucene via + // la description du schema de mettre la chaine dans la bonne forme + // pour la recheche en fonction du type du champs souhaite (ici fulltext) + // tant que ca marche pas on force a la main + value = value.toLowerCase(); + + // pour keyword on ajout automatiquement les *, sinon il faut faire un like + value = "*" + value + "*"; + solrQuery += value; return false; } @@ -383,7 +393,15 @@ element2solr += WikittySolrConstant.SUFFIX_STRING_FULLTEXT; } - solrQuery += element2solr + ":" + evalConditionValue(o.getValue()); + String value = evalConditionValue(o.getValue()); + // TODO poussin 20120107 impossible de comprendre pourquoi il faut force + // la chaine en lower case, ca devrait etre le role de solr/lucene via + // la description du schema de mettre la chaine dans la bonne forme + // pour la recheche en fonction du type du champs souhaite (ici fulltext) + // tant que ca marche pas on force a la main + value = value.toLowerCase(); + + solrQuery += element2solr + ":" + value; return false; } @@ -400,7 +418,15 @@ element2solr += WikittySolrConstant.SUFFIX_STRING_FULLTEXT; } - solrQuery += "-" + element2solr + ":" + evalConditionValue(o.getValue()); + String value = evalConditionValue(o.getValue()); + // TODO poussin 20120107 impossible de comprendre pourquoi il faut force + // la chaine en lower case, ca devrait etre le role de solr/lucene via + // la description du schema de mettre la chaine dans la bonne forme + // pour la recheche en fonction du type du champs souhaite (ici fulltext) + // tant que ca marche pas on force a la main + value = value.toLowerCase(); + + solrQuery += "-" + element2solr + ":" + value; return false; } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-07 16:23:47 UTC (rev 1298) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-07 16:50:21 UTC (rev 1299) @@ -258,17 +258,46 @@ { WikittyQuery query = new WikittyQueryMaker() - .like(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "Group*") + .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "G*") .end(); WikittyQueryResult<String> result = client.findAllByQuery(query); System.out.println("testEq" + result.getAll()); - // FIXME test fail :(. But solr request look like good - // WikittyGroup.name_s_t:Group* -// Assert.assertEquals(2, result.size()); + Assert.assertEquals(2, result.size()); } + { + WikittyQuery query = new WikittyQueryMaker() + .like(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, "*oup*") + .end(); + + WikittyQueryResult<String> result = client.findAllByQuery(query); + + System.out.println("testLike" + result); + Assert.assertEquals(2, result.size()); + } + { + WikittyQuery query = new WikittyQueryMaker() + .like("*", "Grou*") + .end(); + + WikittyQueryResult<String> result = client.findAllByQuery(query); + + System.out.println("testLike" + result); + Assert.assertEquals(2, result.size()); + } + { + WikittyQuery query = new WikittyQueryMaker() + .keyword("Gro") + .end(); + + WikittyQueryResult<String> result = client.findAllByQuery(query); + + System.out.println("testKeyword:" + result); + Assert.assertEquals(2, result.size()); + } + } @Test

1 0

r1298 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org Jan. 7, 2012

Jan. 7, 2012

Author: bpoussin Date: 2012-01-07 17:23:47 +0100 (Sat, 07 Jan 2012) New Revision: 1298 Url: http://nuiton.org/repositories/revision/wikitty/1298 Log: delete debug message Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-07 13:48:37 UTC (rev 1297) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-07 16:23:47 UTC (rev 1298) @@ -67,7 +67,6 @@ if (log.isDebugEnabled()) { log.debug("Element: " + element.getValue() + "(" + element.getClass() + ")"); } - System.out.println("XXXXXElement: " + element.getValue() + "(" + element.getClass() + ")"); String result; if (element instanceof ElementId) { result = SOLR_ID;

1 0

r1297 - trunk/src/site/rst/user
by bpoussin＠users.nuiton.org Jan. 7, 2012

Jan. 7, 2012

Author: bpoussin Date: 2012-01-07 14:48:37 +0100 (Sat, 07 Jan 2012) New Revision: 1297 Url: http://nuiton.org/repositories/revision/wikitty/1297 Log: Evolution #1883: Change Query API to permit use of Select as Value of Terminal condition maj de la doc Modified: trunk/src/site/rst/user/query.rst Modified: trunk/src/site/rst/user/query.rst =================================================================== --- trunk/src/site/rst/user/query.rst 2012-01-07 12:23:36 UTC (rev 1296) +++ trunk/src/site/rst/user/query.rst 2012-01-07 13:48:37 UTC (rev 1297) @@ -67,12 +67,15 @@ De nombreuses contraintes sont disponibles pour créer vos recherches : -* Egalité : eq - Vérifie si un champ est égal a une valeur, si le champs est un - champs texte, il est possible d'ajouter des "*" en début et en fin de la - chaîne de recherche pour faire l'équivalent d'un startsWith ou endsWith. Si - vous utilisez WikittyQueryMaker les méthodes sw (startsWith) et ew (endsWith) - font ce travail pour vous.:: +Egalité : eq +++++++++++++ +Vérifie si un champ est égal a une valeur, si le champs est un +champs texte, il est possible d'ajouter des "*" en début et en fin de la +chaîne de recherche pour faire l'équivalent d'un startsWith ou endsWith. Si +vous utilisez WikittyQueryMaker les méthodes sw (startsWith) et ew (endsWith) +font ce travail pour vous.:: + WikittyQuery q = new WikittyQueryMaker().eq(User.ELEMENT_FIELD_USER_LASTNAME, "poussin").end(); WikittyQuery q = new WikittyQueryMaker().eq(User.ELEMENT_FIELD_USER_LASTNAME, "*ssin").end(); WikittyQuery q = new WikittyQueryMaker().ew(User.ELEMENT_FIELD_USER_LASTNAME, "ssin").end(); @@ -81,10 +84,13 @@ WikittyQuery q = WikittyQueryParser.parse("User.lastname=*ssin"); WikittyQuery q = WikittyQueryParser.parse("User.lastname=*ssin"); -* Non égalité : neq - Vérifie si un champ n'est pas égal a une valeur. De la - même façon que le eq, il est possible d'ajouter des '*'. Ou d'utiliser les - méthode notsw et notew.:: +Non égalité : neq ++++++++++++++++++ +Vérifie si un champ n'est pas égal a une valeur. De la +même façon que le eq, il est possible d'ajouter des '*'. Ou d'utiliser les +méthode notsw et notew.:: + WikittyQuery q = new WikittyQueryMaker().ne(User.ELEMENT_FIELD_USER_LASTNAME, "poussin").end(); WikittyQuery q = new WikittyQueryMaker().ne(User.ELEMENT_FIELD_USER_LASTNAME, "*ssin").end(); WikittyQuery q = new WikittyQueryMaker().notew(User.ELEMENT_FIELD_USER_LASTNAME, "ssin").end(); @@ -93,56 +99,74 @@ WikittyQuery q = WikittyQueryParser.parse("User.lastname!=*ssin"); WikittyQuery q = WikittyQueryParser.parse("User.lastname!=*ssin"); -* Contient tous : containsAll - Vérifie si un champ multivalué contient au moins - une valeur de la liste des valeurs passées en argument:: +Contient tous : containsAll ++++++++++++++++++++++++++++ +Vérifie si un champ multivalué contient au moins une valeur de la liste des +valeurs passées en argument:: + WikittyQuery q = new WikittyQueryMaker() .containsOne(User.ELEMENT_FIELD_USER_LASTNAME, "poussin", "couteau").end(); WikittyQuery q = WikittyQueryParser.parse("User.lastname={poussin, couteau}"); -* Egalité d'extension : exteq - Vérifie si un Wikitty possède une extension:: +Egalité d'extension : exteq ++++++++++++++++++++++++++++ +Vérifie si un Wikitty possède une extension:: + WikittyQuery q = new WikittyQueryMaker() .exteq(User.EXT_USER).end(); WikittyQuery q = WikittyQueryParser.parse("extension=User"); -* Non égalité d'extension : extne - Vérifie qu'un Wikitty ne porte pas une -extension.:: +Non égalité d'extension : extne ++++++++++++++++++++++++++++++++ +Vérifie qu'un Wikitty ne porte pas une extension.:: + WikittyQuery q = new WikittyQueryMaker() .extne(User.EXT_USER).end(); WikittyQuery q = WikittyQueryParser.parse("extension!=User"); -* ContainsAll d'extension : extContainsAll - Vérifie si un Wikitty possède toutes - les extensions:: +ContainsAll d'extension : extContainsAll +++++++++++++++++++++++++++++++++++++++++ +Vérifie si un Wikitty possède toutes les extensions:: + WikittyQuery q = new WikittyQueryMaker() .extContainsAll(User.EXT_USER, Employee.EXT_EMPLOYEE).end(); WikittyQuery q = WikittyQueryParser.parse("extension=[User, Employee]"); -* Égalité d'identifiant : ideq - Vérifie qu'un Wikitty porte l'identifiant:: +Égalité d'identifiant : ideq +++++++++++++++++++++++++++++ +Vérifie qu'un Wikitty porte l'identifiant:: + WikittyQuery q = new WikittyQueryMaker() .ideq(User.EXT_USER).end(); WikittyQuery q = WikittyQueryParser.parse("id=1234567-1234-1234567"); -* Non égalité d'identifiant : idneq - Vérifie qu'un Wikitty ne porte pas -l'identifiant.:: +Non égalité d'identifiant : idneq ++++++++++++++++++++++++++++++++++ +Vérifie qu'un Wikitty ne porte pas l'identifiant.:: + WikittyQuery q = new WikittyQueryMaker() .idne(User.EXT_USER).end(); WikittyQuery q = WikittyQueryParser.parse("id!=1234567-1234-1234567"); -* Similitude : like - Vérifie qu'une chaîne de caractère est égale à une autre - sans tenir compte de la casse ni des accents. Cette opérateur ne recherche que - de façon textuelle, vous pouvez ajouter des '*' en début et fin de d'expression:: +Similitude : like ++++++++++++++++++ +Vérifie qu'une chaîne de caractère est égale à une autre +sans tenir compte de la casse ni des accents. Cette opérateur ne recherche que +de façon textuelle, vous pouvez ajouter des '*' en début et fin de d'expression:: + WikittyQuery q = new WikittyQueryMaker() .like(User.ELEMENT_FIELD_USER_FIRSTNAME, "helene").end(); WikittyQuery q = new WikittyQueryMaker() @@ -151,10 +175,13 @@ WikittyQuery q = WikittyQueryParser.parse("User.fistname LIKE helene"); WikittyQuery q = WikittyQueryParser.parse("User.fistname LIKE *lene"); -* Non similitude : unlike - Vérifie qu'une chaîne de caractère n'est pas égale à une autre - sans tenir compte de la casse ni des accents. Cette opérateur ne recherche que - de façon textuelle, vous pouvez ajouter des '*' en début et fin de d'expression:: +Non similitude : unlike ++++++++++++++++++++++++ +Vérifie qu'une chaîne de caractère n'est pas égale à une autre +sans tenir compte de la casse ni des accents. Cette opérateur ne recherche que +de façon textuelle, vous pouvez ajouter des '*' en début et fin de d'expression:: + WikittyQuery q = new WikittyQueryMaker() .unlike(User.ELEMENT_FIELD_USER_FIRSTNAME, "helene").end(); WikittyQuery q = new WikittyQueryMaker() @@ -163,108 +190,144 @@ WikittyQuery q = WikittyQueryParser.parse("User.fistname UNLIKE helene"); WikittyQuery q = WikittyQueryParser.parse("User.fistname UNLIKE *lene"); -* Supérieur strictement : gt - Vérifie qu'un champ est strictement supérieur à - une valeur. Cette condition s'applique surtout sur les champs de type Date et - Number:: +Supérieur strictement : gt +++++++++++++++++++++++++++ +Vérifie qu'un champ est strictement supérieur à +une valeur. Cette condition s'applique surtout sur les champs de type Date et +Number:: + WikittyQuery q = new WikittyQueryMaker() .gt(User.ELEMENT_FIELD_USER_AGE, 18).end(); WikittyQuery q = WikittyQueryParser.parse("User.age > 18"); -* Supérieur ou égal : ge - Vérifie si un champ est supérieur ou égal à une -valeur.:: +Supérieur ou égal : ge +++++++++++++++++++++++ +Vérifie si un champ est supérieur ou égal à une valeur.:: + WikittyQuery q = new WikittyQueryMaker() .ge(User.ELEMENT_FIELD_USER_AGE, 18).end(); WikittyQuery q = WikittyQueryParser.parse("User.age >= 18"); -* Inférieur strictement : lt - Vérifie si un champ est strictement inférieur à -une valeur.:: +Inférieur strictement : lt +++++++++++++++++++++++++++ +Vérifie si un champ est strictement inférieur à une valeur.:: + WikittyQuery q = new WikittyQueryMaker() .lt(User.ELEMENT_FIELD_USER_AGE, 18).end(); WikittyQuery q = WikittyQueryParser.parse("User.age < 18"); -* Inférieur ou égal : le - Vérifie si un champ est inférieur ou égal à une -valeur.:: +Inférieur ou égal : le +++++++++++++++++++++++ +Vérifie si un champ est inférieur ou égal à une valeur.:: + WikittyQuery q = new WikittyQueryMaker() .le(User.ELEMENT_FIELD_USER_AGE, 18).end(); WikittyQuery q = WikittyQueryParser.parse("User.age <= 18"); -* Entre : bw - Vérifie si un champ est compris entre deux valeurs.:: +Entre : bw +++++++++++ +Vérifie si un champ est compris entre deux valeurs.:: + WikittyQuery q = new WikittyQueryMaker() .bw(Product.ELEMENT_FIELD_PRODUCT_PRICE, 2, 2.50).end(); WikittyQuery q = WikittyQueryParser.parse("Product.price=[2 TO 2.5]"); -* Commence par : sw - Vérifie si un champ de type chaîne commence par une valeur.:: +Commence par : sw ++++++++++++++++++ +Vérifie si un champ de type chaîne commence par une valeur.:: + WikittyQuery q = new WikittyQueryMaker() .sw(User.ELEMENT_FIELD_USER_LASTNAME, "pous").end(); WikittyQuery q = WikittyQueryParser.parse("User.lastname=pous*"); -* Ne commence pas par : notsw - Vérifie si un champ de type chaîne ne commence pas -par une valeur.:: +Ne commence pas par : notsw ++++++++++++++++++++++++++++ +Vérifie si un champ de type chaîne ne commence pas par une valeur.:: + WikittyQuery q = new WikittyQueryMaker() .notsw(User.ELEMENT_FIELD_USER_LASTNAME, "pous").end(); WikittyQuery q = WikittyQueryParser.parse("User.lastname!=pous*"); -* Termine par : ew - Vérifie si un champ de type chaîne termine par une valeur.:: +Termine par : ew +++++++++++++++++ +Vérifie si un champ de type chaîne termine par une valeur.:: + WikittyQuery q = new WikittyQueryMaker() .ew(User.ELEMENT_FIELD_USER_LASTNAME, "sin").end(); WikittyQuery q = WikittyQueryParser.parse("User.lastname=sin*"); -* Ne termine pas par : notew - Vérifie si un champs de type chaîne ne termine -pas par une valeur.:: +Ne termine pas par : notew +++++++++++++++++++++++++++ +Vérifie si un champs de type chaîne ne termine pas par une valeur.:: + WikittyQuery q = new WikittyQueryMaker() .notew(User.ELEMENT_FIELD_USER_LASTNAME, "pous").end(); WikittyQuery q = WikittyQueryParser.parse("User.lastname!=pous*"); -* Mot-clé : keyword - Vérifie si la valeur est présente dans n'importe quel - champ de n'importe quelle extension en fulltext (pas de prise en compte de la - casse ou des accents).:: +Mot-clé : keyword ++++++++++++++++++ +Vérifie si la valeur est présente dans n'importe quel +champ de n'importe quelle extension en fulltext (pas de prise en compte de la +casse ou des accents).:: + WikittyQuery q = new WikittyQueryMaker() .keyword("partout").end(); WikittyQuery q = WikittyQueryParser.parse("partout"); -* Nul : isNull - Vérifie si la valeur d'un champ est nulle:: +Nul : isNull +++++++++++++ +Vérifie si la valeur d'un champ est nulle:: + WikittyQuery q = new WikittyQueryMaker() .isNull(User.ELEMENT_FIELD_USER_LASTNAME).end(); WikittyQuery q = WikittyQueryParser.parse("User.lastname=NULL"); -* Non nul : isNotNull - Vérifie si la valeur d'un champ n'est pas nulle. +Non nul : isNotNull ++++++++++++++++++++ +Vérifie si la valeur d'un champ n'est pas nulle. + WikittyQuery q = new WikittyQueryMaker() .isNotNull(User.ELEMENT_FIELD_USER_LASTNAME).end(); WikittyQuery q = WikittyQueryParser.parse("User.lastname!=NULL"); -* False : rFalse - retourne toujours faux:: +False : rFalse +++++++++++++++ +retourne toujours faux:: + WikittyQuery q = new WikittyQueryMaker() .rFalse().end(); WikittyQuery q = WikittyQueryParser.parse("FALSE"); -* True : rTrue - retourne toujours vrai:: +True : rTrue +++++++++++++ +retourne toujours vrai:: WikittyQuery q = new WikittyQueryMaker() .rTrue().end(); @@ -274,13 +337,16 @@ Les noeuds à sous-requête ------------------------- -* Les noeuds à sous requêtes permettent de faire des requêtes complexes. +Les noeuds à sous requêtes permettent de faire des requêtes complexes. -* Non : not - Résultat inverse de la sous-requête. Permet de faire la négation - d'une condition. On ne peut ajouter qu'une condition dans un not, il faut - donc ajouter en premier soit un or, soit un and pour mettre plusieurs - conditions:: +Non : not ++++++++++ +Résultat inverse de la sous-requête. Permet de faire la négation +d'une condition. On ne peut ajouter qu'une condition dans un not, il faut +donc ajouter en premier soit un or, soit un and pour mettre plusieurs +conditions:: + WikittyQuery q = new WikittyQueryMaker() .not().rFalse().end(); // condition toujours vraie @@ -291,43 +357,45 @@ WikittyQuery q = WikittyQueryParser.parse("NOT(FALSE OR FALSE OR TRUE)"); -* Ou : or - Ou entre les différentes sous-requêtes. On peut ajouter autant - d'élément dans le or que l'on souhaite, en fait les éléments lui sont ajouté - tant qu'il n'est pas fermé (close). +Ou : or ++++++++ +Ou entre les différentes sous-requêtes. On peut ajouter autant +d'élément dans le or que l'on souhaite, en fait les éléments lui sont ajouté +tant qu'il n'est pas fermé (close). + WikittyQuery q = new WikittyQueryMaker() .or().rFalse().rTrue().rFalse().end(); // condition toujours vrai WikittyQuery q = WikittyQueryParser.parse("FALSE OR TRUE OR FALSE"); -* Et : and - Et entre les différentes sous-requêtes. On peut ajouter autant - d'élément dans le and que l'on souhaite, en fait les éléments lui sont ajouté - tant qu'il n'est pas fermé (close). +Et : and +++++++++ +Et entre les différentes sous-requêtes. On peut ajouter autant +d'élément dans le and que l'on souhaite, en fait les éléments lui sont ajouté +tant qu'il n'est pas fermé (close). + WikittyQuery q = new WikittyQueryMaker() .and().rFalse().rTrue().rTrue().end(); // condition toujours fausse WikittyQuery q = WikittyQueryParser.parse("FALSE AND TRUE AND TRUE"); WikittyQuery q = WikittyQueryParser.parse("FALSE TRUE TRUE"); -* Requête associée : in - Permet d'effectuer des jointures. Cette opérateur lie - deux requêtes entres elle. Le résultat d'un requête est utilisé comme un - containsOne dans l'autre. La requête suivante recherche tous les employés - en CDI, mais seulement ceux dont le nom de leur entreprise contient 'lutin'.:: +Selection : select +++++++++++++++++++ - WikittyQuery q = new WikittyQueryMaker() - and() - .eq("Employee.contract", "CDI") - .in("Employee.company").like("Company.name", "*Lutin*").end(); +Ajout d'un select pour définir le champs à retourner au +lieu de l'id. Le select doit toujours être le premier élément de la condition +ou utilisé à la place d'une valeur. - WikittyQuery q = WikittyQueryParser.parse( - "Employee.contract=CDI AND Employee.company in (Company.name LIKE *Lutin*)"); +Attention le select provoque la génération d'une deuxième requête, donc plus il +y a de select dans une requête plus elle demandera de ressource au serveur et +donc des temps de réponse plus long. -* Selection : select - Ajout d'un select pour définir le champs à retourner au - lieu de l'id. Le select doit toujours être le premier élément de la condition - ou du in. Dans l'exemple suivant au lieu de retourner l'id des employés - en CDI, on retourne leur nom. Si deux personnes avait le même nom, ce nom - ne serait retourné qu'une seule fois.:: +Dans l'exemple suivant au lieu de retourner +l'id des employés en CDI, on retourne leur nom. Si deux personnes avait le même +nom, ce nom ne serai retourné qu'une seule fois.:: WikittyQuery q = new WikittyQueryMaker() select("Employee.name").eq("Employee.contract", "CDI").end(); @@ -335,40 +403,50 @@ WikittyQuery q = WikittyQueryParser.parse( "SELECT Employee.name WHERE Employee.contract=CDI"); - Il est possible de coupler le select et le in, par exemple pour recherche - toutes les personnes nés le même jour qu'un évênement qui a eu lieu en france:: +Il est possible de coupler le select et toutes les conditions terminales, par +exemple pour recherche toutes les personnes nés le même jour qu'un évênement +qui a eu lieu en france:: WikittyQuery q = new WikittyQueryMaker() - .in("Person.birthday") + .containsOne("Person.birthday") .select("Event.date").like("Event.country", "france").end(); WikittyQuery q = WikittyQueryParser.parse( - "Person.birthday IN (SELECT Event.date WHERE Event.country LIKE france)"); + "Person.birthday={SELECT Event.date WHERE (Event.country LIKE france)}"); Il est possible d'ajouter des fonctions d'aggrégats dans le Select. Dans ce cas -le résultat retourné ne contient qu'un seul élément. L'aggrégat est fait les élements -retournés (de first à first+Limit) +le résultat retourné ne contient qu'un seul élément. L'aggrégat est fait sur les +élements retournés (de first à first+Limit) -* AVG fait la moyenne des valeurs, il faut donc que le champs sélectionnés soit - un Numeric:: +AVG +~~~ +Fait la moyenne des valeurs, il faut donc que le champs sélectionnés soit +un Numeric:: + WikittyQuery q = new WikittyQueryMaker() .select("Person.age", Aggregate.AVG).eq("Person.firstname", "Jean").end(); - + WikittyQuery q = WikittyQueryParser.parse( "SELECT AVG Person.age WHERE Person.firstname=Jean"); -* COUNT retourne le nombre d'élément retourné:: +COUNT +~~~~~ +Retourne le nombre d'élément retourné:: + WikittyQuery q = new WikittyQueryMaker() .select("Person.age", Aggregate.COUNT).eq("Person.firstname", "Jean").end(); WikittyQuery q = WikittyQueryParser.parse( "SELECT COUNT Person.age WHERE Person.firstname=Jean"); -* MAX retourne la plus grande valeur. MAX peut-etre utilisé sur tout type de champs - mais il est plus pertinant sur les champs: Numeric, Date, String:: +MAX +~~~ +Retourne la plus grande valeur. MAX peut-etre utilisé sur tout type de champs +mais il est plus pertinant sur les champs: Numeric, Date, String:: + // on recherche le plus jeune (plus grande date) des personnes s'appelant Jean WikittyQuery q = new WikittyQueryMaker() .select("Person.birthday", Aggregate.MAX).eq("Person.firstname", "Jean").end(); @@ -376,9 +454,12 @@ WikittyQuery q = WikittyQueryParser.parse( "SELECT MAX Person.birthday WHERE Person.firstname=Jean"); -* MIN retourne la plus petite valeur. MIN peut-etre utilisé sur tout type de champs - mais il est plus pertinant sur les champs: Numeric, Date, String:: +MIN +~~~ +Retourne la plus petite valeur. MIN peut-etre utilisé sur tout type de champs +mais il est plus pertinant sur les champs: Numeric, Date, String:: + // on recherche le plus agé (plus petite date) des personnes s'appelant Jean WikittyQuery q = new WikittyQueryMaker() .select("Person.birthday", Aggregate.MIN).eq("Person.firstname", "Jean").end(); @@ -386,9 +467,12 @@ WikittyQuery q = WikittyQueryParser.parse( "SELECT MIN Person.birthday WHERE Person.firstname=Jean"); -* SUM retourne la somme de tous les nombres. Il faut donc que le champs sélectionné - soit un Numeric:: +SUM +~~~ +Retourne la somme de tous les nombres. Il faut donc que le champs sélectionné +soit un Numeric:: + // fait la somme des facture depuis le début d'année WikittyQuery q = new WikittyQueryMaker() .select("Invoice.amount", Aggregate.SUM).ge("Invoice.date", "01/01/2012").end(); @@ -405,8 +489,11 @@ - pathNode: champs contenant tous les id de noeuds pour atteindre un noeud (du root au noeud lui même inclus) - depthNode: entier indiquant la profondeur d'un noeud (root=1) -* Pour avoir tous les attachments de tous les noeuds de tous les arbres:: +Quelques exemples ++++++++++++++++++ +Pour avoir tous les attachments de tous les noeuds de tous les arbres:: + WikittyQuery q = new WikittyQueryMaker() .in(Element.ID) .select(WikittyTreeNode.ELEMENT_FIELD_WIKITTYTREENODE_ATTACHMENT).end(); @@ -414,7 +501,7 @@ WikittyQuery q = WikittyQueryParser.parse( "id IN (SELECT WikittyTreeNode.attachment)"); -* Pour avoir tous les attachments de tous les noeuds d'un arbre ayant le nom 'MyTree':: +Pour avoir tous les attachments de tous les noeuds d'un arbre ayant le nom 'MyTree':: WikittyQuery q = new WikittyQueryMaker() .in(Element.ID) @@ -425,8 +512,8 @@ WikittyQuery q = WikittyQueryParser.parse( "id IN (SELECT WikittyTreeNode.attachment WHERE rootNode IN (WikittyTreeNode.name=MyTree))"); -* Pour avoir tous les attachments d'un sous arbre commencant à un noeud ayant - le nom "MyBranch" d'un arbre ayant le nom 'MyTree':: +Pour avoir tous les attachments d'un sous arbre commencant à un noeud ayant +le nom "MyBranch" d'un arbre ayant le nom 'MyTree':: WikittyQuery q = new WikittyQueryMaker() .in(Element.ID) @@ -441,8 +528,8 @@ WikittyQuery q = WikittyQueryParser.parse("id IN (SELECT WikittyTreeNode.attachment WHERE + " rootNode IN (WikittyTreeNode.name=MyTree) AND pathNode IN (WikittyTreeNode.name=MyBranch))"); -* Pour avoir tous les attachments d'un arbre ayant le nom 'MyTree' jusqu'à une - profondeur de 3 (root, fils, sous fils):: +Pour avoir tous les attachments d'un arbre ayant le nom 'MyTree' jusqu'à une +profondeur de 3 (root, fils, sous fils):: WikittyQuery q = new WikittyQueryMaker() .in(Element.ID) @@ -459,36 +546,48 @@ Spécificité de WikittyQueryMaker -------------------------------- -* Fermeture d'un noeud: close. Lorsqu'on ouvre un element a sous noeud comme - or, and, not, in, select, il faut pouvoir le fermer pour continuer la - construction de la condition. Pour cela on utilise close(), qui ferme la - dernière condition non terminale.:: +conversion de type +++++++++++++++++++ +Il est possible de passer en argument des méthodes des +objets qui seront directement converti en leur representation String. Les +types supportés sont BusinessEntity, Wikitty, Date, Calendar, Number, Boolean. +Pour un objet Wikitty ou un BusinessEntity on utilise l'id. + +Fermeture d'un noeud: close ++++++++++++++++++++++++++++ + +Lorsqu'on ouvre un element a sous noeud comme +or, and, il faut pouvoir le fermer pour continuer la +construction de la condition. Pour cela on utilise close(), qui ferme la +dernière condition non terminale.:: + WikittyQuery q = new WikittyQueryMaker() .and().or()....close(/*fermeture du or*/).close(/*fermeture du and*/) - .not().and().....end(/*fermeture de tous les elements non ferme (and, not)*/); + .not().and().....end(/*fermeture de tous les elements non ferme (and)*/); -* conversion de type: Il est possible de passer en argument des méthodes des - objets qui seront directement converti en leur representation String. Les - types supportés sont BusinessEntity, Wikitty, Date, Calendar, Number, Boolean. - Pour un objet Wikitty ou un BusinessEntity on utilise l'id. +wikitty ++++++++ -* wikitty: Normalement si l'on passe un wikitty en parametre de méthode - de WikittyQueryMaker, la condition se fait sur l'id, mais on peut vouloir - que le Wikitty soit pris comme exemple de condition (query by exemple) - Dans ce cas, on peut utiliser:: +Normalement si l'on passe un wikitty en parametre de méthode +de WikittyQueryMaker, la condition se fait sur l'id (voir conversion de type), +mais on peut vouloir que le Wikitty soit pris comme exemple de +condition (query by exemple), dans ce cas, on peut utiliser:: WikittyQuery q = new WikittyQueryMaker() .wikitty(monWikitty).end(); -* Condition: Il est aussi possible d'ajouter toute une condition déjà - construite pour l'intégrer à une nouvelle. Dans ce cas cette condition est - prise comme une boîte noire, c'est à dire comme une condition terminale.:: +Condition ++++++++++ +Il est aussi possible d'ajouter toute une condition déjà +construite pour l'intégrer à une nouvelle. Dans ce cas cette condition est +prise comme une boîte noire, c'est à dire comme une condition terminale.:: + WikittyQuery qold = ... WikittyQuery q = new WikittyQueryMaker() - .and().condition(qold).eq(...).end(); + .and().condition(qold.getCondition()).eq(...).end(); Spécificité de WikittyQueryParser --------------------------------- @@ -498,16 +597,16 @@ Par exemple si vous utilisez souvent une longue requête comme:: WikittyQuery q = WikittyQueryParser.parse( - "id IN (SELECT WikittyTreeNode.attachment WHERE" - + " rootNode IN (WikittyTreeNode.name=MyTree)" - + " AND pathNode IN (WikittyTreeNode.name=MyBranch))"); + "id={SELECT WikittyTreeNode.attachment" + + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=MyTree)}" + + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=MyBranch)})}"); Vous pouvez faire:: WikittyQueryParser parser = new WikittyQueryParser(); - parser.addAlias("MyAlias", "id IN (SELECT WikittyTreeNode.attachment WHERE" - + " rootNode IN (WikittyTreeNode.name=MyTree) AND" - + " pathNode IN (WikittyTreeNode.name=MyBranch))"); + parser.addAlias("MyAlias", "id={SELECT WikittyTreeNode.attachment" + + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=MyTree)}" + + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=MyBranch)})}"); Si maintenant votre requête est:: @@ -517,17 +616,17 @@ Elle sera transformée avant d'être parsée en:: WikittyQuery q = parser.parseQuery( - "MyExt.field=toto AND id IN (SELECT WikittyTreeNode.attachment" - + " WHERE rootNode IN (WikittyTreeNode.name=MyTree)" - + " AND pathNode IN (WikittyTreeNode.name=MyBranch))"); + "MyExt.field=toto AND id={SELECT WikittyTreeNode.attachment" + + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=MyTree)}" + + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=MyBranch)})}"); Vous pouvez aussi paramètrer vos alias, par exemple si le nom de l'arbre et de la branche doivent varier vous pouvez faire:: WikittyQueryParser parser = new WikittyQueryParser(); - parser.addAlias("MyAlias$.*, .*$", "id IN (SELECT WikittyTreeNode.attachment" - + " WHERE rootNode IN (WikittyTreeNode.name=$1)" - + " AND pathNode IN (WikittyTreeNode.name=$2))"); + parser.addAlias("MyAlias$.*, .*$", "id={SELECT WikittyTreeNode.attachment" + + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=$1)}" + + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=$2)})}"); Vous pourrez donc ensuite écrire:: @@ -537,9 +636,9 @@ Elle sera transformée avant d'être parsée en:: WikittyQuery q = parser.parseQuery( - "MyExt.field=toto AND id IN (SELECT WikittyTreeNode.attachment" - + " WHERE rootNode IN (WikittyTreeNode.name=OtherTree)" - + " AND pathNode IN (WikittyTreeNode.name=OtherBranch))"); + "MyExt.field=toto AND id={SELECT WikittyTreeNode.attachment" + + " WHERE (rootNode={SELECT ID WHERE (WikittyTreeNode.name=OtherTree)}" + + " AND pathNode={SELECT ID WHERE (WikittyTreeNode.name=OtherBranch)})}"); Recherche avancée ----------------- @@ -558,7 +657,7 @@ WikittyQuery q = WikittyQueryParser.parse("*.name==poussin"); Dans ce cas la recherche est une recherche fulltext qui peut-être utilisée -quel que soit le type du champs. Mais si vous souhaitez restraindre la recherche +quelque soit le type du champs. Mais si vous souhaitez restraindre la recherche aux champs d'un certain type vous pouvez ajouter le type à la fin.:: Date _1950 = new Date(...);

1 0