Author: tchemit Date: 2010-03-07 17:10:52 +0100 (Sun, 07 Mar 2010) New Revision: 1785 Log: - reformat code (80 car per line max) - Evolution #347: Move all i18n api to project i18n - Evolution #348: Use i18n version 1.1 Removed: trunk/src/main/java/org/nuiton/i18n/ trunk/src/test/java/org/nuiton/i18n/ trunk/src/test/resources/i18n/dummy-en.properties trunk/src/test/resources/i18n/dummy-en_GB.properties trunk/src/test/resources/i18n/dummy-en_US.properties trunk/src/test/resources/i18n/dummy-fr.properties trunk/src/test/resources/i18n/dummy-fr_FR.properties trunk/src/test/resources/i18n/dummy.properties trunk/src/test/resources/i18n/dummyOnlyen-en.properties trunk/src/test/resources/i18n/dummyOnlyen.properties trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties trunk/src/test/resources/i18n/dummyOnlyfr.properties trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties trunk/src/test/resources/i18n/verydummy.properties Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java trunk/src/main/java/org/nuiton/util/Resource.java trunk/src/test/java/org/nuiton/log/LutinLogTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/pom.xml 2010-03-07 16:10:52 UTC (rev 1785) @@ -102,7 +102,7 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.0.1</i18n.version> + <i18n.version>1.1-SNAPSHOT</i18n.version> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> Modified: trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java 2010-03-07 16:10:52 UTC (rev 1785) @@ -18,6 +18,7 @@ */ package org.nuiton.util; +import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.lang.reflect.Method; @@ -37,12 +38,13 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ - private static final org.apache.commons.logging.Log log = LogFactory.getLog(ClassLoaderUtil.class); + private static final Log log = LogFactory.getLog(ClassLoaderUtil.class); /** - * Returns the all urls to be used in a {@link java.net.URLClassLoader}. + * Returns the all urls to be used in a {@link URLClassLoader}. * <p/> - * If classloader has only one url and the url is a jar, try to load in manifest class-path + * If classloader has only one url and the url is a jar, try to load in + * manifest class-path. * * @param loader the classloader (if null will use system one) * @return all the url found in the classloader @@ -62,20 +64,24 @@ if (Resource.isJar(currentUrl.toString())) { // jar invocation try { - URL[] newArrayURLs = Resource.getClassPathURLsFromJarManifest(currentUrl); + URL[] newArrayURLs = + Resource.getClassPathURLsFromJarManifest( + currentUrl); if (newArrayURLs == null) { continue; } List<URL> newURLs = Arrays.asList(newArrayURLs); for (URL newURL : newURLs) { - if (!urlTreated.contains(newURL) && !urlToTreate.contains(newURL)) { + if (!urlTreated.contains(newURL) && + !urlToTreate.contains(newURL)) { urlToTreate.add(newURL); } } } catch (Exception e) { if (log.isDebugEnabled()) { // this is not a such error, but some jar can not be - log.debug("error with url" + currentUrl + " for reason : " + e.getMessage()); + log.debug("error with url" + currentUrl + + " for reason : " + e.getMessage()); } } } @@ -84,9 +90,10 @@ } /** - * Recupere la liste des urls d'un {@link java.net.URLClassLoader}. + * Recupere la liste des urls d'un {@link URLClassLoader}. * <p/> - * Note : Un cas particulier est positionné pour JBoss qui utilise la method getAllURLs. + * Note : Un cas particulier est positionné pour JBoss qui utilise + * la method getAllURLs. * * @param classLoader le class loader a scanner * @return les urls du classloade. @@ -97,7 +104,8 @@ } Method m; try { - // Essai de récupération de la méthode getAllURLs() de RepositoryClassLoader (JBoss) + // Essai de récupération de la méthode getAllURLs() de + // RepositoryClassLoader (JBoss) m = classLoader.getClass().getMethod("getAllURLs"); } catch (Exception e) { m = null; Modified: trunk/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/src/main/java/org/nuiton/util/Resource.java 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/main/java/org/nuiton/util/Resource.java 2010-03-07 16:10:52 UTC (rev 1785) @@ -660,7 +660,7 @@ if (log.isTraceEnabled()) { log.trace("zip to search " + file); } - return new ZipFile(file).getEntry(directory + "/") != null; + return new ZipFile(file).getEntry(directory + '/') != null; } if (file.isDirectory()) { // cas ou le ichier du classLoader est un repertoire Modified: trunk/src/test/java/org/nuiton/log/LutinLogTest.java =================================================================== --- trunk/src/test/java/org/nuiton/log/LutinLogTest.java 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/java/org/nuiton/log/LutinLogTest.java 2010-03-07 16:10:52 UTC (rev 1785) @@ -89,6 +89,11 @@ } +/** + * @deprecated since 20090327 this class seam to produce a frame on each + * log call (produce huge memory consumption), will be deleted soon. + */ +@Deprecated public class LutinLogTest extends TestCase { public void testStack() throws Exception { Deleted: trunk/src/test/resources/i18n/dummy-en.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-en.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-en.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-en.one -two=dummy-en.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-en_GB.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-en_GB.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-en_GB.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-en_GB.one -two=dummy-en_GB.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-en_US.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-en_US.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-en_US.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-en-US.one -two=dummy-en-US.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-fr.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-fr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-fr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-fr.un -two=dummy-fr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-fr_FR.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-fr_FR.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-fr_FR.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-fr_FR.un -two=dummy-fr_FR.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy.properties =================================================================== --- trunk/src/test/resources/i18n/dummy.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -very.one=dummy.one -very.two=dummy.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyen-en.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyen-en.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyen-en.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylen.one=dummyOnlyen-en.one -onylen.two=dummyOnlyen-en.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyen.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyen.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyen.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylen.one=dummyOnlyen.one -onylen.two=dummyOnlyen.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylfr.one=dummyOnlyfr-fr.un -onylfr.two=dummyOnlyfr-fr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyfr.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyfr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyfr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylfr.one=dummyOnlyfr.un -onylfr.two=dummyOnlyfr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylfr2.one=dummyOnlyfr2-fr.un -onylfr2.two=dummyOnlyfr2-fr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/verydummy.properties =================================================================== --- trunk/src/test/resources/i18n/verydummy.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/verydummy.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=verydummy.one -two=verydummy.two \ No newline at end of file