- Maven-helper-plugin-commits - mailman.cloud.codelutin.com

r864 - trunk
by tchemit＠users.nuiton.org 11 Oct '12

11 Oct '12

Author: tchemit Date: 2012-10-11 04:48:33 +0200 (Thu, 11 Oct 2012) New Revision: 864 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/864 Log: Update mavenpom4redmineAndCentral to 3.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-30 14:43:29 UTC (rev 863) +++ trunk/pom.xml 2012-10-11 02:48:33 UTC (rev 864) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.7</version> + <version>3.4</version> </parent> <artifactId>helper-maven-plugin</artifactId>

1 0

r863 - trunk
by tchemit＠users.nuiton.org 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:43:29 +0200 (Thu, 30 Aug 2012) New Revision: 863 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/863 Log: Update mavenpom4redmineAndCentral to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-14 18:54:52 UTC (rev 862) +++ trunk/pom.xml 2012-08-30 14:43:29 UTC (rev 863) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.6</version> + <version>3.3.7</version> </parent> <artifactId>helper-maven-plugin</artifactId>

1 0

r862 - trunk
by tchemit＠users.nuiton.org 14 Aug '12

14 Aug '12

Author: tchemit Date: 2012-08-14 20:54:52 +0200 (Tue, 14 Aug 2012) New Revision: 862 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/862 Log: Update mavenpom4redmineAndCentral to 3.3.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-07 07:50:55 UTC (rev 861) +++ trunk/pom.xml 2012-08-14 18:54:52 UTC (rev 862) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <artifactId>helper-maven-plugin</artifactId>

1 0

r861 - trunk
by tchemit＠users.nuiton.org 07 Aug '12

07 Aug '12

Author: tchemit Date: 2012-08-07 09:50:55 +0200 (Tue, 07 Aug 2012) New Revision: 861 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/861 Log: Update mavenpom4redmine to 3.3.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-19 07:38:03 UTC (rev 860) +++ trunk/pom.xml 2012-08-07 07:50:55 UTC (rev 861) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.4</version> + <version>3.3.5</version> </parent> <artifactId>helper-maven-plugin</artifactId>

1 0

r860 - trunk/src/main/java/org/nuiton/io/rest
by tchemit＠users.nuiton.org 19 Jul '12

19 Jul '12

Author: tchemit Date: 2012-07-19 09:38:03 +0200 (Thu, 19 Jul 2012) New Revision: 860 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/860 Log: fixes #2199: Can add request headers in REST Api Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RestRequest.java trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java trunk/src/main/java/org/nuiton/io/rest/RestSession.java Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-19 06:30:26 UTC (rev 859) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-19 07:38:03 UTC (rev 860) @@ -156,6 +156,12 @@ } @Override + public Map<String, String> getHeaders(Object... args) { + // by default no header + return null; + } + + @Override public RestRequest create(final Object... args) { checkRequestArgs(args); @@ -178,6 +184,11 @@ } @Override + public Map<String, String> getHeaders() { + return AbstractRequestBuilder.this.getHeaders(args); + } + + @Override public boolean containsAttachments() { Map<String, File> attachments = getAttachments(); return attachments != null && !attachments.isEmpty(); Modified: trunk/src/main/java/org/nuiton/io/rest/RestRequest.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestRequest.java 2012-07-19 06:30:26 UTC (rev 859) +++ trunk/src/main/java/org/nuiton/io/rest/RestRequest.java 2012-07-19 07:38:03 UTC (rev 860) @@ -69,4 +69,12 @@ * @return 1.5 */ RestMethod getMethod(); + + /** + * Gets headers to add in request. + * + * @return the headers to add in request. + * @since 1.6 + */ + Map<String, String> getHeaders(); } Modified: trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java 2012-07-19 06:30:26 UTC (rev 859) +++ trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java 2012-07-19 07:38:03 UTC (rev 860) @@ -85,4 +85,13 @@ * @since 1.5 */ Map<String, File> getAttachments(Object... args); + + /** + * Computes the headers associated to this request + * + * @param args the args of the request + * @return headers to use for this request + * @since 1.6 + */ + Map<String, String> getHeaders(Object... args); } Modified: trunk/src/main/java/org/nuiton/io/rest/RestSession.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2012-07-19 06:30:26 UTC (rev 859) +++ trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2012-07-19 07:38:03 UTC (rev 860) @@ -25,6 +25,7 @@ package org.nuiton.io.rest; +import org.apache.commons.collections.MapUtils; import org.apache.commons.httpclient.Cookie; import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HttpClient; @@ -239,6 +240,14 @@ } } + Map<String, String> headers = request.getHeaders(); + if (MapUtils.isNotEmpty(headers)) { + + for (Entry<String, String> entry : headers.entrySet()) { + gm.addRequestHeader(entry.getKey(), entry.getValue()); + } + } + client.executeMethod(gm); return gm;

1 0

r859 - trunk
by maven-release＠users.nuiton.org 19 Jul '12

19 Jul '12

Author: maven-release Date: 2012-07-19 08:30:26 +0200 (Thu, 19 Jul 2012) New Revision: 859 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/859 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-19 06:30:25 UTC (rev 858) +++ trunk/pom.xml 2012-07-19 06:30:26 UTC (rev 859) @@ -36,7 +36,7 @@ <artifactId>helper-maven-plugin</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <dependencies> @@ -266,13 +266,13 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk </developerConnection> <url> - http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he… + http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk </url> </scm>

1 0

r858 - in tags: . maven-helper-plugin-1.5
by maven-release＠users.nuiton.org 19 Jul '12

19 Jul '12

Author: maven-release Date: 2012-07-19 08:30:25 +0200 (Thu, 19 Jul 2012) New Revision: 858 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/858 Log: [maven-release-plugin] copy for tag maven-helper-plugin-1.5 Added: tags/maven-helper-plugin-1.5/ Property changes on: tags/maven-helper-plugin-1.5 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.log .project .classpath .settings target .idea Added: svn:mergeinfo +

1 0

r857 - trunk
by maven-release＠users.nuiton.org 19 Jul '12

19 Jul '12

Author: maven-release Date: 2012-07-19 08:30:23 +0200 (Thu, 19 Jul 2012) New Revision: 857 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/857 Log: [maven-release-plugin] prepare release maven-helper-plugin-1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-18 00:14:43 UTC (rev 856) +++ trunk/pom.xml 2012-07-19 06:30:23 UTC (rev 857) @@ -20,9 +20,7 @@ <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> @@ -38,7 +36,7 @@ <artifactId>helper-maven-plugin</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <dependencies> @@ -268,13 +266,13 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/tags/maven-helper-plu… </developerConnection> <url> - http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk + http://www.nuiton.org/repositories/browse/maven-helper-plugin/tags/maven-he… </url> </scm>

1 0

r856 - trunk/src/main/java/org/nuiton/io/rest
by tchemit＠users.nuiton.org 18 Jul '12

18 Jul '12

Author: tchemit Date: 2012-07-18 02:14:43 +0200 (Wed, 18 Jul 2012) New Revision: 856 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/856 Log: fixes #2196: Improve RequestBuilder design Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-17 22:52:31 UTC (rev 855) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-18 00:14:43 UTC (rev 856) @@ -23,10 +23,15 @@ * #L% */ +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; +import org.apache.commons.lang3.ArrayUtils; +import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Map; /** @@ -48,6 +53,7 @@ } /** {@inheritDoc} */ + @Override public void addRequestBuilder(RestRequestBuilder builder) { String name = builder.getName(); if (requestBuilders.containsKey(name)) { @@ -58,6 +64,7 @@ } /** {@inheritDoc} */ + @Override public RestRequest getRequest(String id, Object... args) { RestRequest r; @@ -78,10 +85,132 @@ } /** {@inheritDoc} */ + @Override public RestRequestBuilder getRequestBuilder(String id) { RestRequestBuilder builder = requestBuilders.get(id); return builder; } + /** + * Abstract implementation of a {@link RestRequestBuilder}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ + protected static abstract class AbstractRequestBuilder implements RestRequestBuilder { + + private static final long serialVersionUID = 1L; + + /** + * Name of the request builder. + * + * @since 1.5 + */ + protected String name; + + /** + * Actions of the request (will by default give path of the request). + * + * @since 1.5 + */ + protected String[] action; + + /** + * REST Method to use for this request. + * + * @see RestMethod + * @since 1.5 + */ + protected final RestMethod method; + + public AbstractRequestBuilder(String name, + RestMethod method, + String... action) { + this.name = name; + this.action = action; + this.method = method; + } + + @Override + public String getName() { + return name; + } + + @Override + public String[] getParameters(Object... args) { + // by default, no parameter + return ArrayUtils.EMPTY_STRING_ARRAY; + } + + @Override + public String[] getPath(Object... args) { + // by default, path is extactly action + return action; + } + + @Override + public Map<String, File> getAttachments(Object... args) { + // by default, no attachments + return null; + } + + @Override + public RestRequest create(final Object... args) { + + checkRequestArgs(args); + + return new RestRequest() { + + @Override + public String[] getPath() { + return AbstractRequestBuilder.this.getPath(args); + } + + @Override + public String[] getParameters() { + return AbstractRequestBuilder.this.getParameters(args); + } + + @Override + public Map<String, File> getAttachments() { + return AbstractRequestBuilder.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; + } + + }; + } + + protected void checkRequestArgs(int nbRequires, + String requires, + Object... args) { + Preconditions.checkState( + args.length == nbRequires, + nbRequires == 0 ? + "The request " + getName() + " requires no arg " + + "but had: " + Arrays.toString(args) + : + "The request " + getName() + " requires " + + nbRequires + " args: " + "(" + requires + "), but had: " + + Arrays.toString(args)); + } + } + } Modified: trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java 2012-07-17 22:52:31 UTC (rev 855) +++ trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java 2012-07-18 00:14:43 UTC (rev 856) @@ -25,7 +25,9 @@ package org.nuiton.io.rest; +import java.io.File; import java.io.Serializable; +import java.util.Map; /** * The contract of a request builder. @@ -39,10 +41,48 @@ String getName(); /** + * Checks that args used to create the request are fine. + * <p/> + * This method should be invoked just at the begin of the + * method {@link #create(Object...)}. + * + * @param args the args of the request + * @since 1.5 + */ + void checkRequestArgs(Object... args); + + /** * Create the request given the {@code args}. * * @param args args to create the request * @return the created request */ RestRequest create(Object... args); + + /** + * Computes the parameters associated to this requet. + * + * @param args the args of the request + * @return parameters to use for this request + * @since 1.5 + */ + String[] getParameters(Object... args); + + /** + * Computes the path associated to this request. + * + * @param args the args of the request + * @return path to use for this request + * @since 1.5 + */ + String[] getPath(Object... args); + + /** + * Computes the map of attachments associated to this request + * + * @param args the args of the request + * @return map of attachments to use for this request + * @since 1.5 + */ + Map<String, File> getAttachments(Object... args); }

1 0

r855 - in trunk: . src/site/apt
by tchemit＠users.nuiton.org 17 Jul '12

17 Jul '12

Author: tchemit Date: 2012-07-18 00:52:31 +0200 (Wed, 18 Jul 2012) New Revision: 855 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/855 Log: fix docs + clean pom Modified: trunk/pom.xml trunk/src/site/apt/mojo-examples.apt trunk/src/site/apt/mojo-framework.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-15 20:54:45 UTC (rev 854) +++ trunk/pom.xml 2012-07-17 22:52:31 UTC (rev 855) @@ -473,18 +473,6 @@ </executions> </plugin> -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> </build> Modified: trunk/src/site/apt/mojo-examples.apt =================================================================== --- trunk/src/site/apt/mojo-examples.apt 2012-07-15 20:54:45 UTC (rev 854) +++ trunk/src/site/apt/mojo-examples.apt 2012-07-17 22:52:31 UTC (rev 855) @@ -38,7 +38,7 @@ ------------------------------------------------------------------------------ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>collect-files</id> @@ -71,7 +71,7 @@ ------------------------------------------------------------------------------ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <goals> @@ -99,7 +99,7 @@ ------------------------------------------------------------------------------ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <goals> @@ -132,7 +132,7 @@ -------------------------------------------------------------------------------- <plugin> <groupId>org.nuiton</groupId> -<artifactId>maven-helper-plugin</artifactId> +<artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>check-central-safe</id> @@ -158,7 +158,7 @@ -------------------------------------------------------------------------------- <plugin> <groupId>org.nuiton</groupId> -<artifactId>maven-helper-plugin</artifactId> +<artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>check-central-safe</id> Modified: trunk/src/site/apt/mojo-framework.apt =================================================================== --- trunk/src/site/apt/mojo-framework.apt 2012-07-15 20:54:45 UTC (rev 854) +++ trunk/src/site/apt/mojo-framework.apt 2012-07-17 22:52:31 UTC (rev 855) @@ -36,7 +36,7 @@ The <mojo framework> aims to simplify the writing of new mojos. - To use this framework, your mojo classes <<MUST>> implement the contract + To use this framework, your mojo classes <<MUST>> implements the contract <<org.nuiton.plugin.Plugin>>. The framework use these technologies : @@ -52,7 +52,6 @@ There is some filtering methods : * <<checkPackaging>> to test if can perform mojo for the project's packaging. - * <<init>> : initialize the mojo, throw an error if any problem.

1 0