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

r854 - in trunk/src: main/java/org/nuiton/helper/plugin main/java/org/nuiton/io/rest main/java/org/nuiton/io/xpp3 main/java/org/nuiton/plugin test/java/org/nuiton/io/xpp3
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 22:54:45 +0200 (Sun, 15 Jul 2012) New Revision: 854 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/854 Log: fix copyright Modified: trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RestMethod.java trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java trunk/src/main/java/org/nuiton/plugin/AbstractAvailableDataMojo.java trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java Modified: trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/main/java/org/nuiton/io/rest/RestMethod.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestMethod.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/io/rest/RestMethod.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/main/java/org/nuiton/plugin/AbstractAvailableDataMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/AbstractAvailableDataMojo.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/main/java/org/nuiton/plugin/AbstractAvailableDataMojo.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2011 Tony Chemit, 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 Modified: trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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 Modified: trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java 2012-07-15 20:26:08 UTC (rev 853) +++ trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java 2012-07-15 20:54:45 UTC (rev 854) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2012 Tony Chemit, 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

1 0

r853 - in trunk/src: main/java/org/nuiton/io/rest site
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 22:26:08 +0200 (Sun, 15 Jul 2012) New Revision: 853 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/853 Log: fix site = file header Modified: trunk/src/main/java/org/nuiton/io/rest/RestMethod.java trunk/src/site/site_en.xml Modified: trunk/src/main/java/org/nuiton/io/rest/RestMethod.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestMethod.java 2012-07-15 18:24:59 UTC (rev 852) +++ trunk/src/main/java/org/nuiton/io/rest/RestMethod.java 2012-07-15 20:26:08 UTC (rev 853) @@ -1,4 +1,27 @@ package org.nuiton.io.rest; +/* + * #%L + * Helper Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * 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% + */ /** * Possible rest methods. Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-07-15 18:24:59 UTC (rev 852) +++ trunk/src/site/site_en.xml 2012-07-15 20:26:08 UTC (rev 853) @@ -39,14 +39,14 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.2.2</version> </skin> <custom> <fluidoSkin> - <topBarEnabled>true</topBarEnabled> + <topBarEnabled>false</topBarEnabled> <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> + <sideBarEnabled>true</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> </fluidoSkin>

1 0

r852 - in trunk/src/test/java/org/nuiton: helper/plugin plugin
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 20:24:59 +0200 (Sun, 15 Jul 2012) New Revision: 852 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/852 Log: refix logger Modified: trunk/src/test/java/org/nuiton/helper/plugin/SendEmailMojoTest.java trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java Modified: trunk/src/test/java/org/nuiton/helper/plugin/SendEmailMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/helper/plugin/SendEmailMojoTest.java 2012-07-15 16:31:16 UTC (rev 851) +++ trunk/src/test/java/org/nuiton/helper/plugin/SendEmailMojoTest.java 2012-07-15 18:24:59 UTC (rev 852) @@ -25,6 +25,8 @@ package org.nuiton.helper.plugin; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -40,6 +42,9 @@ */ public class SendEmailMojoTest extends AbstractMojoTest<SendEmailMojo> { + /** Logger. */ + private static final Log log = LogFactory.getLog(SendEmailMojoTest.class); + protected boolean canContinue; @Override Modified: trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2012-07-15 16:31:16 UTC (rev 851) +++ trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2012-07-15 18:24:59 UTC (rev 852) @@ -70,8 +70,8 @@ */ public abstract class AbstractMojoTest { - /** Test logger */ - protected final Log log = LogFactory.getLog(getClass()); + /** Logger. */ + private static final Log log = LogFactory.getLog(AbstractMojoTest.class); /** the basedir of the project */ protected static File basedir; @@ -306,7 +306,7 @@ * the mojo</li> <li>{@link #mojo} : the instanciated and initialized * mojo</li> </ul> */ - protected class MojoTestRule extends TestName { + public class MojoTestRule extends TestName { /** location of the pom to use */ private File pomFile; @@ -330,14 +330,16 @@ if (isVerbose()) { log.info("=============================================================================================="); } + String methodName = name.getMethodName(); + log.info("NEW Mojo test starting : " + getTestClass().getName() + - "#" + getMethodName()); + "#" + methodName); - String goalName = getGoalName(name.getMethodName()); + String goalName = getGoalName(methodName); - testDir = getTest().getTestDir(getMethodName(), goalName); + testDir = getTest().getTestDir(methodName, goalName); - pomFile = getTest().getPomFile(testDir, getMethodName(), goalName); + pomFile = getTest().getPomFile(testDir, methodName, goalName); try { Assert.assertTrue("could not find pom " + @@ -350,7 +352,7 @@ } catch (Exception ex) { throw new IllegalStateException( "could not init test " + getClass() + " - " + - getMethodName() + " for reason " + ex.getMessage(), ex); + methodName + " for reason " + ex.getMessage(), ex); } }

1 0

r851 - in trunk/src: main/java/org/nuiton/plugin test/java/org/nuiton/plugin
by tchemit＠users.nuiton.org 15 Jul '12

15 Jul '12

Author: tchemit Date: 2012-07-15 18:31:16 +0200 (Sun, 15 Jul 2012) New Revision: 851 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/851 Log: fix header, javadoc + improve logger Modified: trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java Modified: trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java =================================================================== --- trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java 2012-07-14 17:00:02 UTC (rev 850) +++ trunk/src/main/java/org/nuiton/plugin/VelocityTemplateGenerator.java 2012-07-15 16:31:16 UTC (rev 851) @@ -23,22 +23,6 @@ * #L% */ - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License" ); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.nuiton.plugin; import org.apache.maven.project.MavenProject; @@ -56,11 +40,11 @@ /** * Generator of template base on velocity. + * + * TODO TC-20091011 should use plexus velocity component * * @author tchemit <chemit(a)codelutin.com> * @since 1.3 - * - * TODO TC-20091011 should use plexus velocity component */ public class VelocityTemplateGenerator { Modified: trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2012-07-14 17:00:02 UTC (rev 850) +++ trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2012-07-15 16:31:16 UTC (rev 851) @@ -37,7 +37,6 @@ import org.junit.Test; import org.junit.rules.TestName; import org.junit.runner.Description; -import org.junit.runners.model.FrameworkMethod; import java.beans.Introspector; import java.io.File; @@ -65,14 +64,14 @@ * #createMojo(File, String)}</li> <li>{@link #setUpMojo(Plugin, File)}</li> * </ul> * - * @author tchemit <chemit(a)codelutin.com> * @param type of goal to test + * @author tchemit <chemit(a)codelutin.com> * @since 1.0.3 */ public abstract class AbstractMojoTest { /** Test logger */ - protected static final Log log = LogFactory.getLog(AbstractMojoTest.class); + protected final Log log = LogFactory.getLog(getClass()); /** the basedir of the project */ protected static File basedir;

1 0

r850 - trunk/src/site
by tchemit＠users.nuiton.org 14 Jul '12

14 Jul '12

Author: tchemit Date: 2012-07-14 19:00:02 +0200 (Sat, 14 Jul 2012) New Revision: 850 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/850 Log: Fix site scm url Modified: trunk/src/site/site_en.xml Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-07-13 17:10:09 UTC (rev 849) +++ trunk/src/site/site_en.xml 2012-07-14 17:00:02 UTC (rev 850) @@ -126,7 +126,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r849 - in trunk/src: main/java/org/nuiton/helper/plugin main/java/org/nuiton/io/rest main/java/org/nuiton/io/xpp3 test/java/org/nuiton/io/xpp3
by tchemit＠users.nuiton.org 13 Jul '12

13 Jul '12

Author: tchemit Date: 2012-07-13 19:10:09 +0200 (Fri, 13 Jul 2012) New Revision: 849 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/849 Log: update headers Modified: trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RestMethod.java trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java Modified: trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/main/java/org/nuiton/helper/plugin/ExecuteRemoteCommandMojo.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/src/main/java/org/nuiton/io/rest/RestMethod.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/main/java/org/nuiton/io/xpp3/AttributeValueToProperty.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/main/java/org/nuiton/io/xpp3/TagContentToProperty.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/main/java/org/nuiton/io/xpp3/TagTextContentToProperty.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/test/java/org/nuiton/io/xpp3/CountryRef.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java =================================================================== --- trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java 2012-07-13 16:25:17 UTC (rev 848) +++ trunk/src/test/java/org/nuiton/io/xpp3/CountryRefXpp3Reader.java 2012-07-13 17:10:09 UTC (rev 849) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as

1 0

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

13 Jul '12

Author: tchemit Date: 2012-07-13 18:25:17 +0200 (Fri, 13 Jul 2012) New Revision: 848 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/848 Log: refs #2183: Introduce a RequestFactory instead of using it inside the rest client (let's get the request builder if needed) Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-12 22:58:47 UTC (rev 847) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-13 16:25:17 UTC (rev 848) @@ -61,7 +61,7 @@ public RestRequest getRequest(String id, Object... args) { RestRequest r; - RestRequestBuilder builder = requestBuilders.get(id); + RestRequestBuilder builder = getRequestBuilder(id); if (builder == null) { throw new IllegalArgumentException( @@ -77,4 +77,11 @@ return r; } + /** {@inheritDoc} */ + public RestRequestBuilder getRequestBuilder(String id) { + RestRequestBuilder builder = requestBuilders.get(id); + + return builder; + } + } Modified: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-12 22:58:47 UTC (rev 847) +++ trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-13 16:25:17 UTC (rev 848) @@ -55,4 +55,11 @@ */ RestRequest getRequest(String id, Object... args); + /** + * Obtain the request builder from a given request id. + * + * @param id the id of request to seek for + * @return the requets builder or {@code null} if not found + */ + RestRequestBuilder getRequestBuilder(String id); }

1 0

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

12 Jul '12

Author: tchemit Date: 2012-07-13 00:58:47 +0200 (Fri, 13 Jul 2012) New Revision: 847 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/847 Log: rest request contains now his method Added: trunk/src/main/java/org/nuiton/io/rest/RestMethod.java Modified: trunk/src/main/java/org/nuiton/io/rest/RestClient.java trunk/src/main/java/org/nuiton/io/rest/RestRequest.java trunk/src/main/java/org/nuiton/io/rest/RestSession.java Modified: trunk/src/main/java/org/nuiton/io/rest/RestClient.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestClient.java 2012-07-12 17:03:55 UTC (rev 846) +++ trunk/src/main/java/org/nuiton/io/rest/RestClient.java 2012-07-12 22:58:47 UTC (rev 847) @@ -25,9 +25,6 @@ package org.nuiton.io.rest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.IOException; import java.io.InputStream; @@ -39,8 +36,6 @@ */ public abstract class RestClient { - private static final Log log = LogFactory.getLog(RestClient.class); - /** rest client configuration */ protected RestClientConfiguration configuration; @@ -85,15 +80,6 @@ } /** - * Add a request into the client. - * - * @param builder the new request to add - */ - public void addRequestBuilder(RestRequestBuilder builder) { - getRequestFactory().addRequestBuilder(builder); - } - - /** * Obtain a request given his id and the args given. * * @param id id of the request Added: trunk/src/main/java/org/nuiton/io/rest/RestMethod.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestMethod.java (rev 0) +++ trunk/src/main/java/org/nuiton/io/rest/RestMethod.java 2012-07-12 22:58:47 UTC (rev 847) @@ -0,0 +1,11 @@ +package org.nuiton.io.rest; + +/** + * Possible rest methods. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public enum RestMethod { + GET, POST, PUT, DELETE, HEAD +} Modified: trunk/src/main/java/org/nuiton/io/rest/RestRequest.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestRequest.java 2012-07-12 17:03:55 UTC (rev 846) +++ trunk/src/main/java/org/nuiton/io/rest/RestRequest.java 2012-07-12 22:58:47 UTC (rev 847) @@ -26,7 +26,6 @@ package org.nuiton.io.rest; import java.io.File; -import java.net.URL; import java.util.Map; /** @@ -36,6 +35,7 @@ * @since 1.0.3 */ public interface RestRequest { + /** @return the splitted path to add to url */ String[] getPath(); @@ -61,5 +61,12 @@ * @return the full url for this request * @since 1.5 */ - String toPath(URL baseUrl); + String toPath(String baseUrl); + + /** + * The method to use for this request. + * + * @return 1.5 + */ + RestMethod getMethod(); } Modified: trunk/src/main/java/org/nuiton/io/rest/RestSession.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2012-07-12 17:03:55 UTC (rev 846) +++ trunk/src/main/java/org/nuiton/io/rest/RestSession.java 2012-07-12 22:58:47 UTC (rev 847) @@ -30,10 +30,16 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpConnection; import org.apache.commons.httpclient.HttpMethod; +import org.apache.commons.httpclient.HttpMethodBase; import org.apache.commons.httpclient.HttpState; import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.StatusLine; +import org.apache.commons.httpclient.methods.DeleteMethod; +import org.apache.commons.httpclient.methods.EntityEnclosingMethod; +import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.PutMethod; import org.apache.commons.httpclient.methods.multipart.FilePart; import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity; import org.apache.commons.httpclient.methods.multipart.Part; @@ -183,28 +189,45 @@ ); } - protected String getUri(String... paths) { + protected String getRequestUrl(RestRequest request) { String uri = client.getHostConfiguration().getHostURL(); - for (String path : paths) { - uri += '/' + path; - } - return uri; + String result = request.toPath(uri); + return result; } public HttpMethod doRequest(RestRequest request) throws IOException { - String uri = getUri(request.getPath()); - String[] parameters = request.getParameters(); - Map<String, File> attachments = request.getAttachments(); - if (showRequest) { - log.info("doRequest " + uri); + log.info("doRequest " + getRequestUrl(request)); } if (log.isDebugEnabled()) { log.debug("doRequest with parameters : " + - Arrays.toString(parameters)); + Arrays.toString(request.getParameters())); } - PostMethod gm = new PostMethod(uri); + + HttpMethod gm; + switch (request.getMethod()) { + + case GET: + gm = prepareGetRequest(request); + break; + case POST: + gm = preparePostRequest(request); + + break; + case PUT: + gm = preparePutRequest(request); + + break; + case DELETE: + gm = prepareDeleteRequest(request); + break; + case HEAD: + default: + throw new IllegalStateException("Can not deal with method " + request.getMethod()); + } + + // add cookies if any if (open) { Cookie[] cookies = client.getState().getCookies(); for (Cookie c : cookies) { @@ -216,8 +239,65 @@ } } + client.executeMethod(gm); + + return gm; + } + + public HttpMethod prepareGetRequest(RestRequest request) throws IOException { + + String uri = getRequestUrl(request); + String[] parameters = request.getParameters(); + Map<String, File> attachments = request.getAttachments(); + + + if (attachments != null) { + + // multi-part request + //not possible with a simple Get method + + throw new IllegalStateException("Can not do a GET request with multi-parts, use a POST or UPDATE request"); + } + + GetMethod gm = new GetMethod(uri); + + addParams(gm, parameters); + + return gm; + } + + public HttpMethod prepareDeleteRequest(RestRequest request) throws IOException { + + String uri = getRequestUrl(request); + String[] parameters = request.getParameters(); + Map<String, File> attachments = request.getAttachments(); + + if (attachments != null) { + + // multi-part request + //not possible with a simple Get method + + throw new IllegalStateException("Can not do a DELETE request with multi-parts, use a POST or UPDATE request"); + } + + DeleteMethod gm = new DeleteMethod(uri); + + addParams(gm, parameters); + + return gm; + } + + public HttpMethod preparePostRequest(RestRequest request) throws IOException { + + String uri = getRequestUrl(request); + String[] parameters = request.getParameters(); + Map<String, File> attachments = request.getAttachments(); + + PostMethod gm = new PostMethod(uri); + if (attachments == null) { + // not a multi-part request if (parameters.length > 0) { @@ -234,6 +314,7 @@ } continue; } + gm.addParameter(key, value); } } @@ -241,69 +322,119 @@ // multi-part request - List<Part> paramParts = new ArrayList<Part>(); + prepareMultiPart(gm, attachments, parameters); + } + return gm; + } - if (parameters.length > 0) { + public HttpMethod preparePutRequest(RestRequest request) throws IOException { - // add parameters as part of multi-part + String uri = getRequestUrl(request); + String[] parameters = request.getParameters(); + Map<String, File> attachments = request.getAttachments(); - int nbParams = parameters.length / 2; - for (int i = 0; i < nbParams; i++) { - String key = parameters[2 * i]; - String value = parameters[2 * i + 1]; - if (value == null) { - if (log.isDebugEnabled()) { - log.debug("skip null parameter " + key); - } - continue; - } - paramParts.add(new StringPart(key, value)); + PutMethod gm = new PutMethod(uri); + + if (attachments == null) { + + + // not a multi-part request + + addParams(gm, parameters); + + } else { + + // multi-part request + + prepareMultiPart(gm, attachments, parameters); + } + return gm; + } + + protected void addParams(HttpMethodBase gm, String... parameters) { + if (parameters.length > 0) { + + // add parameters + + int nbParams = parameters.length / 2; + NameValuePair[] params = new NameValuePair[nbParams]; + for (int i = 0; i < nbParams; i++) { + String key = parameters[2 * i]; + String value = parameters[2 * i + 1]; + if (value == null) { if (log.isDebugEnabled()) { - log.debug("add parameter [" + key + "]=" + value); + log.debug("skip null parameter " + key); } + continue; } + params[i] = new NameValuePair(key, value); } + gm.setQueryString(params); + } + } - // add file parts - for (Entry<String, File> entry : attachments.entrySet()) { - String key = entry.getKey(); - File file = entry.getValue(); + protected void prepareMultiPart(EntityEnclosingMethod gm, + Map<String, File> attachments, + String... parameters) throws IOException { + + List<Part> paramParts = new ArrayList<Part>(); + + if (parameters.length > 0) { + + // add parameters as part of multi-part + + int nbParams = parameters.length / 2; + for (int i = 0; i < nbParams; i++) { + String key = parameters[2 * i]; + String value = parameters[2 * i + 1]; + if (value == null) { + if (log.isDebugEnabled()) { + log.debug("skip null parameter " + key); + } + continue; + } + paramParts.add(new StringPart(key, value)); if (log.isDebugEnabled()) { - log.debug("add attachment " + key + "=" + file); + log.debug("add parameter [" + key + "]=" + value); } - paramParts.add(new FilePart( - key, - file.getName(), - file, - FilePart.DEFAULT_CONTENT_TYPE, - configuration.getEncoding()) - ); } - if (attachments.isEmpty()) { - log.warn("no attachment in a multi-part request!"); - } + } - Part[] parts = paramParts.toArray(new Part[paramParts.size()]); - - MultipartRequestEntity entity = - new MultipartRequestEntity(parts, gm.getParams()); + // add file parts + for (Entry<String, File> entry : attachments.entrySet()) { + String key = entry.getKey(); + File file = entry.getValue(); if (log.isDebugEnabled()) { - entity.writeRequest(System.out); + log.debug("add attachment " + key + "=" + file); } - gm.setRequestEntity(entity); -// gm.addRequestHeader("content-type", "multipart/form-data"); - gm.addRequestHeader("content-type", entity.getContentType()); - gm.addRequestHeader("content-length", entity.getContentLength() + - ""); - if (showRequest) { - log.info("content-type : " + entity.getContentType() + - ", content-length : " + entity.getContentLength()); - } + paramParts.add(new FilePart( + key, + file.getName(), + file, + FilePart.DEFAULT_CONTENT_TYPE, + configuration.getEncoding()) + ); + } + if (attachments.isEmpty()) { + log.warn("no attachment in a multi-part request!"); + } + Part[] parts = paramParts.toArray(new Part[paramParts.size()]); + + MultipartRequestEntity entity = + new MultipartRequestEntity(parts, gm.getParams()); + if (log.isDebugEnabled()) { + entity.writeRequest(System.out); } + gm.setRequestEntity(entity); +// gm.addRequestHeader("content-type", "multipart/form-data"); + gm.addRequestHeader("content-type", entity.getContentType()); + gm.addRequestHeader("content-length", entity.getContentLength() + + ""); + if (showRequest) { + log.info("content-type : " + entity.getContentType() + + ", content-length : " + entity.getContentLength()); + } - client.executeMethod(gm); - - return gm; } }

1 0

r846 - in trunk/src/main/java/org/nuiton/io: mail rest
by tchemit＠users.nuiton.org 12 Jul '12

12 Jul '12

Author: tchemit Date: 2012-07-12 19:03:55 +0200 (Thu, 12 Jul 2012) New Revision: 846 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/846 Log: add svn properties + fix headers + fix api 1.6 Modified: trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java Modified: trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java =================================================================== --- trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java 2012-07-12 16:55:57 UTC (rev 845) +++ trunk/src/main/java/org/nuiton/io/mail/ProjectJavamailMailSender.java 2012-07-12 17:03:55 UTC (rev 846) @@ -25,10 +25,11 @@ package org.nuiton.io.mail; -import java.security.Security; -import java.util.Date; -import java.util.Iterator; -import java.util.Properties; +import org.codehaus.plexus.mailsender.AbstractMailSender; +import org.codehaus.plexus.mailsender.MailMessage; +import org.codehaus.plexus.mailsender.MailSenderException; +import org.codehaus.plexus.mailsender.util.DateFormatUtils; +import org.codehaus.plexus.util.StringUtils; import javax.mail.Authenticator; import javax.mail.Message; @@ -38,20 +39,18 @@ import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import java.security.Provider; +import java.security.Security; +import java.util.Date; +import java.util.Iterator; +import java.util.Properties; -import com.sun.net.ssl.internal.ssl.Provider; -import org.codehaus.plexus.mailsender.AbstractMailSender; -import org.codehaus.plexus.mailsender.MailMessage; -import org.codehaus.plexus.mailsender.MailSenderException; -import org.codehaus.plexus.mailsender.util.DateFormatUtils; -import org.codehaus.plexus.util.StringUtils; - /** * Helper class for sending email. - * + * * Note : this code was stolen in {@code maven-changes-plugin}, should thanks * them... - * + * * @author tchemit <chemit(a)codelutin.com> * @since 1.0.3 */ @@ -59,10 +58,12 @@ extends AbstractMailSender { private static final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory"; + // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- private Properties userProperties; + private Properties props; // ---------------------------------------------------------------------- @@ -90,7 +91,7 @@ props.put("mail.debug", String.valueOf(getLogger().isDebugEnabled())); if (isSslMode()) { - Security.addProvider(new Provider()); + Security.addProvider(getSsllProvider()); props.put("mail.smtp.socketFactory.port", String.valueOf(getSmtpPort())); @@ -100,7 +101,7 @@ } if (userProperties != null) { - for (Iterator<?> i = userProperties.keySet().iterator(); i.hasNext();) { + for (Iterator<?> i = userProperties.keySet().iterator(); i.hasNext(); ) { String key = (String) i.next(); String value = userProperties.getProperty(key); @@ -110,6 +111,17 @@ } } + private Provider getSsllProvider() { + try { + Class<?> aClass = + Class.forName("com.sun.net.ssl.internal.ssl.Provider"); + return (Provider) aClass.newInstance(); + } catch (Exception e) { + + throw new IllegalStateException("Could not obtain ssl provider", e); + } + } + // ---------------------------------------------------------------------- // MailSender Implementation // ---------------------------------------------------------------------- @@ -142,7 +154,7 @@ if (mail.getToAddresses().size() > 0) { InternetAddress[] addressTo = new InternetAddress[mail.getToAddresses().size()]; int count = 0; - for (Iterator<?> i = mail.getToAddresses().iterator(); i.hasNext();) { + for (Iterator<?> i = mail.getToAddresses().iterator(); i.hasNext(); ) { String address = ((MailMessage.Address) i.next()).getRfc2822Address(); addressTo[count++] = new InternetAddress(address); } @@ -152,7 +164,7 @@ if (mail.getCcAddresses().size() > 0) { InternetAddress[] addressCc = new InternetAddress[mail.getCcAddresses().size()]; int count = 0; - for (Iterator<?> i = mail.getCcAddresses().iterator(); i.hasNext();) { + for (Iterator<?> i = mail.getCcAddresses().iterator(); i.hasNext(); ) { String address = ((MailMessage.Address) i.next()).getRfc2822Address(); addressCc[count++] = new InternetAddress(address); } @@ -162,7 +174,7 @@ if (mail.getBccAddresses().size() > 0) { InternetAddress[] addressBcc = new InternetAddress[mail.getBccAddresses().size()]; int count = 0; - for (Iterator<?> i = mail.getBccAddresses().iterator(); i.hasNext();) { + for (Iterator<?> i = mail.getBccAddresses().iterator(); i.hasNext(); ) { String address = ((MailMessage.Address) i.next()).getRfc2822Address(); addressBcc[count++] = new InternetAddress(address); } Modified: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-12 16:55:57 UTC (rev 845) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-12 17:03:55 UTC (rev 846) @@ -1,4 +1,27 @@ package org.nuiton.io.rest; +/* + * #%L + * Helper Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 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% + */ import com.google.common.collect.Maps; Property changes on: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-12 16:55:57 UTC (rev 845) +++ trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-12 17:03:55 UTC (rev 846) @@ -1,4 +1,27 @@ package org.nuiton.io.rest; +/* + * #%L + * Helper Maven Plugin + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 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% + */ import java.text.DateFormat; import java.text.SimpleDateFormat; Property changes on: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r845 - in trunk: . src/main/java/org/nuiton/io/rest src/main/java/org/nuiton/io/xpp3
by tchemit＠users.nuiton.org 12 Jul '12

12 Jul '12

Author: tchemit Date: 2012-07-12 18:55:57 +0200 (Thu, 12 Jul 2012) New Revision: 845 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/845 Log: fixes #2183: Introduce a RequestFactory instead of using it inside the rest client fixes #2182: updates to commons lang 3 Added: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java trunk/src/main/java/org/nuiton/io/rest/RestClient.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/xpp3/DefaultDataConverter.java trunk/src/main/java/org/nuiton/io/xpp3/PropertyMapper.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-12 16:53:52 UTC (rev 844) +++ trunk/pom.xml 2012-07-12 16:55:57 UTC (rev 845) @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  -<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> @@ -56,8 +55,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> @@ -146,7 +145,7 @@ <version>${mavenVersion}</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> @@ -222,7 +221,7 @@ <artifactId>log4j</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>velocity</groupId> <artifactId>velocity</artifactId> @@ -245,7 +244,7 @@ <id>tchemit</id> <email>chemit at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Lead</role> <role>Developer</role> @@ -256,7 +255,7 @@ <id>ymartel</id> <email>martel at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Developer</role> </roles> @@ -268,9 +267,15 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk</url> + <connection> + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + </connection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/maven-helper-plugin/trunk + </developerConnection> + <url> + http://www.nuiton.org/repositories/browse/maven-helper-plugin/trunk + </url> </scm> <distributionManagement> @@ -301,11 +306,6 @@  <siteSourcesType>apt</siteSourcesType> -  - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.target>1.5</maven.compiler.target> - </properties> <build> @@ -487,7 +487,7 @@ </plugins> </build> - + </profile>  @@ -527,7 +527,7 @@ </plugins> </build> - + </profile>  Added: trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java (rev 0) +++ trunk/src/main/java/org/nuiton/io/rest/AbstractRequestFactory.java 2012-07-12 16:55:57 UTC (rev 845) @@ -0,0 +1,57 @@ +package org.nuiton.io.rest; + +import com.google.common.collect.Maps; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Map; + +/** + * Abstract implementation of {@link RequestFactory}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public abstract class AbstractRequestFactory implements RequestFactory { + + public static final DateFormat DATE_FORMAT = + new SimpleDateFormat("yyyy-MM-dd"); + + /** registred requests */ + protected final Map<String, RestRequestBuilder> requestBuilders; + + public AbstractRequestFactory() { + requestBuilders = Maps.newTreeMap(); + } + + /** {@inheritDoc} */ + public void addRequestBuilder(RestRequestBuilder builder) { + String name = builder.getName(); + if (requestBuilders.containsKey(name)) { + throw new IllegalArgumentException("a request builder with name " + + name + " already exists."); + } + requestBuilders.put(name, builder); + } + + /** {@inheritDoc} */ + public RestRequest getRequest(String id, Object... args) { + + RestRequest r; + RestRequestBuilder builder = requestBuilders.get(id); + if (builder == null) { + + throw new IllegalArgumentException( + "Could not find any request builder for request named '" + + id + "'"); + } + r = builder.create(args); + if (r == null) { + throw new IllegalArgumentException( + "Could not find any request named '" + id + + "' using builder " + builder); + } + return r; + } + +} Modified: trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java 2012-07-12 16:53:52 UTC (rev 844) +++ trunk/src/main/java/org/nuiton/io/rest/DefaultRestClientConfiguration.java 2012-07-12 16:55:57 UTC (rev 845) @@ -25,8 +25,8 @@ package org.nuiton.io.rest; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import java.net.URL; Added: trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java (rev 0) +++ trunk/src/main/java/org/nuiton/io/rest/RequestFactory.java 2012-07-12 16:55:57 UTC (rev 845) @@ -0,0 +1,35 @@ +package org.nuiton.io.rest; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; + +/** + * Factory of {@link RestRequest}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public interface RequestFactory { + + public static final DateFormat DATE_FORMAT = + new SimpleDateFormat("yyyy-MM-dd"); + + void addDefaultRequests(); + + /** + * Add a request into the factory. + * + * @param builder the new request to add + */ + void addRequestBuilder(RestRequestBuilder builder); + + /** + * Obtain a request given his id and the args given. + * + * @param id id of the request + * @param args args passed to build the request + * @return the new request + */ + RestRequest getRequest(String id, Object... args); + +} Modified: trunk/src/main/java/org/nuiton/io/rest/RestClient.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestClient.java 2012-07-12 16:53:52 UTC (rev 844) +++ trunk/src/main/java/org/nuiton/io/rest/RestClient.java 2012-07-12 16:55:57 UTC (rev 845) @@ -30,8 +30,6 @@ import java.io.IOException; import java.io.InputStream; -import java.util.Map; -import java.util.TreeMap; /** * Abtract REST client. @@ -49,15 +47,13 @@ /** rest session */ protected RestSession session; - /** registred requests */ - protected final Map<String, RestRequestBuilder> requestBuilders; - /** - * Add the default available requests for this client. - * - * Note: This method is invoked in the constructor of the client. + * Obtains the underlying factory of requests. + * + * @return the factory of requests + * @since 1.5 */ - protected abstract void addDefaultRequests(); + public abstract RequestFactory getRequestFactory(); /** * Open the client. @@ -82,12 +78,9 @@ protected abstract void close(RestSession session) throws IOException; public RestClient() { - requestBuilders = new TreeMap<String, RestRequestBuilder>(); - addDefaultRequests(); } public RestClient(RestClientConfiguration configuration) { - this(); this.configuration = configuration; } @@ -97,11 +90,7 @@ * @param builder the new request to add */ public void addRequestBuilder(RestRequestBuilder builder) { - String name = builder.getName(); - if (requestBuilders.containsKey(name)) { - throw new IllegalArgumentException("a request builder with name " + name + " already exists."); - } - requestBuilders.put(name, builder); + getRequestFactory().addRequestBuilder(builder); } /** @@ -112,12 +101,7 @@ * @return the new request */ public RestRequest getRequest(String id, Object... args) { - RestRequestBuilder builder = requestBuilders.get(id); - if (builder == null) { - // pas de builder de requete... - return null; - } - RestRequest r = builder.create(args); + RestRequest r = getRequestFactory().getRequest(id, args); return r; } Modified: trunk/src/main/java/org/nuiton/io/rest/RestRequest.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestRequest.java 2012-07-12 16:53:52 UTC (rev 844) +++ trunk/src/main/java/org/nuiton/io/rest/RestRequest.java 2012-07-12 16:55:57 UTC (rev 845) @@ -26,6 +26,7 @@ package org.nuiton.io.rest; import java.io.File; +import java.net.URL; import java.util.Map; /** @@ -44,6 +45,21 @@ */ String[] getParameters(); + /** + * @return {@code true} if request has some attachments. + * @since 1.5 + */ + boolean containsAttachments(); + /** @return the map of attachment to pass to request */ Map<String, File> getAttachments(); + + /** + * Obtain the full url of the request. + * + * @param baseUrl the base url to use + * @return the full url for this request + * @since 1.5 + */ + String toPath(URL baseUrl); } Modified: trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java =================================================================== --- trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java 2012-07-12 16:53:52 UTC (rev 844) +++ trunk/src/main/java/org/nuiton/io/rest/RestRequestBuilder.java 2012-07-12 16:55:57 UTC (rev 845) @@ -25,13 +25,15 @@ package org.nuiton.io.rest; +import java.io.Serializable; + /** * The contract of a request builder. * * @author tchemit <chemit(a)codelutin.com> * @since 1.0.3 */ -public interface RestRequestBuilder { +public interface RestRequestBuilder extends Serializable { /** @return the unique name of the request builder */ String getName(); Modified: trunk/src/main/java/org/nuiton/io/xpp3/DefaultDataConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/DefaultDataConverter.java 2012-07-12 16:53:52 UTC (rev 844) +++ trunk/src/main/java/org/nuiton/io/xpp3/DefaultDataConverter.java 2012-07-12 16:55:57 UTC (rev 845) @@ -35,7 +35,6 @@ public enum DefaultDataConverter implements DataConverter { Boolean { - @Override public Object convert(String t) throws Exception { Object r = java.lang.Boolean.valueOf(t); @@ -43,7 +42,6 @@ } }, Short { - @Override public Object convert(String t) throws Exception { Object r = java.lang.Short.valueOf(t); @@ -51,7 +49,6 @@ } }, Integer { - @Override public Object convert(String t) throws Exception { Object r = java.lang.Integer.valueOf(t); @@ -59,7 +56,6 @@ } }, Long { - @Override public Object convert(String t) throws Exception { Object r = java.lang.Long.valueOf(t); @@ -67,7 +63,6 @@ } }, Float { - @Override public Object convert(String t) throws Exception { Object r = java.lang.Float.valueOf(t); @@ -75,7 +70,6 @@ } }, Double { - @Override public Object convert(String t) throws Exception { Object r = java.lang.Double.valueOf(t); @@ -83,7 +77,6 @@ } }, Text { - @Override public Object convert(String t) throws Exception { return t; Modified: trunk/src/main/java/org/nuiton/io/xpp3/PropertyMapper.java =================================================================== --- trunk/src/main/java/org/nuiton/io/xpp3/PropertyMapper.java 2012-07-12 16:53:52 UTC (rev 844) +++ trunk/src/main/java/org/nuiton/io/xpp3/PropertyMapper.java 2012-07-12 16:55:57 UTC (rev 845) @@ -26,8 +26,8 @@ package org.nuiton.io.xpp3; import com.google.common.base.Function; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParser;

1 0