September 2013 - Jredmine-commits - mailman.cloud.codelutin.com

r424 - trunk
by tchemit＠users.nuiton.org 12 Sep '13

12 Sep '13

Author: tchemit Date: 2013-09-12 12:28:37 +0200 (Thu, 12 Sep 2013) New Revision: 424 Url: http://nuiton.org/projects/jredmine/repository/revisions/424 Log: refs #2846: updates mavenpom to 4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-11 22:39:48 UTC (rev 423) +++ trunk/pom.xml 2013-09-12 10:28:37 UTC (rev 424) @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>jredmine</artifactId> @@ -99,12 +99,6 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${httpCommonsHttpclientVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>${httpCommonsHttpclientVersion}</version> <exclusions> @@ -116,12 +110,6 @@ </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>${httpCommonsHttpclientVersion}</version> - </dependency> - - <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-api</artifactId> <version>${helperPluginVersion}</version> @@ -185,13 +173,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.14</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> <version>1.1.8</version> <exclusions> @@ -225,12 +206,6 @@ </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.7</version> - </dependency> - - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${mavenVersion}</version>

1 0

r423 - trunk/jredmine-client/src/site/apt
by tchemit＠users.nuiton.org 11 Sep '13

11 Sep '13

Author: tchemit Date: 2013-09-12 00:39:48 +0200 (Thu, 12 Sep 2013) New Revision: 423 Url: http://nuiton.org/projects/jredmine/repository/revisions/423 Log: fix doc Modified: trunk/jredmine-client/src/site/apt/index.apt Modified: trunk/jredmine-client/src/site/apt/index.apt =================================================================== --- trunk/jredmine-client/src/site/apt/index.apt 2013-09-11 22:35:20 UTC (rev 422) +++ trunk/jredmine-client/src/site/apt/index.apt 2013-09-11 22:39:48 UTC (rev 423) @@ -118,7 +118,7 @@ * récupération du zip du plugin - * dézippage dans le répertoire <plugins> (ou <vendor/plugins> pour redmine < 2.0) + * dézippage dans le répertoire <plugins> (ou <vendor/plugins> pour redmine \< 2.0) * Attention, le répertoire dézippé contient le numéro de version, alors que redmine attend à avoir un répertoire <jredmine>, nous préconisons

1 0

r422 - trunk/jredmine-client/src/site/apt
by tchemit＠users.nuiton.org 11 Sep '13

11 Sep '13

Author: tchemit Date: 2013-09-12 00:35:20 +0200 (Thu, 12 Sep 2013) New Revision: 422 Url: http://nuiton.org/projects/jredmine/repository/revisions/422 Log: update doc Modified: trunk/jredmine-client/src/site/apt/index.apt Modified: trunk/jredmine-client/src/site/apt/index.apt =================================================================== --- trunk/jredmine-client/src/site/apt/index.apt 2013-09-11 22:11:55 UTC (rev 421) +++ trunk/jredmine-client/src/site/apt/index.apt 2013-09-11 22:35:20 UTC (rev 422) @@ -73,6 +73,8 @@ *----------------------------------------*---------------------------------*---------------------------------+ | <<redmine-2.1.x>> (2.1.2.stable.10557) | No | Yes | *----------------------------------------*---------------------------------*---------------------------------+ +| <<redmine-2.3.x>> ( 2.3.1.stable.11910)| No | Yes | +*----------------------------------------*---------------------------------*---------------------------------+ * Source du plugin @@ -116,7 +118,7 @@ * récupération du zip du plugin - * dézippage dans le répertoire vendor/plugins (ou plugins pour redmine 2.0) + * dézippage dans le répertoire <plugins> (ou <vendor/plugins> pour redmine < 2.0) * Attention, le répertoire dézippé contient le numéro de version, alors que redmine attend à avoir un répertoire <jredmine>, nous préconisons

1 0

r421 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client
by tchemit＠users.nuiton.org 11 Sep '13

11 Sep '13

Author: tchemit Date: 2013-09-12 00:11:55 +0200 (Thu, 12 Sep 2013) New Revision: 421 Url: http://nuiton.org/projects/jredmine/repository/revisions/421 Log: fixes #2836: jredmine client assumes redmine's context root is / (improve Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2013-09-11 20:57:58 UTC (rev 420) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2013-09-11 22:11:55 UTC (rev 421) @@ -68,7 +68,6 @@ import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; -import java.net.URL; import java.util.List; import java.util.Map; @@ -90,7 +89,7 @@ protected final HttpClient client; - protected final URL serverUrl; + protected final URI serverURI; protected final HttpContext clientContext; @@ -113,7 +112,12 @@ // Bind custom cookie store to the local context clientContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore); - serverUrl = configuration.getUrl(); + // Get server uri + try { + serverURI = configuration.getUrl().toURI(); + } catch (URISyntaxException e) { + throw new IllegalStateException("Could not get uri from " + configuration.getUrl()); + } // set encoding (will then encode parameters fine) client.getParams().setParameter( @@ -311,13 +315,7 @@ protected <T> String getRequestUrl(RedmineRequest<T> request) { - String result = null; - try { - String uri = serverUrl.toURI().toString(); - result = request.toPath(uri); - } catch (URISyntaxException e) { - throw new IllegalStateException(e); - } + String result = request.toPath(serverURI.toString()); return result; }

1 0

r420 - trunk/jredmine-maven-plugin/src/it
by tchemit＠users.nuiton.org 11 Sep '13

11 Sep '13

Author: tchemit Date: 2013-09-11 22:57:58 +0200 (Wed, 11 Sep 2013) New Revision: 420 Url: http://nuiton.org/projects/jredmine/repository/revisions/420 Log: refs #2836: jredmine client assumes redmine's context root is / (fix then bad it url) Modified: trunk/jredmine-maven-plugin/src/it/settings.xml Modified: trunk/jredmine-maven-plugin/src/it/settings.xml =================================================================== --- trunk/jredmine-maven-plugin/src/it/settings.xml 2013-09-11 20:57:30 UTC (rev 419) +++ trunk/jredmine-maven-plugin/src/it/settings.xml 2013-09-11 20:57:58 UTC (rev 420) @@ -69,7 +69,7 @@ <redmine.serverId>jredmine-test</redmine.serverId> <redmine.projectId>jredmine</redmine.projectId> <redmine.versionId>1.3</redmine.versionId> - <redmine.url>http://nuiton.org/projects</redmine.url> + <redmine.url>http://nuiton.org</redmine.url> <maven.redmine.issue.url> http://nuiton.org/issues/show/%ISSUE% </maven.redmine.issue.url>

1 0

r419 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client
by tchemit＠users.nuiton.org 11 Sep '13

11 Sep '13

Author: tchemit Date: 2013-09-11 22:57:30 +0200 (Wed, 11 Sep 2013) New Revision: 419 Url: http://nuiton.org/projects/jredmine/repository/revisions/419 Log: refs #2836: jredmine client assumes redmine's context root is / Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java Modified: trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java =================================================================== --- trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2013-09-11 20:56:50 UTC (rev 418) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2013-09-11 20:57:30 UTC (rev 419) @@ -33,7 +33,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; -import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; @@ -69,6 +68,7 @@ import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; +import java.net.URL; import java.util.List; import java.util.Map; @@ -90,7 +90,7 @@ protected final HttpClient client; - protected final HttpHost host; + protected final URL serverUrl; protected final HttpContext clientContext; @@ -113,17 +113,8 @@ // Bind custom cookie store to the local context clientContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore); - int port = configuration.getUrl().getPort(); - if (port == -1) { + serverUrl = configuration.getUrl(); - // no port set - host = new HttpHost(configuration.getUrl().getHost()); - } else { - - // a specific port is asked - host = new HttpHost(configuration.getUrl().getHost(), port); - } - // set encoding (will then encode parameters fine) client.getParams().setParameter( CoreProtocolPNames.HTTP_CONTENT_CHARSET, @@ -320,8 +311,13 @@ protected <T> String getRequestUrl(RedmineRequest<T> request) { - String uri = host.toURI(); - String result = request.toPath(uri); + String result = null; + try { + String uri = serverUrl.toURI().toString(); + result = request.toPath(uri); + } catch (URISyntaxException e) { + throw new IllegalStateException(e); + } return result; }

1 0

r418 - trunk/jredmine-client
by tchemit＠users.nuiton.org 11 Sep '13

11 Sep '13

Author: tchemit Date: 2013-09-11 22:56:50 +0200 (Wed, 11 Sep 2013) New Revision: 418 Url: http://nuiton.org/projects/jredmine/repository/revisions/418 Log: while using mavenpom 4.0, need to create archive to deploy before verify phase Modified: trunk/jredmine-client/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2013-08-09 09:04:23 UTC (rev 417) +++ trunk/jredmine-client/pom.xml 2013-09-11 20:56:50 UTC (rev 418) @@ -184,7 +184,7 @@ <executions> <execution> <id>create-assemblies</id> - <phase>verify</phase> + <phase>package</phase> <goals> <goal>single</goal> </goals>

1 0