July 2012 - Jredmine-commits - mailman.cloud.codelutin.com

r310 - in branches/jredmine-1.x: . src/site src/site/apt
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 21:48:53 +0200 (Sun, 15 Jul 2012) New Revision: 310 Url: http://nuiton.org/repositories/revision/jredmine/310 Log: fixes #937: Maven test utilise les properties de test de la distribution (adding documentation) Added: branches/jredmine-1.x/src/site/apt/tests.apt Modified: branches/jredmine-1.x/pom.xml branches/jredmine-1.x/src/site/site_fr.xml Modified: branches/jredmine-1.x/pom.xml =================================================================== --- branches/jredmine-1.x/pom.xml 2012-07-15 19:18:21 UTC (rev 309) +++ branches/jredmine-1.x/pom.xml 2012-07-15 19:48:53 UTC (rev 310) @@ -739,7 +739,7 @@ </profile> <profile> - <id>jredmine-server-test</id> + <id>jredmine-test-profile</id> <build> <plugins> <plugin> Added: branches/jredmine-1.x/src/site/apt/tests.apt =================================================================== --- branches/jredmine-1.x/src/site/apt/tests.apt (rev 0) +++ branches/jredmine-1.x/src/site/apt/tests.apt 2012-07-15 19:48:53 UTC (rev 310) @@ -0,0 +1,147 @@ +~~~ +~~ #%L +~~ JRedmine +~~ +~~ $Id$ +~~ $HeadURL: http://svn.nuiton.org/svn/jredmine/branches/jredmine-1.x/src/site/apt/index… $ +~~ %% +~~ Copyright (C) 2009 - 2012 CodeLutin,Tony Chemit +~~ %% +~~ 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% +~~~ +---- +JRedmine Tests +---- +---- +2009-09-15 +---- + +Introduction + + Cette page décrit comment on peut à partir de la version <<1.4>> configurer + les tests. + +Configuration de base + + Par défaut, les tests vont chercher dans un fichier dans le class-path + nommé <<test-config.properties>> les informations de base pour communiquer + avec un servuer redmine. + + Voici la configuration par défaut actuelle : + +------------------------------------------------------------------------------- +test.redmineUrl=http://nuiton.org +test.encoding=UTF-8 +test.verbose=false +------------------------------------------------------------------------------- + + Cette configuration permet de tester uniquement les fonctionnalités non + authentifiés de l'api. + +Surcharger la configuration de base + + Il est possible de surcharger cette configuration de base en utilisant des + variables d'environnement : + + * <<test.redmineUrl>> : pour changer l'url du serveur redmine à utiliser + * <<jredmine-test.verbose>> : pour changer la verbosité dans les tests. + + Exemple : + +------------------------------------------------------------------------------- +mvn install -Djredmine-test.verbose +------------------------------------------------------------------------------- + +Configuration authentifiée + + Des tests ont aussi été écrits pour tester les fonctionnées authentifiés + de l'api. + + Pour cela il faut fournir aux tests un login + password et ceci peut être fait de plusieurs manières différentes + +* Via des variables d'environnement + + Renseigner les deux variables suivantes : + + * <<jredmine-test.login>> + + * <<jredmine-test.password>> + + Exemple : + +------------------------------------------------------------------------------- +mvn install -Djredmine-test.login=login -Djredmine-test.password=password +------------------------------------------------------------------------------- + +* Via un server défini dans le <<settings.xml>> + + Cela a l'avantage de cacher et crypté votre mot de passe... et de ne pas + à avoir à renseigner vos identifiants à chaque invocation maven. + + Le serveur à utiliser est nommé <<jredmine-test>> + +Exemple : + +------------------------------------------------------------------------------- + + <server> + <id>jredmine-test</id> + <username>login</username> + <password>Le mote de passe crypté {xxx}</password> + </server> +------------------------------------------------------------------------------- + + + Ensuite il faut utiliser le profile nommé <<jredmine-test-profile>> + pour injecter vos identifiants dans les tests + + Exemple : + +------------------------------------------------------------------------------- +mvn install -Pjredmine-test-profile +------------------------------------------------------------------------------- + + Il est aussi possible d'ajouter ce profile dans les profiles actifs par + défaut toujours dans le fichier <<settings.xml>>. + + Exemple : + +------------------------------------------------------------------------------- + + <profiles> + +  + +  + <profile> + <id>jredmine-server-test</id> + </profile> +  + + </profiles> + + <activeProfiles> +  + <activeProfile>jredmine-server-test</activeProfile> + </activeProfiles> +------------------------------------------------------------------------------- + +Jeu de test + + En version <<2.0>> le jeu de test sera configurable et clairement spécifié. + + Pour le moment, le projet testé est <<jredmine>> en version<<1.3>>. Property changes on: branches/jredmine-1.x/src/site/apt/tests.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/jredmine-1.x/src/site/site_fr.xml =================================================================== --- branches/jredmine-1.x/src/site/site_fr.xml 2012-07-15 19:18:21 UTC (rev 309) +++ branches/jredmine-1.x/src/site/site_fr.xml 2012-07-15 19:48:53 UTC (rev 310) @@ -75,6 +75,7 @@ <menu name="Utilisateur"> <item name="Introduction" href="index.html"/> + <item name="Tests" href="tests.html"/> </menu> <menu ref="modules"/>

1 0

r309 - in branches/jredmine-1.x: jredmine-client/src/main/java/org/nuiton/jredmine jredmine-client/src/main/java/org/nuiton/jredmine/rest jredmine-client/src/test/java/org/nuiton/jredmine jredmine-client/src/test/java/org/nuiton/jredmine/rest jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2 jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin jredmine-maven-plugin/src/test/java/org/nuiton/jredmine jredmine-maven-plugin/src/test/java/org/nuiton/jr
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 21:18:21 +0200 (Sun, 15 Jul 2012) New Revision: 309 Url: http://nuiton.org/repositories/revision/jredmine/309 Log: adding missing svn properties + header Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/test-config.properties Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.nuiton.io.rest.RestClientConfiguration; Property changes on: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine.rest; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import com.google.common.base.Joiner; import com.google.common.base.Strings; Property changes on: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.junit.Assert; import org.junit.ClassRule; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import com.google.common.base.Charsets; import com.google.common.collect.ArrayListMultimap; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.junit.rules.TestWatcher; import org.junit.runner.Description; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.junit.Assert; import org.junit.ClassRule; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.junit.Assert; import org.junit.ClassRule; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine.rest; +/* + * #%L + * JRedmine :: Client + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.junit.Assert; import org.junit.Before; Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: attachment.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issue.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issueCategory.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issuePriority.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: issueStatus.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: news.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: project.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: timeEntry.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: tracker.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: user.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml 2012-07-15 19:18:21 UTC (rev 309) @@ -3,8 +3,8 @@ #%L JRedmine :: Client - $Id: version.xml 277 2012-07-13 10:21:59Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/jredmine/trunk/jredmine-client-api/src/test/resou… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin %% Property changes on: branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine.plugin; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine.plugin; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine.plugin; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ /** * Contract to place on mojo which can change data on a redmine server and Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine.plugin; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ /** * Contract to place on mojo which needs a project name redmine context. Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine.plugin; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ /** * Contract to place on mojo which needs a version name redmine context. Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import com.google.common.base.Charsets; import org.apache.commons.io.FileUtils; Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java 2012-07-15 19:18:21 UTC (rev 309) @@ -1,4 +1,27 @@ package org.nuiton.jredmine; +/* + * #%L + * JRedmine :: Maven plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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% + */ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java 2012-07-15 19:18:21 UTC (rev 309) @@ -2,8 +2,8 @@ * #%L * JRedmine :: Maven plugin * - * $Id: AbstractRedmineMojoTest.java 303 2012-07-15 11:14:29Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/jredmine/branches/jredmine-1.x/jredmine-maven-plu… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin * %% Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java 2012-07-15 19:18:21 UTC (rev 309) @@ -2,8 +2,8 @@ * #%L * JRedmine :: Maven plugin * - * $Id: AbstractRedmineMojoTest.java 303 2012-07-15 11:14:29Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/jredmine/branches/jredmine-1.x/jredmine-maven-plu… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 Tony Chemit, CodeLutin * %% Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/test-config.properties =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/test-config.properties 2012-07-15 19:09:51 UTC (rev 308) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/test-config.properties 2012-07-15 19:18:21 UTC (rev 309) @@ -2,8 +2,8 @@ # #%L # JRedmine :: Client # -# $Id: test-config.properties 186 2011-05-20 12:32:08Z tchemit $ -# $HeadURL: http://svn.nuiton.org/svn/jredmine/branches/jredmine-1.x/jredmine-client/sr… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2009 - 2010 CodeLutin # %% Property changes on: branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/test-config.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

15 Jul '12

Author: tchemit Date: 2012-07-15 21:09:51 +0200 (Sun, 15 Jul 2012) New Revision: 308 Url: http://nuiton.org/repositories/revision/jredmine/308 Log: refs #937: Maven test utilise les properties de test de la distribution (improve tests design) fixes #2189: Improve RedmineService design (apply api changes) clean mojos clean mojo test poms Added: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/generateEmailAnnouncement.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/skipGenerateEmailAnnouncement.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/generateNewsAnnouncement.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/skipGenerateNewsAnnouncement.xml Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-07-15 19:09:51 UTC (rev 308) @@ -30,9 +30,8 @@ import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.RedmineService; -import org.nuiton.jredmine.RedmineServiceImplementor; +import org.nuiton.jredmine.RedmineServiceConfiguration; import org.nuiton.plugin.AbstractPlugin; import java.net.URL; @@ -47,7 +46,7 @@ * @requiresProject true * @since 1.0.0 */ -public abstract class AbstractRedmineMojo extends AbstractPlugin implements RestClientConfiguration { +public abstract class AbstractRedmineMojo extends AbstractPlugin implements RedmineServiceConfiguration { public static final String REDMINE_SYSTEM = "redmine"; @@ -194,7 +193,7 @@ try { - ((RedmineServiceImplementor) service).init(this); + service.init(this); serviceInit = true; } catch (Exception e) { if (isSafe()) { @@ -204,44 +203,6 @@ initOk = false; getLog().error("could not init Redmine service [" + getRestUrl() + "] with user '" + getRestUsername() + "'", e); } - -// // check project exists -// -// if (requireProject) { -// boolean r = initReleaseProject(); -// if (!r) { -// if (isSafe()) { -// throw new MojoExecutionException("the project '" + projectId + "' could not be retrieve from redmine server."); -// } -// initOk = false; -// return; -// } -// } -// -// // check user exists -// -// if (requireUser) { -// boolean r = initReleaseUser(); -// if (!r) { -// if (isSafe()) { -// throw new MojoExecutionException("the user '" + username + "' could not be retrieve from redmine server."); -// } -// initOk = false; -// return; -// } -// } -// -// // check version exists -// -// if (requireVersion) { -// boolean r = initReleaseVersion(); -// if (!r) { -// if (isSafe()) { -// throw new MojoExecutionException("the version '" + versionId + "' could not be retrieve from redmine server."); -// } -// initOk = false; -// } -// } } @Override @@ -260,21 +221,6 @@ getLog().error("could not init Redmine service [" + getRestUrl() + "] with user '" + getRestUsername() + "'"); return false; } -// -// if (requireProject && releaseProject == null) { -// -// getLog().error("the project '" + projectId + "' could not be retrieve from redmine server, goal is skip"); -// return false; -// } -// if (requireUser && releaseUser == null) { -// getLog().error("the user '" + username + "' could not be retrieve from redmine server, goal is skip"); -// return false; -// } -// -// if (requireVersion && releaseVersion == null) { -// getLog().error("the version '" + versionId + "' could not be retrieve from redmine server, goal is skip"); -// return false; -// } return true; } @@ -374,85 +320,14 @@ /// Others /////////////////////////////////////////////////////////////////////////// -// protected boolean initReleaseProject() throws MojoExecutionException { -// -// if (projectId == null || projectId.trim().isEmpty()) { -// throw new MojoExecutionException("required a projectId parameter"); -// } -// try { -// Project p = service.getProject(projectId); -// -// if (p == null) { -// -// return false; -// } -// -// releaseProject = p; -// return true; -// } catch (RedmineServiceException e) { -// getLog().warn("could not retreave project '" + projectId + "', for reason " + e.getMessage(), e); -// return false; -// } -// } -// -// protected boolean initReleaseVersion() throws MojoExecutionException { -// -// if (versionId == null || versionId.trim().isEmpty()) { -// throw new MojoExecutionException("required a versionId parameter"); -// } -// -// try { -// -// Version v = service.getVersion(projectId, versionId); -// -// if (v == null) { -// -// return false; -// } -// -// releaseVersion = v; -// return true; -// } catch (RedmineServiceException e) { -// getLog().warn("could not retreave version '" + versionId + "', for reason " + e.getMessage(), e); -// return false; -// } -// } -// -// protected boolean initReleaseUser() { -// -// try { -// users = service.getProjectMembers(projectId); -// -// User user = ModelHelper.byLogin(username, users); -// -// if (user == null) { -// -// return false; -// } -// -// releaseUser = user; -// return true; -// } catch (RedmineServiceException e) { -// getLog().warn("could not retreave user '" + username + "', for reason " + e.getMessage(), e); -// return false; -// } -// } - protected void closeService() { if (service != null) { - RedmineServiceImplementor i; - i = (RedmineServiceImplementor) service; - - if (i.isInit()) { - try { - if (verbose) { - getLog().info("<<< Close redmine rest client..."); - } - i.destroy(); - } catch (Exception ex) { - getLog().error("could not close redmine client for reason " + ex.getMessage(), ex); - } + try { + service.destroy(); + } catch (Exception ex) { + getLog().error("could not close redmine client for reason " + ex.getMessage(), ex); } + } } @@ -467,12 +342,4 @@ public void setSafe(boolean safe) { this.safe = safe; } - -// public String getProjectId() { -// return projectId; -// } -// -// public String getVersionId() { -// return versionId; -// } } Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-07-15 19:09:51 UTC (rev 308) @@ -27,7 +27,6 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; -import org.nuiton.jredmine.RedmineServiceImplementor; import org.nuiton.jredmine.model.I18nAble; import org.nuiton.jredmine.model.IdAble; import org.nuiton.jredmine.model.ModelHelper; @@ -207,7 +206,7 @@ RedmineModelScope scope = entry.getScope(); String requestName = entry.getRequestAll(); - IdAble[] datas = (IdAble[]) ((RedmineServiceImplementor) service).getDatas(requestName, entry.getModelType(), projectId, versionId); + IdAble[] datas = (IdAble[]) service.getDelegateImplementor().getDatas(requestName, entry.getModelType(), projectId, versionId); List<IdAble> list = Arrays.asList(datas); if (sortById) { Collections.sort(list, ModelHelper.ID_ABLE_COMPARATOR); Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-07-15 19:09:51 UTC (rev 308) @@ -32,8 +32,8 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Settings; import org.nuiton.helper.plugin.ShareServerSecretPlugin; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.RedmineService; +import org.nuiton.jredmine.RedmineServiceConfiguration; import org.nuiton.jredmine.RedmineServiceImplementor; import org.nuiton.plugin.AbstractPlugin; import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; @@ -47,7 +47,7 @@ * @since 1.2.1 */ @Mojo(name = "login", requiresOnline = true, requiresProject = true) -public class LoginMojo extends AbstractPlugin implements RestClientConfiguration { +public class LoginMojo extends AbstractPlugin implements RedmineServiceConfiguration { /** * Dependance du projet. Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-07-15 19:09:51 UTC (rev 308) @@ -247,7 +247,7 @@ protected boolean checkRunOnceDone() { String template = getAnnouncementTemplate(); - File out = new File(templateOutputDirectory, template); + File out = getOutputFile(); Date buildStartTime = session == null ? null : session.getStartTime(); Date newStartTime = out.exists() ? new Date(out.lastModified()) : null; @@ -349,7 +349,7 @@ //TODO-TC-20091209 must obtain back the full name of dev from the project team on each action String template = getAnnouncementTemplate(); - File out = new File(templateOutputDirectory, template); + File out = getOutputFile(); getLog().info("Apply template [" + template + "]"); getLog().info(" from : " + xmlPath); @@ -449,4 +449,8 @@ public Map<String, Object> getAnnounceParameters() { return announceParameters; } + + protected File getOutputFile() { + return new File(templateOutputDirectory, getAnnouncementTemplate()); + } } Added: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java (rev 0) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java 2012-07-15 19:09:51 UTC (rev 308) @@ -0,0 +1,63 @@ +package org.nuiton.jredmine; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assume; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import java.io.IOException; + +/** + * A class rule that provider the {@link RedmineFixtures} and check that the + * valid anonymous configuration is found. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineAnonymousFixtureClassRule implements TestRule { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RedmineAnonymousFixtureClassRule.class); + + RedmineFixtures fixtures = new RedmineFixtures(); + + RedmineServiceConfiguration conf; + + @Override + public Statement apply(Statement base, Description description) { + + Class<?> testClass = description.getTestClass(); + + try { + conf = fixtures.obtainRedmineConfiguration(); + + if (conf == null) { + + // could not find any configuration + if (log.isWarnEnabled()) { + log.warn("could not connect to server " + + fixtures.newAnonymousConfiguration() + ", will skip test " + + testClass.getName()); + } + Assume.assumeTrue(false); + } + // since having a configuration available, is by force anonymous + + } catch (IOException e) { + throw new IllegalStateException("Could not check jredmine configuration in test " + testClass.getName(), e); + + } + return base; + } + + public RedmineFixtures getFixtures() { + return fixtures; + } + + public RedmineServiceConfiguration getConf() { + return conf; + } +} Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 19:09:51 UTC (rev 308) @@ -1,33 +1,19 @@ package org.nuiton.jredmine; import com.google.common.base.Charsets; -import com.google.common.collect.ArrayListMultimap; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.io.rest.RestClientConfiguration; -import org.nuiton.jredmine.model.Attachment; -import org.nuiton.jredmine.model.Issue; -import org.nuiton.jredmine.model.IssueCategory; -import org.nuiton.jredmine.model.IssuePriority; -import org.nuiton.jredmine.model.IssueStatus; -import org.nuiton.jredmine.model.News; -import org.nuiton.jredmine.model.Project; -import org.nuiton.jredmine.model.TimeEntry; -import org.nuiton.jredmine.model.Tracker; -import org.nuiton.jredmine.model.User; -import org.nuiton.jredmine.model.Version; -import org.nuiton.jredmine.model.io.xpp3.RedmineDataConverter; +import org.nuiton.io.rest.RestException; +import org.nuiton.jredmine.rest.RedmineRestClient; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.Date; -import java.util.List; import java.util.Properties; /** @@ -41,22 +27,10 @@ /** Logger. */ private static final Log log = LogFactory.getLog(RedmineFixtures.class); - public static final String FILE_TO_UPLOAD_CONTENT = "Fichier à uploader"; -// -// public static final String PROJECT_NAME = "jredmine"; -// -// public static final String VERSION_NAME = "1.3"; -// -// public static final String ISSUE_ID = "1925"; + private RedmineServiceConfiguration anonymousConfiguration; - private Project JRedmineProject; + private RedmineServiceConfiguration logguedConfiguration; - private ArrayListMultimap<Class<?>, Object> model; - - private RestClientConfiguration anonymousConfiguration; - - private RestClientConfiguration logguedConfiguration; - public String projectName() { return "jredmine"; } @@ -73,35 +47,108 @@ return "1925"; } - public RestClientConfiguration newAnonymousConfiguration() + public RedmineServiceConfiguration newAnonymousConfiguration() throws IOException { - RestClientConfiguration conf = new FakeRedmineServiceConfiguration(); + RedmineServiceConfiguration conf = new FakeRedmineServiceConfiguration(); copyConfiguration(getAnonymousConfiguration(), conf); return conf; } - public RestClientConfiguration newLogguedConfiguration() + public RedmineServiceConfiguration newLogguedConfiguration() throws IOException { - RestClientConfiguration conf = new FakeRedmineServiceConfiguration(); + RedmineServiceConfiguration conf = new FakeRedmineServiceConfiguration(); copyConfiguration(getLogguedConfiguration(), conf); return conf; } - public RedmineAnonymousService newRedmineAnonymousService(RestClientConfiguration configuration) + public RedmineAnonymousService newRedmineAnonymousService(RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { - DefaultRedmineAnonymousService service = new DefaultRedmineAnonymousService(); + RedmineAnonymousService service = new DefaultRedmineAnonymousService(); service.init(configuration); return service; } - public RedmineService newRedmineService(RestClientConfiguration configuration) + public RedmineService newRedmineService(RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { - DefaultRedmineService service = new DefaultRedmineService(); + RedmineService service = new DefaultRedmineService(); service.init(configuration); return service; } - protected RestClientConfiguration getAnonymousConfiguration() + public void copyConfiguration(RedmineServiceConfiguration src, + RedmineServiceConfiguration dst) { + dst.setRestUrl(src.getRestUrl()); + dst.setRestUsername(src.getRestUsername()); + dst.setRestPassword(src.getRestPassword()); + dst.setEncoding(src.getEncoding()); + dst.setVerbose(src.isVerbose()); + dst.setAnonymous(src.isAnonymous()); + } + + public RedmineServiceConfiguration obtainRedmineConfiguration() throws IOException { + + RedmineServiceConfiguration conf = newLogguedConfiguration(); + + boolean ok = false; + + RedmineRestClient client = new RedmineRestClient(conf); + + try { + + client.open(); + ok = client.isOpen(); + } catch (Exception e) { + + if (log.isDebugEnabled()) { + log.debug("Could not connect to redmine with configuration: " + conf, e); + } + + } finally { + try { + client.close(); + } catch (RestException e) { + if (log.isErrorEnabled()) { + log.error("Could not close session", e); + } + } + } + + if (!ok) { + + // try to connect anonymous + conf = newAnonymousConfiguration(); + + client = new RedmineRestClient(conf); + + try { + + client.open(); + ok = client.isOpen(); + } catch (Exception e) { + + if (log.isDebugEnabled()) { + log.debug("Could not connect to redmine with configuration: " + conf, e); + } + } finally { + try { + client.close(); + } catch (RestException e) { + if (log.isErrorEnabled()) { + log.error("Could not close session", e); + } + } + } + } + + if (!ok) { + + // no conf available + conf = null; + } + return conf; + } + + protected RedmineServiceConfiguration getAnonymousConfiguration() throws IOException { if (anonymousConfiguration == null) { @@ -158,13 +205,13 @@ return anonymousConfiguration; } - protected RestClientConfiguration getLogguedConfiguration() + protected RedmineServiceConfiguration getLogguedConfiguration() throws IOException { if (logguedConfiguration == null) { // use anonymous configuration - RestClientConfiguration anoConf = getAnonymousConfiguration(); + RedmineServiceConfiguration anoConf = getAnonymousConfiguration(); if (anoConf != null) { logguedConfiguration = new FakeRedmineServiceConfiguration(); copyConfiguration(anoConf, logguedConfiguration); @@ -184,528 +231,13 @@ return logguedConfiguration; } - public void copyConfiguration(RestClientConfiguration src, - RestClientConfiguration dst) { - dst.setRestUrl(src.getRestUrl()); - dst.setRestUsername(src.getRestUsername()); - dst.setRestPassword(src.getRestPassword()); - dst.setEncoding(src.getEncoding()); - dst.setVerbose(src.isVerbose()); - dst.setAnonymous(src.isAnonymous()); - } - - public List<Attachment> getAttachments() { - return get(Attachment.class); - } - - public List<Issue> getIssues() { - return get(Issue.class); - } - - public List<Project> getProjects() { - return get(Project.class); - } - - public List<Tracker> getTrackers() { - return get(Tracker.class); - } - - public List<User> getUsers() { - return get(User.class); - } - - public List<Version> getVersions() { - return get(Version.class); - } - - public <T> List<T> get(Class<T> modelType) { - if (model == null) { - try { - loadModel(); - } catch (Exception ex) { - throw new RuntimeException(ex); - } - } - return (List<T>) model.get(modelType); - } - - public <T> T get(Class<T> type, int pos) { - List<T> ts = get(type); - return ts.get(pos); - } - - public Project getJRedmineProject() { - if (JRedmineProject == null) { - JRedmineProject = new Project(); - JRedmineProject.setName("jredmine"); - JRedmineProject.setIdentifier("jredmine"); - JRedmineProject.setIsPublic(true); - JRedmineProject.setHomepage("http://maven-site.nuiton.org/jredmine"); - JRedmineProject.setDescription( - "Permet de communiquer en java avec un serveur " + "redmine qui a installé le plugin rails jredmine"); - JRedmineProject.setId(36); - JRedmineProject.setStatus(1); - } - return JRedmineProject; - } - - - public static final String VERSION_TO_CREATE_NAME = "do_not_use_me"; - - public Version getVersion() { - Version version = new Version(); - version.setName(VERSION_TO_CREATE_NAME); - version.setDescription("Une version créée par les tests de jredmine," + - " ne pas utiliser,et modifiée"); - return version; - } - - private void loadModel() - throws Exception { - model = ArrayListMultimap.create(); - - Attachment tempA; - tempA = new Attachment(); - tempA.setAuthorId((Integer) RedmineDataConverter.Integer.convert("4")); - tempA.setContainerId((Integer) RedmineDataConverter.Integer.convert("1")); - tempA.setId((Integer) RedmineDataConverter.Integer.convert("1")); - tempA.setFilesize((Integer) RedmineDataConverter.Integer.convert("411")); - tempA.setDownloads((Integer) RedmineDataConverter.Integer.convert("0")); - tempA.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-05T12:56:41+02:00")); - tempA.setContainerType((String) RedmineDataConverter.Text.convert("Version")); - tempA.setContentType((String) RedmineDataConverter.Text.convert("application/json")); - tempA.setDigest((String) RedmineDataConverter.Text.convert("6ea84342c7475c05fb077b4aca832f9a")); - tempA.setDiskFilename((String) RedmineDataConverter.Text.convert("090905125641_get_issue.json")); - tempA.setFilename((String) RedmineDataConverter.Text.convert("get_issue.json")); - model.put(Attachment.class, tempA); - tempA = new Attachment(); - tempA.setAuthorId((Integer) RedmineDataConverter.Integer.convert("4")); - tempA.setContainerId((Integer) RedmineDataConverter.Integer.convert("1")); - tempA.setId((Integer) RedmineDataConverter.Integer.convert("1")); - tempA.setFilesize((Integer) RedmineDataConverter.Integer.convert("411")); - tempA.setDownloads((Integer) RedmineDataConverter.Integer.convert("0")); - tempA.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-05T12:56:41+02:00")); - tempA.setContainerType((String) RedmineDataConverter.Text.convert("Version")); - tempA.setContentType((String) RedmineDataConverter.Text.convert("application/json")); - tempA.setDigest((String) RedmineDataConverter.Text.convert("6ea84342c7475c05fb077b4aca832f9a")); - tempA.setDiskFilename((String) RedmineDataConverter.Text.convert("090905125641_get_issue.json2")); - tempA.setFilename((String) RedmineDataConverter.Text.convert("get_issue.json2")); - model.put(Attachment.class, tempA); - - Issue tempI; - tempI = new Issue(); - tempI.setAuthorId((Integer) RedmineDataConverter.Integer.convert("5")); - tempI.setCategoryId((Integer) RedmineDataConverter.Integer.convert("2")); - tempI.setDoneRatio((Integer) RedmineDataConverter.Integer.convert("0")); - tempI.setLockVersion((Integer) RedmineDataConverter.Integer.convert("7")); - tempI.setPriorityId((Integer) RedmineDataConverter.Integer.convert("4")); - tempI.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempI.setStatusId((Integer) RedmineDataConverter.Integer.convert("3")); - tempI.setTrackerId((Integer) RedmineDataConverter.Integer.convert("1")); - tempI.setFixedVersionId((Integer) RedmineDataConverter.Integer.convert("1")); - tempI.setId((Integer) RedmineDataConverter.Integer.convert("3")); - tempI.setParentId((Integer) RedmineDataConverter.Integer.convert("3")); - tempI.setRootId((Integer) RedmineDataConverter.Integer.convert("3")); - tempI.setLft((Integer) RedmineDataConverter.Integer.convert("1")); - tempI.setRgt((Integer) RedmineDataConverter.Integer.convert("2")); - tempI.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T20:11:52+02:00")); - tempI.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T00:37:40+02:00")); - tempI.setStartDate((Date) RedmineDataConverter.Date.convert("2009-09-04")); - tempI.setDescription((String) RedmineDataConverter.Text.convert("avec une description !")); - tempI.setSubject((String) RedmineDataConverter.Text.convert("yes!")); - model.put(Issue.class, tempI); - tempI = new Issue(); - tempI.setAuthorId((Integer) RedmineDataConverter.Integer.convert("5")); - tempI.setCategoryId((Integer) RedmineDataConverter.Integer.convert("2")); - tempI.setDoneRatio((Integer) RedmineDataConverter.Integer.convert("0")); - tempI.setLockVersion((Integer) RedmineDataConverter.Integer.convert("7")); - tempI.setPriorityId((Integer) RedmineDataConverter.Integer.convert("4")); - tempI.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempI.setStatusId((Integer) RedmineDataConverter.Integer.convert("3")); - tempI.setTrackerId((Integer) RedmineDataConverter.Integer.convert("1")); - tempI.setFixedVersionId((Integer) RedmineDataConverter.Integer.convert("1")); - tempI.setId((Integer) RedmineDataConverter.Integer.convert("4")); - tempI.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T20:11:52+02:00")); - tempI.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T00:37:40+02:00")); - tempI.setStartDate((Date) RedmineDataConverter.Date.convert("2009-09-04")); - tempI.setDescription((String) RedmineDataConverter.Text.convert("avec une description !2")); - tempI.setSubject((String) RedmineDataConverter.Text.convert("yes!2")); - model.put(Issue.class, tempI); - - Project tempP; - tempP = new Project(); - tempP.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T18:11:54+02:00")); - tempP.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T18:11:54+02:00")); - tempP.setIdentifier((String) RedmineDataConverter.Text.convert("one")); - tempP.setName((String) RedmineDataConverter.Text.convert("one")); - tempP.setId((Integer) RedmineDataConverter.Integer.convert("1")); - tempP.setLft((Integer) RedmineDataConverter.Integer.convert("1")); - tempP.setRgt((Integer) RedmineDataConverter.Integer.convert("2")); - tempP.setProjectsCount((Integer) RedmineDataConverter.Integer.convert("0")); - tempP.setStatus((Integer) RedmineDataConverter.Integer.convert("1")); - tempP.setIsPublic((Boolean) RedmineDataConverter.Boolean.convert("true")); - model.put(Project.class, tempP); - tempP = new Project(); - tempP.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-05T16:22:14+02:00")); - tempP.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-05T16:22:29+02:00")); - tempP.setIdentifier((String) RedmineDataConverter.Text.convert("two")); - tempP.setName((String) RedmineDataConverter.Text.convert("two")); - tempP.setId((Integer) RedmineDataConverter.Integer.convert("2")); - tempP.setProjectsCount((Integer) RedmineDataConverter.Integer.convert("0")); - tempP.setStatus((Integer) RedmineDataConverter.Integer.convert("1")); - tempP.setIsPublic((Boolean) RedmineDataConverter.Boolean.convert("false")); - model.put(Project.class, tempP); - - Tracker tempT; - tempT = new Tracker(); - tempT.setId((Integer) RedmineDataConverter.Integer.convert("1")); - tempT.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempT.setTrackerId((Integer) RedmineDataConverter.Integer.convert("1")); - tempT.setPosition((Integer) RedmineDataConverter.Integer.convert("1")); - tempT.setIsInChlog((Boolean) RedmineDataConverter.Boolean.convert("true")); - tempT.setIsInRoadmap((Boolean) RedmineDataConverter.Boolean.convert("false")); - tempT.setName((String) RedmineDataConverter.Text.convert("Anomalie")); - model.put(Tracker.class, tempT); - tempT = new Tracker(); - tempT.setId((Integer) RedmineDataConverter.Integer.convert("2")); - tempT.setIsInChlog((Boolean) RedmineDataConverter.Boolean.convert("true")); - tempT.setIsInRoadmap((Boolean) RedmineDataConverter.Boolean.convert("true")); - tempT.setName((String) RedmineDataConverter.Text.convert("Evolution")); - tempT.setPosition((Integer) RedmineDataConverter.Integer.convert("2")); - tempT.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempT.setTrackerId((Integer) RedmineDataConverter.Integer.convert("2")); - model.put(Tracker.class, tempT); - tempT = new Tracker(); - tempT.setId((Integer) RedmineDataConverter.Integer.convert("3")); - tempT.setIsInChlog((Boolean) RedmineDataConverter.Boolean.convert("false")); - tempT.setIsInRoadmap((Boolean) RedmineDataConverter.Boolean.convert("false")); - tempT.setName((String) RedmineDataConverter.Text.convert("Assistance")); - tempT.setPosition((Integer) RedmineDataConverter.Integer.convert("3")); - tempT.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempT.setTrackerId((Integer) RedmineDataConverter.Integer.convert("3")); - model.put(Tracker.class, tempT); - - User tempU; - tempU = new User(); - tempU.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T17:24:46+02:00")); - tempU.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T01:23:59+02:00")); - tempU.setLastLoginOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T01:23:59+02:00")); - tempU.setId((Integer) RedmineDataConverter.Integer.convert("1")); - tempU.setMemberId((Integer) RedmineDataConverter.Integer.convert("5")); - tempU.setRoleId((Integer) RedmineDataConverter.Integer.convert("3")); - tempU.setStatus((Integer) RedmineDataConverter.Integer.convert("1")); - tempU.setAdmin((Boolean) RedmineDataConverter.Boolean.convert("true")); - tempU.setMailNotification((Boolean) RedmineDataConverter.Boolean.convert("true")); - tempU.setFirstname((String) RedmineDataConverter.Text.convert("Redmine")); - tempU.setHashedPassword( - (String) RedmineDataConverter.Text.convert("70c881d4a26984ddce795f6f71817c9cf4480e79")); - tempU.setLanguage((String) RedmineDataConverter.Text.convert("fr")); - tempU.setLastname((String) RedmineDataConverter.Text.convert("Admin")); - tempU.setLogin((String) RedmineDataConverter.Text.convert("admin")); - tempU.setMail((String) RedmineDataConverter.Text.convert("dummy(a)codelutin.com")); - tempU.setIdentityUrl((String) RedmineDataConverter.Text.convert("yo")); - model.put(User.class, tempU); - tempU = new User(); - tempU.setAdmin((Boolean) RedmineDataConverter.Boolean.convert("true")); - tempU.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T19:49:02+02:00")); - tempU.setFirstname((String) RedmineDataConverter.Text.convert("tony")); - tempU.setHashedPassword( - (String) RedmineDataConverter.Text.convert("8aed1322e5450badb078e1fb60a817a1df25a2ca")); - tempU.setId((Integer) RedmineDataConverter.Integer.convert("5")); - tempU.setLanguage((String) RedmineDataConverter.Text.convert("fr")); - tempU.setLastLoginOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T19:49:38+02:00")); - tempU.setLastname((String) RedmineDataConverter.Text.convert("chemit2")); - tempU.setLogin((String) RedmineDataConverter.Text.convert("tchemit2")); - tempU.setMail((String) RedmineDataConverter.Text.convert("chemit(a)codelutin.com")); - tempU.setMailNotification((Boolean) RedmineDataConverter.Boolean.convert("false")); - tempU.setMemberId((Integer) RedmineDataConverter.Integer.convert("4")); - tempU.setRoleId((Integer) RedmineDataConverter.Integer.convert("3")); - tempU.setStatus((Integer) RedmineDataConverter.Integer.convert("1")); - tempU.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T19:49:38+02:00")); - model.put(User.class, tempU); - tempU = new User(); - tempU.setAdmin((Boolean) RedmineDataConverter.Boolean.convert("false")); - tempU.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-05T16:24:11+02:00")); - tempU.setFirstname((String) RedmineDataConverter.Text.convert("dev")); - tempU.setHashedPassword( - (String) RedmineDataConverter.Text.convert("70c881d4a26984ddce795f6f71817c9cf4480e79")); - tempU.setId((Integer) RedmineDataConverter.Integer.convert("7")); - tempU.setLanguage((String) RedmineDataConverter.Text.convert("fr")); - tempU.setLastLoginOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T16:34:39+02:00")); - tempU.setLastname((String) RedmineDataConverter.Text.convert("dev")); - tempU.setLogin((String) RedmineDataConverter.Text.convert("dev")); - tempU.setMail((String) RedmineDataConverter.Text.convert("dev3(a)ynot-home.info")); - tempU.setMailNotification((Boolean) RedmineDataConverter.Boolean.convert("false")); - tempU.setMemberId((Integer) RedmineDataConverter.Integer.convert("9")); - tempU.setRoleId((Integer) RedmineDataConverter.Integer.convert("4")); - tempU.setStatus((Integer) RedmineDataConverter.Integer.convert("1")); - tempU.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T16:34:39+02:00")); - model.put(User.class, tempU); - - Version tempV; - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T02:47:39+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("yo")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("9")); - tempV.setName((String) RedmineDataConverter.Text.convert("yor")); - tempV.setSharing((String) RedmineDataConverter.Text.convert("none")); - tempV.setStatus((String) RedmineDataConverter.Text.convert("open")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T02:50:49+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:05:09+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("ysssoye")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("13")); - tempV.setName((String) RedmineDataConverter.Text.convert("rrrrrrrrrouuuuuua")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:05:09+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:07:58+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("ysssoye")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("15")); - tempV.setName((String) RedmineDataConverter.Text.convert("aaaauuuuuua")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:07:58+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T04:12:25+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("ysssoyeppppppppppppppppp")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("16")); - tempV.setName((String) RedmineDataConverter.Text.convert("aaaau")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T04:13:20+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:05:40+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("ysssoye")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("14")); - tempV.setName((String) RedmineDataConverter.Text.convert("aaaaaaaaaarrrrrrrrrouuuuuua")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:05:40+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-05T00:39:15+02:00")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("5")); - tempV.setName((String) RedmineDataConverter.Text.convert("2")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-05T00:39:15+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T18:13:05+02:00")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setName((String) RedmineDataConverter.Text.convert("1.0.0")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-04T18:13:05+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:00:12+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("yoye")); - tempV.setEffectiveDate((Date) RedmineDataConverter.Date.convert("2009-09-06")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("11")); - tempV.setName((String) RedmineDataConverter.Text.convert("yaouuuuuua")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:00:12+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T02:50:59+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("yoye")); - tempV.setEffectiveDate((Date) RedmineDataConverter.Date.convert("2009-09-06")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("10")); - tempV.setName((String) RedmineDataConverter.Text.convert("ya")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T02:54:16+02:00")); - model.put(Version.class, tempV); - tempV = new Version(); - tempV.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:00:37+02:00")); - tempV.setDescription((String) RedmineDataConverter.Text.convert("ysssoye")); - tempV.setEffectiveDate((Date) RedmineDataConverter.Date.convert("2009-09-06")); - tempV.setId((Integer) RedmineDataConverter.Integer.convert("12")); - tempV.setName((String) RedmineDataConverter.Text.convert("ouuuuuua")); - tempV.setProjectId((Integer) RedmineDataConverter.Integer.convert("1")); - tempV.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-06T03:00:42+02:00")); - model.put(Version.class, tempV); - - IssueStatus tempIS; - tempIS = new IssueStatus(); - tempIS.setId(1); - tempIS.setName("Nouveau"); - tempIS.setPosition(1); - tempIS.setDefaultDoneRatio(10); - tempIS.setIsClosed(false); - tempIS.setIsDefault(true); - model.put(IssueStatus.class, tempIS); - tempIS = new IssueStatus(); - tempIS.setId(2); - tempIS.setName("Assigné"); - tempIS.setPosition(2); - tempIS.setIsClosed(false); - tempIS.setIsDefault(false); - model.put(IssueStatus.class, tempIS); - tempIS = new IssueStatus(); - tempIS.setId(3); - tempIS.setName("Résolu"); - tempIS.setPosition(3); - tempIS.setIsClosed(false); - tempIS.setIsDefault(false); - model.put(IssueStatus.class, tempIS); - tempIS = new IssueStatus(); - tempIS.setId(4); - tempIS.setName("Commentaire"); - tempIS.setPosition(4); - tempIS.setIsClosed(false); - tempIS.setIsDefault(false); - model.put(IssueStatus.class, tempIS); - tempIS = new IssueStatus(); - tempIS.setId(5); - tempIS.setName("Fermé"); - tempIS.setPosition(5); - tempIS.setIsClosed(true); - tempIS.setIsDefault(false); - model.put(IssueStatus.class, tempIS); - tempIS = new IssueStatus(); - tempIS.setId(6); - tempIS.setPosition(6); - tempIS.setName("Rejeté"); - tempIS.setIsClosed(true); - tempIS.setIsDefault(false); - model.put(IssueStatus.class, tempIS); - - IssuePriority tempIP; - tempIP = new IssuePriority(); - tempIP.setId(3); - tempIP.setParentId(1); - tempIP.setProjectId(2); - tempIP.setName("Bas"); - tempIP.setPosition(1); - tempIP.setOpt("IPRI"); - tempIP.setIsDefault(false); - tempIP.setActive(true); - model.put(IssuePriority.class, tempIP); - tempIP = new IssuePriority(); - tempIP.setId(4); - tempIP.setName("Normal"); - tempIP.setPosition(2); - tempIP.setOpt("IPRI"); - tempIP.setIsDefault(true); - model.put(IssuePriority.class, tempIP); - tempIP = new IssuePriority(); - tempIP.setId(5); - tempIP.setName("Haut"); - tempIP.setPosition(3); - tempIP.setOpt("IPRI"); - tempIP.setIsDefault(false); - model.put(IssuePriority.class, tempIP); - tempIP = new IssuePriority(); - tempIP.setId(6); - tempIP.setName("Urgent"); - tempIP.setPosition(4); - tempIP.setOpt("IPRI"); - tempIP.setIsDefault(false); - model.put(IssuePriority.class, tempIP); - tempIP = new IssuePriority(); - tempIP.setId(7); - tempIP.setName("Immédiat"); - tempIP.setPosition(5); - tempIP.setOpt("IPRI"); - tempIP.setIsDefault(false); - model.put(IssuePriority.class, tempIP); - - IssueCategory tempIC; - tempIC = new IssueCategory(); - tempIC.setId(1); - tempIC.setName("categorie one"); - tempIC.setProjectId(1); - model.put(IssueCategory.class, tempIC); - tempIC = new IssueCategory(); - tempIC.setId(2); - tempIC.setName("categorie two"); - tempIC.setProjectId(1); - model.put(IssueCategory.class, tempIC); - - News tempN; - tempN = new News(); - tempN.setId(85); - tempN.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-17T21:50:26+02:00")); - tempN.setProjectId(1); - tempN.setAuthorId(4); - tempN.setCommentsCount(0); - tempN.setDescription("description"); - tempN.setSummary("summary"); - tempN.setTitle("title"); - model.put(News.class, tempN); - tempN = new News(); - tempN.setId(86); - tempN.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-09-17T21:55:26+02:00")); - tempN.setProjectId(1); - tempN.setAuthorId(4); - tempN.setCommentsCount(0); - tempN.setDescription("description2"); - tempN.setSummary("summary2"); - tempN.setTitle("title2"); - model.put(News.class, tempN); - - TimeEntry tempE; - - tempE = new TimeEntry(); - tempE.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-12-31T23:02:02+01:00")); - tempE.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-12-31T23:02:02+01:00")); - tempE.setSpentOn((Date) RedmineDataConverter.Date.convert("2009-12-31")); - tempE.setId(1); - tempE.setProjectId(1); - tempE.setUserId(4); - tempE.setIssueId(6); - tempE.setActivityId(8); - - tempE.setHours(1); - tempE.setTmonth(12); - tempE.setTyear(2009); - tempE.setTweek(53); - tempE.setComments("Test"); - model.put(TimeEntry.class, tempE); - - tempE = new TimeEntry(); - tempE.setCreatedOn((Date) RedmineDataConverter.Datetime.convert("2009-12-31T23:10:01+01:00")); - tempE.setUpdatedOn((Date) RedmineDataConverter.Datetime.convert("2009-12-31T23:10:01+01:00")); - tempE.setSpentOn((Date) RedmineDataConverter.Date.convert("2009-12-31")); - tempE.setId(2); - tempE.setProjectId(1); - tempE.setUserId(4); - tempE.setIssueId(6); - tempE.setActivityId(9); - - tempE.setHours(2); - tempE.setTmonth(12); - tempE.setTyear(2009); - tempE.setTweek(53); - tempE.setComments("deuxième temps"); - model.put(TimeEntry.class, tempE); - } - - - public Attachment getAttachment() { - Attachment result = new Attachment(); - File fileToUpload = null; - try { - fileToUpload = File.createTempFile("toupload", ".txt"); - FileUtils.write(fileToUpload, FILE_TO_UPLOAD_CONTENT); - result.setToUpload(fileToUpload); - result.setDescription("attachment description..."); - return result; - } catch (IOException e) { - throw new RuntimeException("Could not create temp file", e); - } - - } - /** * Configuration of a redmine service for test purposes. * * @author tchemit <chemit(a)codelutin.com> * @since 1.4 */ - public static class FakeRedmineServiceConfiguration implements RestClientConfiguration { + public static class FakeRedmineServiceConfiguration implements RedmineServiceConfiguration { URL restUrl; @@ -781,8 +313,9 @@ @Override public String toString() { - ToStringBuilder b = new ToStringBuilder(this, - ToStringStyle.MULTI_LINE_STYLE + ToStringBuilder b = new ToStringBuilder( + this, + ToStringStyle.MULTI_LINE_STYLE ); b.append("redmineUrl", restUrl); if (anonymous) { Added: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java (rev 0) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java 2012-07-15 19:09:51 UTC (rev 308) @@ -0,0 +1,74 @@ +package org.nuiton.jredmine; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assume; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import java.io.IOException; + +/** + * A class rule that provider the {@link RedmineFixtures} and check that the + * valid loggued configuration is found. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineLogguedFixtureClassRule implements TestRule { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RedmineLogguedFixtureClassRule.class); + + RedmineFixtures fixtures = new RedmineFixtures(); + + RedmineServiceConfiguration conf; + + @Override + public Statement apply(Statement base, Description description) { + + Class<?> testClass = description.getTestClass(); + + try { + conf = fixtures.obtainRedmineConfiguration(); + + if (conf == null) { + + // could not find any configuration + if (log.isWarnEnabled()) { + log.warn("could not connect to server " + + fixtures.newAnonymousConfiguration() + ", will skip test " + + testClass.getName()); + } + Assume.assumeTrue(false); + } else { + + // configuration must NOT be anonymous + + if (conf.isAnonymous()) { + + if (log.isWarnEnabled()) { + log.warn("A authenticated configuration was required, will skip test " + + testClass.getName()); + } + Assume.assumeTrue(false); + } + } + + } catch (IOException e) { + throw new IllegalStateException("Could not check jredmine configuration in test " + testClass.getName(), e); + + } + return base; + } + + public RedmineFixtures getFixtures() { + return fixtures; + } + + public RedmineServiceConfiguration getConf() { + return conf; + } +} Added: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java (rev 0) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractAnonymousRedmineMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -0,0 +1,56 @@ +/* + * #%L + * JRedmine :: Maven plugin + * + * $Id: AbstractRedmineMojoTest.java 303 2012-07-15 11:14:29Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/jredmine/branches/jredmine-1.x/jredmine-maven-plu… $ + * %% + * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine.plugin; + +import org.junit.ClassRule; +import org.nuiton.jredmine.RedmineAnonymousFixtureClassRule; +import org.nuiton.jredmine.RedmineFixtures; +import org.nuiton.jredmine.RedmineServiceConfiguration; + +import java.io.IOException; + +/** + * @param type of mojo to test + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.0 + */ +public abstract class AbstractAnonymousRedmineMojoTest extends AbstractRedmineMojoTest { + + @ClassRule + public static final RedmineAnonymousFixtureClassRule classRule = + new RedmineAnonymousFixtureClassRule(); + + @Override + protected RedmineFixtures getFixtures() { + return classRule.getFixtures(); + } + + protected final RedmineServiceConfiguration getConfiguration() throws IOException { + // by default use a anonymous configuration + RedmineServiceConfiguration conf = getFixtures().newAnonymousConfiguration(); + return conf; + } + +} Added: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java (rev 0) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractLogguedRedmineMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -0,0 +1,55 @@ +/* + * #%L + * JRedmine :: Maven plugin + * + * $Id: AbstractRedmineMojoTest.java 303 2012-07-15 11:14:29Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/jredmine/branches/jredmine-1.x/jredmine-maven-plu… $ + * %% + * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine.plugin; + +import org.junit.ClassRule; +import org.nuiton.jredmine.RedmineFixtures; +import org.nuiton.jredmine.RedmineLogguedFixtureClassRule; +import org.nuiton.jredmine.RedmineServiceConfiguration; + +import java.io.IOException; + +/** + * @param type of mojo to test + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.0 + */ +public abstract class AbstractLogguedRedmineMojoTest extends AbstractRedmineMojoTest { + + @ClassRule + public static final RedmineLogguedFixtureClassRule classRule = + new RedmineLogguedFixtureClassRule(); + + @Override + protected RedmineFixtures getFixtures() { + return classRule.getFixtures(); + } + + protected final RedmineServiceConfiguration getConfiguration() throws IOException { + RedmineServiceConfiguration conf = getFixtures().newLogguedConfiguration(); + return conf; + } + +} Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -24,13 +24,14 @@ */ package org.nuiton.jredmine.plugin; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.maven.model.IssueManagement; import org.codehaus.plexus.util.StringUtils; import org.junit.After; import org.junit.Assert; -import org.junit.BeforeClass; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.RedmineFixtures; +import org.nuiton.jredmine.RedmineServiceConfiguration; import org.nuiton.plugin.AbstractMojoTest; import java.io.File; @@ -43,23 +44,20 @@ */ public abstract class AbstractRedmineMojoTest extends AbstractMojoTest { - @BeforeClass - public static void atTheBegining() throws IOException { + /** Logger. */ + private static final Log log = + LogFactory.getLog(AbstractRedmineMojoTest.class); - fixtures = new RedmineFixtures(); - } + protected static boolean init; protected boolean canContinue; - protected static RedmineFixtures fixtures; + protected abstract RedmineServiceConfiguration getConfiguration() throws IOException; - protected RestClientConfiguration getConfiguration() throws IOException { - // by default use a anonymous configuration - RestClientConfiguration conf = fixtures.newAnonymousConfiguration(); - return conf; - } + protected abstract RedmineFixtures getFixtures(); protected void beforeMojoInit(P mojo, File pomFile) throws Exception { + // add a issue management IssueManagement i = new IssueManagement(); i.setSystem(AbstractRedmineMojo.REDMINE_SYSTEM); @@ -74,7 +72,7 @@ String projectId = redmineMojoWithProject.getProjectId(); if (StringUtils.isBlank(projectId)) { - redmineMojoWithProject.setProjectId(fixtures.projectName()); + redmineMojoWithProject.setProjectId(getFixtures().projectName()); } } @@ -86,7 +84,7 @@ String versionId = redmineMojoWithProjectAndVersion.getVersionId(); if (StringUtils.isBlank(versionId)) { - redmineMojoWithProjectAndVersion.setVersionId(fixtures.versionName()); + redmineMojoWithProjectAndVersion.setVersionId(getFixtures().versionName()); } } @@ -99,12 +97,13 @@ @Override protected void setUpMojo(P mojo, File pomFile) throws Exception { + super.setUpMojo(mojo, pomFile); - RestClientConfiguration configuration = getConfiguration(); + RedmineServiceConfiguration configuration = getConfiguration(); // copy redmine test server configuration - fixtures.copyConfiguration(configuration, mojo); + getFixtures().copyConfiguration(configuration, mojo); beforeMojoInit(mojo, pomFile); @@ -139,15 +138,16 @@ } protected void mojoDoAction() throws Exception { - if (!canContinue) { - return; + + if (canContinue) { + + P mojo = getMojo(); + Assert.assertNotNull(mojo); + try { + mojo.doAction(); + } finally { + mojo.afterExecute(); + } } - P mojo = getMojo(); - Assert.assertNotNull(mojo); - try { - mojo.doAction(); - } finally { - mojo.afterExecute(); - } } } Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -30,7 +30,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class DisplayDataMojoTest extends AbstractRedmineMojoTest<DisplayDataMojo> { +public class DisplayDataMojoTest extends AbstractAnonymousRedmineMojoTest<DisplayDataMojo> { @Override protected String getGoalName(String methodName) { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -25,27 +25,18 @@ package org.nuiton.jredmine.plugin; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import java.io.IOException; - /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class GenerateChangesMojoTest extends AbstractRedmineMojoTest<GenerateChangesMojo> { +public class GenerateChangesMojoTest extends AbstractLogguedRedmineMojoTest<GenerateChangesMojo> { @Override protected String getGoalName(String methodName) { return "generate-changes"; } - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration conf = fixtures.newLogguedConfiguration(); - return conf; - } - @Test public void generateChanges() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -25,27 +25,18 @@ package org.nuiton.jredmine.plugin; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import java.io.IOException; - /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class NextVersionMojoTest extends AbstractRedmineMojoTest<NextVersionMojo> { +public class NextVersionMojoTest extends AbstractLogguedRedmineMojoTest<NextVersionMojo> { @Override protected String getGoalName(String methodName) { return "next-version"; } - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration conf = fixtures.newLogguedConfiguration(); - return conf; - } - @Test public void nextVersion() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -25,28 +25,18 @@ package org.nuiton.jredmine.plugin; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import java.io.IOException; - /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class PublishAttachmentsMojoTest extends AbstractRedmineMojoTest<PublishAttachmentsMojo> { +public class PublishAttachmentsMojoTest extends AbstractLogguedRedmineMojoTest<PublishAttachmentsMojo> { @Override protected String getGoalName(String methodName) { return "publish-attachments"; } - - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration conf = fixtures.newLogguedConfiguration(); - return conf; - } - @Test public void publishAttachments() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -25,28 +25,18 @@ package org.nuiton.jredmine.plugin; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import java.io.IOException; - /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class PublishNewsMojoTest extends AbstractRedmineMojoTest<PublishNewsMojo> { +public class PublishNewsMojoTest extends AbstractLogguedRedmineMojoTest<PublishNewsMojo> { @Override protected String getGoalName(String methodName) { return "publish-news"; } - - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration conf = fixtures.newLogguedConfiguration(); - return conf; - } - @Test public void publishNews() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -25,27 +25,18 @@ package org.nuiton.jredmine.plugin; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import java.io.IOException; - /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class UpdateVersionMojoTest extends AbstractRedmineMojoTest<UpdateVersionMojo> { +public class UpdateVersionMojoTest extends AbstractLogguedRedmineMojoTest<UpdateVersionMojo> { @Override protected String getGoalName(String methodName) { return "update-version"; } - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration conf = fixtures.newLogguedConfiguration(); - return conf; - } - @Test public void updateVersion() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -24,35 +24,44 @@ */ package org.nuiton.jredmine.plugin.announcement; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import org.nuiton.jredmine.plugin.AbstractRedmineMojoTest; +import org.nuiton.jredmine.plugin.AbstractLogguedRedmineMojoTest; -import java.io.IOException; +import java.io.File; /** - * * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class GenerateEmailAnnouncementMojoTest extends AbstractRedmineMojoTest<GenerateEmailAnnouncementMojo> { +public class GenerateEmailAnnouncementMojoTest extends AbstractLogguedRedmineMojoTest<GenerateEmailAnnouncementMojo> { + /** Logger. */ + private static final Log log = + LogFactory.getLog(GenerateEmailAnnouncementMojoTest.class); + @Override protected String getGoalName(String methodName) { return "generate-email-announcement"; } - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration conf = fixtures.newLogguedConfiguration(); - return conf; - } - @Test public void generateEmailAnnouncement() throws Exception { + File outputFile = getMojo().getOutputFile(); + Assert.assertNotNull(outputFile); mojoDoAction(); - //TODO check file is generated + Assert.assertTrue(outputFile.exists()); + if (getMojo().isVerbose()) { + + String content = FileUtils.readFileToString(outputFile); + if (log.isInfoEnabled()) { + log.info("Announcement content:\n" + content); + } + } } @Test Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -24,35 +24,45 @@ */ package org.nuiton.jredmine.plugin.announcement; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import org.nuiton.jredmine.plugin.AbstractRedmineMojoTest; +import org.nuiton.jredmine.plugin.AbstractLogguedRedmineMojoTest; -import java.io.IOException; +import java.io.File; /** - * * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public class GenerateNewsAnnouncementMojoTest extends AbstractRedmineMojoTest<GenerateNewsAnnouncementMojo> { +public class GenerateNewsAnnouncementMojoTest extends AbstractLogguedRedmineMojoTest<GenerateNewsAnnouncementMojo> { + /** Logger. */ + private static final Log log = + LogFactory.getLog(GenerateNewsAnnouncementMojoTest.class); + @Override protected String getGoalName(String methodName) { return "generate-news-announcement"; } - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration conf = fixtures.newLogguedConfiguration(); - return conf; - } - @Test public void generateNewsAnnouncement() throws Exception { + File outputFile = getMojo().getOutputFile(); + Assert.assertNotNull(outputFile); + mojoDoAction(); - //TODO check file is generated + Assert.assertTrue(outputFile.exists()); + if (getMojo().isVerbose()) { + + String content = FileUtils.readFileToString(outputFile); + if (log.isInfoEnabled()) { + log.info("Announcement content:\n" + content); + } + } } @Test Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java 2012-07-15 19:09:51 UTC (rev 308) @@ -26,14 +26,14 @@ import org.junit.Assume; import org.junit.Test; -import org.nuiton.jredmine.plugin.AbstractRedmineMojoTest; +import org.nuiton.jredmine.plugin.AbstractLogguedRedmineMojoTest; /** * @param type of issue reports to test * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ -public abstract class AbstractIssuesReportTest extends AbstractRedmineMojoTest { +public abstract class AbstractIssuesReportTest extends AbstractLogguedRedmineMojoTest { @Test public void issueReport() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/generateEmailAnnouncement.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/generateEmailAnnouncement.xml 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/generateEmailAnnouncement.xml 2012-07-15 19:09:51 UTC (rev 308) @@ -33,6 +33,8 @@ <version>0</version> <modelVersion>4.0.0</modelVersion> + <name>JRedmine</name> + <description>JRedmine is a java redmine client</description> <build> <plugins> @@ -44,21 +46,6 @@ <xmlPath> target/test-classes/org/nuiton/jredmine/plugin/announcement/changes.xml </xmlPath> - <templateDirectory> - org/nuiton/jredmine/plugin/announcement - </templateDirectory> - <attachmentLinkTemplate> - %URL%/attachments/download/%FILE% - </attachmentLinkTemplate> - <emailAnnouncementTemplate> - release-email-announcement.vm - </emailAnnouncementTemplate> - <skipGenerateEmailAnnouncement>false</skipGenerateEmailAnnouncement> - <developmentTeam>One team</developmentTeam> - <urlDownload>http://mynuiton.org/projects/list_files/one</urlDownload> - <introduction> - The release 1.0.0 is the first release of this plugin... - </introduction> <templateEncoding>UTF-8</templateEncoding> </configuration> <executions> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/skipGenerateEmailAnnouncement.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/skipGenerateEmailAnnouncement.xml 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/skipGenerateEmailAnnouncement.xml 2012-07-15 19:09:51 UTC (rev 308) @@ -44,21 +44,6 @@ <xmlPath> target/test-classes/org/nuiton/jredmine/plugin/announcement/changes.xml </xmlPath> - <templateDirectory> - org/nuiton/jredmine/plugin/announcement - </templateDirectory> - <emailAnnouncementTemplate> - release-email-announcement.vm - </emailAnnouncementTemplate> - <attachmentLinkTemplate> - %URL%/attachments/download/%FILE% - </attachmentLinkTemplate> - <skipGenerateEmailAnnouncement>true</skipGenerateEmailAnnouncement> - <developmentTeam>One team</developmentTeam> - <urlDownload>http://mynuiton.org/projects/list_files/one</urlDownload> - <introduction> - The release 1.0.0 is the first release of this plugin... - </introduction> <templateEncoding>UTF-8</templateEncoding> </configuration> <executions> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/generateNewsAnnouncement.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/generateNewsAnnouncement.xml 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/generateNewsAnnouncement.xml 2012-07-15 19:09:51 UTC (rev 308) @@ -44,21 +44,6 @@ <xmlPath> target/test-classes/org/nuiton/jredmine/plugin/announcement/changes.xml </xmlPath> - <templateDirectory> - org/nuiton/jredmine/plugin/announcement - </templateDirectory> - <attachmentLinkTemplate> - %URL%/attachments/download/%FILE% - </attachmentLinkTemplate> - <newsAnnouncementTemplate> - release-news-announcement.vm - </newsAnnouncementTemplate> - <skipGenerateNewsAnnouncement>false</skipGenerateNewsAnnouncement> - <developmentTeam>One team</developmentTeam> - <urlDownload>http://mynuiton.org/projects/list_files/one</urlDownload> - <introduction> - The release 1.0.0 is the first release of this plugin... - </introduction> <templateEncoding>UTF-8</templateEncoding> </configuration> <executions> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/skipGenerateNewsAnnouncement.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/skipGenerateNewsAnnouncement.xml 2012-07-15 19:08:28 UTC (rev 307) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/skipGenerateNewsAnnouncement.xml 2012-07-15 19:09:51 UTC (rev 308) @@ -44,21 +44,6 @@ <xmlPath> target/test-classes/org/nuiton/jredmine/plugin/announcement/changes.xml </xmlPath> - <templateDirectory> - org/nuiton/jredmine/plugin/announcement - </templateDirectory> - <attachmentLinkTemplate> - %URL%/attachments/download/%FILE% - </attachmentLinkTemplate> - <newsAnnouncementTemplate> - release-news-announcement.vm - </newsAnnouncementTemplate> - <skipGenerateNewsAnnouncement>true</skipGenerateNewsAnnouncement> - <developmentTeam>One team</developmentTeam> - <urlDownload>http://mynuiton.org/projects/list_files/one</urlDownload> - <introduction> - The release 1.0.0 is the first release of this plugin... - </introduction> <templateEncoding>UTF-8</templateEncoding> </configuration> <executions>

1 0

r307 - in branches/jredmine-1.x/jredmine-client/src: main/java/org/nuiton/jredmine test/java/org/nuiton/jredmine test/java/org/nuiton/jredmine/model/io/xpp3 test/java/org/nuiton/jredmine/rest
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 21:08:28 +0200 (Sun, 15 Jul 2012) New Revision: 307 Url: http://nuiton.org/repositories/revision/jredmine/307 Log: fixes #2188: Make possible to use redmine service or any api without plexus container fixes #2189: Improve RedmineService design refs #937: Maven test utilise les properties de test de la distribution (improve test design) Added: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java Removed: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineAnonymousServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceAsAnonymousTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineTestContract.java Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java 2012-07-15 19:08:28 UTC (rev 307) @@ -26,7 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.io.rest.RestClient; import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.Issue; @@ -44,8 +43,6 @@ /** * Default implementation of {@link RedmineAnonymousService}. * - * This implementation just make sure that the rest client is anonnymous. - * * Created: 2 janv. 2010 * * @author tchemit <chemit(a)codelutin.com> @@ -53,152 +50,195 @@ * @see RestClientConfiguration#isAnonymous() * @since 1.0.3 */ -public class DefaultRedmineAnonymousService implements RedmineServiceImplementor, RedmineAnonymousService { +public class DefaultRedmineAnonymousService implements RedmineAnonymousService { /** Logger. */ private static final Log log = LogFactory.getLog(DefaultRedmineAnonymousService.class); - /** @plexus.requirement role="org.nuiton.jredmine.RedmineServiceImplementor" role-hint="default" */ - protected RedmineServiceImplementor delegateImplementor; + /** + * Delegate all the technical layer to an implementor. + * + * @see RedmineServiceImplementor + */ + protected final RedmineServiceImplementor delegateImplementor; + /** + * Default constructor. + * + * Make this service use the default {@link RedmineServiceImplementor}. + * + * @see DefaultRedmineServiceImplementor + * @since 1.4 + */ public DefaultRedmineAnonymousService() { + this(new DefaultRedmineServiceImplementor()); } + /** + * Service constructor using the givne implementator to deal this technical layer. + * + * @param delegateImplementor the implementator to use + * @since 1.4 + */ + public DefaultRedmineAnonymousService(RedmineServiceImplementor delegateImplementor) { + this.delegateImplementor = delegateImplementor; + } + /////////////////////////////////////////////////////////////////////////// /// RedmineAnonymousService implementation /////////////////////////////////////////////////////////////////////////// @Override + public void init(RedmineServiceConfiguration configuration) throws RedmineServiceException { + // Force to not be loggued + configuration.setAnonymous(true); + if (log.isDebugEnabled()) { + log.debug("init service with configuration: " + configuration); + } + delegateImplementor.init(configuration); + } + + @Override + public void destroy() throws RedmineServiceException { + delegateImplementor.destroy(); + } + + @Override + public RedmineServiceImplementor getDelegateImplementor() { + return delegateImplementor; + } + + @Override public IssueStatus[] getIssueStatuses() throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_ISSUE_STATUS_REQUEST_NAME, - IssueStatus.class + return delegateImplementor.getDatas(ModelHelper.GET_ALL_ISSUE_STATUS_REQUEST_NAME, + IssueStatus.class ); } @Override public IssuePriority[] getIssuePriorities() throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_ISSUE_PRIORITY_REQUEST_NAME, - IssuePriority.class + return delegateImplementor.getDatas(ModelHelper.GET_ALL_ISSUE_PRIORITY_REQUEST_NAME, + IssuePriority.class ); } @Override public Project[] getProjects() throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_PROJECT_REQUEST_NAME, Project.class); + return delegateImplementor.getDatas(ModelHelper.GET_ALL_PROJECT_REQUEST_NAME, Project.class); } @Override public IssueCategory[] getIssueCategories(String projectName) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_ISSUE_CATEGORY_REQUEST_NAME, - IssueCategory.class, - projectName + return delegateImplementor.getDatas(ModelHelper.GET_ALL_ISSUE_CATEGORY_REQUEST_NAME, + IssueCategory.class, + projectName ); } @Override public Project getProject(String projectName) throws RedmineServiceException { - return getData(ModelHelper.GET_PROJECT_REQUEST_NAME, - Project.class, - projectName + return delegateImplementor.getData(ModelHelper.GET_PROJECT_REQUEST_NAME, + Project.class, + projectName ); } @Override public Tracker[] getTrackers(String projectName) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_TRACKER_REQUEST_NAME, - Tracker.class, - projectName + return delegateImplementor.getDatas(ModelHelper.GET_ALL_TRACKER_REQUEST_NAME, + Tracker.class, + projectName ); } @Override public News[] getNews(String projectName) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_NEWS_REQUEST_NAME, - News.class, - projectName + return delegateImplementor.getDatas(ModelHelper.GET_ALL_NEWS_REQUEST_NAME, + News.class, + projectName ); } @Override public User[] getProjectMembers(String projectName) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_USER_REQUEST_NAME, - User.class, - projectName + return delegateImplementor.getDatas(ModelHelper.GET_ALL_USER_REQUEST_NAME, + User.class, + projectName ); } @Override public Version[] getVersions(String projectName) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_VERSION_REQUEST_NAME, - Version.class, - projectName + return delegateImplementor.getDatas(ModelHelper.GET_ALL_VERSION_REQUEST_NAME, + Version.class, + projectName ); } @Override public Version getVersion(String projectName, String versionName) throws RedmineServiceException { - return getData(ModelHelper.GET_VERSION_REQUEST_NAME, - Version.class, - projectName, - versionName + return delegateImplementor.getData(ModelHelper.GET_VERSION_REQUEST_NAME, + Version.class, + projectName, + versionName ); } @Override public Attachment[] getAttachments(String projectName, String versionName) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_ATTACHMENTS_REQUEST_NAME, - Attachment.class, - projectName, - versionName + return delegateImplementor.getDatas(ModelHelper.GET_ALL_ATTACHMENTS_REQUEST_NAME, + Attachment.class, + projectName, + versionName ); } @Override public Issue[] getIssues(String projectName, String versionName) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_ISSUES_REQUEST_NAME, - Issue.class, - projectName, - versionName + return delegateImplementor.getDatas(ModelHelper.GET_ALL_ISSUES_REQUEST_NAME, + Issue.class, + projectName, + versionName ); } @Override public TimeEntry[] getIssueTimeEntries(String projectName, String issueId) throws RedmineServiceException { - return getDatas(ModelHelper.GET_ALL_ISSUE_TIME_ENTRY_REQUEST_NAME, - TimeEntry.class, - projectName, - issueId + return delegateImplementor.getDatas(ModelHelper.GET_ALL_ISSUE_TIME_ENTRY_REQUEST_NAME, + TimeEntry.class, + projectName, + issueId ); } @Override public Issue[] getIssues(String projectName) throws RedmineServiceException { - Issue[] result = getDatas(ModelHelper.GET_ALL_PROJECT_ISSUES_REQUEST_NAME, - Issue.class, - projectName + Issue[] result = delegateImplementor.getDatas(ModelHelper.GET_ALL_PROJECT_ISSUES_REQUEST_NAME, + Issue.class, + projectName ); return result; } @Override public Issue[] getOpenedIssues(String projectName) throws RedmineServiceException { - Issue[] result = getDatas(ModelHelper.GET_ALL_PROJECT_OPENED_ISSUES_REQUEST_NAME, - Issue.class, - projectName + Issue[] result = delegateImplementor.getDatas(ModelHelper.GET_ALL_PROJECT_OPENED_ISSUES_REQUEST_NAME, + Issue.class, + projectName ); return result; } @Override public Issue[] getClosedIssues(String projectName) throws RedmineServiceException { - Issue[] result = getDatas(ModelHelper.GET_ALL_PROJECT_CLOSED_ISSUES_REQUEST_NAME, - Issue.class, - projectName + Issue[] result = delegateImplementor.getDatas(ModelHelper.GET_ALL_PROJECT_CLOSED_ISSUES_REQUEST_NAME, + Issue.class, + projectName ); return result; } @@ -206,72 +246,63 @@ /////////////////////////////////////////////////////////////////////////// /// RedmineServiceImplementor implementation /////////////////////////////////////////////////////////////////////////// - @Override - public RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException { - // Force to not be loggued - configuration.setAnonymous(true); - if (log.isDebugEnabled()) { - log.debug("init configuration for " + this); - } - RedmineServiceImplementor result = delegateImplementor.init(configuration); - return result; - } - @Override - public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { - if (log.isDebugEnabled()) { - log.debug("init session for " + this); - } - checkNotLoggued(session); - return delegateImplementor.init(session); - } +// @Override +// public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { +// // Force to not be loggued +// configuration.setAnonymous(true); +// if (log.isDebugEnabled()) { +// log.debug("init configuration for " + this); +// } +// return delegateImplementor.init(configuration); +// } +// +// @Override +// public <T> T getData(String requestName, +// Class<T> type, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.getData(requestName, type, args); +// } +// +// @Override +// public <T> T[] getDatas(String requestName, +// Class<T> type, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.getDatas(requestName, type, args); +// } +// +// @Override +// public <T> T sendData(String requestName, +// Class<T> klazz, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.sendData(requestName, klazz, args); +// } +// +// @Override +// public <T> T[] sendDatas(String requestName, +// Class<T> klazz, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.sendDatas(requestName, klazz, args); +// } +// +// @Override +// public boolean isInit() { +// return delegateImplementor.isInit(); +// } +// +// @Override +// public void destroy() throws RedmineServiceException { +// delegateImplementor.destroy(); +// } +// +// @Override +// public void checkNotLoggued(RestClient session) throws IllegalStateException, RedmineServiceLoginException, NullPointerException { +// delegateImplementor.checkNotLoggued(session); +// } +// +// @Override +// public void checkLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { +// delegateImplementor.checkLoggued(); +// } - @Override - public <T> T getData(String requestName, - Class<T> type, - Object... args) throws RedmineServiceException { - return delegateImplementor.getData(requestName, type, args); - } - - @Override - public <T> T[] getDatas(String requestName, - Class<T> type, - Object... args) throws RedmineServiceException { - return delegateImplementor.getDatas(requestName, type, args); - } - - @Override - public <T> T sendData(String requestName, - Class<T> klazz, - Object... args) throws RedmineServiceException { - return delegateImplementor.sendData(requestName, klazz, args); - } - - @Override - public <T> T[] sendDatas(String requestName, - Class<T> klazz, - Object... args) throws RedmineServiceException { - return delegateImplementor.sendDatas(requestName, klazz, args); - } - - @Override - public boolean isInit() { - return delegateImplementor.isInit(); - } - - @Override - public void destroy() throws RedmineServiceException { - delegateImplementor.destroy(); - } - - @Override - public void checkNotLoggued(RestClient session) throws IllegalStateException, RedmineServiceLoginException, NullPointerException { - delegateImplementor.checkNotLoggued(session); - } - - @Override - public void checkLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { - delegateImplementor.checkLoggued(); - } - } Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java 2012-07-15 19:08:28 UTC (rev 307) @@ -26,49 +26,200 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.News; import org.nuiton.jredmine.model.Project; import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; /** - * Default {@link RedmineService} implementation based on a {@link RestClient} + * Default {@link RedmineService} implementation. * * @author tchemit <chemit(a)codelutin.com> * @plexus.component role="org.nuiton.jredmine.RedmineService" role-hint="default" * @since 1.0.0 */ -public class DefaultRedmineService extends DefaultRedmineAnonymousService implements RedmineService { +public class DefaultRedmineService implements RedmineService { protected static final Log log = LogFactory.getLog(DefaultRedmineService.class); + /** + * Delegate all the technical layer to a implementor. + * + * @see RedmineServiceImplementor + * @since 1.4 + */ + protected final RedmineServiceImplementor delegateImplementor; + + /** + * Delegate all anonymous call to the anonymous service. + * + * @see RedmineAnonymousService + * @since 1.4 + */ + protected final RedmineAnonymousService anonymousService; + + /** + * Default constructor. + * + * Make this service use the default {@link RedmineServiceImplementor}. + * + * @see DefaultRedmineServiceImplementor + * @since 1.4 + */ + public DefaultRedmineService() { + this(new DefaultRedmineServiceImplementor()); + } + + /** + * Service constructor using the givne implementator to deal this technical layer. + * + * @param delegateImplementor the implementator to use + * @since 1.4 + */ + public DefaultRedmineService(RedmineServiceImplementor delegateImplementor) { + this.delegateImplementor = delegateImplementor; + this.anonymousService = new DefaultRedmineAnonymousService(delegateImplementor); + } + /////////////////////////////////////////////////////////////////////////// - /// RedmineServiceImplementor implementation + /// RedmineAnonymousService implementation /////////////////////////////////////////////////////////////////////////// + @Override - public RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException { - RedmineServiceImplementor result = delegateImplementor.init(configuration); + public void init(RedmineServiceConfiguration configuration) throws RedmineServiceException { + if (log.isDebugEnabled()) { + log.debug("init service with configuration: " + configuration); + } + delegateImplementor.init(configuration); + } + + @Override + public void destroy() throws RedmineServiceException { + delegateImplementor.destroy(); + } + + @Override + public RedmineServiceImplementor getDelegateImplementor() { + return delegateImplementor; + } + + @Override + public IssueStatus[] getIssueStatuses() throws RedmineServiceException { + IssueStatus[] result = anonymousService.getIssueStatuses(); return result; } @Override - public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { - return delegateImplementor.init(session); + public IssuePriority[] getIssuePriorities() throws RedmineServiceException { + IssuePriority[] result = anonymousService.getIssuePriorities(); + return result; } + @Override + public Project[] getProjects() throws RedmineServiceException { + Project[] result = anonymousService.getProjects(); + return result; + } + + @Override + public IssueCategory[] getIssueCategories(String projectName) throws RedmineServiceException { + IssueCategory[] result = anonymousService.getIssueCategories(projectName); + return result; + } + + @Override + public Project getProject(String projectName) throws RedmineServiceException { + Project result = anonymousService.getProject(projectName); + return result; + } + + @Override + public Tracker[] getTrackers(String projectName) throws RedmineServiceException { + Tracker[] result = anonymousService.getTrackers(projectName); + return result; + } + + @Override + public News[] getNews(String projectName) throws RedmineServiceException { + News[] result = anonymousService.getNews(projectName); + return result; + } + + @Override + public User[] getProjectMembers(String projectName) throws RedmineServiceException { + User[] result = anonymousService.getProjectMembers(projectName); + return result; + } + + @Override + public Version[] getVersions(String projectName) throws RedmineServiceException { + Version[] result = anonymousService.getVersions(projectName); + return result; + } + + @Override + public Version getVersion(String projectName, + String versionName) throws RedmineServiceException { + Version result = anonymousService.getVersion(projectName, versionName); + return result; + } + + @Override + public Attachment[] getAttachments(String projectName, + String versionName) throws RedmineServiceException { + Attachment[] result = anonymousService.getAttachments(projectName, versionName); + return result; + } + + @Override + public Issue[] getIssues(String projectName, + String versionName) throws RedmineServiceException { + Issue[] result = anonymousService.getIssues(projectName, versionName); + return result; + } + + @Override + public TimeEntry[] getIssueTimeEntries(String projectName, + String issueId) throws RedmineServiceException { + TimeEntry[] result = anonymousService.getIssueTimeEntries(projectName, issueId); + return result; + } + + @Override + public Issue[] getIssues(String projectName) throws RedmineServiceException { + Issue[] result = anonymousService.getIssues(projectName); + return result; + } + + @Override + public Issue[] getOpenedIssues(String projectName) throws RedmineServiceException { + Issue[] result = anonymousService.getOpenedIssues(projectName); + return result; + } + + @Override + public Issue[] getClosedIssues(String projectName) throws RedmineServiceException { + Issue[] result = anonymousService.getClosedIssues(projectName); + return result; + } + /////////////////////////////////////////////////////////////////////////// /// RedmineLogguedService implementation /////////////////////////////////////////////////////////////////////////// @Override public Project[] getUserProjects() throws RedmineServiceException { - checkLoggued(); - Project[] result = getDatas(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME, - Project.class); + delegateImplementor.checkLoggued(); + Project[] result = delegateImplementor.getDatas(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME, + Project.class); return result; } @@ -77,10 +228,10 @@ Version version) throws RedmineServiceException { // send data and obtain created version - Version result = sendData(ModelHelper.ADD_VERSION_REQUEST_NAME, - Version.class, - projectName, - version + Version result = delegateImplementor.sendData(ModelHelper.ADD_VERSION_REQUEST_NAME, + Version.class, + projectName, + version ); return result; } @@ -90,10 +241,10 @@ Version version) throws RedmineServiceException { // send data and obtain updated version - Version result = sendData(ModelHelper.UPDATE_VERSION_REQUEST_NAME, - Version.class, - projectName, - version + Version result = delegateImplementor.sendData(ModelHelper.UPDATE_VERSION_REQUEST_NAME, + Version.class, + projectName, + version ); return result; } @@ -104,11 +255,11 @@ Version newVersion) throws RedmineServiceException { // send data and obtain updated or created new version - Version result = sendData(ModelHelper.NEXT_VERSION_REQUEST_NAME, - Version.class, - projectName, - newVersion, - oldVersionName + Version result = delegateImplementor.sendData(ModelHelper.NEXT_VERSION_REQUEST_NAME, + Version.class, + projectName, + newVersion, + oldVersionName ); return result; } @@ -119,11 +270,11 @@ Attachment attachement) throws RedmineServiceException { // send data and obtain created attachment - Attachment result = sendData(ModelHelper.ADD_ATTACHMENT_REQUEST_NAME, - Attachment.class, - projectName, - versionName, - attachement + Attachment result = delegateImplementor.sendData(ModelHelper.ADD_ATTACHMENT_REQUEST_NAME, + Attachment.class, + projectName, + versionName, + attachement ); return result; } @@ -131,11 +282,12 @@ @Override public News addNews(String projectName, News news) throws RedmineServiceException { + // send data and obtain created news - News result = sendData(ModelHelper.ADD_NEWS_REQUEST_NAME, - News.class, - projectName, - news + News result = delegateImplementor.sendData(ModelHelper.ADD_NEWS_REQUEST_NAME, + News.class, + projectName, + news ); return result; } @@ -144,13 +296,74 @@ public TimeEntry addIssueTimeEntry(String projectName, String issueId, TimeEntry entry) throws RedmineServiceException { - // send data and obtain updated version - TimeEntry result = sendData(ModelHelper.ADD_ISSUE_TIME_ENTRY_REQUEST_NAME, - TimeEntry.class, - projectName, - issueId, - entry + + // send data and obtain created time entry + TimeEntry result = delegateImplementor.sendData(ModelHelper.ADD_ISSUE_TIME_ENTRY_REQUEST_NAME, + TimeEntry.class, + projectName, + issueId, + entry ); return result; } + + /////////////////////////////////////////////////////////////////////////// + /// RedmineServiceImplementor implementation + /////////////////////////////////////////////////////////////////////////// + +// @Override +// public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { +// if (log.isDebugEnabled()) { +// log.debug("init configuration for " + this); +// } +// return delegateImplementor.init(configuration); +// } +// +// @Override +// public <T> T getData(String requestName, +// Class<T> type, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.getData(requestName, type, args); +// } +// +// @Override +// public <T> T[] getDatas(String requestName, +// Class<T> type, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.getDatas(requestName, type, args); +// } +// +// @Override +// public <T> T sendData(String requestName, +// Class<T> klazz, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.sendData(requestName, klazz, args); +// } +// +// @Override +// public <T> T[] sendDatas(String requestName, +// Class<T> klazz, +// Object... args) throws RedmineServiceException { +// return delegateImplementor.sendDatas(requestName, klazz, args); +// } +// +// @Override +// public boolean isInit() { +// return delegateImplementor.isInit(); +// } +// +// @Override +// public void destroy() throws RedmineServiceException { +// delegateImplementor.destroy(); +// } +// +// @Override +// public void checkNotLoggued(RestClient session) throws IllegalStateException, RedmineServiceLoginException, NullPointerException { +// delegateImplementor.checkNotLoggued(session); +// } +// +// @Override +// public void checkLoggued() throws IllegalStateException, RedmineServiceLoginException, NullPointerException { +// delegateImplementor.checkLoggued(); +// } } Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java 2012-07-15 19:08:28 UTC (rev 307) @@ -24,10 +24,8 @@ */ package org.nuiton.jredmine; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import com.google.common.base.Preconditions; import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.io.rest.RestException; import org.nuiton.io.rest.RestRequest; import org.nuiton.jredmine.model.io.xpp3.RedmineXpp3Helper; @@ -41,21 +39,12 @@ * Created: 2 janv. 2010 * * @author tchemit <chemit(a)codelutin.com> - * @plexus.component role="org.nuiton.jredmine.RedmineServiceImplementor" role-hint="default" * @see RedmineServiceImplementor * @since 1.0.3 */ public class DefaultRedmineServiceImplementor implements RedmineServiceImplementor { - /** Logger */ - private static final Log log = - LogFactory.getLog(DefaultRedmineServiceImplementor.class); - - /** - * Client Rest. - * - * @plexus.requirement role="org.nuiton.io.rest.RestClient" role-hint="redmine" - */ + /** Redmine Client Rest. */ protected RestClient session; /** xpp3 xpp3Helper to transform xml stream to pojo */ @@ -66,10 +55,6 @@ public DefaultRedmineServiceImplementor() { xpp3Helper = new RedmineXpp3Helper(); - if (log.isDebugEnabled()) { - log.debug("new " + this); - } - session = new RedmineRestClient(); } /////////////////////////////////////////////////////////////////////////// @@ -82,20 +67,12 @@ } @Override - public RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException { + public RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException { + Preconditions.checkNotNull(configuration, "the client configuration was not be null!"); + Preconditions.checkState(!init, "the client " + this + " was already init!"); + session = new RedmineRestClient(); session.setConfiguration(configuration); - RedmineServiceImplementor result = init(session); - return result; - } - - @Override - public RedmineServiceImplementor init(RestClient session) throws RedmineServiceException { - if (init) { - throw new IllegalStateException( - "the client " + this + " was already init!"); - } try { - this.session = session; if (!session.isOpen()) { session.open(); @@ -111,23 +88,23 @@ @Override public void destroy() throws RedmineServiceException { - checkInit(); - try { - if (session.isOpen()) { - try { - session.close(); - } catch (RestException ex) { - throw new RedmineServiceException( - "has problem while closing Rest client " + - ex.getMessage(), ex); + if (isInit()) { + try { + if (session.isOpen()) { + try { + session.close(); + } catch (RestException ex) { + throw new RedmineServiceException( + "has problem while closing Rest client " + + ex.getMessage(), ex); + } } + } finally { + if (session != null) { + session = null; + } + init = false; } - } finally { - // can't remove the reference since plexus injects it -// if (session != null) { -// session = null; -// } - init = false; } } Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousService.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousService.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousService.java 2012-07-15 19:08:28 UTC (rev 307) @@ -50,6 +50,29 @@ public interface RedmineAnonymousService { /** + * Initialize the service. + * + * @param configuration the configuration to be used to init the internal redmine client + * @throws RedmineServiceException if any pb + */ + void init(RedmineServiceConfiguration configuration) throws RedmineServiceException; + + /** + * Close the service and destroy any connexion to the redmine service. + * + * @throws RedmineServiceException if any pb + */ + void destroy() throws RedmineServiceException; + + /** + * Get the technical layer. + * + * @return the technical layer. + * @since 1.4 + */ + RedmineServiceImplementor getDelegateImplementor(); + + /** * Obtain all accessible projects. * * @return all the projects Added: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,14 @@ +package org.nuiton.jredmine; + +import org.nuiton.io.rest.RestClientConfiguration; + +/** + * Contract of a redmine service configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public interface RedmineServiceConfiguration extends RestClientConfiguration { + + +} \ No newline at end of file Property changes on: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java 2012-07-15 19:08:28 UTC (rev 307) @@ -25,7 +25,6 @@ package org.nuiton.jredmine; import org.nuiton.io.rest.RestClient; -import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.rest.RedmineRestClient; /** @@ -50,15 +49,15 @@ */ boolean isInit(); - /** - * Initialize the service given a redmine client already initialized. - * - * @param session the redmine client to be used by the service - * @return the initialized service - * @throws RedmineServiceException if any pb - * @see RedmineRestClient - */ - RedmineServiceImplementor init(RestClient session) throws RedmineServiceException; +// /** +// * Initialize the service given a redmine client already initialized. +// * +// * @param session the redmine client to be used by the service +// * @return the initialized service +// * @throws RedmineServiceException if any pb +// * @see RedmineRestClient +// */ +// RedmineServiceImplementor init(RestClient session) throws RedmineServiceException; /** * Initialize the service given a client configuration. @@ -67,7 +66,7 @@ * @return the initialized service * @throws RedmineServiceException if any pb */ - RedmineServiceImplementor init(RestClientConfiguration configuration) throws RedmineServiceException; + RedmineServiceImplementor init(RedmineServiceConfiguration configuration) throws RedmineServiceException; /** * Close the service and destroy any connexion to the redmine service. Deleted: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -1,290 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import org.nuiton.jredmine.model.Attachment; -import org.nuiton.jredmine.model.Issue; -import org.nuiton.jredmine.model.IssueCategory; -import org.nuiton.jredmine.model.IssuePriority; -import org.nuiton.jredmine.model.IssueStatus; -import org.nuiton.jredmine.model.News; -import org.nuiton.jredmine.model.Project; -import org.nuiton.jredmine.model.TimeEntry; -import org.nuiton.jredmine.model.Tracker; -import org.nuiton.jredmine.model.User; -import org.nuiton.jredmine.model.Version; -import org.nuiton.jredmine.rest.RedmineRestClient; - -import java.io.IOException; - -/** - * Created: 2 janv. 2010 - * - * @author tchemit <chemit(a)codelutin.com> - * @deprecated since 1.4, will be rethink in version 2.0 (avoid inheritance on tests). - */ -@Deprecated -public abstract class AbstractRedmineServiceTest<S extends RedmineAnonymousService> implements RedmineTestContract { - - /** Logger. */ - private static final Log log = LogFactory.getLog(AbstractRedmineServiceTest.class); - - /** shared rest client (open only one session for all the test). */ - static RedmineRestClient client; - - /** service to test. */ - private S service; - - protected static RedmineFixtures fixtures; - - protected Project[] projects; - - protected Project project; - - protected Version[] versions; - - protected Version version; - - protected User[] users; - - protected Issue[] issues; - - protected IssuePriority[] issuePriorities; - - protected IssueStatus[] issueStatuses; - - protected IssueCategory[] issueCategories; - - protected Tracker[] trackers; - - protected News newz; - - protected News[] news; - - protected Attachment attachment; - - protected Attachment[] attachments; - - protected TimeEntry timeEntry; - - protected TimeEntry[] timeEntries; - - private final Class<S> serviceType; - - public AbstractRedmineServiceTest(Class<S> serviceType) { - this.serviceType = serviceType; - } - - protected S getService() { - return service; - } - - @BeforeClass - public static void setUpClass() throws Exception { - // make sure client is null before starting the test - - client = null; - fixtures = new RedmineFixtures(); - } - - @AfterClass - public static void tearDownClass() throws Exception { - fixtures = null; - if (client != null) { - client.close(); - client = null; - } - } - - protected final S newService() throws Exception { - S s = serviceType.newInstance(); - ((DefaultRedmineAnonymousService) s).delegateImplementor = new DefaultRedmineServiceImplementor(); - return s; - } - - @Before - public void setUp() throws Exception { - - if (client == null) { - - RestClientConfiguration configuration = getConfiguration(); - try { - client = new RedmineRestClient(configuration); - - client.open(); - } catch (Exception e) { - - // could not log - if (log.isErrorEnabled()) { - log.error("can not connect to server " + configuration.getRestUrl() + ", will skip test " + DefaultRedmineServiceTest.class.getName()); - } -// System.out.println("can not connect to server " + configuration.getRestUrl() + ", will skip test " + DefaultRedmineServiceTest.class.getName()); - client = null; - } finally { - Assume.assumeTrue(client != null && client.isOpen()); - } - } - - service = newService(); - - ((RedmineServiceImplementor) service).init(client); - } - - protected abstract RestClientConfiguration getConfiguration() throws IOException; - - @After - public void tearDown() throws Exception { - service = null; - project = null; - projects = null; - version = null; - versions = null; - users = null; - issues = null; - issueCategories = null; - issuePriorities = null; - issueStatuses = null; - trackers = null; - newz = null; - news = null; - attachment = null; - attachments = null; - timeEntry = null; - timeEntries = null; - } - - - @Test - public void isInit() throws Exception { - - Assert.assertFalse(((RedmineServiceImplementor) newService()).isInit()); - } - - @Test - @Override - public void getProjects() throws Exception { - projects = getService().getProjects(); - } - - @Test - @Override - public void getIssuePriorities() throws Exception { - issuePriorities = getService().getIssuePriorities(); - } - - @Test - @Override - public void getIssueStatuses() throws Exception { - issueStatuses = getService().getIssueStatuses(); - } - - @Test - @Override - public void getProject() throws Exception { - project = getService().getProject(PROJECT_NAME); - } - - @Test - @Override - public void getIssueCategories() throws Exception { - issueCategories = getService().getIssueCategories(PROJECT_NAME); - } - - @Test - @Override - public void getTrackers() throws Exception { - trackers = getService().getTrackers(PROJECT_NAME); - } - - @Test - @Override - public void getNews() throws Exception { - news = getService().getNews(PROJECT_NAME); - } - - @Test - @Override - public void getProjectMembers() throws Exception { - users = getService().getProjectMembers(PROJECT_NAME); - } - - @Test - @Override - public void getProjectIssues() throws Exception { - issues = getService().getIssues(PROJECT_NAME); - } - - @Test - @Override - public void getVersions() throws Exception { - versions = getService().getVersions(PROJECT_NAME); - } - - @Test - @Override - public void getVersion() throws Exception { - version = getService().getVersion(PROJECT_NAME, VERSION_NAME); - } - - @Test - @Override - public void getVersionIssues() throws Exception { - issues = getService().getIssues(PROJECT_NAME, VERSION_NAME); - } - - @Test - @Override - public void getOpenedIssues() throws Exception { - issues = getService().getOpenedIssues(PROJECT_NAME); - } - - @Test - @Override - public void getClosedIssues() throws Exception { - issues = getService().getClosedIssues(PROJECT_NAME); - } - - @Test - @Override - public void getIssueTimeEntries() throws Exception { - timeEntries = getService().getIssueTimeEntries(PROJECT_NAME, ISSUE_ID); - } - - @Test - @Override - public void getAttachments() throws Exception { - attachments = getService().getAttachments(PROJECT_NAME, VERSION_NAME); - } -} Deleted: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineAnonymousServiceTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineAnonymousServiceTest.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineAnonymousServiceTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -1,93 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine; - -import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; - -import java.io.IOException; - -/** - * Created: 2 janv. 2010 - * - * @author tchemit <chemit(a)codelutin.com> - * @deprecated since 1.4, will be rethink in version 2.0 (avoid inheritance on tests). - */ -@Deprecated -public class DefaultRedmineAnonymousServiceTest extends AbstractRedmineServiceTest<DefaultRedmineAnonymousService> { - - public DefaultRedmineAnonymousServiceTest() { - super(DefaultRedmineAnonymousService.class); - } - - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - return fixtures.newAnonymousConfiguration(); - } - - @Test - @Override - public void getUserProjects() throws Exception { - // not for anonymous service - } - - @Test - @Override - public void addVersion() throws Exception { - // not for anonymous service - } - - @Test - @Override - public void addAttachment() throws Exception { - // not for anonymous service - } - - @Test - @Override - public void addNews() throws Exception { - // not for anonymous service - } - - @Test - @Override - public void updateVersion() throws Exception { - // not for anonymous service - } - - @Test - @Override - public void nextVersion() throws Exception { - // not for anonymous service - } - - @Test - @Override - public void addIssueTime() throws Exception { - // not for anonymous service - } - - -} Deleted: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceAsAnonymousTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceAsAnonymousTest.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceAsAnonymousTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -1,105 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine; - -import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import org.nuiton.jredmine.model.Attachment; -import org.nuiton.jredmine.model.News; -import org.nuiton.jredmine.model.TimeEntry; -import org.nuiton.jredmine.model.Version; - -import java.io.IOException; - -/** - * Created: 2 janv. 2010 - * - * @author tchemit <chemit(a)codelutin.com> - * @deprecated since 1.4, will be rethink in version 2.0 (avoid inheritance on tests). - */ -@Deprecated -public class DefaultRedmineServiceAsAnonymousTest extends AbstractRedmineServiceTest<DefaultRedmineService> { - - public DefaultRedmineServiceAsAnonymousTest() { - super(DefaultRedmineService.class); - } - - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - RestClientConfiguration configuration = fixtures.newLogguedConfiguration(); - configuration.setAnonymous(true); - return configuration; - } - - @Test(expected = RedmineServiceLoginException.class) - @Override - public void getUserProjects() throws Exception { - projects = getService().getUserProjects(); - } - - @Test(expected = RedmineServiceLoginException.class) - @Override - public void addVersion() throws Exception { - version = new Version(); - getService().addVersion(PROJECT_NAME, version); - } - - @Test(expected = RedmineServiceLoginException.class) - @Override - public void addAttachment() throws Exception { - attachment = new Attachment(); - getService().addAttachment(PROJECT_NAME, VERSION_NAME, attachment); - } - - @Test(expected = RedmineServiceLoginException.class) - @Override - public void addNews() throws Exception { - newz = new News(); - getService().addNews(PROJECT_NAME, newz); - } - - @Test(expected = RedmineServiceLoginException.class) - @Override - public void updateVersion() throws Exception { - version = new Version(); - getService().updateVersion(PROJECT_NAME, version); - } - - @Test(expected = RedmineServiceLoginException.class) - @Override - public void nextVersion() throws Exception { - - version = new Version(); - getService().nextVersion(PROJECT_NAME, VERSION_NAME, version); - } - - @Test(expected = RedmineServiceLoginException.class) - @Override - public void addIssueTime() throws Exception { - timeEntry = new TimeEntry(); - getService().addIssueTimeEntry(PROJECT_NAME, ISSUE_ID, timeEntry); - } - -} \ No newline at end of file Deleted: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -1,95 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine; - -import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; - -import java.io.IOException; - -/** - * @author tchemit <chemit(a)codelutin.com> - * @deprecated since 1.4, will be rethink in version 2.0 (avoid inheritance on tests). - */ - -@Deprecated -public class DefaultRedmineServiceTest extends AbstractRedmineServiceTest<DefaultRedmineService> { - - public DefaultRedmineServiceTest() { - super(DefaultRedmineService.class); - } - - @Override - protected RestClientConfiguration getConfiguration() throws IOException { - return fixtures.newLogguedConfiguration(); - } - - @Test - @Override - public void getUserProjects() throws Exception { - projects = getService().getUserProjects(); - } - - @Test - @Override - public void addVersion() throws Exception { - // TODO - } - - @Test - @Override - public void addAttachment() throws Exception { - // TODO - } - - @Test - @Override - public void addNews() throws Exception { - // TODO - } - - @Test - @Override - public void updateVersion() throws Exception { - // TODO - } - - @Test - @Override - public void nextVersion() throws Exception { - // TODO - } - - @Test - @Override - public void addIssueTime() throws Exception { -// TimeEntry timeEntry = new TimeEntry(); -// timeEntry.setActivityId(9); -// timeEntry.setComments("ajout time"); -// timeEntry.setHours(3.5f); -//// timeEntry.setSpentOn(new Date()); -// getService().addIssueTimeEntry(PROJECT_NAME, ISSUE_ID, timeEntry); - } -} Added: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousFixtureClassRule.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,63 @@ +package org.nuiton.jredmine; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assume; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import java.io.IOException; + +/** + * A class rule that provider the {@link RedmineFixtures} and check that the + * valid anonymous configuration is found. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineAnonymousFixtureClassRule implements TestRule { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RedmineAnonymousFixtureClassRule.class); + + RedmineFixtures fixtures = new RedmineFixtures(); + + RedmineServiceConfiguration conf; + + @Override + public Statement apply(Statement base, Description description) { + + Class<?> testClass = description.getTestClass(); + + try { + conf = fixtures.obtainRedmineConfiguration(); + + if (conf == null) { + + // could not find any configuration + if (log.isWarnEnabled()) { + log.warn("could not connect to server " + + fixtures.newAnonymousConfiguration() + ", will skip test " + + testClass.getName()); + } + Assume.assumeTrue(false); + } + // since having a configuration available, is by force anonymous + + } catch (IOException e) { + throw new IllegalStateException("Could not check jredmine configuration in test " + testClass.getName(), e); + + } + return base; + } + + public RedmineFixtures getFixtures() { + return fixtures; + } + + public RedmineServiceConfiguration getConf() { + return conf; + } +} Added: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineAnonymousServiceTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,170 @@ +package org.nuiton.jredmine; + +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; +import org.nuiton.jredmine.model.Version; + +import java.io.IOException; + +/** + * Tests the {@link RedmineAnonymousService} service. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineAnonymousServiceTest { + + @ClassRule + public static final RedmineAnonymousFixtureClassRule classRule = + new RedmineAnonymousFixtureClassRule(); + + @Rule + public final RedmineServer<RedmineAnonymousService> server = new RedmineServer<RedmineAnonymousService>(classRule.getFixtures()) { + + @Override + protected RedmineAnonymousService createService( + RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { + + return fixtures.newRedmineAnonymousService(configuration); + } + + @Override + protected RedmineServiceConfiguration createConfiguration() throws IOException { + RedmineServiceConfiguration conf = fixtures.newAnonymousConfiguration(); + return conf; + } + }; + + protected RedmineFixtures getFixtures() { + return server.getFixtures(); + } + + protected RedmineAnonymousService getService() { + return server.getService(); + } + + @Test + public void getProjects() throws Exception { + Project[] projects = getService().getProjects(); + Assert.assertNotNull(projects); + Assert.assertTrue(projects.length > 0); + } + + @Test + public void getProject() throws Exception { + Project project = getService().getProject(getFixtures().projectName()); + Assert.assertNotNull(project); + } + + @Test + public void getNews() throws Exception { + News[] news = getService().getNews(getFixtures().projectName()); + Assert.assertNotNull(news); + Assert.assertTrue(news.length > 0); + } + + @Test + public void getProjectIssues() throws Exception { + Issue[] issues = getService().getIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getVersions() throws Exception { + Version[] versions = getService().getVersions(getFixtures().projectName()); + Assert.assertNotNull(versions); + Assert.assertTrue(versions.length > 0); + } + + @Test + public void getVersion() throws Exception { + Version version = getService().getVersion(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(version); + } + + @Test + public void getIssueCategories() throws Exception { + // Need to be loggued ? don't know why :( Need to report a bug + IssueCategory[] issueCategories = getService().getIssueCategories(getFixtures().projectName()); + Assert.assertNotNull(issueCategories); + Assert.assertTrue(issueCategories.length > 0); + } + + @Test + public void getProjectMembers() throws Exception { + // Need to be loggued ? don't know why :( Need to report a bug + User[] users = getService().getProjectMembers(getFixtures().projectName()); + Assert.assertNotNull(users); + Assert.assertTrue(users.length > 0); + } + + @Test + public void getOpenedIssues() throws Exception { + Issue[] issues = getService().getOpenedIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getClosedIssues() throws Exception { + Issue[] issues = getService().getClosedIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getIssueTimeEntries() throws Exception { + TimeEntry[] timeEntries = getService().getIssueTimeEntries(getFixtures().projectName(), getFixtures().issueId()); + Assert.assertNotNull(timeEntries); + Assert.assertTrue(timeEntries.length > 0); + } + + @Test + public void getIssuePriorities() throws Exception { + IssuePriority[] issuePriorities = getService().getIssuePriorities(); + Assert.assertNotNull(issuePriorities); + Assert.assertTrue(issuePriorities.length > 0); + } + + @Test + public void getIssueStatuses() throws Exception { + IssueStatus[] issueStatuses = getService().getIssueStatuses(); + Assert.assertNotNull(issueStatuses); + Assert.assertTrue(issueStatuses.length > 0); + } + + @Test + public void getTrackers() throws Exception { + Tracker[] trackers = getService().getTrackers(getFixtures().projectName()); + Assert.assertNotNull(trackers); + Assert.assertTrue(trackers.length > 0); + } + + @Test + public void getVersionIssues() throws Exception { + Issue[] issues = getService().getIssues(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getAttachments() throws Exception { + Attachment[] attachments = getService().getAttachments(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(attachments); + Assert.assertTrue(attachments.length > 0); + } + +} \ No newline at end of file Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineFixtures.java 2012-07-15 19:08:28 UTC (rev 307) @@ -6,9 +6,11 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.io.rest.RestClientConfiguration; +import org.nuiton.io.rest.RestException; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.Issue; import org.nuiton.jredmine.model.IssueCategory; @@ -21,6 +23,7 @@ import org.nuiton.jredmine.model.User; import org.nuiton.jredmine.model.Version; import org.nuiton.jredmine.model.io.xpp3.RedmineDataConverter; +import org.nuiton.jredmine.rest.RedmineRestClient; import java.io.File; import java.io.IOException; @@ -38,20 +41,9 @@ */ public class RedmineFixtures { - /** Logger. */ private static final Log log = LogFactory.getLog(RedmineFixtures.class); - public static final String FILE_TO_UPLOAD_CONTENT = "Fichier à uploader"; -// -// public static final String PROJECT_NAME = "jredmine"; -// -// public static final String VERSION_NAME = "1.3"; -// -// public static final String ISSUE_ID = "1925"; - - private Project JRedmineProject; - private ArrayListMultimap<Class<?>, Object> model; private RestClientConfiguration anonymousConfiguration; @@ -74,30 +66,94 @@ return "1925"; } - public RestClientConfiguration newAnonymousConfiguration() + + protected RedmineServiceConfiguration obtainRedmineConfiguration() throws IOException { + + RedmineServiceConfiguration conf = newLogguedConfiguration(); + + boolean ok = false; + + RedmineRestClient client = new RedmineRestClient(conf); + + try { + + client.open(); + ok = client.isOpen(); + } catch (Exception e) { + + if (log.isDebugEnabled()) { + log.debug("Could not connect to redmine with configuration: " + conf, e); + } + + } finally { + try { + client.close(); + } catch (RestException e) { + if (log.isErrorEnabled()) { + log.error("Could not close session", e); + } + } + } + + if (!ok) { + + // try to connect anonymous + conf = newAnonymousConfiguration(); + + client = new RedmineRestClient(conf); + + try { + + client.open(); + ok = client.isOpen(); + } catch (Exception e) { + + if (log.isDebugEnabled()) { + log.debug("Could not connect to redmine with configuration: " + conf, e); + } + } finally { + try { + client.close(); + } catch (RestException e) { + if (log.isErrorEnabled()) { + log.error("Could not close session", e); + } + } + } + } + + if (!ok) { + + // no conf available + conf = null; + } + return conf; + } + + public RedmineServiceConfiguration newAnonymousConfiguration() throws IOException { - RestClientConfiguration conf = new FakeRedmineServiceConfiguration(); + RedmineServiceConfiguration conf = new FakeRedmineServiceConfiguration(); copyConfiguration(getAnonymousConfiguration(), conf); return conf; } - public RestClientConfiguration newLogguedConfiguration() + public RedmineServiceConfiguration newLogguedConfiguration() throws IOException { - RestClientConfiguration conf = new FakeRedmineServiceConfiguration(); + RedmineServiceConfiguration conf = new FakeRedmineServiceConfiguration(); copyConfiguration(getLogguedConfiguration(), conf); return conf; } - public RedmineAnonymousService newRedmineAnonymousService(RestClientConfiguration configuration) + public RedmineAnonymousService newRedmineAnonymousService(RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { - DefaultRedmineAnonymousService service = new DefaultRedmineAnonymousService(); + RedmineAnonymousService service = new DefaultRedmineAnonymousService(); service.init(configuration); return service; } - public RedmineService newRedmineService(RestClientConfiguration configuration) + public RedmineService newRedmineService(RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { - DefaultRedmineService service = new DefaultRedmineService(); + RedmineService service = new DefaultRedmineService(); service.init(configuration); return service; } @@ -235,32 +291,6 @@ return ts.get(pos); } - public Project getJRedmineProject() { - if (JRedmineProject == null) { - JRedmineProject = new Project(); - JRedmineProject.setName("jredmine"); - JRedmineProject.setIdentifier("jredmine"); - JRedmineProject.setIsPublic(true); - JRedmineProject.setHomepage("http://maven-site.nuiton.org/jredmine"); - JRedmineProject.setDescription( - "Permet de communiquer en java avec un serveur " + "redmine qui a installé le plugin rails jredmine"); - JRedmineProject.setId(36); - JRedmineProject.setStatus(1); - } - return JRedmineProject; - } - - - public static final String VERSION_TO_CREATE_NAME = "do_not_use_me"; - - public Version getVersion() { - Version version = new Version(); - version.setName(VERSION_TO_CREATE_NAME); - version.setDescription("Une version créée par les tests de jredmine," + - " ne pas utiliser,et modifiée"); - return version; - } - private void loadModel() throws Exception { model = ArrayListMultimap.create(); @@ -684,29 +714,58 @@ model.put(TimeEntry.class, tempE); } + public Version versionToAdd() { + Version version = new Version(); + version.setName(versionName()); + version.setId(Integer.valueOf(versionId())); + version.setDescription("Version to add"); + return version; + } - public Attachment getAttachment() { - Attachment result = new Attachment(); - File fileToUpload = null; - try { - fileToUpload = File.createTempFile("toupload", ".txt"); - FileUtils.write(fileToUpload, FILE_TO_UPLOAD_CONTENT); - result.setToUpload(fileToUpload); - result.setDescription("attachment description..."); - return result; - } catch (IOException e) { - throw new RuntimeException("Could not create temp file", e); - } + public Version versionToUpdate() { + Version version = new Version(); + version.setName(versionName()); + version.setId(Integer.valueOf(versionId())); + version.setDescription("Version to update"); + return version; + } + public String oldVersionName() { + return "1.2"; } + public News newsToAdd() { + News news = new News(); + news.setTitle("Title"); + news.setDescription("Description"); + news.setSummary("Summary"); + return news; + } + + public TimeEntry timeEntryToAdd() { + TimeEntry timeEntry = new TimeEntry(); + timeEntry.setComments("Comments"); + Date date = new Date(); + DateUtils.setYears(date, 2012); + DateUtils.setMonths(date, 7); + DateUtils.setDays(date, 15); + timeEntry.setSpentOn(date); + return timeEntry; + } + + public Attachment attachmentToAdd() { + Attachment attachmentToAdd = new Attachment(); + attachmentToAdd.setDescription("Description"); + return attachmentToAdd; + } + /** * Configuration of a redmine service for test purposes. * * @author tchemit <chemit(a)codelutin.com> * @since 1.4 */ - public static class FakeRedmineServiceConfiguration implements RestClientConfiguration { + public static class FakeRedmineServiceConfiguration implements RedmineServiceConfiguration { URL restUrl; @@ -782,8 +841,9 @@ @Override public String toString() { - ToStringBuilder b = new ToStringBuilder(this, - ToStringStyle.MULTI_LINE_STYLE + ToStringBuilder b = new ToStringBuilder( + this, + ToStringStyle.MULTI_LINE_STYLE ); b.append("redmineUrl", restUrl); if (anonymous) { Added: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineLogguedFixtureClassRule.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,74 @@ +package org.nuiton.jredmine; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assume; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import java.io.IOException; + +/** + * A class rule that provider the {@link RedmineFixtures} and check that the + * valid loggued configuration is found. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineLogguedFixtureClassRule implements TestRule { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(RedmineLogguedFixtureClassRule.class); + + RedmineFixtures fixtures = new RedmineFixtures(); + + RedmineServiceConfiguration conf; + + @Override + public Statement apply(Statement base, Description description) { + + Class<?> testClass = description.getTestClass(); + + try { + conf = fixtures.obtainRedmineConfiguration(); + + if (conf == null) { + + // could not find any configuration + if (log.isWarnEnabled()) { + log.warn("could not connect to server " + + fixtures.newAnonymousConfiguration() + ", will skip test " + + testClass.getName()); + } + Assume.assumeTrue(false); + } else { + + // configuration must NOT be anonymous + + if (conf.isAnonymous()) { + + if (log.isWarnEnabled()) { + log.warn("A authenticated configuration was required, will skip test " + + testClass.getName()); + } + Assume.assumeTrue(false); + } + } + + } catch (IOException e) { + throw new IllegalStateException("Could not check jredmine configuration in test " + testClass.getName(), e); + + } + return base; + } + + public RedmineFixtures getFixtures() { + return fixtures; + } + + public RedmineServiceConfiguration getConf() { + return conf; + } +} Added: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,86 @@ +package org.nuiton.jredmine; + +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; + +import java.io.IOException; + +/** + * A redmine server resource used by tests. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public abstract class RedmineServer<S extends RedmineAnonymousService> extends TestWatcher { + + /** + * Fixtures. + * + * @since 1.4 + */ + protected final RedmineFixtures fixtures; + + /** + * Service configuration to use. + * + * @since 1.4 + */ + protected RedmineServiceConfiguration configuration; + + /** + * Redmine service to use. + * + * @since 1.4 + */ + protected S service; + + public RedmineServer(RedmineFixtures fixtures) { + this.fixtures = fixtures; + } + + protected abstract S createService(RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException; + + protected abstract RedmineServiceConfiguration createConfiguration() throws IOException; + + public RedmineFixtures getFixtures() { + return fixtures; + } + + public RedmineServiceConfiguration getConfiguration() { + return configuration; + } + + public S getService() { + return service; + } + + @Override + protected void starting(Description description) { + + try { + configuration = createConfiguration(); + } catch (IOException e) { + + throw new IllegalStateException("Could not create configuration", e); + } + + try { + service = createService(configuration); + } catch (Exception e) { + throw new IllegalStateException("Could not create service", e); + } + } + + @Override + protected void finished(Description description) { + + if (service != null) { + try { + service.destroy(); + } catch (RedmineServiceException e) { + throw new IllegalStateException("Could not close service ", e); + } + } + } + +} \ No newline at end of file Property changes on: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceAsAnonymousTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,205 @@ +package org.nuiton.jredmine; + +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; +import org.nuiton.jredmine.model.Version; + +import java.io.IOException; + +/** + * Tests the {@link RedmineService} service with anonymous configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineServiceAsAnonymousTest { + + @ClassRule + public static final RedmineAnonymousFixtureClassRule classRule = + new RedmineAnonymousFixtureClassRule(); + + + protected RedmineFixtures getFixtures() { + return server.getFixtures(); + } + + @Rule + public final RedmineServer<RedmineService> server = new RedmineServer<RedmineService>(classRule.getFixtures()) { + + @Override + protected RedmineService createService( + RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { + + return fixtures.newRedmineService(configuration); + } + + @Override + protected RedmineServiceConfiguration createConfiguration() throws IOException { + RedmineServiceConfiguration conf = fixtures.newAnonymousConfiguration(); + return conf; + } + }; + + protected RedmineService getService() { + return server.getService(); + } + + @Test + public void getProjects() throws Exception { + Project[] projects = getService().getProjects(); + Assert.assertNotNull(projects); + Assert.assertTrue(projects.length > 0); + } + + @Test + public void getProject() throws Exception { + Project project = getService().getProject(getFixtures().projectName()); + Assert.assertNotNull(project); + } + + @Test + public void getNews() throws Exception { + News[] news = getService().getNews(getFixtures().projectName()); + Assert.assertNotNull(news); + Assert.assertTrue(news.length > 0); + } + + @Test + public void getProjectIssues() throws Exception { + Issue[] issues = getService().getIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getVersions() throws Exception { + Version[] versions = getService().getVersions(getFixtures().projectName()); + Assert.assertNotNull(versions); + Assert.assertTrue(versions.length > 0); + } + + @Test + public void getVersion() throws Exception { + Version version = getService().getVersion(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(version); + } + + @Test + public void getIssueCategories() throws Exception { + // Need to be loggued ? don't know why :( Need to report a bug + IssueCategory[] issueCategories = getService().getIssueCategories(getFixtures().projectName()); + Assert.assertNotNull(issueCategories); + Assert.assertTrue(issueCategories.length > 0); + } + + @Test + public void getProjectMembers() throws Exception { + // Need to be loggued ? don't know why :( Need to report a bug + User[] users = getService().getProjectMembers(getFixtures().projectName()); + Assert.assertNotNull(users); + Assert.assertTrue(users.length > 0); + } + + @Test + public void getOpenedIssues() throws Exception { + Issue[] issues = getService().getOpenedIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getClosedIssues() throws Exception { + Issue[] issues = getService().getClosedIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getIssueTimeEntries() throws Exception { + TimeEntry[] timeEntries = getService().getIssueTimeEntries(getFixtures().projectName(), getFixtures().issueId()); + Assert.assertNotNull(timeEntries); + Assert.assertTrue(timeEntries.length > 0); + } + + @Test + public void getIssuePriorities() throws Exception { + IssuePriority[] issuePriorities = getService().getIssuePriorities(); + Assert.assertNotNull(issuePriorities); + Assert.assertTrue(issuePriorities.length > 0); + } + + @Test + public void getIssueStatuses() throws Exception { + IssueStatus[] issueStatuses = getService().getIssueStatuses(); + Assert.assertNotNull(issueStatuses); + Assert.assertTrue(issueStatuses.length > 0); + } + + @Test + public void getTrackers() throws Exception { + Tracker[] trackers = getService().getTrackers(getFixtures().projectName()); + Assert.assertNotNull(trackers); + Assert.assertTrue(trackers.length > 0); + } + + @Test + public void getVersionIssues() throws Exception { + Issue[] issues = getService().getIssues(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getAttachments() throws Exception { + Attachment[] attachments = getService().getAttachments(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(attachments); + Assert.assertTrue(attachments.length > 0); + } + + @Test(expected = RedmineServiceLoginException.class) + public void getUserProjects() throws Exception { + getService().getUserProjects(); + } + + @Test(expected = RedmineServiceLoginException.class) + public void addVersion() throws Exception { + getService().addVersion(getFixtures().projectName(), new Version()); + } + + @Test(expected = RedmineServiceLoginException.class) + public void addAttachment() throws Exception { + getService().addAttachment(getFixtures().projectName(), getFixtures().versionName(), new Attachment()); + } + + @Test(expected = RedmineServiceLoginException.class) + public void addNews() throws Exception { + getService().addNews(getFixtures().projectName(), new News()); + } + + @Test(expected = RedmineServiceLoginException.class) + public void updateVersion() throws Exception { + getService().updateVersion(getFixtures().projectName(), new Version()); + } + + @Test(expected = RedmineServiceLoginException.class) + public void nextVersion() throws Exception { + getService().nextVersion(getFixtures().projectName(), getFixtures().versionName(), new Version()); + } + + @Test(expected = RedmineServiceLoginException.class) + public void addIssueTime() throws Exception { + getService().addIssueTimeEntry(getFixtures().projectName(), getFixtures().issueId(), new TimeEntry()); + } +} Added: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineServiceTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,212 @@ +package org.nuiton.jredmine; + +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.Issue; +import org.nuiton.jredmine.model.IssueCategory; +import org.nuiton.jredmine.model.IssuePriority; +import org.nuiton.jredmine.model.IssueStatus; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.Project; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Tracker; +import org.nuiton.jredmine.model.User; +import org.nuiton.jredmine.model.Version; + +import java.io.IOException; + +/** + * Tests the {@link RedmineService} service with loggued configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineServiceTest { + + @ClassRule + public static final RedmineLogguedFixtureClassRule classRule = + new RedmineLogguedFixtureClassRule(); + + @Rule + public final RedmineServer<RedmineService> server = new RedmineServer<RedmineService>(classRule.getFixtures()) { + + @Override + protected RedmineService createService( + RedmineServiceConfiguration configuration) throws IOException, RedmineServiceException { + return fixtures.newRedmineService(configuration); + } + + @Override + protected RedmineServiceConfiguration createConfiguration() throws IOException { + RedmineServiceConfiguration conf = fixtures.newLogguedConfiguration(); + return conf; + } + }; + + protected RedmineFixtures getFixtures() { + return server.getFixtures(); + } + + protected RedmineService getService() { + return server.getService(); + } + + @Test + public void getProjects() throws Exception { + Project[] projects = getService().getProjects(); + Assert.assertNotNull(projects); + Assert.assertTrue(projects.length > 0); + } + + @Test + public void getProject() throws Exception { + Project project = getService().getProject(getFixtures().projectName()); + Assert.assertNotNull(project); + } + + @Test + public void getNews() throws Exception { + News[] news = getService().getNews(getFixtures().projectName()); + Assert.assertNotNull(news); + Assert.assertTrue(news.length > 0); + } + + @Test + public void getProjectIssues() throws Exception { + Issue[] issues = getService().getIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getVersions() throws Exception { + Version[] versions = getService().getVersions(getFixtures().projectName()); + Assert.assertNotNull(versions); + Assert.assertTrue(versions.length > 0); + } + + @Test + public void getVersion() throws Exception { + Version version = getService().getVersion(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(version); + } + + @Test + public void getIssueCategories() throws Exception { + // Need to be loggued ? don't know why :( Need to report a bug + IssueCategory[] issueCategories = getService().getIssueCategories(getFixtures().projectName()); + Assert.assertNotNull(issueCategories); + Assert.assertTrue(issueCategories.length > 0); + } + + @Test + public void getProjectMembers() throws Exception { + // Need to be loggued ? don't know why :( Need to report a bug + User[] users = getService().getProjectMembers(getFixtures().projectName()); + Assert.assertNotNull(users); + Assert.assertTrue(users.length > 0); + } + + @Test + public void getOpenedIssues() throws Exception { + Issue[] issues = getService().getOpenedIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getClosedIssues() throws Exception { + Issue[] issues = getService().getClosedIssues(getFixtures().projectName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getIssueTimeEntries() throws Exception { + TimeEntry[] timeEntries = getService().getIssueTimeEntries(getFixtures().projectName(), getFixtures().issueId()); + Assert.assertNotNull(timeEntries); + Assert.assertTrue(timeEntries.length > 0); + } + + @Test + public void getIssuePriorities() throws Exception { + IssuePriority[] issuePriorities = getService().getIssuePriorities(); + Assert.assertNotNull(issuePriorities); + Assert.assertTrue(issuePriorities.length > 0); + } + + @Test + public void getIssueStatuses() throws Exception { + IssueStatus[] issueStatuses = getService().getIssueStatuses(); + Assert.assertNotNull(issueStatuses); + Assert.assertTrue(issueStatuses.length > 0); + } + + @Test + public void getTrackers() throws Exception { + Tracker[] trackers = getService().getTrackers(getFixtures().projectName()); + Assert.assertNotNull(trackers); + Assert.assertTrue(trackers.length > 0); + } + + @Test + public void getVersionIssues() throws Exception { + Issue[] issues = getService().getIssues(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(issues); + Assert.assertTrue(issues.length > 0); + } + + @Test + public void getAttachments() throws Exception { + Attachment[] attachments = getService().getAttachments(getFixtures().projectName(), getFixtures().versionName()); + Assert.assertNotNull(attachments); + Assert.assertTrue(attachments.length > 0); + } + + @Ignore + @Test + public void addVersion() throws Exception { + getService().addVersion(getFixtures().projectName(), getFixtures().versionToAdd()); + } + + @Ignore + @Test + public void addAttachment() throws Exception { + Version version = getFixtures().versionToUpdate(); + Attachment attachment = getFixtures().attachmentToAdd(); + Attachment updatedAttachment = getService().addAttachment( + getFixtures().projectName(), + version.getName(), + attachment + ); + Assert.assertNotNull(updatedAttachment); + } + + @Ignore + @Test + public void addNews() throws Exception { + getService().addNews(getFixtures().projectName(), getFixtures().newsToAdd()); + } + + @Ignore + @Test + public void updateVersion() throws Exception { + getService().updateVersion(getFixtures().projectName(), getFixtures().versionToUpdate()); + } + + @Ignore + @Test + public void nextVersion() throws Exception { + getService().nextVersion(getFixtures().projectName(), getFixtures().versionName(), getFixtures().versionToUpdate()); + } + + @Ignore + @Test + public void addIssueTime() throws Exception { + getService().addIssueTimeEntry(getFixtures().projectName(), getFixtures().issueId(), getFixtures().timeEntryToAdd()); + } +} Deleted: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineTestContract.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineTestContract.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineTestContract.java 2012-07-15 19:08:28 UTC (rev 307) @@ -1,90 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine; - -/** - * Contract of methods to tests for both redmine rest client and redmine service. - * - * Created: 1 janv. 2010 - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0.3 - * @deprecated will be removed in version 2.0 - */ -@Deprecated -public interface RedmineTestContract { - - String PROJECT_NAME = "jredmine"; - - String VERSION_NAME = "1.3"; - - String ISSUE_ID = "1925"; - - void getProjects() throws Exception; - - void getIssuePriorities() throws Exception; - - void getIssueStatuses() throws Exception; - - void getProject() throws Exception; - - void getIssueCategories() throws Exception; - - void getTrackers() throws Exception; - - void getNews() throws Exception; - - void getUserProjects() throws Exception; - - void getProjectMembers() throws Exception; - - void getProjectIssues() throws Exception; - - void getVersions() throws Exception; - - void getVersion() throws Exception; - - void getVersionIssues() throws Exception; - - void getOpenedIssues() throws Exception; - - void getClosedIssues() throws Exception; - - void getIssueTimeEntries() throws Exception; - - void getAttachments() throws Exception; - - void addVersion() throws Exception; - - void addAttachment() throws Exception; - - void addNews() throws Exception; - - void updateVersion() throws Exception; - - void nextVersion() throws Exception; - - void addIssueTime() throws Exception; -} Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -320,23 +320,23 @@ } } - public static <T> SingleDataSupplier<T> newSingleData(Class<T> type) { + static <T> SingleDataSupplier<T> newSingleData(Class<T> type) { return new SingleDataSupplier<T>(type); } - public static <T> EmptyListDataSupplier<T> newEmptyListData(Class<T> type) { + static <T> EmptyListDataSupplier<T> newEmptyListData(Class<T> type) { return new EmptyListDataSupplier<T>(type); } - public static <T> SingletonListDataSupplier<T> newSingletonListData(Class<T> type) { + static <T> SingletonListDataSupplier<T> newSingletonListData(Class<T> type) { return new SingletonListDataSupplier<T>(type); } - public static <T> MultiListDataSupplier<T> newMultiListData(Class<T> type) { + static <T> MultiListDataSupplier<T> newMultiListData(Class<T> type) { return new MultiListDataSupplier<T>(type); } - public <T> void assertMyListEquals(Class<T> type, List<T> expecteds, T[] actuals) + <T> void assertMyListEquals(Class<T> type, List<T> expecteds, T... actuals) throws Exception { junit.framework.Assert.assertNotNull(actuals); Added: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java (rev 0) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRequestFactoryTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -0,0 +1,215 @@ +package org.nuiton.jredmine.rest; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.io.rest.RequestFactory; +import org.nuiton.io.rest.RestRequest; +import org.nuiton.jredmine.RedmineFixtures; +import org.nuiton.jredmine.model.Attachment; +import org.nuiton.jredmine.model.ModelHelper; +import org.nuiton.jredmine.model.News; +import org.nuiton.jredmine.model.TimeEntry; +import org.nuiton.jredmine.model.Version; + +import java.util.Arrays; + +/** + * Tests the {@link RedmineRequestFactory}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class RedmineRequestFactoryTest { + + protected static final RedmineFixtures fixtures = new RedmineFixtures(); + + protected RequestFactory factory; + + protected String projectName; + + protected String versionName; + + protected String issueId; + + @Before + public void setUp() throws Exception { + factory = new RedmineRequestFactory(); + + factory.addDefaultRequests(); + + projectName = fixtures.projectName(); + versionName = fixtures.versionName(); + issueId = fixtures.issueId(); + } + + @Test + public void login() { + assertRequestParameters( + assertRequestUrl("/jredmine/login", ModelHelper.LOGIN_REQUEST_NAME, "redmineuser", "redminepassword"), + "username", "redmineuser", "password", "redminepassword"); + } + + @Test + public void logout() { + assertRequestParameters(assertRequestUrl("/jredmine/logout", ModelHelper.LOGOUT_REQUEST_NAME)); + } + + @Test + public void ping() { + assertRequestParameters(assertRequestUrl("/jredmine/ping", ModelHelper.PING_REQUEST_NAME)); + } + + @Test + public void getAllProjects() { + assertRequestParameters(assertRequestUrl("/jredmine/get_projects.xml", ModelHelper.GET_ALL_PROJECT_REQUEST_NAME)); + } + + @Test + public void getAllIssueStatuses() { + assertRequestParameters(assertRequestUrl("/jredmine/get_issue_statuses.xml", ModelHelper.GET_ALL_ISSUE_STATUS_REQUEST_NAME)); + } + + @Test + public void getAllIssuePriorities() { + assertRequestParameters(assertRequestUrl("/jredmine/get_issue_priorities.xml", ModelHelper.GET_ALL_ISSUE_PRIORITY_REQUEST_NAME)); + } + + @Test + public void getProject() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project.xml/" + projectName, ModelHelper.GET_PROJECT_REQUEST_NAME, projectName)); + } + + @Test + public void getAllIssues() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project_issues.xml/" + projectName, ModelHelper.GET_ALL_PROJECT_ISSUES_REQUEST_NAME, projectName)); + } + + @Test + public void getAllOpenedIssues() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project_opened_issues.xml/" + projectName, ModelHelper.GET_ALL_PROJECT_OPENED_ISSUES_REQUEST_NAME, projectName)); + } + + @Test + public void getAllClosesIssues() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project_closed_issues.xml/" + projectName, ModelHelper.GET_ALL_PROJECT_CLOSED_ISSUES_REQUEST_NAME, projectName)); + } + + @Test + public void getAllVersions() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project_versions.xml/" + projectName, ModelHelper.GET_ALL_VERSION_REQUEST_NAME, projectName)); + } + + @Test + public void getAllIssueCategories() { + assertRequestParameters(assertRequestUrl("/jredmine/get_issue_categories.xml/" + projectName, ModelHelper.GET_ALL_ISSUE_CATEGORY_REQUEST_NAME, projectName)); + } + + @Test + public void getAllTrackers() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project_trackers.xml/" + projectName, ModelHelper.GET_ALL_TRACKER_REQUEST_NAME, projectName)); + } + + @Test + public void getAllUsers() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project_users.xml/" + projectName, ModelHelper.GET_ALL_USER_REQUEST_NAME, projectName)); + } + + @Test + public void getAllNews() { + assertRequestParameters(assertRequestUrl("/jredmine/get_project_news.xml/" + projectName, ModelHelper.GET_ALL_NEWS_REQUEST_NAME, projectName)); + } + + @Test + public void addVersion() { + Version version = fixtures.versionToAdd(); + assertRequestParameters(assertRequestUrl("/jredmine/add_version.xml/" + projectName, ModelHelper.ADD_VERSION_REQUEST_NAME, projectName, version), + "version[name]", "1.3", "version[description]", "Version to add", "version[effective_date]", "", "version[status]", "open"); + } + + @Test + public void updateVersion() { + Version version = fixtures.versionToUpdate(); + assertRequestParameters(assertRequestUrl("/jredmine/update_version.xml/" + projectName, ModelHelper.UPDATE_VERSION_REQUEST_NAME, projectName, version), + "version[name]", "1.3", "version[description]", "Version to update", "version[effective_date]", "", "version[status]", "open"); + } + + @Test + public void nextVersion() { + Version version = fixtures.versionToUpdate(); + String oldVersionName = fixtures.oldVersionName(); + assertRequestParameters(assertRequestUrl("/jredmine/next_version.xml/" + projectName, ModelHelper.NEXT_VERSION_REQUEST_NAME, projectName, version, oldVersionName), + "oldVersionName", oldVersionName, "version[name]", "1.3", "version[description]", "Version to update", "version[effective_date]", "", "version[status]", "open"); + } + + @Test + public void addNews() { + News newsToAdd = fixtures.newsToAdd(); + assertRequestParameters(assertRequestUrl("/jredmine/add_news.xml/" + projectName, ModelHelper.ADD_NEWS_REQUEST_NAME, projectName, newsToAdd), + "news[title]", newsToAdd.getTitle(), + "news[summary]", newsToAdd.getSummary(), + "news[description]", newsToAdd.getDescription()); + } + + @Test + public void getVersion() { + assertRequestParameters(assertRequestUrl("/jredmine/get_version.xml/" + projectName, ModelHelper.GET_VERSION_REQUEST_NAME, projectName, versionName), + "version_name", versionName); + } + + @Test + public void getAllVersionIssues() { + assertRequestParameters(assertRequestUrl("/jredmine/get_version_issues.xml/" + projectName, ModelHelper.GET_ALL_ISSUES_REQUEST_NAME, projectName, versionName), + "version_name", versionName); + } + + @Test + public void getAllAttachments() { + assertRequestParameters(assertRequestUrl("/jredmine/get_version_attachments.xml/" + projectName, ModelHelper.GET_ALL_ATTACHMENTS_REQUEST_NAME, projectName, versionName), + "version_name", versionName); + } + + @Test + public void addAttachment() { + Attachment attachment = fixtures.attachmentToAdd(); + + assertRequestParameters(assertRequestUrl("/jredmine/add_version_attachment.xml/" + projectName, ModelHelper.ADD_ATTACHMENT_REQUEST_NAME, projectName, versionName, attachment), + "version_name", versionName, + "attachment[description]", attachment.getDescription()); + } + + @Test + public void getAllIssueTimeEntires() { + assertRequestParameters(assertRequestUrl("/jredmine/get_issue_times.xml/" + projectName, ModelHelper.GET_ALL_ISSUE_TIME_ENTRY_REQUEST_NAME, projectName, issueId), + "issue_id", issueId); + } + + @Test + public void addIssueTimeEntry() { + TimeEntry timeEntry = fixtures.timeEntryToAdd(); + assertRequestParameters(assertRequestUrl("/jredmine/add_issue_time.xml/" + projectName, ModelHelper.ADD_ISSUE_TIME_ENTRY_REQUEST_NAME, projectName, issueId, timeEntry), + "issue_id", issueId, + "time_entry[activity_id]", timeEntry.getActivityId() + "", + "time_entry[spent_on]", "2012-07-15", + "time_entry[hours]", timeEntry.getHours() + "", + "time_entry[comments]", timeEntry.getComments()); + } + + protected RestRequest assertRequestUrl(String expectedUrl, + String requestId, + Object... args) { + + RestRequest request = factory.getRequest(requestId, args); + + Assert.assertNotNull(request); + String actual = request.toPath(""); + Assert.assertEquals(expectedUrl, actual); + return request; + } + + protected void assertRequestParameters(RestRequest request, + String... expectedParams) { + String[] actual = request.getParameters(); + Assert.assertArrayEquals("Expected:" + Arrays.toString(expectedParams) + " but was:" + Arrays.toString(actual), expectedParams, actual); + } +} Modified: branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java 2012-07-15 18:29:25 UTC (rev 306) +++ branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java 2012-07-15 19:08:28 UTC (rev 307) @@ -28,73 +28,55 @@ import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.util.IOUtil; import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.ClassRule; import org.junit.Test; -import org.nuiton.io.rest.RestClientConfiguration; -import org.nuiton.io.rest.RestException; import org.nuiton.io.rest.RestRequest; +import org.nuiton.jredmine.RedmineAnonymousFixtureClassRule; import org.nuiton.jredmine.RedmineFixtures; -import org.nuiton.jredmine.RedmineTestContract; +import org.nuiton.jredmine.RedmineServiceConfiguration; import org.nuiton.jredmine.model.ModelHelper; -import java.io.IOException; import java.io.InputStream; /** * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 - * @deprecated since 1.4, will be rethink in version 2.0 (avoid inheritance on tests). */ -@Deprecated -public class RedmineRestClientTest implements RedmineTestContract { +public class RedmineRestClientTest { /** Logger. */ private static final Log log = LogFactory.getLog(RedmineRestClientTest.class); + @ClassRule + public static final RedmineAnonymousFixtureClassRule checkConfigRule = new RedmineAnonymousFixtureClassRule(); - private static final RedmineFixtures fixtures = new RedmineFixtures(); - - static RestClientConfiguration configuration; - - RedmineRestClient client; - - public RedmineRestClientTest() { + protected RedmineFixtures getFixtures() { + return checkConfigRule.getFixtures(); } - @BeforeClass - public static void setUpClass() throws Exception { + protected RedmineRestClient client; - configuration = fixtures.newAnonymousConfiguration(); + protected String projectName; - RedmineRestClient client = new RedmineRestClient(configuration); - try { + protected String versionName; - client.open(); - } catch (Exception e) { + protected String issueId; - // could not log - if (log.isWarnEnabled()) { - log.warn("could not connect to server " + configuration.getRestUrl() + ", will skip test " + RedmineRestClientTest.class.getName()); - } - } finally { - Assume.assumeTrue(client.isOpen()); - } - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - @Before public void setUp() throws Exception { - client = new RedmineRestClient(configuration); + RedmineFixtures fixtures = checkConfigRule.getFixtures(); + + client = new RedmineRestClient(getConfiguration()); client.open(); + + projectName = fixtures.projectName(); + versionName = fixtures.versionName(); + issueId = fixtures.issueId(); } @After @@ -117,173 +99,157 @@ Assert.assertFalse(client.isOpen()); } - @Override @Test public void getProjects() throws Exception { - doRequest(ModelHelper.GET_ALL_PROJECT_REQUEST_NAME); + askData(ModelHelper.GET_ALL_PROJECT_REQUEST_NAME); } - @Override @Test public void getIssuePriorities() throws Exception { - doRequest(ModelHelper.GET_ALL_ISSUE_PRIORITY_REQUEST_NAME); + askData(ModelHelper.GET_ALL_ISSUE_PRIORITY_REQUEST_NAME); } - @Override @Test public void getIssueStatuses() throws Exception { - doRequest(ModelHelper.GET_ALL_ISSUE_STATUS_REQUEST_NAME); + askData(ModelHelper.GET_ALL_ISSUE_STATUS_REQUEST_NAME); } - @Override @Test public void getProject() throws Exception { - doRequest(ModelHelper.GET_PROJECT_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_PROJECT_REQUEST_NAME, projectName); } - @Override @Test public void getIssueCategories() throws Exception { - doRequest(ModelHelper.GET_ALL_ISSUE_CATEGORY_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_ISSUE_CATEGORY_REQUEST_NAME, projectName); } - @Override @Test public void getTrackers() throws Exception { - doRequest(ModelHelper.GET_ALL_TRACKER_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_TRACKER_REQUEST_NAME, projectName); } - @Override @Test public void getNews() throws Exception { - doRequest(ModelHelper.GET_ALL_NEWS_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_NEWS_REQUEST_NAME, projectName); } - @Override - public void getUserProjects() throws Exception { - - doRequest(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME, PROJECT_NAME); - } - - @Override + @Test public void getProjectMembers() throws Exception { - doRequest(ModelHelper.GET_ALL_USER_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_USER_REQUEST_NAME, projectName); } - @Override @Test public void getProjectIssues() throws Exception { - doRequest(ModelHelper.GET_ALL_PROJECT_ISSUES_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_PROJECT_ISSUES_REQUEST_NAME, projectName); } - @Override @Test public void getVersions() throws Exception { - doRequest(ModelHelper.GET_ALL_VERSION_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_VERSION_REQUEST_NAME, projectName); } - @Override @Test public void getVersion() throws Exception { - doRequest(ModelHelper.GET_VERSION_REQUEST_NAME, PROJECT_NAME, VERSION_NAME); + askData(ModelHelper.GET_VERSION_REQUEST_NAME, projectName, versionName); } - @Override @Test public void getVersionIssues() throws Exception { - doRequest(ModelHelper.GET_ALL_ISSUES_REQUEST_NAME, PROJECT_NAME, VERSION_NAME); + askData(ModelHelper.GET_ALL_ISSUES_REQUEST_NAME, projectName, versionName); } - @Override @Test public void getOpenedIssues() throws Exception { - doRequest(ModelHelper.GET_ALL_PROJECT_OPENED_ISSUES_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_PROJECT_OPENED_ISSUES_REQUEST_NAME, projectName); } - @Override @Test public void getClosedIssues() throws Exception { - doRequest(ModelHelper.GET_ALL_PROJECT_CLOSED_ISSUES_REQUEST_NAME, PROJECT_NAME); + askData(ModelHelper.GET_ALL_PROJECT_CLOSED_ISSUES_REQUEST_NAME, projectName); } - @Override @Test public void getIssueTimeEntries() throws Exception { - doRequest(ModelHelper.GET_ALL_ISSUE_TIME_ENTRY_REQUEST_NAME, PROJECT_NAME, ISSUE_ID); + askData(ModelHelper.GET_ALL_ISSUE_TIME_ENTRY_REQUEST_NAME, projectName, issueId); } - - @Override @Test public void getAttachments() throws Exception { - doRequest(ModelHelper.GET_ALL_ATTACHMENTS_REQUEST_NAME, PROJECT_NAME, VERSION_NAME); + askData(ModelHelper.GET_ALL_ATTACHMENTS_REQUEST_NAME, projectName, versionName); } - @Override + @Test + public void getUserProjects() throws Exception { + + Assume.assumeTrue(!getConfiguration().isAnonymous()); + askData(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME, projectName); + } + + @Test public void addVersion() throws Exception { + Assume.assumeTrue(!getConfiguration().isAnonymous()); //TODO } - @Override @Test public void addAttachment() throws Exception { + Assume.assumeTrue(!getConfiguration().isAnonymous()); //TODO } - @Override @Test public void addNews() throws Exception { + Assume.assumeTrue(!getConfiguration().isAnonymous()); //TODO } - @Override @Test public void updateVersion() throws Exception { + Assume.assumeTrue(!getConfiguration().isAnonymous()); //TODO } - @Override @Test public void nextVersion() throws Exception { + Assume.assumeTrue(!getConfiguration().isAnonymous()); //TODO } - @Override @Test public void addIssueTime() throws Exception { + Assume.assumeTrue(!getConfiguration().isAnonymous()); //TODO } - protected void doRequest(String requestId, Object... params) throws IOException, RestException { + protected void askData(String requestId, Object... params) throws Exception { - RestRequest request; - InputStream askData; - String toString; - - request = client.getRequest(requestId, params); - askData = client.askData(request); - toString = IOUtil.toString(askData); - if (configuration.isVerbose()) { - if (log.isInfoEnabled()) { - log.info(toString); - } + RestRequest request = client.getRequest(requestId, params); + InputStream askData = client.askData(request); + String toString = IOUtil.toString(askData); + if (getConfiguration().isVerbose() && log.isInfoEnabled()) { + log.info(toString); } } + + protected RedmineServiceConfiguration getConfiguration() { + return checkConfigRule.getConf(); + } }

1 0

r306 - branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 20:29:25 +0200 (Sun, 15 Jul 2012) New Revision: 306 Url: http://nuiton.org/repositories/revision/jredmine/306 Log: let request builder not public api Removed: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/IssueScopeRequestBuilder.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java Deleted: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java 2012-07-15 11:59:36 UTC (rev 305) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java 2012-07-15 18:29:25 UTC (rev 306) @@ -1,124 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine.rest; - -import com.google.common.base.Joiner; -import org.apache.commons.lang3.ArrayUtils; -import org.nuiton.io.rest.RestMethod; -import org.nuiton.io.rest.RestRequest; -import org.nuiton.io.rest.RestRequestBuilder; - -import java.io.File; -import java.util.Map; - -/** - * Default {@link RestRequestBuilder} to be used in {@link RedmineRestClient}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0.0 - */ -public class DefaultRequestBuilder implements RestRequestBuilder { - - private static final long serialVersionUID = 1L; - - protected String name; - - protected String[] action; - - protected final RestMethod method; - - public DefaultRequestBuilder(String name, - RestMethod method, - String... action) { - this.name = name; - this.action = action; - this.method = method; - } - - @Override - public String getName() { - return name; - } - - /** - * @param args the args of the request - * @return TODO - */ - public String[] getParameters(Object... args) { - // by default, no parameter - return ArrayUtils.EMPTY_STRING_ARRAY; - } - - public String[] getPath(Object... args) { - // by default, path is contextPath / action - return action; - } - - public Map<String, File> getAttachments(Object... args) { - // by default, no attachments - return null; - } - - @Override - public RestRequest create(final Object... args) { - - return new RestRequest() { - - @Override - public String[] getPath() { - return DefaultRequestBuilder.this.getPath(args); - } - - @Override - public String[] getParameters() { - return DefaultRequestBuilder.this.getParameters(args); - } - - @Override - public Map<String, File> getAttachments() { - return DefaultRequestBuilder.this.getAttachments(args); - } - - @Override - public boolean containsAttachments() { - Map<String, File> attachments = getAttachments(); - return attachments != null && !attachments.isEmpty(); - } - - @Override - public String toPath(String redmineUrl) { - String result = redmineUrl + "/" + - Joiner.on('/').join(getPath()); - return result; - } - - @Override - public RestMethod getMethod() { - return method; - } - - }; - } -} Deleted: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/IssueScopeRequestBuilder.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/IssueScopeRequestBuilder.java 2012-07-15 11:59:36 UTC (rev 305) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/IssueScopeRequestBuilder.java 2012-07-15 18:29:25 UTC (rev 306) @@ -1,63 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine.rest; - -import org.nuiton.io.rest.RestMethod; - -/** - * Builder of requests which are in a project and issue context. - * - * Created: 1 janv. 2010 - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0.3 - */ -public class IssueScopeRequestBuilder extends ProjectScopeRequestBuilder { - - private static final long serialVersionUID = 1L; - - public IssueScopeRequestBuilder(String name, - RestMethod method, - String... action) { - super(name, method, action); - } - - public IssueScopeRequestBuilder(String name, String... action) { - this(name, null, action); - } - - @Override - public String[] getParameters(Object... args) { - - // args 1 = project id - // args 2 = issue id - - String issueId = (String) args[1]; - - return new String[]{ - "issue_id", issueId - }; - } -} Deleted: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java 2012-07-15 11:59:36 UTC (rev 305) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java 2012-07-15 18:29:25 UTC (rev 306) @@ -1,61 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine.rest; - -import org.nuiton.io.rest.RestMethod; - -/** - * Builder of requests which are in a project context. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0.0 - */ -public class ProjectScopeRequestBuilder extends DefaultRequestBuilder { - - private static final long serialVersionUID = 1L; - - public ProjectScopeRequestBuilder(String name, String... action) { - this(name, null, action); - } - - public ProjectScopeRequestBuilder(String name, - RestMethod method, - String... action) { - super(name, method, action); - } - - @Override - public String[] getPath(Object... args) { - - // one args : projectName - - String projectName = (String) args[0]; - - String[] result = new String[action.length + 1]; - System.arraycopy(action, 0, result, 0, action.length); - result[action.length] = projectName; - return result; - } -} Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java 2012-07-15 11:59:36 UTC (rev 305) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRequestFactory.java 2012-07-15 18:29:25 UTC (rev 306) @@ -1,8 +1,12 @@ package org.nuiton.jredmine.rest; +import com.google.common.base.Joiner; import com.google.common.base.Strings; +import org.apache.commons.lang3.ArrayUtils; import org.nuiton.io.rest.AbstractRequestFactory; import org.nuiton.io.rest.RestMethod; +import org.nuiton.io.rest.RestRequest; +import org.nuiton.io.rest.RestRequestBuilder; import org.nuiton.jredmine.model.Attachment; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.News; @@ -16,7 +20,7 @@ import java.util.Map; /** - * TODO + * Request factory for the redmine client. * * @author tchemit <chemit(a)codelutin.com> * @since 1.4 @@ -28,175 +32,366 @@ // misc requests - addRequestBuilder(new DefaultRequestBuilder(ModelHelper.PING_REQUEST_NAME, RestMethod.GET, "jredmine", "ping")); - addRequestBuilder(new DefaultRequestBuilder(ModelHelper.LOGOUT_REQUEST_NAME, RestMethod.GET, "jredmine", "logout")); - addRequestBuilder(new DefaultRequestBuilder(ModelHelper.LOGIN_REQUEST_NAME, RestMethod.POST, "jredmine", "login") { + addRequestBuilder(new DefaultRequestBuilder(ModelHelper.PING_REQUEST_NAME, RestMethod.GET, "jredmine", "ping")); + addRequestBuilder(new DefaultRequestBuilder(ModelHelper.LOGOUT_REQUEST_NAME, RestMethod.GET, "jredmine", "logout")); + addRequestBuilder(new DefaultRequestBuilder(ModelHelper.LOGIN_REQUEST_NAME, RestMethod.POST, "jredmine", "login") { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @Override - public String[] getParameters(Object... args) { - String login = (String) args[0]; - String password = (String) args[1]; - return new String[]{"username", login, "password", password}; - } - }); + @Override + public String[] getParameters(Object... args) { + String login = (String) args[0]; + String password = (String) args[1]; + return new String[]{"username", login, "password", password}; + } + }); - // data with no scope requests + // data with no scope requests - addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_ALL_PROJECT_REQUEST_NAME, RestMethod.GET, "jredmine", "get_projects.xml")); - addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_user_projects.xml")); - addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_ALL_ISSUE_STATUS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_statuses.xml")); - addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_ALL_ISSUE_PRIORITY_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_priorities.xml")); + addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_ALL_PROJECT_REQUEST_NAME, RestMethod.GET, "jredmine", "get_projects.xml")); + addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_USER_PROJECTS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_user_projects.xml")); + addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_ALL_ISSUE_STATUS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_statuses.xml")); + addRequestBuilder(new DefaultRequestBuilder(ModelHelper.GET_ALL_ISSUE_PRIORITY_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_priorities.xml")); - // data with project scope requests + // data with project scope requests - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_PROJECT_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_PROJECT_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_issues.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_PROJECT_OPENED_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_opened_issues.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_PROJECT_CLOSED_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_closed_issues.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_VERSION_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_versions.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_ISSUE_CATEGORY_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_categories.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_TRACKER_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_trackers.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_USER_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_users.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_NEWS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_news.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_PROJECT_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_PROJECT_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_issues.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_PROJECT_OPENED_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_opened_issues.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_PROJECT_CLOSED_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_closed_issues.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_VERSION_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_versions.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_ISSUE_CATEGORY_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_categories.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_TRACKER_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_trackers.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_USER_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_users.xml")); + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.GET_ALL_NEWS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_project_news.xml")); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.ADD_VERSION_REQUEST_NAME, RestMethod.POST, "jredmine", "add_version.xml") { + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.ADD_VERSION_REQUEST_NAME, RestMethod.POST, "jredmine", "add_version.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + Version version = (Version) args[1]; + String date = getVersionEffectiveDate(version); + String status = getVersionStatus(version); + return new String[]{ + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date, + "version[status]", status + }; + } + }); + + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.UPDATE_VERSION_REQUEST_NAME, RestMethod.POST, "jredmine", "update_version.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + Version version = (Version) args[1]; + String date = getVersionEffectiveDate(version); + String status = getVersionStatus(version); + return new String[]{ + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date, + "version[status]", status + }; + } + }); + + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.NEXT_VERSION_REQUEST_NAME, RestMethod.POST, "jredmine", "next_version.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + + + Version version = (Version) args[1]; + String date = getVersionEffectiveDate(version); + String status = getVersionStatus(version); + String oldVersionName = (String) args[2]; + return new String[]{ + "oldVersionName", oldVersionName, + "version[name]", version.getName(), + "version[description]", version.getDescription(), + "version[effective_date]", date, + "version[status]", status + }; + } + }); + + addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.ADD_NEWS_REQUEST_NAME, RestMethod.POST, "jredmine", "add_news.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + News news = (News) args[1]; + return new String[]{ + "news[title]", news.getTitle(), + "news[summary]", news.getSummary(), + "news[description]", news.getDescription() + }; + } + }); + + // version scope requests + + addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.GET_VERSION_REQUEST_NAME, RestMethod.GET, "jredmine", "get_version.xml")); + addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.GET_ALL_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_version_issues.xml")); + addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.GET_ALL_ATTACHMENTS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_version_attachments.xml")); + addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.ADD_ATTACHMENT_REQUEST_NAME, RestMethod.POST, "jredmine", "add_version_attachment.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + String versionId = (String) args[1]; + Attachment attachment = (Attachment) args[2]; + return new String[]{ + "version_name", versionId, + "attachment[description]", attachment.getDescription() + }; + } + + @Override + public Map<String, File> getAttachments(Object... args) { + Map<String, File> upload = new HashMap<String, File>(); + Attachment attachment = (Attachment) args[2]; + upload.put("attachment[file]", attachment.getToUpload()); + return upload; + } + }); + + // issue scope requests + + addRequestBuilder(new IssueScopeRequestBuilder(ModelHelper.GET_ALL_ISSUE_TIME_ENTRY_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_times.xml")); + + addRequestBuilder(new IssueScopeRequestBuilder(ModelHelper.ADD_ISSUE_TIME_ENTRY_REQUEST_NAME, RestMethod.POST, "jredmine", "add_issue_time.xml") { + private static final long serialVersionUID = 1L; + + @Override + public String[] getParameters(Object... args) { + String issueId = (String) args[1]; + TimeEntry timeEntry = (TimeEntry) args[2]; + Date d = timeEntry.getSpentOn(); + if (d == null) { + d = new Date(); + } + String date = DATE_FORMAT.format(d); + return new String[]{ + "issue_id", issueId, + "time_entry[activity_id]", timeEntry.getActivityId() + "", + "time_entry[spent_on]", date, + "time_entry[hours]", timeEntry.getHours() + "", + "time_entry[comments]", timeEntry.getComments() == null ? "" : timeEntry.getComments() + }; + } + }); + } + + protected static String getVersionStatus(Version version) { + String status = version.getStatus(); + if (Strings.isNullOrEmpty(status)) { + + // use default open status + status = VersionStatusEnum.open.name(); + } + return status; + } + + protected static String getVersionEffectiveDate(Version version) { + return version.getEffectiveDate() == null ? "" : + DATE_FORMAT.format(version.getEffectiveDate()); + } + + /** + * Default {@link RestRequestBuilder} to be used in {@link RedmineRestClient}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.0 + */ + protected static class DefaultRequestBuilder implements RestRequestBuilder { + private static final long serialVersionUID = 1L; + protected String name; + + protected String[] action; + + protected final RestMethod method; + + public DefaultRequestBuilder(String name, + RestMethod method, + String... action) { + this.name = name; + this.action = action; + this.method = method; + } + @Override + public String getName() { + return name; + } + + /** + * @param args the args of the request + * @return TODO + */ public String[] getParameters(Object... args) { - Version version = (Version) args[1]; - String date = getVersionEffectiveDate(version); - String status = getVersionStatus(version); - return new String[]{ - "version[name]", version.getName(), - "version[description]", version.getDescription(), - "version[effective_date]", date, - "version[status]", status - }; + // by default, no parameter + return ArrayUtils.EMPTY_STRING_ARRAY; } - }); - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.UPDATE_VERSION_REQUEST_NAME, RestMethod.POST, "jredmine", "update_version.xml") { - private static final long serialVersionUID = 1L; + public String[] getPath(Object... args) { + // by default, path is contextPath / action + return action; + } + public Map<String, File> getAttachments(Object... args) { + // by default, no attachments + return null; + } + @Override - public String[] getParameters(Object... args) { - Version version = (Version) args[1]; - String date = getVersionEffectiveDate(version); - String status = getVersionStatus(version); - return new String[]{ - "version[name]", version.getName(), - "version[description]", version.getDescription(), - "version[effective_date]", date, - "version[status]", status + public RestRequest create(final Object... args) { + + return new RestRequest() { + + @Override + public String[] getPath() { + return DefaultRequestBuilder.this.getPath(args); + } + + @Override + public String[] getParameters() { + return DefaultRequestBuilder.this.getParameters(args); + } + + @Override + public Map<String, File> getAttachments() { + return DefaultRequestBuilder.this.getAttachments(args); + } + + @Override + public boolean containsAttachments() { + Map<String, File> attachments = getAttachments(); + return attachments != null && !attachments.isEmpty(); + } + + @Override + public String toPath(String redmineUrl) { + String result = redmineUrl + "/" + + Joiner.on('/').join(getPath()); + return result; + } + + @Override + public RestMethod getMethod() { + return method; + } + }; } - }); + } - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.NEXT_VERSION_REQUEST_NAME, RestMethod.POST, "jredmine", "next_version.xml") { + /** + * Builder of requests which are in a project context. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.0 + */ + protected static class ProjectScopeRequestBuilder extends DefaultRequestBuilder { + private static final long serialVersionUID = 1L; + public ProjectScopeRequestBuilder(String name, String... action) { + this(name, null, action); + } + + public ProjectScopeRequestBuilder(String name, + RestMethod method, + String... action) { + super(name, method, action); + } + @Override - public String[] getParameters(Object... args) { + public String[] getPath(Object... args) { + // one args : projectName - Version version = (Version) args[1]; - String date = getVersionEffectiveDate(version); - String status = getVersionStatus(version); - String oldVersionName = (String) args[2]; - return new String[]{ - "oldVersionName", oldVersionName, - "version[name]", version.getName(), - "version[description]", version.getDescription(), - "version[effective_date]", date, - "version[status]", status - }; + String projectName = (String) args[0]; + + String[] result = new String[action.length + 1]; + System.arraycopy(action, 0, result, 0, action.length); + result[action.length] = projectName; + return result; } - }); + } - addRequestBuilder(new ProjectScopeRequestBuilder(ModelHelper.ADD_NEWS_REQUEST_NAME, RestMethod.POST, "jredmine", "add_news.xml") { + /** + * Builder of requests which are in a project and issue context. + * + * Created: 1 janv. 2010 + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.3 + */ + protected static class IssueScopeRequestBuilder extends ProjectScopeRequestBuilder { + private static final long serialVersionUID = 1L; + public IssueScopeRequestBuilder(String name, + RestMethod method, + String... action) { + super(name, method, action); + } + + public IssueScopeRequestBuilder(String name, String... action) { + this(name, null, action); + } + @Override public String[] getParameters(Object... args) { - News news = (News) args[1]; + + // args 1 = project id + // args 2 = issue id + + String issueId = (String) args[1]; + return new String[]{ - "news[title]", news.getTitle(), - "news[summary]", news.getSummary(), - "news[description]", news.getDescription() + "issue_id", issueId }; } - }); + } - // version scope requests + /** + * Builder of requests which are in a project and version context. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.0 + */ + protected static class VersionScopeRequestBuilder extends ProjectScopeRequestBuilder { - addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.GET_VERSION_REQUEST_NAME, RestMethod.GET, "jredmine", "get_version.xml")); - addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.GET_ALL_ISSUES_REQUEST_NAME, RestMethod.GET, "jredmine", "get_version_issues.xml")); - addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.GET_ALL_ATTACHMENTS_REQUEST_NAME, RestMethod.GET, "jredmine", "get_version_attachments.xml")); - addRequestBuilder(new VersionScopeRequestBuilder(ModelHelper.ADD_ATTACHMENT_REQUEST_NAME, RestMethod.POST, "jredmine", "add_version_attachment.xml") { private static final long serialVersionUID = 1L; - @Override - public String[] getParameters(Object... args) { - String versionId = (String) args[1]; - Attachment attachment = (Attachment) args[2]; - return new String[]{ - "version_name", versionId, - "attachment[description]", attachment.getDescription() - }; + public VersionScopeRequestBuilder(String name, RestMethod method, String... action) { + super(name, method, action); } - @Override - public Map<String, File> getAttachments(Object... args) { - Map<String, File> upload = new HashMap<String, File>(); - Attachment attachment = (Attachment) args[2]; - upload.put("attachment[file]", attachment.getToUpload()); - return upload; + public VersionScopeRequestBuilder(String name, String... action) { + this(name, null, action); } - }); - // issue scope requests + @Override + public String[] getParameters(Object... args) { - addRequestBuilder(new IssueScopeRequestBuilder(ModelHelper.GET_ALL_ISSUE_TIME_ENTRY_REQUEST_NAME, RestMethod.GET, "jredmine", "get_issue_times.xml")); + // args 1 = project id + // args 2 = version name - addRequestBuilder(new IssueScopeRequestBuilder(ModelHelper.ADD_ISSUE_TIME_ENTRY_REQUEST_NAME, RestMethod.POST, "jredmine", "add_issue_time.xml") { - private static final long serialVersionUID = 1L; + String versionName = (String) args[1]; - @Override - public String[] getParameters(Object... args) { - String issueId = (String) args[1]; - TimeEntry timeEntry = (TimeEntry) args[2]; - Date d = timeEntry.getSpentOn(); - if (d == null) { - d = new Date(); - } - String date = DATE_FORMAT.format(d); return new String[]{ - "issue_id", issueId, - //"timeEntry[issue_id]", issueId, - "time_entry[activity_id]", timeEntry.getActivityId() + "", - "time_entry[spent_on]", date, - "time_entry[hours]", timeEntry.getHours() + "", - "time_entry[comments]", timeEntry.getComments() == null ? "" : timeEntry.getComments() + "version_name", versionName }; } - }); -} - - protected static String getVersionStatus(Version version) { - String status = version.getStatus(); - if (Strings.isNullOrEmpty(status)) { - - // use default open status - status = VersionStatusEnum.open.name(); - } - return status; } - - protected static String getVersionEffectiveDate(Version version) { - return version.getEffectiveDate() == null ? "" : - DATE_FORMAT.format(version.getEffectiveDate()); - } } Modified: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java 2012-07-15 11:59:36 UTC (rev 305) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java 2012-07-15 18:29:25 UTC (rev 306) @@ -81,16 +81,15 @@ @Override protected void close(RestSession session) throws IOException { - if (session == null) { - return; + if (session != null) { + try { + RestRequest request = getRequest(ModelHelper.LOGOUT_REQUEST_NAME); + session.setOpen(false); + session.doRequest(request); + } finally { + session.close(); + } } - try { - RestRequest request = getRequest(ModelHelper.LOGOUT_REQUEST_NAME); - session.setOpen(false); - session.doRequest(request); - } finally { - session.close(); - } } protected void ping(RestSession session) throws IOException { Deleted: branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java =================================================================== --- branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java 2012-07-15 11:59:36 UTC (rev 305) +++ branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java 2012-07-15 18:29:25 UTC (rev 306) @@ -1,59 +0,0 @@ -/* - * #%L - * JRedmine :: Client - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 Tony Chemit, 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.jredmine.rest; - -import org.nuiton.io.rest.RestMethod; - -/** - * Builder of requests which are in a project and version context. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.0.0 - */ -public class VersionScopeRequestBuilder extends ProjectScopeRequestBuilder { - - private static final long serialVersionUID = 1L; - - public VersionScopeRequestBuilder(String name, RestMethod method, String... action) { - super(name, method, action); - } - - public VersionScopeRequestBuilder(String name, String... action) { - this(name, null, action); - } - - @Override - public String[] getParameters(Object... args) { - - // args 1 = project id - // args 2 = version name - - String versionName = (String) args[1]; - - return new String[]{ - "version_name", versionName - }; - } -}

1 0

r305 - in branches/jredmine-1.x/jredmine-maven-plugin/src/test: java/org/nuiton/jredmine/plugin/announcement resources/org/nuiton/jredmine/plugin/announcement
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 13:59:36 +0200 (Sun, 15 Jul 2012) New Revision: 305 Url: http://nuiton.org/repositories/revision/jredmine/305 Log: make more tests to pass Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/changes.xml Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java 2012-07-15 11:35:27 UTC (rev 304) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java 2012-07-15 11:59:36 UTC (rev 305) @@ -25,8 +25,11 @@ package org.nuiton.jredmine.plugin.announcement; import org.junit.Test; +import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.plugin.AbstractRedmineMojoTest; +import java.io.IOException; + /** * * @author tchemit <chemit(a)codelutin.com> @@ -39,6 +42,12 @@ return "generate-email-announcement"; } + @Override + protected RestClientConfiguration getConfiguration() throws IOException { + RestClientConfiguration conf = fixtures.newLogguedConfiguration(); + return conf; + } + @Test public void generateEmailAnnouncement() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java 2012-07-15 11:35:27 UTC (rev 304) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java 2012-07-15 11:59:36 UTC (rev 305) @@ -25,8 +25,11 @@ package org.nuiton.jredmine.plugin.announcement; import org.junit.Test; +import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.plugin.AbstractRedmineMojoTest; +import java.io.IOException; + /** * * @author tchemit <chemit(a)codelutin.com> @@ -39,6 +42,12 @@ return "generate-news-announcement"; } + @Override + protected RestClientConfiguration getConfiguration() throws IOException { + RestClientConfiguration conf = fixtures.newLogguedConfiguration(); + return conf; + } + @Test public void generateNewsAnnouncement() throws Exception { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/changes.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/changes.xml 2012-07-15 11:35:27 UTC (rev 304) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/changes.xml 2012-07-15 11:59:36 UTC (rev 305) @@ -36,7 +36,7 @@ <action dev="chemit" due-to="Tony Chemit" due-to-email="perso(a)noway.fr" issue="4" type="fix" system="redmine">test anomalie</action> <action dev="chemit" due-to="Tony Chemit" due-to-email="perso(a)noway.fr" issue="5" type="add" system="redmine">test evolution</action> </release> - <release version="1.0.3" date="2009-09-12" description="new versions"> + <release version="1.3" date="2009-09-12" description="new versions"> <action dev="chemit" due-to="Tony Chemit" due-to-email="perso(a)noway.fr" issue="4" type="fix" system="redmine">test anomalie</action> <action dev="chemit" due-to="Tony Chemit" due-to-email="perso(a)noway.fr" issue="5" type="add" system="redmine">test evolution</action> </release>

1 0

r304 - branches/jredmine-1.x
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 13:35:27 +0200 (Sun, 15 Jul 2012) New Revision: 304 Url: http://nuiton.org/repositories/revision/jredmine/304 Log: refs #937: Maven test utilise les properties de test de la distribution (use a maven server to log in tests)" Modified: branches/jredmine-1.x/pom.xml Modified: branches/jredmine-1.x/pom.xml =================================================================== --- branches/jredmine-1.x/pom.xml 2012-07-15 11:14:29 UTC (rev 303) +++ branches/jredmine-1.x/pom.xml 2012-07-15 11:35:27 UTC (rev 304) @@ -738,6 +738,32 @@ </properties> </profile> + <profile> + <id>jredmine-server-test</id> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-redmine-test-login</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>initialize</phase> + <configuration> + <serverId>jredmine-test</serverId> + <usernameOut>jredmine-test.login</usernameOut> + <passwordOut>jredmine-test.password</passwordOut> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>

1 0

15 Jul '12

Author: tchemit Date: 2012-07-15 13:14:29 +0200 (Sun, 15 Jul 2012) New Revision: 303 Url: http://nuiton.org/repositories/revision/jredmine/303 Log: update copyright + improve generated site Modified: branches/jredmine-1.x/jredmine-client/pom.xml branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineAnonymousService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/DefaultRedmineServiceImplementor.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineAnonymousService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineLogguedService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineService.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceException.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceImplementor.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/RedmineServiceLoginException.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/Attachment.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/I18nAble.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/IdAble.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/Issue.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueCategory.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssuePriority.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/IssueStatus.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/ModelHelper.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/News.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/Project.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/RedmineModelEnum.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/RedmineModelScope.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/TimeEntry.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/Tracker.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/User.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/Version.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/AttachmentXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueCategoryXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssuePriorityXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueStatusXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/IssueXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/NewsXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/ProjectXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/RedmineDataConverter.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3Helper.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TimeEntryXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/TrackerXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/UserXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/model/io/xpp3/VersionXpp3Reader.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/DefaultRequestBuilder.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/IssueScopeRequestBuilder.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/ProjectScopeRequestBuilder.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/RedmineRestClient.java branches/jredmine-1.x/jredmine-client/src/main/java/org/nuiton/jredmine/rest/VersionScopeRequestBuilder.java branches/jredmine-1.x/jredmine-client/src/site/apt/index.apt branches/jredmine-1.x/jredmine-client/src/site/apt/rails_api.apt branches/jredmine-1.x/jredmine-client/src/site/apt/redmine_service.apt branches/jredmine-1.x/jredmine-client/src/site/site_fr.xml branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/AbstractRedmineServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineAnonymousServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceAsAnonymousTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/DefaultRedmineServiceTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/RedmineTestContract.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/model/io/xpp3/RedmineXpp3HelperTest.java branches/jredmine-1.x/jredmine-client/src/test/java/org/nuiton/jredmine/rest/RedmineRestClientTest.java branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/attachment.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issue.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueCategory.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issuePriority.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/issueStatus.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/news.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/project.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/timeEntry.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/tracker.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/user.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty/version.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/attachment.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issue.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueCategory.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issuePriority.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/issueStatus.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/news.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/project.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/timeEntry.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/tracker.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/user.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-empty2/version.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/attachment.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issue.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueCategory.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issuePriority.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/issueStatus.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/news.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/project.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/timeEntry.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/tracker.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/user.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-multi/version.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/attachment.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issue.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueCategory.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issuePriority.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/issueStatus.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/news.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/project.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/timeEntry.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/tracker.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/user.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/array-singleton/version.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/attachment.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issue.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueCategory.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issuePriority.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/issueStatus.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/news.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/project.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/timeEntry.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/tracker.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/user.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single/version.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/issue.xml branches/jredmine-1.x/jredmine-client/src/test/resources/org/nuiton/jredmine/model/io/xpp3/single2/user.xml branches/jredmine-1.x/jredmine-maven-plugin/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssueCollectorConfiguration.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGeneratorConfiguration.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java branches/jredmine-1.x/jredmine-maven-plugin/src/site/apt/index.apt branches/jredmine-1.x/jredmine-maven-plugin/src/site/apt/usage.apt branches/jredmine-1.x/jredmine-maven-plugin/src/site/site_fr.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssigneeTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategoryTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriorityTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporterTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatusTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByTrackerTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersionTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/changes.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/generateEmailAnnouncement.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateEmailAnnouncementMojoTest/skipGenerateEmailAnnouncement.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/generateNewsAnnouncement.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/announcement/generateNewsAnnouncementMojoTest/skipGenerateNewsAnnouncement.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayAll.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayIssuePriorities.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayIssueStatuses.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayProjectIssueCategories.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayProjectTrackers.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayProjectUsers.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayProjects.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/displayDataMojoTest/displayVersions.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/generateChangesMojoTest/generateChanges.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/nextVersionMojoTest/nextVersion.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/nextVersionMojoTest/skipNextVersion.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/publishAttachmentsMojoTest/publishAttachments.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/publishAttachmentsMojoTest/skipPublishAttachments.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/publishNewsMojoTest/publishNews.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/publishNewsMojoTest/skipPublishNews.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportByAssigneeTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportByCategoryTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportByPriorityTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportByReporterTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportByStatusTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportByTrackerTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportByVersionTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/report/issuesReportTest/issueReport.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/updateVersionMojoTest/skipUpdateVersion.xml branches/jredmine-1.x/jredmine-maven-plugin/src/test/resources/org/nuiton/jredmine/plugin/updateVersionMojoTest/updateVersion.xml branches/jredmine-1.x/pom.xml Modified: branches/jredmine-1.x/jredmine-client/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/pom.xml 2012-07-15 11:05:32 UTC (rev 302) +++ branches/jredmine-1.x/jredmine-client/pom.xml 2012-07-15 11:14:29 UTC (rev 303) @@ -2,10 +2,8 @@  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -349,7 +349,7 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </exclusion> - <exclusion> + <exclusion> <groupId>velocity</groupId> <artifactId>velocity</artifactId> </exclusion> @@ -380,7 +380,7 @@ <version>2.6</version> <exclusions> <exclusion> - <groupId>org.codehaus.plexus</groupId> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> </exclusion> <exclusion> @@ -395,7 +395,7 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-mail-sender-javamail</artifactId> </exclusion> - <exclusion> + <exclusion> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </exclusion> @@ -577,8 +577,73 @@ </build> <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadocPluginVersion}</version> + <configuration> + <quiet>true</quiet> + <tagletArtifacts> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>${pluginPluginVersion}</version> + </tagletArtifact> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.5.5</version> + </tagletArtifact> + </tagletArtifacts> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + </profile> +  +we do not propagate jredmine-maven-plugin to child modules -->  <profile> <id>redmine-build-release-profile</id>

1 0

r302 - branches/jredmine-1.x
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 13:05:32 +0200 (Sun, 15 Jul 2012) New Revision: 302 Url: http://nuiton.org/repositories/revision/jredmine/302 Log: fix project url Modified: branches/jredmine-1.x/pom.xml Modified: branches/jredmine-1.x/pom.xml =================================================================== --- branches/jredmine-1.x/pom.xml 2012-07-15 10:59:44 UTC (rev 301) +++ branches/jredmine-1.x/pom.xml 2012-07-15 11:05:32 UTC (rev 302) @@ -60,7 +60,7 @@ <distributionManagement> <site> <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <url>${our.site.repository}/${projectId}/1.x</url> </site> </distributionManagement> @@ -509,7 +509,7 @@ <inceptionYear>2009</inceptionYear> - <url>http://maven-site.nuiton.org/jredmine</url> + <url>http://maven-site.nuiton.org/jredmine/1.x</url> <developers>

1 0

r301 - in branches/jredmine-1.x: jredmine-client jredmine-maven-plugin jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 12:59:44 +0200 (Sun, 15 Jul 2012) New Revision: 301 Url: http://nuiton.org/repositories/revision/jredmine/301 Log: fixes #926: Use m-plugin-p 3 api fix javadoc author optimize dependencies Modified: branches/jredmine-1.x/jredmine-client/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/pom.xml branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssueCollectorConfiguration.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssigneeTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategoryTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriorityTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporterTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatusTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByTrackerTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersionTest.java branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportTest.java Modified: branches/jredmine-1.x/jredmine-client/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-client/pom.xml 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-client/pom.xml 2012-07-15 10:59:44 UTC (rev 301) @@ -76,6 +76,16 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> Modified: branches/jredmine-1.x/jredmine-maven-plugin/pom.xml =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/pom.xml 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/pom.xml 2012-07-15 10:59:44 UTC (rev 301) @@ -49,14 +49,6 @@ <version>${project.version}</version> </dependency> -  - <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> @@ -67,6 +59,21 @@ <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> +  <dependency> <groupId>org.codehaus.plexus</groupId> Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -27,6 +27,8 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.model.IssueManagement; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.nuiton.io.rest.RestClientConfiguration; import org.nuiton.jredmine.RedmineService; @@ -40,7 +42,7 @@ /** * Abstract redmine mojo. * - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @requiresOnline true * @requiresProject true * @since 1.0.0 @@ -52,11 +54,9 @@ /** * Dependance du projet. * - * @parameter default-value="${project}" - * @required - * @readonly * @since 1.0.0 */ + @Component protected MavenProject project; /** @@ -64,9 +64,9 @@ * * If no url is given, will use the issue management url. * - * @parameter expression="${redmine.url}" * @since 1.0.0 */ + @Parameter(property = "redmine.url") protected URL url; /** @@ -75,9 +75,9 @@ * Note: : this parameter is mandatory if you not use a {@code anonymous} service. * configuration. * - * @parameter expression="${redmine.username}" * @since 1.0.0 */ + @Parameter(property = "redmine.username") protected String username; /** @@ -86,9 +86,9 @@ * Note: : this parameter is mandatory if you not use a {@code anonymous} service. * configuration. * - * @parameter expression="${redmine.password}" * @since 1.0.0 */ + @Parameter(property = "redmine.password") protected String password; /** @@ -97,79 +97,40 @@ * Note: If nothing is filled here, we will use the system * property {@code file.encoding}. * - * @parameter expression="${redmine.encoding}" default-value="${project.build.sourceEncoding}" * @since 1.0.0 */ + @Parameter(property = "redmine.encoding", defaultValue = "${project.build.sourceEncoding}") protected String encoding; -// /** -// * Redmine project name. -// * -// * @parameter expression="${redmine.projectId}" default-value="${project.artifactId}" -// * @required -// * @since 1.0.0 -// */ -// protected String projectId; -// -// /** -// * redmine version name. -// * -// * @parameter expression="${redmine.versionId}" default-value="${project.version}" -// * @since 1.0.0 -// */ -// protected String versionId; - /** * Un flag pour activer le mode verbeux. * - * @parameter expression="${redmine.verbose}" default-value="${maven.verbose}" * @since 1.0.0 */ + @Parameter(property = "redmine.verbose", defaultValue = "${maven.verbose}") protected boolean verbose; /** * Un flag pour faire échouer le build si la configuration n'est pas ok. * - * @parameter expression="${redmine.safe}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.safe", defaultValue = "true") protected boolean safe; /** - * @parameter expression="${session}" - * @readonly */ + @Component protected MavenSession session; /** * Redmine service. * - * @component * @since 1.0.0 */ + @Component protected RedmineService service; -// /** flag to load in init a required project using the {@link #projectId} name */ -// private final boolean requireProject; -// -// /** flag to load in init a required version using the {@link #versionId} name. */ -// private final boolean requireVersion; -// -// /** flag to load in init a required user using the user loggued to redmine server. */ -// private final boolean requireUser; - -// /** the project loaded in init if {@link #requireProject} flag is on */ -// protected Project releaseProject; -// -// /** the version loaded in init if {@link #requireVersion} flag is on */ -// protected Version releaseVersion; -// -// /** the user loaded in init if {@link #requireUser} flag is on */ -// protected User releaseUser; -// -// /** cache of users of a given project loaded in int if {@link #requireUser} flag is on */ -// protected User[] users; - /** the date format used to write a date */ protected DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -181,14 +142,6 @@ protected boolean initOk = true; -// public AbstractRedmineMojo(boolean requireProject, -// boolean requireVersion, -// boolean requireUser) { -// this.requireProject = requireProject; -// this.requireVersion = requireVersion; -// this.requireUser = requireUser; -// } - /////////////////////////////////////////////////////////////////////////// /// AbstractPlugin /////////////////////////////////////////////////////////////////////////// Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProject.java 2012-07-15 10:59:44 UTC (rev 301) @@ -1,6 +1,7 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.util.StringUtils; import org.nuiton.jredmine.RedmineServiceException; import org.nuiton.jredmine.model.ModelHelper; @@ -18,10 +19,9 @@ /** * Redmine project name. * - * @parameter expression="${redmine.projectId}" default-value="${project.artifactId}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.projectId", defaultValue = "${project.artifactId}", required = true) protected String projectId; /** the project loaded in init. */ @@ -140,6 +140,10 @@ } } + /////////////////////////////////////////////////////////////////////////// + /// RedmineProjectAware + /////////////////////////////////////////////////////////////////////////// + public final String getProjectId() { return projectId; } Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoWithProjectAndVersion.java 2012-07-15 10:59:44 UTC (rev 301) @@ -1,6 +1,7 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.jredmine.RedmineServiceException; import org.nuiton.jredmine.model.Version; @@ -15,9 +16,9 @@ /** * redmine version name. * - * @parameter expression="${redmine.versionId}" default-value="${project.version}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionId", defaultValue = "${project.version}") protected String versionId; /** the version loaded in init. */ @@ -84,6 +85,10 @@ } } + /////////////////////////////////////////////////////////////////////////// + /// RedmineVersionAware + /////////////////////////////////////////////////////////////////////////// + @Override public final String getVersionId() { return versionId; Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DisplayDataMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.jredmine.RedmineServiceImplementor; import org.nuiton.jredmine.model.I18nAble; import org.nuiton.jredmine.model.IdAble; @@ -43,27 +45,26 @@ * * This goals requires no authentication to the server. * - * @author tchemit - * @goal display-data + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "display-data", requiresOnline = true, requiresProject = true) public class DisplayDataMojo extends AbstractRedmineMojo implements RedmineProjectAware, RedmineVersionAware { /** * Redmine project name. * - * @parameter expression="${redmine.projectId}" default-value="${project.artifactId}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.projectId", defaultValue = "${project.artifactId}", required = true) protected String projectId; /** * redmine version name. * - * @parameter expression="${redmine.versionId}" default-value="${project.version}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionId", defaultValue = "${project.version}") protected String versionId; /** @@ -79,19 +80,17 @@ * * Note : you can specifiy several types separated by comma * - * @parameter expression="${types}" - * @required * @since 1.0.0 */ + @Parameter(property = "types", required = true) protected String types; /** * A flag to sort of not retrived data by id. * - * @parameter expression="${sortById}" default-value="true" - * @required * @since 1.0.0 */ + @Parameter(property = "sortById", defaultValue = "true", required = true) protected boolean sortById; /** @@ -102,9 +101,9 @@ * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "anonymous", defaultValue = "true") protected boolean anonymous; /** list of actions to perform */ @@ -160,6 +159,10 @@ this.anonymous = anonymous; } + /////////////////////////////////////////////////////////////////////////// + /// RedmineProjectAware + /////////////////////////////////////////////////////////////////////////// + @Override public String getProjectId() { return projectId; @@ -170,6 +173,10 @@ this.projectId = projectId; } + /////////////////////////////////////////////////////////////////////////// + /// RedmineVersionAware + /////////////////////////////////////////////////////////////////////////// + @Override public String getVersionId() { return versionId; Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/DryRunAware.java 2012-07-15 10:59:44 UTC (rev 301) @@ -1,7 +1,8 @@ package org.nuiton.jredmine.plugin; /** - * TODO + * Contract to place on mojo which can change data on a redmine server and + * can then have a dry run behaviour. * * @author tchemit <chemit(a)codelutin.com> * @since 1.4 Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/GenerateChangesMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.changes.model.Action; import org.apache.maven.plugins.changes.model.Author; import org.apache.maven.plugins.changes.model.Body; @@ -58,10 +60,10 @@ * by the maven-changes-plugin to generates the release report and send * the annoncement mail at a release time. * - * @author tchemit - * @goal generate-changes + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "generate-changes", requiresOnline = true, requiresProject = true) public class GenerateChangesMojo extends AbstractRedmineMojoWithProjectAndVersion implements IssueCollectorConfiguration { /** The actions understood by the changes.xml format. */ @@ -81,18 +83,17 @@ * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "true") protected boolean anonymous; /** * The path of the <code>changes.xml</code> file that will be converted into an HTML report. * - * @parameter expression="${redmine.xmlPath}" default-value="${basedir}/src/changes/changes.xml" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.xmlPath", defaultValue = "${basedir}/src/changes/changes.xml", required = true) protected File xmlPath; /** @@ -100,18 +101,17 @@ * * Note : if not sets - will use the redmine version description (if exists). * - * @parameter expression="${releaseDescription}" * @since 1.0.0 */ + @Parameter(property = "releaseDescription") protected String releaseDescription; /** * The changes file title. * - * @parameter expression="${changesTitle}" default-value="${project.description}" - * @required * @since 1.0.0 */ + @Parameter(property = "changesTitle", defaultValue = "${project.description}", required = true) protected String changesTitle; /** @@ -119,9 +119,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersion; /** @@ -138,10 +138,9 @@ * fix:1, add:1 * </pre> * - * @parameter expression="${redmine.actionMapping}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.actionMapping", required = true) protected String actionMapping; /** @@ -150,9 +149,9 @@ * Note : If a value is set to empty - that means to include all status. * * - * @parameter expression="${redmine.statusIds}" * @since 1.0.0 */ + @Parameter(property = "redmine.statusIds") protected String statusIds; /** @@ -161,17 +160,17 @@ * Note : If a value is set to empty - that means to include all categories. * * - * @parameter expression="${redmine.categoryIds}" * @since 1.0.0 */ + @Parameter(property = "redmine.categoryIds") protected String categoryIds; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipGenerateChanges}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipGenerateChanges", defaultValue = "false") protected boolean skipGenerateChanges; /** @@ -181,9 +180,9 @@ * * The default behaviour is to generate once to reduce calls to redmine * - * @parameter expression="${redmine.generateOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.generateOnce", defaultValue = "true") protected boolean generateOnce; /** le fichier deja genere */ Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssueCollectorConfiguration.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssueCollectorConfiguration.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssueCollectorConfiguration.java 2012-07-15 10:59:44 UTC (rev 301) @@ -29,7 +29,7 @@ * * TODO javadoc * - * @author chemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public interface IssueCollectorConfiguration { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/IssuesCollector.java 2012-07-15 10:59:44 UTC (rev 301) @@ -42,7 +42,7 @@ /** * A class to collect some issues due to given filters. * - * @author chemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesCollector { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/LoginMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -26,6 +26,9 @@ import org.apache.maven.model.IssueManagement; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Settings; import org.nuiton.helper.plugin.ShareServerSecretPlugin; @@ -41,23 +44,17 @@ * Obtain login for the redmine server to use. * * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ par : - * $Author$ - * @goal login * @since 1.2.1 */ +@Mojo(name = "login", requiresOnline = true, requiresProject = true) public class LoginMojo extends AbstractPlugin implements RestClientConfiguration { /** * Dependance du projet. * - * @parameter default-value="${project}" - * @required - * @readonly * @since 1.2.1 */ + @Component protected MavenProject project; /** @@ -65,33 +62,33 @@ * * If no url is given, will use the issue management url. * - * @parameter expression="${redmine.url}" * @since 1.2.1 */ + @Parameter(property = "redmine.url") protected URL url; /** * Un flag pour activer le mode verbeux. * - * @parameter expression="${redmine.verbose}" default-value="${maven.verbose}" * @since 1.2.1 */ + @Parameter(property = "redmine.verbose", defaultValue = "${maven.verbose}") protected boolean verbose; /** * Un flag pour verifier le login (effectue une connexion au serveur). * - * @parameter expression="${redmine.checkLogin}" default-value="false" * @since 1.2.1 */ + @Parameter(property = "redmine.checkLogin", defaultValue = "false") protected boolean checkLogin; /** * Un flag pour faire échouer le build si la configuration n'est pas ok. * - * @parameter expression="${redmine.safe}" default-value="true" * @since 1.2.1 */ + @Parameter(property = "redmine.safe", defaultValue = "true") protected boolean safe; /** @@ -99,28 +96,25 @@ * * The server must be defined in your settings.xml file in servers section. * - * @parameter expression="${redmine.serverId}" - * @required * @since 1.2.1 */ + @Parameter(property = "redmine.serverId", required = true) protected String serverId; /** - * Dependance du settings. + * Settings. * - * @parameter default-value="${settings}" - * @required - * @readonly * @since 1.2.1 */ + @Component protected Settings settings; /** - * password decypher + * password decypher. * - * @component roleHint="maven-helper-plugin" * @since 1.2.1 */ + @Component(hint = "helper-maven-plugin") protected SecDispatcher sec; /** @@ -129,6 +123,7 @@ * @component * @since 1.2.1 */ + @Component protected RedmineService service; /** Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/NextVersionMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; import org.nuiton.plugin.PluginHelper; @@ -39,10 +41,10 @@ * previous version to the new one. * * - * @author tchemit - * @goal next-version + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "next-version", requiresOnline = true, requiresProject = true) public class NextVersionMojo extends AbstractRedmineMojoWithProjectAndVersion implements DryRunAware { /** @@ -51,9 +53,9 @@ * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** @@ -61,9 +63,9 @@ * * Note : if not set, no update of the description will be made. * - * @parameter expression="${redmine.versionDescription}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionDescription") protected String versionDescription; /** @@ -74,9 +76,9 @@ * If not Set - will use current day date. * flag is on. * - * @parameter expression="${redmine.effectiveDate}" * @since 1.0.0 */ + @Parameter(property = "redmine.effectiveDate") protected String effectiveDate; /** @@ -84,33 +86,33 @@ * * If not Set - will not move any issues to the new version. * - * @parameter expression="${redmine.previousVersionName}" * @since 1.0.0 */ + @Parameter(property = "redmine.previousVersionName") protected String previousVersionName; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipNextVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipNextVersion", defaultValue = "false") protected boolean skipNextVersion; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; /** effective date to set */ Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -26,6 +26,8 @@ import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.helper.plugin.CollectFilesMojo; import org.nuiton.jredmine.model.Attachment; import org.nuiton.plugin.PluginHelper; @@ -40,20 +42,21 @@ /** * Publish files for a given project and version on redmine server. * - * @author tchemit - * @goal publish-attachments + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "publish-attachments", requiresOnline = true, requiresProject = true) public class PublishAttachmentsMojo extends AbstractRedmineMojoWithProjectAndVersion implements DryRunAware { + /** * Flag to know if anonymous connexion to redmine server is required. * * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** @@ -65,9 +68,9 @@ * * If no Set - will not use this source * - * @parameter expression="${redmine.filesFromProperties}" * @since 1.0.0 */ + @Parameter(property = "redmine.filesFromProperties") protected File filesFromProperties; /** @@ -75,33 +78,33 @@ * * If no Set - will not use this source * - * @parameter expression="${redmine.files}" * @since 1.0.0 */ + @Parameter(property = "redmine.files") protected File[] files; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipCollectReleaseAttachments}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipCollectReleaseAttachments", defaultValue = "false") protected boolean skipPublishAttachments; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; /** files to deploy */ Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/PublishNewsMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.nuiton.jredmine.model.News; import org.nuiton.plugin.PluginHelper; @@ -33,37 +35,37 @@ /** * Publish a news on redmine server. * - * @author tchemit - * @goal publish-news + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "publish-news", requiresOnline = true, requiresProject = true) public class PublishNewsMojo extends AbstractRedmineMojoWithProject implements DryRunAware{ + /** * Flag to know if anonymous connexion to redmine server is required. * * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** * The content file of the news. * - * @parameter expression="${redmine.newsContentFile}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.newsContentFile", required = true) protected File newsContentFile; /** * Short description or introduction of the released artifact. * - * @parameter expression="${redmine.newsSummary}" * @since 1.0.0 */ + @Parameter(property = "redmine.newsSummary") protected String newsSummary; /** @@ -72,34 +74,33 @@ * Note : the size can not be more than 60 caracters (due to a * redmine limitation). * - * @parameter expression="${redmine.newsTitle}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.newsTitle", required = true) protected String newsTitle; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipPublishNews}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipPublishNews", defaultValue = "false") protected boolean skipPublishNews; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; public PublishNewsMojo() { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineProjectAware.java 2012-07-15 10:59:44 UTC (rev 301) @@ -1,7 +1,7 @@ package org.nuiton.jredmine.plugin; /** - * TODO + * Contract to place on mojo which needs a project name redmine context. * * @author tchemit <chemit(a)codelutin.com> * @since 1.4 Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/RedmineVersionAware.java 2012-07-15 10:59:44 UTC (rev 301) @@ -1,7 +1,7 @@ package org.nuiton.jredmine.plugin; /** - * TODO + * Contract to place on mojo which needs a version name redmine context. * * @author tchemit <chemit(a)codelutin.com> * @since 1.4 Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/UpdateVersionMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,6 +25,8 @@ package org.nuiton.jredmine.plugin; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.util.StringUtils; import org.nuiton.jredmine.model.ModelHelper; import org.nuiton.jredmine.model.Version; @@ -40,20 +42,21 @@ * * Will add a the version if not existing, otherwise, will update the version. * - * @author tchemit - * @goal update-version + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "update-version", requiresOnline = true, requiresProject = true) public class UpdateVersionMojo extends AbstractRedmineMojoWithProjectAndVersion implements DryRunAware{ + /** * Flag to know if anonymous connexion to redmine server is required. * * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="false" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "false") protected boolean anonymous; /** @@ -61,9 +64,9 @@ * * Note : if not set, no update of the description will be made. * - * @parameter expression="${redmine.versionDescription}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionDescription") protected String versionDescription; /** @@ -71,9 +74,9 @@ * * The status of the version will be setted to {@code closed} then. * - * @parameter expression="${redmine.closeVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.closeVersion", defaultValue = "false") protected boolean closeVersion; /** @@ -84,9 +87,9 @@ * If not Set - will use current day date only if {@link #closeVersion} * flag is on. * - * @parameter expression="${redmine.effectiveDate}" * @since 1.0.0 */ + @Parameter(property = "redmine.effectiveDate") protected String effectiveDate; /** @@ -95,36 +98,35 @@ * If not Set - will use the {@code closed} value only if * {@link #closeVersion} flag is on. * - * @parameter expression="${redmine.versionStatus}" * @since 1.2.1 */ + @Parameter(property = "redmine.versionStatus") protected String versionStatus; /** * A flag to skip the goal. * - * @parameter expression="${redmine.skipUpdateVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipUpdateVersion", defaultValue = "false") protected boolean skipUpdateVersion; /** * A flag to test plugin but send nothing to redmine. * - * @parameter expression="${redmine.dryRun}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.dryRun", defaultValue = "false") protected boolean dryRun; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; - /** effective date to set */ private Date date; Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AbstractAnnouncementMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -26,6 +26,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.changes.ChangesXML; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.codehaus.plexus.util.ReaderFactory; @@ -41,7 +43,7 @@ import java.util.Map; /** - * @author chemit + * @author tchemit <chemit(a)codelutin.com> * @requiresOnline true */ public abstract class AbstractAnnouncementMojo extends AbstractRedmineMojoWithProjectAndVersion implements AnnouncementGeneratorConfiguration { @@ -54,27 +56,25 @@ * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "true") protected boolean anonymous; /** * Directory where the template file will be generated. * - * @parameter expression="${redmine.templateOutputDirectory}" default-value="${project.build.directory}/generated-sources/announcement" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.templateOutputDirectory", defaultValue = "${project.build.directory}/generated-sources/announcement", required = true) protected File templateOutputDirectory; /** * The path of the changes.xml file. * - * @parameter expression="${redmine.xmlPath}" default-value="${basedir}/src/changes/changes.xml" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.xmlPath", defaultValue = "${basedir}/src/changes/changes.xml", required = true) protected File xmlPath; /** @@ -84,26 +84,25 @@ * <code>/src/main/resources/ or current project base directory</code>. * * - * @parameter expression="${redmine.templateDirectory}" default-value="org/nuiton/jredmine/plugin/announcement" - * @required * @since 1.0.0 */ - protected String templateDirectory; + @Parameter(property = "redmine.templateDirectory", defaultValue = "org/nuiton/jredmine/plugin/announcement", required = true) + protected String templateDirectory = "org/nuiton/jredmine/plugin/announcement"; /** * The template encoding. * - * @parameter expression="${redmine.templateEncoding}" default-value="${project.build.sourceEncoding}" * @since 1.0.0 */ + @Parameter(property = "redmine.templateEncoding", defaultValue = "${project.build.sourceEncoding}") protected String templateEncoding; /** * Map which will be pass to the velocity context * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, Object> announceParameters; /** @@ -115,59 +114,49 @@ * and everything that comes after it. <code>%FILE%</code>: this is the issue number. * * - * @parameter expression="${redmine.attachmentLinkTemplate}" default-value="%URL%/attachments/download/%FILE%" * @since 1.0.0 */ - protected String attachmentLinkTemplate; + @Parameter(property = "redmine.attachmentLinkTemplate", defaultValue = "%URL%/attachments/download/%FILE%") + protected String attachmentLinkTemplate = "%URL%/attachments/download/%FILE%"; - /** - * @parameter expression="${project.groupId}" - * @readonly - * @since 1.0.0 - */ + /** @since 1.0.0 */ + @Parameter(property = "project.groupId", readonly = true) protected String groupId; - /** - * @parameter expression="${project.artifactId}" - * @readonly - * @since 1.0.0 - */ + /** @since 1.0.0 */ + @Parameter(property = "project.artifactId", readonly = true) protected String artifactId; /** * Distribution url of the artifact. * - * @parameter expression="${redmine.projectUrl}" default-value="${project.url}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.projectUrl", defaultValue = "${project.url}", required = true) protected String projectUrl; /** * Packaging structure for the artifact. * - * @parameter expression="${project.packaging}" - * @readonly * @since 1.0.0 */ + @Parameter(property = "project.packaging", readonly = true) protected String packaging; /** * The name of the artifact to be used in the announcement. * - * @parameter expression="${redmine.finalName}" default-value="${project.build.finalName}" - * @required * @since 1.0.0 */ + @Parameter(property = "redmine.finalName", defaultValue = "${project.build.finalName}", required = true) protected String finalName; /** * The current project base directory. * - * @parameter expression="${basedir}" - * @required * @since 1.0.0 */ + @Parameter(property = "basedir", required = true) protected String basedir; /** @@ -177,50 +166,45 @@ * @parameter * @since 1.0.0 */ + @Parameter protected String urlDownload; /** * Name of the team that develops the artifact. * - * @parameter expression="${redmine.developmentTeam}" default-value="${project.name} team" * @required * @since 1.0.0 */ + @Parameter(property = "redmine.developmentTeam", defaultValue = "${project.name} team", required = true) protected String developmentTeam; /** * Short description or introduction of the released artifact. * - * @parameter expression="${redmine.introduction}" default-value="${project.description}" * @since 1.0.0 */ + @Parameter(property = "redmine.introduction", defaultValue = "${project.description}") protected String introduction; /** * A flag to restirct only one run in a build (for multi-module context). * - * @parameter expression="${redmine.runOnce}" default-value="true" * @since 1.0.0 */ + @Parameter(property = "redmine.runOnce", defaultValue = "true") protected boolean runOnce; - /** - * @parameter expression="${redmine.artifactsFile}" - * @since 1.2.1 - */ + /** @since 1.2.1 */ + @Parameter(property = "redmine.artifactsFile") protected File artifactsFile; /** - * @parameter expression="${redmine.deploymentUrl}" - * @readonly */ + @Parameter(property = "redmine.deploymentUrl", readonly = true) protected String deploymentUrl; - /** - * Velocity Component. - * - * @component roleHint="jredmine-maven-plugin" - */ + /** Velocity Component. */ + @Component(hint = "jredmine-maven-plugin") protected VelocityComponent velocity; protected Attachment[] attachments; Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/AnnouncementGenerator.java 2012-07-15 10:59:44 UTC (rev 301) @@ -52,7 +52,7 @@ import java.util.regex.Pattern; /** - * @author chemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class AnnouncementGenerator { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,30 +24,32 @@ */ package org.nuiton.jredmine.plugin.announcement; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + /** * Generate the content of the release email announcement. * - * @author tchemit - * @goal generate-email-announcement + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "generate-email-announcement", requiresOnline = true, requiresProject = true) public class GenerateEmailAnnouncementMojo extends AbstractAnnouncementMojo { /** * The Velocity template used to format the release email announcement. * - * @parameter expression="${redmine.emailAnnouncementTemplate}" default-value="release-email-announcement.vm" - * @required * @since 1.0.0 */ - protected String emailAnnouncementTemplate; + @Parameter(property = "redmine.emailAnnouncementTemplate", defaultValue = "release-email-announcement.vm", required = true) + protected String emailAnnouncementTemplate = "release-email-announcement.vm"; /** * A flag to enable or disable the goal. * - * @parameter expression="${changes.skipGenerateEmailAnnouncement}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "changes.skipGenerateEmailAnnouncement", defaultValue = "false") protected boolean skipGenerateEmailAnnouncement; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojo.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,30 +24,32 @@ */ package org.nuiton.jredmine.plugin.announcement; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + /** * Generate the content of the release announcement news for Redmine. * - * @author tchemit - * @goal generate-news-announcement + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "generate-news-announcement", requiresOnline = true, requiresProject = true) public class GenerateNewsAnnouncementMojo extends AbstractAnnouncementMojo { /** * The Velocity template used to format the redmine announcement. * - * @parameter expression="${redmine.newsAnnouncementTemplate}" default-value="release-news-announcement.vm" - * @required * @since 1.0.0 */ - protected String newsAnnouncementTemplate; + @Parameter(property = "redmine.newsAnnouncementTemplate", defaultValue = "release-news-announcement.vm", required = true) + protected String newsAnnouncementTemplate = "release-news-announcement.vm"; /** * A flag to enable or disable the goal. * - * @parameter expression="${redmine.skipGenerateNewsAnnouncement}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipGenerateNewsAnnouncement", defaultValue = "false") protected boolean skipGenerateNewsAnnouncement; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2012-07-15 10:59:44 UTC (rev 301) @@ -38,7 +38,7 @@ /** * Abstract Generates a report for issues from Redmine's server * - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public abstract class AbstractIssuesReport extends AbstractRedmineReport implements IssueCollectorConfiguration { @@ -193,22 +193,7 @@ /// IssueCollectionConfiguration /////////////////////////////////////////////////////////////////////////// -// @Override -// public final String getProjectId() { -// return projectId; -// } - @Override - public final String getVersionId() { - return versionId; - } - - @Override - public void setVersionId(String versionId) { - this.versionId = versionId; - } - - @Override public String getCategoryIds() { return getFilters() == null ? null : getFilters().get("category"); } Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-07-15 10:59:44 UTC (rev 301) @@ -42,6 +42,8 @@ import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.i18n.I18N; @@ -60,8 +62,7 @@ /** * Abstract redmine report mojo. * - * @author chemit - * @requiresReports true + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public abstract class AbstractRedmineReport extends AbstractRedmineMojoWithProject implements MavenReport, RedmineVersionAware { @@ -69,9 +70,9 @@ /** * redmine version name. * - * @parameter expression="${redmine.versionId}" default-value="${project.version}" * @since 1.0.0 */ + @Parameter(property = "redmine.versionId", defaultValue = "${project.version}") protected String versionId; /** @@ -82,9 +83,9 @@ * Note: If set to {@code false}, you should fill {@link #username} * and {@link #password} properties. * - * @parameter expression="${redmine.anonymous}" default-value="true" * @since 1.1.3 */ + @Parameter(property = "redmine.anonymous", defaultValue = "true") protected boolean anonymous; /** @@ -96,10 +97,10 @@ * and everything that comes after it. <code>%ISSUE%</code>: this is the issue number. * * - * @parameter expression="${redmine.issueLinkTemplate}" default-value="%URL%/issues/show/%ISSUE%" * @since 1.0.0 */ - protected String issueLinkTemplate; + @Parameter(property = "redmine.issueLinkTemplate", defaultValue = "%URL%/issues/show/%ISSUE%") + protected String issueLinkTemplate = "%URL%/issues/show/%ISSUE%"; /** * Template strings per system that is used to discover the URL to use to display an issue report. Each key in this @@ -110,47 +111,37 @@ * and everything that comes after it. <code>%VERSION%</code>: this is the issue number. * * - * @parameter expression="${redmine.versionLinkTemplate}" default-value="%URL%/versions/show/%VERSION%" * @since 1.0.0 */ - protected String versionLinkTemplate; + @Parameter(property = "redmine.versionLinkTemplate", defaultValue = "%URL%/versions/show/%VERSION%") + protected String versionLinkTemplate = "%URL%/versions/show/%VERSION%"; - /** - * Local Repository. - * - * @parameter expression="${localRepository}" - * @required - * @readonly - */ + /** Local Repository. */ + @Parameter(property = "localRepository", required = true, readonly = true) protected ArtifactRepository localRepository; /** * Report output directory. Note that this parameter is only relevant if the goal is run from the command line or * from the default build lifecycle. If the goal is run indirectly as part of a site generation, the output * directory configured in the Maven Site Plugin is used instead. - * - * @parameter default-value="${project.reporting.outputDirectory}" */ + @Parameter(defaultValue = "${project.reporting.outputDirectory}") protected File outputDirectory; - /** @component */ + /** */ + @Component protected ArtifactResolver resolver; - /** @component */ + /** */ + @Component protected ArtifactFactory factory; - /** - * Internationalization. - * - * @component - */ + /** Internationalization. */ + @Component protected I18N i18n; - /** - * Doxia Site Renderer. - * - * @component - */ + /** Doxia Site Renderer. */ + @Component protected Renderer siteRenderer; private Sink sink; @@ -175,6 +166,17 @@ public void setAnonymous(boolean anonymous) { this.anonymous = anonymous; } + + @Override + public final String getVersionId() { + return versionId; + } + + @Override + public void setVersionId(String versionId) { + this.versionId = versionId; + } + /////////////////////////////////////////////////////////////////////////// /// Plugin /////////////////////////////////////////////////////////////////////////// Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2012-07-15 10:59:44 UTC (rev 301) @@ -52,7 +52,7 @@ /** * Generates a Redmine report. * - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssueReportGenerator { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReport.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server * - * @author tchemit - * @goal issues-report + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReport extends AbstractIssuesReport { /** @@ -43,6 +46,7 @@ * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntries; /** @@ -50,9 +54,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersion; /** @@ -81,9 +85,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filters; /** @@ -98,9 +102,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 1.0.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNames; /** @@ -109,9 +113,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReport}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReport", defaultValue = "false") protected boolean skipIssueReport; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssignee.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by assignee. * - * @author tchemit - * @goal issues-report-by-assignee + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report-by-assignee", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByAssignee extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * * Note: use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByAssignee; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByAssignee; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByAssignee; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByAssignee; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByAssignee}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByAssignee", defaultValue = "false") protected boolean skipIssueReportByAssignee; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategory.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by category. * - * @author tchemit - * @goal issues-report-by-category + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report-by-category", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByCategory extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * * Note: use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByCategory; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByCategory; /** @@ -81,9 +84,9 @@ * mvn redmine:display-data -Dtypes=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByCategory; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByCategory; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByCategory}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByCategory", defaultValue = "false") protected boolean skipIssueReportByCategory; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriority.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by priority. * - * @author tchemit - * @goal issues-report-by-priority + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report-by-priority", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByPriority extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * * Note: use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByPriority; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByPriority; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByPriority; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByPriority; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByPriority}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByPriority", defaultValue = "false") protected boolean skipIssueReport; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporter.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by reporter. * - * @author tchemit - * @goal issues-report-by-reporter + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report-by-reporter", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByReporter extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * * Note: use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByReporter; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByReporter; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByReporter; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByReporter; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByReporter}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByReporter", defaultValue = "false") protected boolean skipIssueReportByReporter; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatus.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by status. * - * @author tchemit - * @goal issues-report-by-status + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report-by-status", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByStatus extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * * Note: use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByStatus; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByStatus; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByStatus; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByStatus; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByStatus}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByStatus", defaultValue = "false") protected boolean skipIssueReportByStatus; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByTracker.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by tracker. * - * @author tchemit - * @goal issues-report-by-tracker + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report-by-tracker", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByTracker extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * * Note: use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByTracker; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByTracker; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByTracker; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByTracker; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByTracker}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByTracker", defaultValue = "false") protected boolean skipIssueReportByTracker; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersion.java 2012-07-15 10:59:44 UTC (rev 301) @@ -24,15 +24,18 @@ */ package org.nuiton.jredmine.plugin.report; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; + import java.util.Map; /** * Generates a report for issues from Redmine's server group by version. * - * @author tchemit - * @goal issues-report-by-version + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ +@Mojo(name = "issues-report-by-version", requiresOnline = true, requiresProject = true, requiresReports = true) public class IssuesReportByVersion extends AbstractIssuesReport { /** @@ -40,9 +43,9 @@ * * Note: use value 0 to have no limits * - * @parameter expression="${redmine.maxEntries}" default-value="100" * @since 1.0.0 */ + @Parameter(property = "redmine.maxEntries", defaultValue = "100") protected int maxEntriesByVersion; /** @@ -50,9 +53,9 @@ * The current version being used is <code>${project.version}</code> minus * any "-SNAPSHOT" suffix. * - * @parameter expression="${redmine.onlyCurrentVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.onlyCurrentVersion", defaultValue = "false") protected boolean onlyCurrentVersionByVersion; /** @@ -81,9 +84,9 @@ * mvn redmine:display-ids -Dtype=<entry key> * </pre> * - * @parameter * @since 1.0.0 */ + @Parameter protected Map<String, String> filtersByVersion; /** @@ -98,9 +101,9 @@ * <code>Updated</code>. * * - * @parameter expression="${redmine.columnNames}" default-value="Tracker,Category,Key,Summary,Status,Assignee,Version" * @since 2.0 */ + @Parameter(property = "redmine.columnNames", defaultValue = "Tracker,Category,Key,Summary,Status,Assignee,Version") protected String columnNamesByVersion; /** @@ -109,9 +112,9 @@ * This can be usefull since there is no way to skip a report from an * inherited reportSet configuration. * - * @parameter expression="${redmine.skipIssueReportByVersion}" default-value="false" * @since 1.0.0 */ + @Parameter(property = "redmine.skipIssueReportByVersion", defaultValue = "false") protected boolean skipIssueReportByVersion; @Override Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/AbstractRedmineMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -38,7 +38,7 @@ /** * @param type of mojo to test - * @author chemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public abstract class AbstractRedmineMojoTest extends AbstractMojoTest { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/DisplayDataMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -27,7 +27,7 @@ import org.junit.Test; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class DisplayDataMojoTest extends AbstractRedmineMojoTest<DisplayDataMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/GenerateChangesMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -30,7 +30,7 @@ import java.io.IOException; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class GenerateChangesMojoTest extends AbstractRedmineMojoTest<GenerateChangesMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/NextVersionMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -30,7 +30,7 @@ import java.io.IOException; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class NextVersionMojoTest extends AbstractRedmineMojoTest<NextVersionMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishAttachmentsMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -30,7 +30,7 @@ import java.io.IOException; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class PublishAttachmentsMojoTest extends AbstractRedmineMojoTest<PublishAttachmentsMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/PublishNewsMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -30,7 +30,7 @@ import java.io.IOException; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class PublishNewsMojoTest extends AbstractRedmineMojoTest<PublishNewsMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/UpdateVersionMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -30,7 +30,7 @@ import java.io.IOException; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class UpdateVersionMojoTest extends AbstractRedmineMojoTest<UpdateVersionMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateEmailAnnouncementMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -29,7 +29,7 @@ /** * - * @author chemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class GenerateEmailAnnouncementMojoTest extends AbstractRedmineMojoTest<GenerateEmailAnnouncementMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/announcement/GenerateNewsAnnouncementMojoTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -29,7 +29,7 @@ /** * - * @author chemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class GenerateNewsAnnouncementMojoTest extends AbstractRedmineMojoTest<GenerateNewsAnnouncementMojo> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReportTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -30,7 +30,7 @@ /** * @param type of issue reports to test - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public abstract class AbstractIssuesReportTest extends AbstractRedmineMojoTest { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssigneeTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssigneeTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByAssigneeTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportByAssigneeTest extends AbstractIssuesReportTest<IssuesReportByAssignee> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategoryTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategoryTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByCategoryTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportByCategoryTest extends AbstractIssuesReportTest<IssuesReportByAssignee> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriorityTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriorityTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByPriorityTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportByPriorityTest extends AbstractIssuesReportTest<IssuesReportByAssignee> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporterTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporterTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByReporterTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportByReporterTest extends AbstractIssuesReportTest<IssuesReportByAssignee> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatusTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatusTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByStatusTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportByStatusTest extends AbstractIssuesReportTest<IssuesReportByAssignee> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByTrackerTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByTrackerTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByTrackerTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportByTrackerTest extends AbstractIssuesReportTest<IssuesReportByAssignee> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersionTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersionTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportByVersionTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportByVersionTest extends AbstractIssuesReportTest<IssuesReportByAssignee> { Modified: branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportTest.java =================================================================== --- branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportTest.java 2012-07-14 17:28:17 UTC (rev 300) +++ branches/jredmine-1.x/jredmine-maven-plugin/src/test/java/org/nuiton/jredmine/plugin/report/IssuesReportTest.java 2012-07-15 10:59:44 UTC (rev 301) @@ -25,7 +25,7 @@ package org.nuiton.jredmine.plugin.report; /** - * @author tchemit + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.0 */ public class IssuesReportTest extends AbstractIssuesReportTest<IssuesReportByAssignee> {

1 0