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

r392 - trunk
by tchemit＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:43:52 +0100 (Tue, 30 Oct 2012) New Revision: 392 Url: http://nuiton.org/repositories/revision/jredmine/392 Log: Update mavenpom4redmineAndCentral to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 16:26:42 UTC (rev 391) +++ trunk/pom.xml 2012-10-30 07:43:52 UTC (rev 392) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <artifactId>jredmine</artifactId>

1 0

r391 - in trunk: . jredmine-client jredmine-maven-plugin
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 18:26:42 +0200 (Fri, 26 Oct 2012) New Revision: 391 Url: http://nuiton.org/repositories/revision/jredmine/391 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 2012-10-26 16:26:40 UTC (rev 390) +++ trunk/jredmine-client/pom.xml 2012-10-26 16:26:42 UTC (rev 391) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2012-10-26 16:26:40 UTC (rev 390) +++ trunk/jredmine-maven-plugin/pom.xml 2012-10-26 16:26:42 UTC (rev 391) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 16:26:40 UTC (rev 390) +++ trunk/pom.xml 2012-10-26 16:26:42 UTC (rev 391) @@ -31,7 +31,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> <name>JRedmine</name> <description>JRedmine is a java redmine client</description> @@ -74,11 +74,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.5.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jredmine/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.5.1 + scm:svn:http://svn.nuiton.org/svn/jredmine/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.5.1</url> + <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> </scm> <distributionManagement>

1 0

r390 - tags
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 18:26:40 +0200 (Fri, 26 Oct 2012) New Revision: 390 Url: http://nuiton.org/repositories/revision/jredmine/390 Log: [maven-release-plugin] copy for tag jredmine-1.5.1 Added: tags/jredmine-1.5.1/

1 0

r389 - in trunk: . jredmine-client jredmine-maven-plugin
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 18:26:37 +0200 (Fri, 26 Oct 2012) New Revision: 389 Url: http://nuiton.org/repositories/revision/jredmine/389 Log: [maven-release-plugin] prepare release jredmine-1.5.1 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 2012-10-26 16:23:37 UTC (rev 388) +++ trunk/jredmine-client/pom.xml 2012-10-26 16:26:37 UTC (rev 389) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/jredmine-maven-plugin/pom.xml =================================================================== --- trunk/jredmine-maven-plugin/pom.xml 2012-10-26 16:23:37 UTC (rev 388) +++ trunk/jredmine-maven-plugin/pom.xml 2012-10-26 16:26:37 UTC (rev 389) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jredmine</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1</version> </parent> <groupId>org.nuiton.jredmine</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 16:23:37 UTC (rev 388) +++ trunk/pom.xml 2012-10-26 16:26:37 UTC (rev 389) @@ -31,7 +31,7 @@ </parent> <artifactId>jredmine</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1</version> <name>JRedmine</name> <description>JRedmine is a java redmine client</description> @@ -74,11 +74,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.5.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jredmine/trunk + scm:svn:http://svn.nuiton.org/svn/jredmine/tags/jredmine-1.5.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/jredmine/trunk</url> + <url>http://www.nuiton.org/repositories/browse/jredmine/tags/jredmine-1.5.1</url> </scm> <distributionManagement>

1 0

r388 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 18:23:37 +0200 (Fri, 26 Oct 2012) New Revision: 388 Url: http://nuiton.org/repositories/revision/jredmine/388 Log: fixes #2382: For post and put request prefer use parameters in a form rather than by url 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 2012-10-26 16:06:28 UTC (rev 387) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2012-10-26 16:23:37 UTC (rev 388) @@ -25,19 +25,23 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.collections.MapUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; 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; import org.apache.http.StatusLine; import org.apache.http.client.CookieStore; import org.apache.http.client.HttpClient; import org.apache.http.client.ResponseHandler; +import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpGet; @@ -51,6 +55,7 @@ import org.apache.http.entity.mime.content.StringBody; import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; import org.apache.http.params.CoreProtocolPNames; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; @@ -64,6 +69,7 @@ import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; +import java.util.List; import java.util.Map; /** @@ -367,7 +373,7 @@ if (MapUtils.isEmpty(attachments)) { // not a multi-part request - addParams(gm, parameters); + addParamsAsEntity(gm, parameters); } else { // multi-part request @@ -387,7 +393,7 @@ if (MapUtils.isEmpty(attachments)) { // not a multi-part request - addParams(gm, parameters); + addParamsAsEntity(gm, parameters); } else { @@ -426,7 +432,34 @@ } } + protected void addParamsAsEntity(HttpEntityEnclosingRequest gm, + Map<String, String> parameters) throws IOException { + if (MapUtils.isNotEmpty(parameters)) { + + // add parameters + + List<NameValuePair> params = Lists.newArrayList(); + + for (Map.Entry<String, String> entry : parameters.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + if (value == null) { + if (log.isDebugEnabled()) { + log.debug("skip null parameter " + key); + } + continue; + } + params.add(new BasicNameValuePair(key, value)); + } + + UrlEncodedFormEntity entity = new UrlEncodedFormEntity( + params, + configuration.getEncoding()); + gm.setEntity(entity); + } + } + protected void prepareMultiPart(HttpEntityEnclosingRequestBase gm, Map<String, File> attachments, Map<String, String> parameters) throws IOException {

1 0

r387 - trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 18:06:28 +0200 (Fri, 26 Oct 2012) New Revision: 387 Url: http://nuiton.org/repositories/revision/jredmine/387 Log: fixes #2379: Could not login to redmine using the jredmine login api Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb Modified: trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb =================================================================== --- trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2012-10-26 11:51:48 UTC (rev 386) +++ trunk/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb 2012-10-26 16:06:28 UTC (rev 387) @@ -473,6 +473,10 @@ end end end + if user.nil? + # Last chance using request params + user = User.try_to_login(params[:username], params[:password]) + end user end

1 0

r386 - trunk
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 13:51:48 +0200 (Fri, 26 Oct 2012) New Revision: 386 Url: http://nuiton.org/repositories/revision/jredmine/386 Log: fixes #2380: Updates to mavenpom 3.4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:43:32 UTC (rev 385) +++ trunk/pom.xml 2012-10-26 11:51:48 UTC (rev 386) @@ -59,12 +59,8 @@ <projectId>jredmine</projectId>  - <jredminePluginVersion>1.4</jredminePluginVersion> + <jredminePluginVersion>1.5</jredminePluginVersion> -  - <helperPluginVersion>1.6</helperPluginVersion> - <httpCommonsHttpclientVersion>4.2.1</httpCommonsHttpclientVersion> - <doxiaVersion>1.3</doxiaVersion>

1 0

r385 - trunk
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 13:43:32 +0200 (Fri, 26 Oct 2012) New Revision: 385 Url: http://nuiton.org/repositories/revision/jredmine/385 Log: Update mavenpom4redmineAndCentral to 3.4.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 09:06:30 UTC (rev 384) +++ trunk/pom.xml 2012-10-26 11:43:32 UTC (rev 385) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4</version> + <version>3.4.2</version> </parent> <artifactId>jredmine</artifactId>

1 0

r384 - tags/jredmine-1.5/jredmine-client/src/main/java/org/nuiton/jredmine/client
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 11:06:30 +0200 (Fri, 26 Oct 2012) New Revision: 384 Url: http://nuiton.org/repositories/revision/jredmine/384 Log: fixes #2377: Can't publish attachment any more Modified: tags/jredmine-1.5/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java Modified: tags/jredmine-1.5/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java =================================================================== --- tags/jredmine-1.5/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2012-10-26 09:05:13 UTC (rev 383) +++ tags/jredmine-1.5/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2012-10-26 09:06:30 UTC (rev 384) @@ -471,7 +471,6 @@ } gm.setEntity(entity); gm.addHeader("content-type", entity.getContentType().getValue()); - gm.addHeader("content-length", entity.getContentLength() + ""); if (showRequest) { log.info("content-type : " + entity.getContentType() + ", content-length : " + entity.getContentLength());

1 0

r383 - trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client
by tchemit＠users.nuiton.org 26 Oct '12

26 Oct '12

Author: tchemit Date: 2012-10-26 11:05:13 +0200 (Fri, 26 Oct 2012) New Revision: 383 Url: http://nuiton.org/repositories/revision/jredmine/383 Log: fixes #2377: Can't publish attachment any more 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 2012-10-26 08:50:24 UTC (rev 382) +++ trunk/jredmine-client/src/main/java/org/nuiton/jredmine/client/RedmineClient.java 2012-10-26 09:05:13 UTC (rev 383) @@ -471,7 +471,6 @@ } gm.setEntity(entity); gm.addHeader("content-type", entity.getContentType().getValue()); - gm.addHeader("content-length", entity.getContentLength() + ""); if (showRequest) { log.info("content-type : " + entity.getContentType() + ", content-length : " + entity.getContentLength());

1 0