June 2010 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r1895 - trunk
by tchemit＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: tchemit Date: 2010-06-29 14:15:38 +0200 (Tue, 29 Jun 2010) New Revision: 1895 Url: http://nuiton.org/repositories/revision/nuiton-utils/1895 Log: Evolution #738: Use mavenpom 2.2.2 Evolution #739: Use i18n 1.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-28 07:39:39 UTC (rev 1894) +++ trunk/pom.xml 2010-06-29 12:15:38 UTC (rev 1895) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -122,7 +122,7 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.2.2</i18n.version> + <i18n.version>1.2.3-SNAPSHOT</i18n.version>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1894 - trunk
by tchemit＠users.nuiton.org 28 Jun '10

28 Jun '10

Author: tchemit Date: 2010-06-28 09:39:39 +0200 (Mon, 28 Jun 2010) New Revision: 1894 Url: http://nuiton.org/repositories/revision/nuiton-utils/1894 Log: use maven-license-plugin 2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-27 06:36:01 UTC (rev 1893) +++ trunk/pom.xml 2010-06-28 07:39:39 UTC (rev 1894) @@ -123,7 +123,6 @@ <properties> <i18n.version>1.2.2</i18n.version> - <license.version>2.3-SNAPSHOT</license.version>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1893 - trunk
by tchemit＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: tchemit Date: 2010-06-27 08:36:01 +0200 (Sun, 27 Jun 2010) New Revision: 1893 Url: http://nuiton.org/repositories/revision/nuiton-utils/1893 Log: Utilisation de mavenpom4redmine 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-22 18:28:28 UTC (rev 1892) +++ trunk/pom.xml 2010-06-27 06:36:01 UTC (rev 1893) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1892 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: fdesbois Date: 2010-06-22 20:28:28 +0200 (Tue, 22 Jun 2010) New Revision: 1892 Url: http://nuiton.org/repositories/revision/nuiton-utils/1892 Log: fix javadoc Modified: trunk/src/main/java/org/nuiton/util/TestUtil.java Modified: trunk/src/main/java/org/nuiton/util/TestUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TestUtil.java 2010-06-22 18:26:01 UTC (rev 1891) +++ trunk/src/main/java/org/nuiton/util/TestUtil.java 2010-06-22 18:28:28 UTC (rev 1892) @@ -25,7 +25,6 @@ * directory name will be the default one defined by {@link #TESTS_DATA_DEFAULT_DIR} * * @return the directory created - * @throws IOException for problem on directory creation * @see #createTestsDataDirectory(String) */ public static File createDefaultTestsDataDirectory() { @@ -37,8 +36,8 @@ * directory will be called {@code dirName}. This directory will be useful * to put all data created during tests. * + * @param dirName name of the directory to create * @return the directory created - * @throws IOException for problem on directory creation */ public static File createTestsDataDirectory(String dirName) { // Search basedir from maven environment

1 0

r1891 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: fdesbois Date: 2010-06-22 20:26:01 +0200 (Tue, 22 Jun 2010) New Revision: 1891 Url: http://nuiton.org/repositories/revision/nuiton-utils/1891 Log: Evo #702 : Create class TestUtil Added: trunk/src/main/java/org/nuiton/util/TestUtil.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Added: trunk/src/main/java/org/nuiton/util/TestUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TestUtil.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/TestUtil.java 2010-06-22 18:26:01 UTC (rev 1891) @@ -0,0 +1,68 @@ +package org.nuiton.util; + +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; + +import java.io.File; +import java.io.IOException; + +/** + * This class contains useful methods for Tests. + * + * Created: 22 juin 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +public class TestUtil { + + private static Log log = LogFactory.getLog(TestUtil.class); + + public static final String TESTS_DATA_DEFAULT_DIR = "surefire-data"; + + /** + * Create a directory in target directory for maven projects. The + * directory name will be the default one defined by {@link #TESTS_DATA_DEFAULT_DIR} + * + * @return the directory created + * @throws IOException for problem on directory creation + * @see #createTestsDataDirectory(String) + */ + public static File createDefaultTestsDataDirectory() { + return createTestsDataDirectory(TESTS_DATA_DEFAULT_DIR); + } + + /** + * Create a directory in target directory for maven projects. The + * directory will be called {@code dirName}. This directory will be useful + * to put all data created during tests. + * + * @return the directory created + * @throws IOException for problem on directory creation + */ + public static File createTestsDataDirectory(String dirName) { + // Search basedir from maven environment + String basedirPath = System.getenv("basedir"); + if (basedirPath == null) { + basedirPath = new File("").getAbsolutePath(); + } + + File result = new File(basedirPath, "target" + File.separator + dirName); + + try { + FileUtil.createDirectoryIfNecessary(result); + } catch (IOException eee) { + String errorMessage = "Error during tests data directory creation"; + if (log.isErrorEnabled()) { + log.error(errorMessage, eee); + } + throw new Error(errorMessage, eee); + } + + if (log.isDebugEnabled()) { + log.debug("Create tests data directory : " + result.getAbsolutePath()); + } + + return result; + } +} Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-20 21:30:42 UTC (rev 1890) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-22 18:26:01 UTC (rev 1891) @@ -69,16 +69,9 @@ } @BeforeClass - public static void setUpClass() throws IOException { + public static void setUpClass() { // Initialize DIR_TESTS_DATA to target/surefire-data - String basedirPath = System.getenv("basedir"); - if (basedirPath == null) { - basedirPath = new File("").getAbsolutePath(); - } - DIR_TESTS_DATA = new File(basedirPath, - "target" + File.separator + "surefire-data"); - FileUtil.createDirectoryIfNecessary(DIR_TESTS_DATA); - log.info("Initialize main tests-data directory : " + DIR_TESTS_DATA.getAbsolutePath()); + DIR_TESTS_DATA = TestUtil.createDefaultTestsDataDirectory(); } @Test

1 0

r1890 - in trunk: . src/license
by tchemit＠users.nuiton.org 20 Jun '10

20 Jun '10

Author: tchemit Date: 2010-06-20 23:30:42 +0200 (Sun, 20 Jun 2010) New Revision: 1890 Url: http://nuiton.org/repositories/revision/nuiton-utils/1890 Log: use maven-license-plugin 2.3 Added: trunk/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 18:57:01 UTC (rev 1889) +++ trunk/pom.xml 2010-06-20 21:30:42 UTC (rev 1890) @@ -123,7 +123,8 @@ <properties> <i18n.version>1.2.2</i18n.version> - + <license.version>2.3-SNAPSHOT</license.version> +  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> Added: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/src/license/THIRD-PARTY.properties 2010-06-20 21:30:42 UTC (rev 1890) @@ -0,0 +1,17 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#--------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License - Version 2.0 +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Lesser General Public License version 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - The Apache Software License, Version 2.0 +# - Unknown license +# +#--------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +#Sun Jun 20 23:07:54 CEST 2010 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 Property changes on: trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1889 - trunk
by tchemit＠users.nuiton.org 19 Jun '10

19 Jun '10

Author: tchemit Date: 2010-06-19 20:57:01 +0200 (Sat, 19 Jun 2010) New Revision: 1889 Url: http://nuiton.org/repositories/revision/nuiton-utils/1889 Log: Utilisation de mavenpom4redmine 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-19 12:23:21 UTC (rev 1888) +++ trunk/pom.xml 2010-06-19 18:57:01 UTC (rev 1889) @@ -22,9 +22,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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -163,10 +161,8 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk - </connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk - </developerConnection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> @@ -198,7 +194,7 @@  <profile> - <id>release-assembly-profile</id> + <id>assembly-profile</id> <activation> <property> <name>performRelease</name> @@ -251,6 +247,7 @@ </properties> <build> + <defaultGoal>validate</defaultGoal> <plugins> <plugin> <groupId>org.nuiton</groupId> @@ -260,14 +257,16 @@ <id>check-central-safe</id> <inherited>true</inherited> <goals> - <goal>check-central-safe</goal> + <goal>check-auto-container</goal> </goals> <configuration> - <extraRepositories> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + <repositories> <nuiton-central-releases> http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases </nuiton-central-releases> - </extraRepositories> + </repositories> </configuration> </execution> </executions>

1 0

r1888 - trunk/src/test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 19 Jun '10

19 Jun '10

Author: fdesbois Date: 2010-06-19 14:23:21 +0200 (Sat, 19 Jun 2010) New Revision: 1888 Url: http://nuiton.org/repositories/revision/nuiton-utils/1888 Log: Resolve issue on unsafe test (file already exist, test need to have no file existing at startup) Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-19 00:44:28 UTC (rev 1887) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-19 12:23:21 UTC (rev 1888) @@ -99,17 +99,27 @@ ApplicationConfig config = new ApplicationConfig(); config.setOption(ApplicationConfig.CONFIG_FILE_NAME, filename); - Assert.assertFalse(config.getUserConfigFile().exists()); + File userFile = config.getUserConfigFile(); + + // If file exists, delete the file and his parent directory + if (userFile.exists()) { + userFile.delete(); + userFile.getParentFile().delete(); + } + + Assert.assertFalse(userFile.exists()); + Assert.assertFalse(userFile.getParentFile().exists()); + log.info("execute saveForUser : path = " + path + " _ filename = " + filename); + // Parent directory will be created config.saveForUser(); - Assert.assertTrue(config.getUserConfigFile().exists()); + Assert.assertTrue(userFile.exists()); /** CLEAN **/ // Reset initial values System.setProperty(SYSTEM_PROPERTY_USER_HOME, oldHome); - config.getUserConfigFile().delete(); } /**

1 0

r1887 - trunk
by tchemit＠users.nuiton.org 19 Jun '10

19 Jun '10

Author: tchemit Date: 2010-06-19 02:44:28 +0200 (Sat, 19 Jun 2010) New Revision: 1887 Url: http://nuiton.org/repositories/revision/nuiton-utils/1887 Log: use mavenpom 2.2 and central-safe profile Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-18 15:55:06 UTC (rev 1886) +++ trunk/pom.xml 2010-06-19 00:44:28 UTC (rev 1887) @@ -22,213 +22,260 @@ <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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.5</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.2-SNAPSHOT</version> + </parent> - <artifactId>nuiton-utils</artifactId> - <version>1.3.2-SNAPSHOT</version> + <artifactId>nuiton-utils</artifactId> + <version>1.3.2-SNAPSHOT</version> - <dependencies> + <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.2</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.2</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${i18n.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${i18n.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-20</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-20</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <version>7.1.0.v20100505</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.eclipse.jetty.aggregate</groupId> + <artifactId>jetty-webapp</artifactId> + <version>7.1.0.v20100505</version> + <scope>provided</scope> + </dependency> - </dependencies> + </dependencies> -  -  -  +  +  +  - <name>Nuiton Utils</name> - <description>Library of usefull class to be used in any project.</description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-utils</url> + <name>Nuiton Utils</name> + <description>Library of usefull class to be used in any project.</description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-utils</url> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> - <i18n.version>1.2.2</i18n.version> + <properties> + <i18n.version>1.2.2</i18n.version> -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> + </properties> - <build> - + <build> + + <plugins> + +  + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> + <silent>true</silent> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + +  +  +  + +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + </connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + </scm> + + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + </links> + </configuration> + </plugin> + </plugins> + </reporting> -  - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> - <configuration> - <silent>true</silent> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> + </profile> +  + <profile> + <id>release-assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + </plugins> - </build> + </build> + </profile> -  -  -  + <profile> + <id>central-safe</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> - </scm> + <properties> - <profiles> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - </links> - </configuration> - </plugin> - </plugins> - </reporting> - - </profile> +  + <release.repository>${nuiton.central.release.repository}</release.repository> -  - <profile> - <id>release-assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + </properties> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-central-safe</goal> + </goals> + <configuration> + <extraRepositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </extraRepositories> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> - </plugins> + </profiles> - </build> - </profile> - </profiles> - </project>

1 0

r1886 - trunk/src/test/java/org/nuiton/util
by echatellier＠users.nuiton.org 18 Jun '10

18 Jun '10

Author: echatellier Date: 2010-06-18 17:55:06 +0200 (Fri, 18 Jun 2010) New Revision: 1886 Url: http://nuiton.org/repositories/revision/nuiton-utils/1886 Log: Add test on printConfig Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:38:35 UTC (rev 1885) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-18 15:55:06 UTC (rev 1886) @@ -25,8 +25,12 @@ package org.nuiton.util; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.io.PrintStream; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -34,8 +38,8 @@ import java.util.ListIterator; import java.util.Map; +import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.logging.Log; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -381,4 +385,28 @@ Assert.assertNull(instance.getOptionAsFile("dfsdfgqsgqfg")); } + + /** + * Test on printConfig output. + * + * @throws ArgumentsParserException + * @throws UnsupportedEncodingException + */ + public void testxx() throws ArgumentsParserException, UnsupportedEncodingException { + ApplicationConfig instance = new ApplicationConfig(); + instance.parse(new String[]{}); + instance.setOption("toto", "tata"); + + // get content of printConfig + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + instance.printConfig(ps); + String content = baos.toString("UTF-8"); + + if (log.isDebugEnabled()) { + log.debug("printConfig = " + content); + } + + Assert.assertTrue(content.indexOf("toto=tata") > 0); + } }

1 0

r1885 - trunk/src/test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 15:38:35 +0200 (Thu, 17 Jun 2010) New Revision: 1885 Url: http://nuiton.org/repositories/revision/nuiton-utils/1885 Log: Ano #687 : Clean test initialization Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:36:25 UTC (rev 1884) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:38:35 UTC (rev 1885) @@ -74,6 +74,7 @@ DIR_TESTS_DATA = new File(basedirPath, "target" + File.separator + "surefire-data"); FileUtil.createDirectoryIfNecessary(DIR_TESTS_DATA); + log.info("Initialize main tests-data directory : " + DIR_TESTS_DATA.getAbsolutePath()); } @Test

1 0

r1884 - trunk/src/test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 15:36:25 +0200 (Thu, 17 Jun 2010) New Revision: 1884 Url: http://nuiton.org/repositories/revision/nuiton-utils/1884 Log: Ano #687 : Clean test initialization Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:31:02 UTC (rev 1883) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:36:25 UTC (rev 1884) @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; import org.junit.Assert; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.util.ApplicationConfig.Action; @@ -49,30 +49,32 @@ private static final Log log = LogFactory.getLog(ApplicationConfigTest.class); - // says testsData is where we start tests. - protected File testsDataDir; + /** main folder for tests data **/ + protected static File DIR_TESTS_DATA; protected static final String SYSTEM_PROPERTY_USER_HOME = "user.home"; - @Before - public void setUp() throws IOException { + protected static int DUMMY_ACTION_CALL = 0; + + public static class DummyAction { + @Action.Step(1) + public void dummyAction(String s, int step) { + DUMMY_ACTION_CALL++; + System.out.println(s + ":" + step); + } + } + + @BeforeClass + public static void setUpClass() throws IOException { + // Initialize DIR_TESTS_DATA to target/surefire-data String basedirPath = System.getenv("basedir"); if (basedirPath == null) { basedirPath = new File("").getAbsolutePath(); } - testsDataDir = new File(basedirPath, + DIR_TESTS_DATA = new File(basedirPath, "target" + File.separator + "surefire-data"); - FileUtil.createDirectoryIfNecessary(testsDataDir); + FileUtil.createDirectoryIfNecessary(DIR_TESTS_DATA); } - - static int dummyActionCall = 0; - static public class DummyAction { - @Action.Step(1) - public void dummyAction(String s, int step) { - dummyActionCall++; - System.out.println(s + ":" + step); - } - } @Test public void testSaveForUser() { @@ -81,7 +83,7 @@ /** PREPARE DATA **/ // Initiliaze path and filename - String path = new File(testsDataDir, "user").getAbsolutePath(); + String path = new File(DIR_TESTS_DATA, "user").getAbsolutePath(); String filename = "test-saveForUser.properties"; // Set path to USER_HOME (keep old value) @@ -152,14 +154,14 @@ Action action = new Action(1, new DummyAction(), DummyAction.class.getMethod("dummyAction", String.class, Integer.TYPE), "coucou", "12"); instance.addAction(action); - dummyActionCall = 0; - Assert.assertEquals(0, dummyActionCall); + DUMMY_ACTION_CALL = 0; + Assert.assertEquals(0, DUMMY_ACTION_CALL); instance.doAction(0); - Assert.assertEquals(0, dummyActionCall); + Assert.assertEquals(0, DUMMY_ACTION_CALL); instance.doAction(1); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); instance.doAction(2); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); } /** @@ -264,9 +266,9 @@ Action result = instance.createAction( DummyAction.class.getName() + "#dummyAction", args); Assert.assertEquals(1, result.step); - dummyActionCall = 0; + DUMMY_ACTION_CALL = 0; result.doAction(); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); } /** @@ -284,7 +286,7 @@ instance.addAlias("-m", "--" + DummyAction.class.getName() + "#dummyAction"); instance.parse(args); - dummyActionCall = 0; + DUMMY_ACTION_CALL = 0; Assert.assertEquals("file", instance.getOption("file")); Assert.assertEquals("true", instance.getOption("verbose")); Assert.assertEquals("true", instance.getOption("debug")); @@ -292,7 +294,7 @@ Assert.assertEquals(Arrays.asList("others", "args"), instance.getUnparsed()); instance.doAction(1); - Assert.assertEquals(1, dummyActionCall); + Assert.assertEquals(1, DUMMY_ACTION_CALL); } /**

1 0

r1883 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 15:31:02 +0200 (Thu, 17 Jun 2010) New Revision: 1883 Url: http://nuiton.org/repositories/revision/nuiton-utils/1883 Log: Ano #687 : Add test Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 11:24:03 UTC (rev 1882) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 13:31:02 UTC (rev 1883) @@ -603,15 +603,16 @@ prop.remove(excludeKey); } - // Ano #687 : check existence of parentFile before using it in FileWriter - // TODO-fdesbois-2010-06-17 : Need to be tested - FileUtil.createDirectoryIfNecessary(file.getParentFile()); + // Ano #687 : create parentFile before using it in FileWriter + boolean dirCreated = FileUtil.createDirectoryIfNecessary(file.getParentFile()); + if (dirCreated && log.isDebugEnabled()) { + log.debug("Creation of config directory " + file.getParent()); + } Writer writer = new FileWriter(file); try { prop.store(writer, "Last saved " + new java.util.Date()); - } - finally { + } finally { writer.close(); } } @@ -918,7 +919,7 @@ String userHome = null; try { - userHome = System.getProperty("user.home"); + userHome = getUserHome(); } catch (SecurityException ignore) { } Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 11:24:03 UTC (rev 1882) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-06-17 13:31:02 UTC (rev 1883) @@ -26,6 +26,7 @@ package org.nuiton.util; import java.io.File; +import java.io.IOException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +34,10 @@ import java.util.ListIterator; import java.util.Map; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.nuiton.util.ApplicationConfig.Action; @@ -42,6 +46,24 @@ * @author poussin */ public class ApplicationConfigTest { + + private static final Log log = LogFactory.getLog(ApplicationConfigTest.class); + + // says testsData is where we start tests. + protected File testsDataDir; + + protected static final String SYSTEM_PROPERTY_USER_HOME = "user.home"; + + @Before + public void setUp() throws IOException { + String basedirPath = System.getenv("basedir"); + if (basedirPath == null) { + basedirPath = new File("").getAbsolutePath(); + } + testsDataDir = new File(basedirPath, + "target" + File.separator + "surefire-data"); + FileUtil.createDirectoryIfNecessary(testsDataDir); + } static int dummyActionCall = 0; static public class DummyAction { @@ -52,6 +74,37 @@ } } + @Test + public void testSaveForUser() { + log.info("testSaveForUser"); + + /** PREPARE DATA **/ + + // Initiliaze path and filename + String path = new File(testsDataDir, "user").getAbsolutePath(); + String filename = "test-saveForUser.properties"; + + // Set path to USER_HOME (keep old value) + String oldHome = System.getProperty(SYSTEM_PROPERTY_USER_HOME); + System.setProperty(SYSTEM_PROPERTY_USER_HOME, path); + + /** EXEC METHOD **/ + + ApplicationConfig config = new ApplicationConfig(); + config.setOption(ApplicationConfig.CONFIG_FILE_NAME, filename); + Assert.assertFalse(config.getUserConfigFile().exists()); + + log.info("execute saveForUser : path = " + path + " _ filename = " + filename); + config.saveForUser(); + Assert.assertTrue(config.getUserConfigFile().exists()); + + /** CLEAN **/ + + // Reset initial values + System.setProperty(SYSTEM_PROPERTY_USER_HOME, oldHome); + config.getUserConfigFile().delete(); + } + /** * Test of getUnparsed method, of class ApplicationConfig. */

1 0

r1882 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 13:24:03 +0200 (Thu, 17 Jun 2010) New Revision: 1882 Url: http://nuiton.org/repositories/revision/nuiton-utils/1882 Log: Ano #687 : Create method in FileUtil 'createDirectoryIfNecessary' and use it in ApplicationConfig to create parent directory of config Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/main/java/org/nuiton/util/FileUtil.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 08:55:37 UTC (rev 1881) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 11:24:03 UTC (rev 1882) @@ -604,13 +604,8 @@ } // Ano #687 : check existence of parentFile before using it in FileWriter - // Need to be tested -// if (!file.getParentFile().exists()) { -// boolean createFolders = file.mkdirs(); -// if (createFolders && log.isInfoEnabled()) { -// log.info("Create folders to save file configuration : " + file.getParent()); -// } -// } + // TODO-fdesbois-2010-06-17 : Need to be tested + FileUtil.createDirectoryIfNecessary(file.getParentFile()); Writer writer = new FileWriter(file); try { Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-06-17 08:55:37 UTC (rev 1881) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-06-17 11:24:03 UTC (rev 1882) @@ -1177,4 +1177,25 @@ sed(searchRegex, replace, new File("."), fileRegex, encoding); } + /** + * Create the directory (and his parents) if necessary. + * + * @param dir the directory to create if not exisiting + * @return {@code true} if directory was created, {@code false} if was no + * need to create it + * @throws IOException if could not create directory + * @since 1.3.2 + */ + public static boolean createDirectoryIfNecessary(File dir) + throws IOException { + if (!dir.exists()) { + boolean b = dir.mkdirs(); + if (!b) { + throw new IOException("Could not create directory " + dir); + } + return true; + } + return false; + } + } // FileUtil

1 0

r1881 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 17 Jun '10

17 Jun '10

Author: fdesbois Date: 2010-06-17 10:55:37 +0200 (Thu, 17 Jun 2010) New Revision: 1881 Url: http://nuiton.org/repositories/revision/nuiton-utils/1881 Log: Comment previous bad commit, Ano #687 need to be tested Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-16 21:02:35 UTC (rev 1880) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-17 08:55:37 UTC (rev 1881) @@ -604,12 +604,13 @@ } // Ano #687 : check existence of parentFile before using it in FileWriter - if (!file.getParentFile().exists()) { - boolean createFolders = file.mkdirs(); - if (createFolders && log.isInfoEnabled()) { - log.info("Create folders to save file configuration : " + file.getParent()); - } - } + // Need to be tested +// if (!file.getParentFile().exists()) { +// boolean createFolders = file.mkdirs(); +// if (createFolders && log.isInfoEnabled()) { +// log.info("Create folders to save file configuration : " + file.getParent()); +// } +// } Writer writer = new FileWriter(file); try {

2 1

r1880 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 16 Jun '10

16 Jun '10

Author: fdesbois Date: 2010-06-16 23:02:35 +0200 (Wed, 16 Jun 2010) New Revision: 1880 Url: http://nuiton.org/repositories/revision/nuiton-utils/1880 Log: Evo #2332 : Clean previous code for comment popup in edition mode : use a proper ContactComment prototype class. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-12 14:01:56 UTC (rev 1879) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-16 21:02:35 UTC (rev 1880) @@ -603,6 +603,14 @@ prop.remove(excludeKey); } + // Ano #687 : check existence of parentFile before using it in FileWriter + if (!file.getParentFile().exists()) { + boolean createFolders = file.mkdirs(); + if (createFolders && log.isInfoEnabled()) { + log.info("Create folders to save file configuration : " + file.getParent()); + } + } + Writer writer = new FileWriter(file); try { prop.store(writer, "Last saved " + new java.util.Date());

1 0

r1879 - trunk
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:56 +0200 (Sat, 12 Jun 2010) New Revision: 1879 Url: http://nuiton.org/repositories/revision/nuiton-utils/1879 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:01:55 UTC (rev 1878) +++ trunk/pom.xml 2010-06-12 14:01:56 UTC (rev 1879) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3.1</version> + <version>1.3.2-SNAPSHOT</version> <dependencies> @@ -161,9 +161,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0

r1878 - in tags: . nuiton-utils-1.3.1
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:55 +0200 (Sat, 12 Jun 2010) New Revision: 1878 Url: http://nuiton.org/repositories/revision/nuiton-utils/1878 Log: [maven-release-plugin] copy for tag nuiton-utils-1.3.1 Added: tags/nuiton-utils-1.3.1/ Property changes on: tags/nuiton-utils-1.3.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1877 - trunk
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:54 +0200 (Sat, 12 Jun 2010) New Revision: 1877 Url: http://nuiton.org/repositories/revision/nuiton-utils/1877 Log: [maven-release-plugin] prepare release nuiton-utils-1.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-12 14:01:18 UTC (rev 1876) +++ trunk/pom.xml 2010-06-12 14:01:54 UTC (rev 1877) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> <dependencies> @@ -161,9 +161,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1876 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 12 Jun '10

12 Jun '10

Author: tchemit Date: 2010-06-12 16:01:18 +0200 (Sat, 12 Jun 2010) New Revision: 1876 Url: http://nuiton.org/repositories/revision/nuiton-utils/1876 Log: fix Reflectutil bug Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:18:55 UTC (rev 1875) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-12 14:01:18 UTC (rev 1876) @@ -316,11 +316,14 @@ type = boxType(type); runtimeType = boxType(runtimeType); - if (!type.equals(runtimeType) || + if (!type.equals(runtimeType) && !type.isAssignableFrom(runtimeType)) { // not same type parametersMatches = false; + if (log.isDebugEnabled()) { + log.debug("Types are not matching."); + } break; } }

1 0

r1875 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:18:55 +0200 (Wed, 09 Jun 2010) New Revision: 1875 Url: http://nuiton.org/repositories/revision/nuiton-utils/1875 Log: add usefull methods in ReflectUtil Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:14:18 UTC (rev 1874) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:18:55 UTC (rev 1875) @@ -156,7 +156,16 @@ String methodName, boolean strict, Object... arguments) throws IllegalArgumentException { - Method method = getDeclaredMethod(klass, methodName, new HashSet<Class<?>>(), arguments); + HashSet<Class<?>> classes = new HashSet<Class<?>>(); + Method method; + try { + method = getDeclaredMethod(klass, methodName, classes, arguments); + } finally { + if (log.isDebugEnabled()) { + log.debug("Inspected classes : " + classes); + } + classes.clear(); + } if (method == null && strict) { throw new IllegalArgumentException( "could not find method " + methodName + " on type " +

1 0

r1874 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 09 Jun '10

09 Jun '10

Author: tchemit Date: 2010-06-09 12:14:18 +0200 (Wed, 09 Jun 2010) New Revision: 1874 Url: http://nuiton.org/repositories/revision/nuiton-utils/1874 Log: add usefull methods in ReflectionUtil Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java Modified: trunk/src/main/java/org/nuiton/util/ReflectUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-08 09:01:57 UTC (rev 1873) +++ trunk/src/main/java/org/nuiton/util/ReflectUtil.java 2010-06-09 10:14:18 UTC (rev 1874) @@ -25,13 +25,20 @@ package org.nuiton.util; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Des méthodes utiles d'introspection * @@ -39,6 +46,10 @@ */ public class ReflectUtil { + + /** Logger */ + static private Log log = LogFactory.getLog(ReflectUtil.class); + /** * Pour déterminer si un champ d'une classe est une constante * (modifiers sont static, final et public) @@ -57,7 +68,7 @@ * <p/> * L'algorithme parcourt aussi les superclasses. * - * @param <T> enumeration's type + * @param <T> enumeration's type * @param klass la classe contenant les constantes * @param searchingClass le type des champs constants à récupérer * @return la liste des champs du type requis dans @@ -86,7 +97,7 @@ } /** - * @param <T> enumeration's type + * @param <T> enumeration's type * @param klass the required class * @param fieldName the required constant name * @return the constant value @@ -111,7 +122,7 @@ /** * Convertit une classe non typée, en une classe d'enum * - * @param <T> enumeration's type + * @param <T> enumeration's type * @param type la classe a typer * @return la classe typee * @throws IllegalArgumentException si le type est null ou non une extension @@ -127,4 +138,218 @@ } return (Class<T>) type; } + + /** + * Cherche une methode selon son nom et ses paramètres d'invocation. + * + * @param klass la classe dans laquelle rechercher la méthode + * @param methodName le nom de la méthode recherchée + * @param strict un drapeau pour déclancher une exception si la méthode + * n'est pas trouvée + * @param arguments les arguments d'invocation de la méthode + * @return la méthode trouvée + * @throws IllegalArgumentException si la méthode n'est pas trouvée et que + * le drapeau {@code strict} est à {@code true} + * @since 1.3.1 + */ + public static Method getDeclaredMethod(Class<?> klass, + String methodName, + boolean strict, + Object... arguments) throws IllegalArgumentException { + Method method = getDeclaredMethod(klass, methodName, new HashSet<Class<?>>(), arguments); + if (method == null && strict) { + throw new IllegalArgumentException( + "could not find method " + methodName + " on type " + + klass.getName()); + } + + return method; + } + + /** + * Obtain the boxed type of any incoming type. + * <p/> + * If incoming type is not a primitive type, then just returns himself. + * + * @param type the type to box + * @return the boxed type + * @see Class#isPrimitive() + * @since 1.3.1 + */ + public static Class<?> boxType(Class<?> type) { + if (!type.isPrimitive()) { + return type; + } + if (boolean.class.equals(type)) { + return Boolean.class; + } + if (char.class.equals(type)) { + return Character.class; + } + if (byte.class.equals(type)) { + return Byte.class; + } + if (short.class.equals(type)) { + return Short.class; + } + if (int.class.equals(type)) { + return Integer.class; + } + if (long.class.equals(type)) { + return Long.class; + } + if (float.class.equals(type)) { + return Float.class; + } + if (double.class.equals(type)) { + return Double.class; + } + if (void.class.equals(type)) { + return Void.class; + } + // should never come here... + return type; + + } + + /** + * Obtain the unboxed type of any incoming type. + * <p/> + * If incoming type is a primitive type, then just returns himself. + * + * @param type the type to unbox + * @return the unboxed type + * @see Class#isPrimitive() + * @since 1.3.1 + */ + public static Class<?> unboxType(Class<?> type) { + if (type.isPrimitive()) { + return type; + } + if (Boolean.class.equals(type)) { + return boolean.class; + } + if (Character.class.equals(type)) { + return char.class; + } + if (Byte.class.equals(type)) { + return byte.class; + } + if (Short.class.equals(type)) { + return short.class; + } + if (Integer.class.equals(type)) { + return int.class; + } + if (Long.class.equals(type)) { + return long.class; + } + if (Float.class.equals(type)) { + return float.class; + } + if (Double.class.equals(type)) { + return double.class; + } + if (Void.class.equals(type)) { + return void.class; + } + + // not a primitive type + return type; + + } + + protected static Method getDeclaredMethod(Class<?> klass, + String methodName, + Set<Class<?>> visitedClasses, + Object... arguments) { + if (visitedClasses.contains(klass)) { + + // this means class was already unsucessfull visited + return null; + } + visitedClasses.add(klass); + Method method = null; + for (Method m : klass.getDeclaredMethods()) { + if (!methodName.equals(m.getName())) { + continue; + } + + // same method name + + Class<?>[] types = m.getParameterTypes(); + if (arguments.length != types.length) { + continue; + } + + // same number arguments + + Class<?>[] prototype = m.getParameterTypes(); + if (log.isDebugEnabled()) { + log.debug("Found a method with same parameters size : " + + m.getName() + " : " + Arrays.toString(prototype)); + } + int index = 0; + boolean parametersMatches = true; + for (Object argument : arguments) { + Class<?> type = prototype[index++]; + if (argument == null) { + + // can not say anything, let says it is ok... + continue; + } + Class<?> runtimeType = argument.getClass(); + if (log.isDebugEnabled()) { + log.debug("Test parameter [" + (index - 1) + "] : " + + type + " vs " + runtimeType); + } + + type = boxType(type); + runtimeType = boxType(runtimeType); + + if (!type.equals(runtimeType) || + !type.isAssignableFrom(runtimeType)) { + + // not same type + parametersMatches = false; + break; + } + } + if (parametersMatches) { + + // same parameters types, this is a match + method = m; + } + break; + } + if (method == null) { + + // try on super class + if (klass.getSuperclass() != null) { + method = getDeclaredMethod(klass.getSuperclass(), + methodName, + visitedClasses, + arguments + ); + } + } + + if (method == null) { + + // try on interfaces + Class<?>[] interfaces = klass.getInterfaces(); + for (Class<?> anInterface : interfaces) { + method = getDeclaredMethod(anInterface, + methodName, + visitedClasses, + arguments + ); + if (method != null) { + break; + } + } + } + return method; + + } }

1 0

r1873 - trunk
by echatellier＠users.nuiton.org 08 Jun '10

08 Jun '10

Author: echatellier Date: 2010-06-08 11:01:57 +0200 (Tue, 08 Jun 2010) New Revision: 1873 Url: http://nuiton.org/repositories/revision/nuiton-utils/1873 Log: Update to 0.9.10-hudson-20 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 10:29:15 UTC (rev 1872) +++ trunk/pom.xml 2010-06-08 09:01:57 UTC (rev 1873) @@ -92,7 +92,7 @@ <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> + <version>0.9.10-hudson-20</version> <scope>provided</scope> </dependency>

1 0

r1872 - trunk
by tchemit＠users.nuiton.org 02 Jun '10

02 Jun '10

Author: tchemit Date: 2010-06-02 12:29:15 +0200 (Wed, 02 Jun 2010) New Revision: 1872 Url: http://nuiton.org/repositories/revision/nuiton-utils/1872 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 13:31:51 UTC (rev 1871) +++ trunk/pom.xml 2010-06-02 10:29:15 UTC (rev 1872) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1871 - trunk/src/main/java/org/nuiton/util
by tchemit＠users.nuiton.org 01 Jun '10

01 Jun '10

Author: tchemit Date: 2010-06-01 15:31:51 +0200 (Tue, 01 Jun 2010) New Revision: 1871 Url: http://nuiton.org/repositories/revision/nuiton-utils/1871 Log: - use new converter api - let OptionDef be Serializable Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-05-28 10:13:06 UTC (rev 1870) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-06-01 13:31:51 UTC (rev 1871) @@ -26,6 +26,8 @@ package org.nuiton.util; +import org.nuiton.util.converter.ConverterUtil; + import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.collections.EnumerationUtils; import org.apache.commons.logging.Log; @@ -63,7 +65,7 @@ /** * Application configuration. * - * <h3>TODO</h3> + * <h3>A finir...</h3> * <ul> * <li>Ajout d'annotations sur les methodes * pour preciser plus de chose pour les options (pattern, min/max, alias, @@ -408,7 +410,7 @@ * * @since 1.0.0-rc-9 */ - public interface OptionDef { + public interface OptionDef extends Serializable { /** * @return la clef identifiant l'option

1 0