[jredmine] branch develop updated (3c77857 -> c02efd2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jredmine. See http://git.nuiton.org/jredmine.git from 3c77857 refs #3318: Add a tool to fetch versions of a project in a file new f0e2aa8 fixes #3532: Add a get_project_closed_versions REST Request new c02efd2 fixes #3531: Migrates to git fixes #3255: Use pom and use new site layout The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c02efd28173f7a4c799b94af7ba408e3da740d88 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 8 11:06:34 2014 +0200 fixes #3531: Migrates to git fixes #3255: Use pom and use new site layout commit f0e2aa885e286bea97382ea5d3d2c49d0adbdb4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 8 10:45:20 2014 +0200 fixes #3532: Add a get_project_closed_versions REST Request Summary of changes: .../app/controllers/jredmine_controller.rb | 6 + jredmine-client/src/site/apt/rails_api.apt | 13 ++ jredmine-client/src/site/{site_fr.xml => site.xml} | 30 ---- .../src/site/{site_fr.xml => site.xml} | 35 ----- pom.xml | 153 ++++++++++++++------- src/site/site.xml | 69 ++++++++++ src/site/site_fr.xml | 117 ---------------- 7 files changed, 188 insertions(+), 235 deletions(-) rename jredmine-client/src/site/{site_fr.xml => site.xml} (60%) rename jredmine-maven-plugin/src/site/{site_fr.xml => site.xml} (67%) create mode 100644 src/site/site.xml delete mode 100644 src/site/site_fr.xml -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jredmine. See http://git.nuiton.org/jredmine.git commit f0e2aa885e286bea97382ea5d3d2c49d0adbdb4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 8 10:45:20 2014 +0200 fixes #3532: Add a get_project_closed_versions REST Request --- .../jredmine-2.x/app/controllers/jredmine_controller.rb | 6 ++++++ jredmine-client/src/site/apt/rails_api.apt | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb b/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb index b3bdd70..2592251 100644 --- a/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb +++ b/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb @@ -165,6 +165,12 @@ class JredmineController < ActionController::Base render_array_result @versions, "versions" end + # recuperation des versions fermees d'un projet + def get_project_closed_versions + @versions = @project.versions.find(:all, :conditions => [ "status = 'closed'" ]) + render_array_result @versions, "versions" + end + # recuperation de toutes les issues d'un projet def get_project_issues r =@project.issues.find(:all) diff --git a/jredmine-client/src/site/apt/rails_api.apt b/jredmine-client/src/site/apt/rails_api.apt index 1305637..b976b99 100644 --- a/jredmine-client/src/site/apt/rails_api.apt +++ b/jredmine-client/src/site/apt/rails_api.apt @@ -216,6 +216,8 @@ jredmine/get_issue_priorities.json *-------------------------------*---------------------------------------+ | <<get_project_versions>> | toutes les versions d'un projet | *-------------------------------*---------------------------------------+ +| <<get_project_closed_versions>>| toutes les versions fermées d'un projet | +*-------------------------------*---------------------------------------+ | <<get_project_issues>> | toutes les issues d'un projet | *-------------------------------*---------------------------------------+ | <<get_project_opened_issues>> | toutes les issues ouvertes d'un projet| @@ -278,6 +280,17 @@ jredmine/get_project_versions.xml/myProject jredmine/get_project_versions.json/myProject -------------------------------------------------------------------------------- +** get_project_closed_versions + + Ce service ne requiert pas de paramètre. + + Requètes : + +-------------------------------------------------------------------------------- +jredmine/get_project_closed_versions.xml/myProject +jredmine/get_project_closed_versions.json/myProject +-------------------------------------------------------------------------------- + ** get_issues Ce service ne requiert pas de paramètre. -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jredmine. See http://git.nuiton.org/jredmine.git commit c02efd28173f7a4c799b94af7ba408e3da740d88 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 8 11:06:34 2014 +0200 fixes #3531: Migrates to git fixes #3255: Use pom and use new site layout --- jredmine-client/src/site/{site_fr.xml => site.xml} | 30 ---- .../src/site/{site_fr.xml => site.xml} | 35 ----- pom.xml | 153 ++++++++++++++------- src/site/site.xml | 69 ++++++++++ src/site/site_fr.xml | 117 ---------------- 5 files changed, 169 insertions(+), 235 deletions(-) diff --git a/jredmine-client/src/site/site_fr.xml b/jredmine-client/src/site/site.xml similarity index 60% rename from jredmine-client/src/site/site_fr.xml rename to jredmine-client/src/site/site.xml index c3d562a..220bcbb 100644 --- a/jredmine-client/src/site/site_fr.xml +++ b/jredmine-client/src/site/site.xml @@ -35,14 +35,6 @@ <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> <breadcrumbs> <item name="${project.name}" href="index.html"/> @@ -56,29 +48,7 @@ <item name="JRedmine java service" href="redmine_service.html"/> </menu> - <menu name="Téléchargement"> - <item href="https://forge.nuiton.org/projects/jredmine/files" - name="Sources bundles"/> - </menu> - <menu ref="reports"/> - <footer> - - <div id='projectMetas' locale='fr' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_vmFiles=",," - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> - </body> </project> diff --git a/jredmine-maven-plugin/src/site/site_fr.xml b/jredmine-maven-plugin/src/site/site.xml similarity index 67% rename from jredmine-maven-plugin/src/site/site_fr.xml rename to jredmine-maven-plugin/src/site/site.xml index c2dbe7c..f410d0f 100644 --- a/jredmine-maven-plugin/src/site/site_fr.xml +++ b/jredmine-maven-plugin/src/site/site.xml @@ -35,15 +35,6 @@ <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> - <breadcrumbs> <item name="${project.name}" href="index.html"/> </breadcrumbs> @@ -76,33 +67,7 @@ </item> </menu> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/jredmine/jredmine-maven-plugin/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - <menu ref="reports"/> - <footer> - - <div id='projectMetas' locale='fr' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_vmFiles=",usage.html," - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> - </body> </project> diff --git a/pom.xml b/pom.xml index a1f57b6..42fdc5d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,31 +20,34 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<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> + <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.1-SNAPSHOT</version> + <artifactId>nuitonpom</artifactId> + <version>1.4-SNAPSHOT</version> </parent> <artifactId>jredmine</artifactId> <version>1.8.3-SNAPSHOT</version> - <packaging>pom</packaging> - <name>JRedmine</name> - <description>JRedmine is a java redmine client</description> - <url>http://doc.nuiton.org/jredmine</url> - <inceptionYear>2009</inceptionYear> + <modules> + <module>jredmine-client</module> + <module>jredmine-maven-plugin</module> + </modules> <developers> <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit at codelutin dot com</email> + <email>chemit@codelutin.com</email> <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> @@ -53,29 +56,17 @@ </developers> + <name>JRedmine</name> + <description>JRedmine is a java redmine client</description> + <inceptionYear>2009</inceptionYear> + <url>http://doc.nuiton.org/jredmine</url> + + <packaging>pom</packaging> + <prerequisites> <maven>3.0</maven> </prerequisites> - <modules> - <module>jredmine-client</module> - <module>jredmine-maven-plugin</module> - </modules> - - <scm> - <connection>scm:git:http://git.nuiton.org/jredmine.git</connection> - <developerConnection> - scm:git:https://git.nuiton.org/jredmine.git - </developerConnection> - <url>https://gitweb.nuiton.org/jredmine.git</url> - </scm> - <distributionManagement> - <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> - </site> - </distributionManagement> - <properties> <projectId>jredmine</projectId> @@ -84,20 +75,36 @@ <jredminePluginVersion>1.8.2</jredminePluginVersion> <doxiaVersion>1.6</doxiaVersion> + <mavenVersion>2.2.1</mavenVersion> + <helperPluginVersion>2.1</helperPluginVersion> <!-- documentation is in apt --> <siteSourcesType>apt</siteSourcesType> </properties> + <scm> + <connection>scm:git:http://git.nuiton.org/jredmine.git</connection> + <developerConnection>scm:git:https://git.nuiton.org/jredmine.git</developerConnection> + <url>https://gitweb.nuiton.org/jredmine.git</url> + </scm> + + <distributionManagement> + <site> + <id>${site.server}</id> + <url>${site.url}</url> + </site> + </distributionManagement> + <dependencyManagement> <dependencies> + <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-rc-2</version> <exclusions> <exclusion> <groupId>org.nuiton.i18n</groupId> @@ -106,10 +113,52 @@ </exclusions> </dependency> + <!-- Commons --> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.9.2</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.9</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.3.2</version> + </dependency> + + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.3.2</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>4.3.5</version> + </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${httpCommonsHttpclientVersion}</version> + <version>4.3.5</version> <exclusions> <exclusion> <groupId>commons-codec</groupId> @@ -118,6 +167,13 @@ </exclusions> </dependency> + <!-- Guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>17.0</version> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-api</artifactId> @@ -466,13 +522,26 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4jVersion}</version> + <version>1.2.17</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.0.17</version> + </dependency> + <!-- tests dependencies --> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> @@ -595,28 +664,6 @@ <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> diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..50ea83c --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JRedmine + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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% + --> + + +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + <logo href="${siteCommonResourcesUrl}/jrst" name="JRst" img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <links> + <item name="nuiton.org" href="http://forge.nuiton.org"/> + <item name="CodeLutin" href="http://codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu ref="modules"/> + + <menu name="Utilisateur"> + <item name="Introduction" href="index.html"/> + <item name="Tests" href="tests.html"/> + </menu> + + </body> +</project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml deleted file mode 100644 index 65b7bfd..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - JRedmine - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2010 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% - --> - - -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> - - <body> - - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> - - <links> - <item name="nuiton.org" href="http://www.nuiton.org"/> - <item name="CodeLutin" href="http://codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - <item name="${project.version}" - href="${project.url}/${siteDeployClassifier}/index.html"/> - </breadcrumbs> - - - <menu name="Utilisateur"> - <item name="Introduction" href="index.html"/> - <item name="Tests" href="tests.html"/> - </menu> - - <menu ref="modules"/> - - <menu ref="reports"/> - - <footer> - - <div id='projectMetas' locale='fr' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_vmFiles=",," - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> - - </body> -</project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm