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

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

r417 - in trunk: . jredmine-maven-plugin
by tchemit＠users.nuiton.org 09 Aug '13

09 Aug '13

Author: tchemit Date: 2013-08-09 11:04:23 +0200 (Fri, 09 Aug 2013) New Revision: 417 Url: http://nuiton.org/projects/jredmine/repository/revisions/417 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2013-08-08 14:28:56 UTC (rev 416) +++ trunk/jredmine-maven-plugin/pom.xml 2013-08-09 09:04:23 UTC (rev 417) @@ -39,6 +39,12 @@ JRedmine maven plugin to interacts with Redmine's server </description> + <properties> + +  + <skipPostRelease>false</skipPostRelease> + </properties> + <dependencies> <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-08 14:28:56 UTC (rev 416) +++ trunk/pom.xml 2013-08-09 09:04:23 UTC (rev 417) @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <artifactId>jredmine</artifactId>

1 0

r416 - in trunk: . jredmine-client jredmine-maven-plugin
by maven-release＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: maven-release Date: 2013-08-08 16:28:56 +0200 (Thu, 08 Aug 2013) New Revision: 416 Url: http://nuiton.org/projects/jredmine/repository/revisions/416 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jredmine-client/pom.xml trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2013-08-08 14:28:53 UTC (rev 415) +++ trunk/jredmine-client/pom.xml 2013-08-08 14:28:56 UTC (rev 416) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2013-08-08 14:28:53 UTC (rev 415) +++ trunk/jredmine-maven-plugin/pom.xml 2013-08-08 14:28:56 UTC (rev 416) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-08 14:28:53 UTC (rev 415) +++ trunk/pom.xml 2013-08-08 14:28:56 UTC (rev 416) @@ -30,7 +30,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> <packaging>pom</packaging> <name>JRedmine</name> @@ -63,11 +63,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.6</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.6 + scm:svn:http://svn.nuiton.org/svn/jredmine/trunk </developerConnection> - <url>http://nuiton.org/projects/jredmine/repository/show/tags/jredmine-1.6</url> + <url>http://nuiton.org/projects/jredmine/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r415 - tags
by maven-release＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: maven-release Date: 2013-08-08 16:28:53 +0200 (Thu, 08 Aug 2013) New Revision: 415 Url: http://nuiton.org/projects/jredmine/repository/revisions/415 Log: [maven-release-plugin] copy for tag jredmine-1.6 Added: tags/jredmine-1.6/

1 0

r414 - in trunk: . jredmine-client jredmine-maven-plugin
by maven-release＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: maven-release Date: 2013-08-08 16:28:50 +0200 (Thu, 08 Aug 2013) New Revision: 414 Url: http://nuiton.org/projects/jredmine/repository/revisions/414 Log: [maven-release-plugin] prepare release jredmine-1.6 Modified: trunk/jredmine-client/pom.xml trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2013-08-08 14:26:32 UTC (rev 413) +++ trunk/jredmine-client/pom.xml 2013-08-08 14:28:50 UTC (rev 414) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2013-08-08 14:26:32 UTC (rev 413) +++ trunk/jredmine-maven-plugin/pom.xml 2013-08-08 14:28:50 UTC (rev 414) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-08 14:26:32 UTC (rev 413) +++ trunk/pom.xml 2013-08-08 14:28:50 UTC (rev 414) @@ -30,7 +30,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> <packaging>pom</packaging> <name>JRedmine</name> @@ -63,11 +63,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.6</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/trunk + scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.6 </developerConnection> - <url>http://nuiton.org/projects/jredmine/repository/show/trunk</url> + <url>http://nuiton.org/projects/jredmine/repository/show/tags/jredmine-1.6</url> </scm> <distributionManagement> <site>

1 0

r413 - in trunk: . jredmine-client jredmine-maven-plugin
by tchemit＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: tchemit Date: 2013-08-08 16:26:32 +0200 (Thu, 08 Aug 2013) New Revision: 413 Url: http://nuiton.org/projects/jredmine/repository/revisions/413 Log: apply tidy plugin on pom Modified: trunk/jredmine-client/pom.xml trunk/jredmine-maven-plugin/pom.xml trunk/pom.xml Modified: trunk/jredmine-client/pom.xml =================================================================== --- trunk/jredmine-client/pom.xml 2013-08-08 14:05:04 UTC (rev 412) +++ trunk/jredmine-client/pom.xml 2013-08-08 14:26:32 UTC (rev 413) @@ -22,7 +22,6 @@ --> <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> @@ -33,6 +32,7 @@ <groupId>org.nuiton.jredmine</groupId> <artifactId>jredmine-client</artifactId> + <name>JRedmine :: Client</name> <description>The JRedmine client</description> @@ -117,7 +117,6 @@ </dependencies> <build> - <plugins>  <plugin> @@ -132,7 +131,6 @@ </executions> </plugin> </plugins> - </build> <reporting> @@ -256,5 +254,4 @@ </profile> </profiles> - </project> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2013-08-08 14:05:04 UTC (rev 412) +++ trunk/jredmine-maven-plugin/pom.xml 2013-08-08 14:26:32 UTC (rev 413) @@ -22,7 +22,6 @@ --> <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> @@ -33,12 +32,12 @@ <groupId>org.nuiton.jredmine</groupId> <artifactId>jredmine-maven-plugin</artifactId> + <packaging>maven-plugin</packaging> <name>JRedmine :: Maven plugin</name> <description> JRedmine maven plugin to interacts with Redmine's server </description> - <packaging>maven-plugin</packaging> <dependencies> @@ -199,7 +198,6 @@ </dependencies> <build> - <pluginManagement> <plugins> @@ -221,7 +219,6 @@ </plugins> </pluginManagement> - </build> <profiles> @@ -290,5 +287,4 @@ </profile> </profiles> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-08 14:05:04 UTC (rev 412) +++ trunk/pom.xml 2013-08-08 14:26:32 UTC (rev 413) @@ -21,7 +21,6 @@ #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"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -32,12 +31,12 @@ <artifactId>jredmine</artifactId> <version>1.6-SNAPSHOT</version> + <packaging>pom</packaging> <name>JRedmine</name> <description>JRedmine is a java redmine client</description> - <inceptionYear>2009</inceptionYear> <url>http://maven-site.nuiton.org/jredmine</url> - <packaging>pom</packaging> + <inceptionYear>2009</inceptionYear> <developers> @@ -58,23 +57,6 @@ <maven>3.0</maven> </prerequisites> - <properties> - - <projectId>jredmine</projectId> - -  - <jredminePluginVersion>1.5.1</jredminePluginVersion> - -  - <helperPluginVersion>2.1</helperPluginVersion> - - <doxiaVersion>1.4</doxiaVersion> - -  - <siteSourcesType>apt</siteSourcesType> - - </properties> - <modules> <module>jredmine-client</module> <module>jredmine-maven-plugin</module> @@ -87,7 +69,6 @@ </developerConnection> <url>http://nuiton.org/projects/jredmine/repository/show/trunk</url> </scm> - <distributionManagement> <site> <id>${platform}</id> @@ -95,6 +76,23 @@ </site> </distributionManagement> + <properties> + + <projectId>jredmine</projectId> + +  + <jredminePluginVersion>1.5.1</jredminePluginVersion> + +  + <helperPluginVersion>2.1</helperPluginVersion> + + <doxiaVersion>1.4</doxiaVersion> + +  + <siteSourcesType>apt</siteSourcesType> + + </properties> + <dependencyManagement> <dependencies> @@ -574,7 +572,6 @@ </dependencyManagement> <build> - <pluginManagement> <plugins> @@ -604,7 +601,6 @@ </plugins> </pluginManagement> - </build> <profiles> @@ -798,5 +794,4 @@ </profile> </profiles> - </project>

1 0

r412 - trunk
by tchemit＠users.nuiton.org 08 Aug '13

08 Aug '13

Author: tchemit Date: 2013-08-08 16:05:04 +0200 (Thu, 08 Aug 2013) New Revision: 412 Url: http://nuiton.org/projects/jredmine/repository/revisions/412 Log: use las stable of helper-m-p Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-08 12:31:31 UTC (rev 411) +++ trunk/pom.xml 2013-08-08 14:05:04 UTC (rev 412) @@ -64,8 +64,10 @@  <jredminePluginVersion>1.5.1</jredminePluginVersion> - <helperPluginVersion>2.1-SNAPSHOT</helperPluginVersion> +  + <helperPluginVersion>2.1</helperPluginVersion> + <doxiaVersion>1.4</doxiaVersion>

1 0