November 2008 - Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r1249 - maven-license-switcher-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: tchemit Date: 2008-11-21 15:46:55 +0000 (Fri, 21 Nov 2008) New Revision: 1249 Modified: maven-license-switcher-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.5 Modified: maven-license-switcher-plugin/trunk/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:44:22 UTC (rev 1248) +++ maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:46:55 UTC (rev 1249) @@ -1,6 +1,5 @@ <?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> @@ -15,7 +14,7 @@ <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> <dependencies> @@ -66,11 +65,10 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.site.gen.dir}/resources"/> - <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" - overwrite="false"> + <mkdir dir="${maven.site.gen.dir}/resources" /> + <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" overwrite="false"> <fileset dir="${maven.src.dir}/main/resources/META-INF"> - <include name="licenses/**"/> + <include name="licenses/**" /> </fileset> </copy> </tasks> @@ -100,9 +98,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-license-s…</url> </scm> </project>

1 0

[Lutinutil-commits] r1248 - maven-license-switcher-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: tchemit Date: 2008-11-21 15:44:22 +0000 (Fri, 21 Nov 2008) New Revision: 1248 Modified: maven-license-switcher-plugin/trunk/pom.xml Log: [maven-release-plugin] rollback the release of 0.5 Modified: maven-license-switcher-plugin/trunk/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:40:00 UTC (rev 1247) +++ maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:44:22 UTC (rev 1248) @@ -1,5 +1,6 @@ <?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> @@ -14,7 +15,7 @@ <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> <dependencies> @@ -65,10 +66,11 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.site.gen.dir}/resources" /> - <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" overwrite="false"> + <mkdir dir="${maven.site.gen.dir}/resources"/> + <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" + overwrite="false"> <fileset dir="${maven.src.dir}/main/resources/META-INF"> - <include name="licenses/**" /> + <include name="licenses/**"/> </fileset> </copy> </tasks> @@ -98,9 +100,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-license-s…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> </project>

1 0

[Lutinutil-commits] r1247 - maven-license-switcher-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: tchemit Date: 2008-11-21 15:40:00 +0000 (Fri, 21 Nov 2008) New Revision: 1247 Modified: maven-license-switcher-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven-license-switcher-plugin/trunk/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:39:57 UTC (rev 1246) +++ maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:40:00 UTC (rev 1247) @@ -14,7 +14,7 @@ <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <dependencies> @@ -98,9 +98,9 @@  <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-license-s…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-license-s…</url> </scm> </project>

1 0

[Lutinutil-commits] r1246 - in maven-license-switcher-plugin/tags: . 0.5 0.5/src/main/java/org/codelutin/license/plugin
by tchemit＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: tchemit Date: 2008-11-21 15:39:57 +0000 (Fri, 21 Nov 2008) New Revision: 1246 Added: maven-license-switcher-plugin/tags/0.5/ maven-license-switcher-plugin/tags/0.5/changelog maven-license-switcher-plugin/tags/0.5/pom.xml maven-license-switcher-plugin/tags/0.5/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java Removed: maven-license-switcher-plugin/tags/0.5/changelog maven-license-switcher-plugin/tags/0.5/pom.xml maven-license-switcher-plugin/tags/0.5/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java Log: [maven-release-plugin] copy for tag 0.5 Copied: maven-license-switcher-plugin/tags/0.5 (from rev 1234, maven-license-switcher-plugin/trunk) Deleted: maven-license-switcher-plugin/tags/0.5/changelog =================================================================== --- maven-license-switcher-plugin/trunk/changelog 2008-11-17 11:45:24 UTC (rev 1234) +++ maven-license-switcher-plugin/tags/0.5/changelog 2008-11-21 15:39:57 UTC (rev 1246) @@ -1,7 +0,0 @@ -ver-0-4 chemit 20081013 - * 20081013 [chemit] Improve third-party goal : onyl keep included dependencies - -ver-0-3 chemit 20081013 - * 20081013 [chemit] Improve licence resolving - * 20080922 [thimel] Modified version of jrst and plugin's groupId - * 20080922 [chemit] Using lutinpluginproject 3.0 Copied: maven-license-switcher-plugin/tags/0.5/changelog (from rev 1244, maven-license-switcher-plugin/trunk/changelog) =================================================================== --- maven-license-switcher-plugin/tags/0.5/changelog (rev 0) +++ maven-license-switcher-plugin/tags/0.5/changelog 2008-11-21 15:39:57 UTC (rev 1246) @@ -0,0 +1,11 @@ +ver-0-5 chemit 200811?? + * 20081121 [chemit] fix bug when no name is defined in license + * 20081118 [chemit] use lutinpluginproject 3.1 + +ver-0-4 chemit 20081013 + * 20081013 [chemit] Improve third-party goal : onyl keep included dependencies + +ver-0-3 chemit 20081013 + * 20081013 [chemit] Improve licence resolving + * 20080922 [thimel] Modified version of jrst and plugin's groupId + * 20080922 [chemit] Using lutinpluginproject 3.0 Deleted: maven-license-switcher-plugin/tags/0.5/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2008-11-17 11:45:24 UTC (rev 1234) +++ maven-license-switcher-plugin/tags/0.5/pom.xml 2008-11-21 15:39:57 UTC (rev 1246) @@ -1,104 +0,0 @@ -<?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"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginproject</artifactId> - <version>3.0</version> - </parent> - - <artifactId>maven-license-switcher-plugin</artifactId> - - <dependencies> - - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinprocessor</artifactId> - <version>0.15</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>0.2</version> - <scope>compile</scope> - </dependency> - - </dependencies> - -  -  -  - <name>Plugin maven pour switcher les licenses</name> - <version>0.5-SNAPSHOT</version> - <description>Plugin pour switcher de license dans un module maven 2</description> - <inceptionYear>2008</inceptionYear> - -  -  -  - - <packaging>maven-plugin</packaging> - - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -  - <execution> - <id>CopySiteFiles2</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.site.gen.dir}/resources" /> - <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" overwrite="false"> - <fileset dir="${maven.src.dir}/main/resources/META-INF"> - <include name="licenses/**" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <properties> - -  - <labs.id>12</labs.id> - -  - <labs.project>lutinutil</labs.project> - - </properties> - -  -  -  - -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: maven-license-switcher-plugin/tags/0.5/pom.xml (from rev 1245, maven-license-switcher-plugin/trunk/pom.xml) =================================================================== --- maven-license-switcher-plugin/tags/0.5/pom.xml (rev 0) +++ maven-license-switcher-plugin/tags/0.5/pom.xml 2008-11-21 15:39:57 UTC (rev 1246) @@ -0,0 +1,106 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginproject</artifactId> + <version>3.1</version> + </parent> + + <artifactId>maven-license-switcher-plugin</artifactId> + + <version>0.5</version> + + <dependencies> + + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinprocessor</artifactId> + <version>0.15</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Plugin maven pour switcher les licenses</name> + + <description>Plugin pour switcher de license dans un module maven 2</description> + <inceptionYear>2008</inceptionYear> + +  +  +  + + <packaging>maven-plugin</packaging> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> +  + <execution> + <id>CopySiteFiles2</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${maven.site.gen.dir}/resources" /> + <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" overwrite="false"> + <fileset dir="${maven.src.dir}/main/resources/META-INF"> + <include name="licenses/**" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <properties> + +  + <labs.id>12</labs.id> + +  + <labs.project>lutinutil</labs.project> + + </properties> + +  +  +  + +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-license-s…</url> + </scm> + +</project> Deleted: maven-license-switcher-plugin/tags/0.5/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java 2008-11-17 11:45:24 UTC (rev 1234) +++ maven-license-switcher-plugin/tags/0.5/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java 2008-11-21 15:39:57 UTC (rev 1246) @@ -1,324 +0,0 @@ -/** - * *##% Plugin maven pour switcher les licenses - * Copyright (C) 2008 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>. ##%* - */ -package org.codelutin.license.plugin; - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.metadata.ArtifactMetadataSource; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactCollector; -import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; -import org.apache.maven.model.License; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.MavenProjectBuilder; -import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.shared.dependency.tree.DependencyNode; -import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; -import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; -import org.codelutin.util.FileUtil; - -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - -/** - * Le goal pour copier le fichier THIRD-PARTY.txt (contenant les licenses de toutes les dependances du projet) - * dans le classpath (et le generer s'il n'existe pas). - * - * @author chemit - * @goal third-party - * @phase process-classes - * @requiresDependencyResolution test - * @requiresProject true - */ -public class ThirdPartyMojo extends AbstractLicenseMojo { - - private static final String unknownLicenseMessage = "Unknown license"; - - /** - * Local Repository. - * - * @parameter expression="${localRepository}" - * @required - * @readonly - */ - protected ArtifactRepository localRepository; - - - /** - * Remote repositories used for the project. - * - * @parameter expression="${project.remoteArtifactRepositories}" - * @required - * @readonly - */ - protected List remoteRepositories; - - /** - * Fichier ou ecrire les licences des dependances. - * - * @parameter expression="${license-switcher.thirdPartyFile}" default-value="${project.build.outputDirectory}/THIRD-PARTY.txt" - * @required - */ - protected File thirdPartyFile; - - /** - * Dependency tree builder component. - * - * @component - */ - protected DependencyTreeBuilder dependencyTreeBuilder; - - /** - * Artifact Factory component. - * - * @component - */ - protected ArtifactFactory factory; - - /** - * Artifact metadata source component. - * - * @component - */ - protected ArtifactMetadataSource artifactMetadataSource; - - /** - * Artifact collector component. - * - * @component - */ - protected ArtifactCollector collector; - - /** - * Maven Project Builder component. - * - * @component - */ - protected MavenProjectBuilder mavenProjectBuilder; - - /** - * Un flag pour indiquer la regeneration des fichiers. - * - * @parameter expression="${license-switcher.doGenerate}" default-value="true" - */ - protected boolean doGenerate; - /** - * content of third party file (only computed if {@link #doGenerate} is active or the - * {@link #thirdPartyFile} does not exist. - */ - protected String thirdPartyFileContent; - - protected void init() throws Exception { - - // must generate if file does not exist - doGenerate = doGenerate || !thirdPartyFile.exists(); - - if ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())) { - // nothing to be done for this type of packaging - doGenerate = false; - getLog().info("skip third-party goal for packaging " + project.getPackaging()); - return; - } - - if (doGenerate) { - - // prepare thirdPartyFileContent - - DependencyNode dependencyTreeNode = resolveProject(); - - LicenseMap licenseMap = new LicenseMap(); - - for (Object o : dependencyTreeNode.getChildren()) { - - buildLicenseMap((DependencyNode) o, licenseMap); - } - - thirdPartyFileContent = buildGroupedLicenses(licenseMap); - - // log dependencies with no license - SortedSet<String> dependenciesWithNoLicense = licenseMap.get(unknownLicenseMessage); - if (dependenciesWithNoLicense != null) { - for (String dep : dependenciesWithNoLicense) { - // no license found for the dependency - getLog().warn("no license found for dependency " + dep); - } - } - } - } - - @Override - public void execute() throws MojoExecutionException, MojoFailureException { - - super.execute(); - - if (doGenerate) { - if (verbose) { - getLog().info("writing third-party file : " + thirdPartyFile); - } - if (keepBackup && thirdPartyFile.exists()) { - if (verbose) { - getLog().info("backup " + thirdPartyFile); - } - thirdPartyFile.renameTo(new File(thirdPartyFile.getAbsolutePath() + '~')); - } - try { - FileUtil.writeString(thirdPartyFile, thirdPartyFileContent, encoding); - } catch (IOException e) { - throw new MojoExecutionException("could not write file " + thirdPartyFile + " for reason : " + e.getMessage(), e); - } - } - - } - - - /** @return resolve the dependency tree */ - protected DependencyNode resolveProject() { - try { - ArtifactFilter artifactFilter = new ScopeArtifactFilter(Artifact.SCOPE_TEST); - return dependencyTreeBuilder.buildDependencyTree(project, localRepository, factory, - artifactMetadataSource, artifactFilter, collector); - } - catch (DependencyTreeBuilderException e) { - getLog().error("Unable to build dependency tree.", e); - return null; - } - } - - protected void buildLicenseMap(DependencyNode node, LicenseMap licenseMap) { - if (node.getState() != DependencyNode.INCLUDED) { - // this dependency is not included, so do not treate it - if (verbose) { - getLog().info("do not include this dependency " + node.toNodeString()); - } - return; - } - Artifact artifact = node.getArtifact(); - - if (verbose && getLog().isDebugEnabled()) { - getLog().debug("treate node " + node.toNodeString()); - } - - if (!Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) { - try { - MavenProject artifactProject = getMavenProjectFromRepository(artifact); - String artifactName = getArtifactName(artifactProject); - - List licenses = artifactProject.getLicenses(); - - if (licenses.isEmpty()) { - // no license found for the dependency - licenseMap.put(unknownLicenseMessage, artifactName); - - } else { - for (Object license : licenses) { - licenseMap.put(((License) license).getName(), artifactName); - } - } - } - catch (ProjectBuildingException e) { - getLog().error("ProjectBuildingException error : ", e); - } - } - if (!node.getChildren().isEmpty()) { - for (Object o : node.getChildren()) { - buildLicenseMap((DependencyNode) o, licenseMap); - } - } - } - - protected String buildGroupedLicenses(LicenseMap licenseMap) { - StringBuilder sb = new StringBuilder(); - sb.append("List of third-party dependencies grouped by their license type."); - for (String licenseName : licenseMap.keySet()) { - sb.append("\n\n").append(licenseName).append(" : "); - - SortedSet<String> projects = licenseMap.get(licenseName); - - for (String projectName : projects) { - sb.append("\n * ").append(projectName); - } - } - return sb.toString(); - } - - protected String getArtifactName(MavenProject artifactProject) { - StringBuilder sb = new StringBuilder(); - - sb.append(artifactProject.getName()); - sb.append(" ("); - sb.append(artifactProject.getGroupId()); - sb.append(":"); - sb.append(artifactProject.getArtifactId()); - sb.append(":"); - sb.append(artifactProject.getVersion()); - sb.append(" - "); - String url = artifactProject.getUrl(); - sb.append(url == null ? "no url defined" : url); - sb.append(")"); - - return sb.toString(); - } - - /** - * Get the <code>Maven project</code> from the repository depending the <code>Artifact</code> given. - * - * @param artifact an artifact - * @return the Maven project for the given artifact - * @throws ProjectBuildingException if any - */ - protected MavenProject getMavenProjectFromRepository(Artifact artifact) - throws ProjectBuildingException { - - boolean allowStubModel = false; - - if (!"pom".equals(artifact.getType())) { - artifact = factory.createProjectArtifact(artifact.getGroupId(), artifact.getArtifactId(), - artifact.getVersion(), artifact.getScope()); - allowStubModel = true; - } - - // TODO: we should use the MavenMetadataSource instead - return mavenProjectBuilder.buildFromRepository(artifact, remoteRepositories, localRepository, - allowStubModel); - } - - protected class LicenseMap extends java.util.TreeMap<String, SortedSet<String>> { - private static final long serialVersionUID = 864199843545688069L; - - /** {@inheritDoc} */ - public SortedSet<String> put(String key, String value) { - // handle multiple values as a set to avoid duplicates - SortedSet<String> valueList = get(key); - if (valueList == null) { - valueList = new TreeSet<String>(); - } - if (getLog().isDebugEnabled()) { - getLog().debug("key:" + key + ",value: " + value); - } - valueList.add(value); - return put(key, valueList); - } - } -} Copied: maven-license-switcher-plugin/tags/0.5/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java (from rev 1244, maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java) =================================================================== --- maven-license-switcher-plugin/tags/0.5/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java (rev 0) +++ maven-license-switcher-plugin/tags/0.5/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java 2008-11-21 15:39:57 UTC (rev 1246) @@ -0,0 +1,333 @@ +/** + * *##% Plugin maven pour switcher les licenses + * Copyright (C) 2008 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>. ##%* + */ +package org.codelutin.license.plugin; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.factory.ArtifactFactory; +import org.apache.maven.artifact.metadata.ArtifactMetadataSource; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.ArtifactCollector; +import org.apache.maven.artifact.resolver.filter.ArtifactFilter; +import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; +import org.apache.maven.model.License; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.MavenProjectBuilder; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.shared.dependency.tree.DependencyNode; +import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; +import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; +import org.codelutin.util.FileUtil; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + +/** + * Le goal pour copier le fichier THIRD-PARTY.txt (contenant les licenses de toutes les dependances du projet) + * dans le classpath (et le generer s'il n'existe pas). + * + * @author chemit + * @goal third-party + * @phase process-classes + * @requiresDependencyResolution test + * @requiresProject true + */ +public class ThirdPartyMojo extends AbstractLicenseMojo { + + private static final String unknownLicenseMessage = "Unknown license"; + + /** + * Local Repository. + * + * @parameter expression="${localRepository}" + * @required + * @readonly + */ + protected ArtifactRepository localRepository; + + + /** + * Remote repositories used for the project. + * + * @parameter expression="${project.remoteArtifactRepositories}" + * @required + * @readonly + */ + protected List remoteRepositories; + + /** + * Fichier ou ecrire les licences des dependances. + * + * @parameter expression="${license-switcher.thirdPartyFile}" default-value="${project.build.outputDirectory}/THIRD-PARTY.txt" + * @required + */ + protected File thirdPartyFile; + + /** + * Dependency tree builder component. + * + * @component + */ + protected DependencyTreeBuilder dependencyTreeBuilder; + + /** + * Artifact Factory component. + * + * @component + */ + protected ArtifactFactory factory; + + /** + * Artifact metadata source component. + * + * @component + */ + protected ArtifactMetadataSource artifactMetadataSource; + + /** + * Artifact collector component. + * + * @component + */ + protected ArtifactCollector collector; + + /** + * Maven Project Builder component. + * + * @component + */ + protected MavenProjectBuilder mavenProjectBuilder; + + /** + * Un flag pour indiquer la regeneration des fichiers. + * + * @parameter expression="${license-switcher.doGenerate}" default-value="true" + */ + protected boolean doGenerate; + /** + * content of third party file (only computed if {@link #doGenerate} is active or the + * {@link #thirdPartyFile} does not exist. + */ + protected String thirdPartyFileContent; + + protected void init() throws Exception { + + // must generate if file does not exist + doGenerate = doGenerate || !thirdPartyFile.exists(); + + if ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())) { + // nothing to be done for this type of packaging + doGenerate = false; + getLog().info("skip third-party goal for packaging " + project.getPackaging()); + return; + } + + if (doGenerate) { + + // prepare thirdPartyFileContent + + DependencyNode dependencyTreeNode = resolveProject(); + + LicenseMap licenseMap = new LicenseMap(); + + for (Object o : dependencyTreeNode.getChildren()) { + + buildLicenseMap((DependencyNode) o, licenseMap); + } + + thirdPartyFileContent = buildGroupedLicenses(licenseMap); + + // log dependencies with no license + SortedSet<String> dependenciesWithNoLicense = licenseMap.get(unknownLicenseMessage); + if (dependenciesWithNoLicense != null) { + for (String dep : dependenciesWithNoLicense) { + // no license found for the dependency + getLog().warn("no license found for dependency " + dep); + } + } + } + } + + @Override + public void execute() throws MojoExecutionException, MojoFailureException { + + super.execute(); + + if (doGenerate) { + if (verbose) { + getLog().info("writing third-party file : " + thirdPartyFile); + } + if (keepBackup && thirdPartyFile.exists()) { + if (verbose) { + getLog().info("backup " + thirdPartyFile); + } + thirdPartyFile.renameTo(new File(thirdPartyFile.getAbsolutePath() + '~')); + } + try { + FileUtil.writeString(thirdPartyFile, thirdPartyFileContent, encoding); + } catch (IOException e) { + throw new MojoExecutionException("could not write file " + thirdPartyFile + " for reason : " + e.getMessage(), e); + } + } + + } + + + /** @return resolve the dependency tree */ + protected DependencyNode resolveProject() { + try { + ArtifactFilter artifactFilter = new ScopeArtifactFilter(Artifact.SCOPE_TEST); + return dependencyTreeBuilder.buildDependencyTree(project, localRepository, factory, + artifactMetadataSource, artifactFilter, collector); + } + catch (DependencyTreeBuilderException e) { + getLog().error("Unable to build dependency tree.", e); + return null; + } + } + + protected void buildLicenseMap(DependencyNode node, LicenseMap licenseMap) { + if (node.getState() != DependencyNode.INCLUDED) { + // this dependency is not included, so do not treate it + if (verbose) { + getLog().info("do not include this dependency " + node.toNodeString()); + } + return; + } + Artifact artifact = node.getArtifact(); + + if (verbose && getLog().isDebugEnabled()) { + getLog().debug("treate node " + node.toNodeString()); + } + + if (!Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) { + try { + MavenProject artifactProject = getMavenProjectFromRepository(artifact); + String artifactName = getArtifactName(artifactProject); + + List licenses = artifactProject.getLicenses(); + + if (licenses.isEmpty()) { + // no license found for the dependency + licenseMap.put(unknownLicenseMessage, artifactName); + + } else { + for (Object o : licenses) { + if (o == null) { + getLog().warn("could not acquire the license for " + artifactName); + continue; + } + License license = (License) o; + String licenseKey = license.getName(); + if (license.getName() == null) { + licenseKey = license.getUrl(); + } + licenseMap.put(licenseKey, artifactName); + } + } + } + catch (ProjectBuildingException e) { + getLog().error("ProjectBuildingException error : ", e); + } + } + if (!node.getChildren().isEmpty()) { + for (Object o : node.getChildren()) { + buildLicenseMap((DependencyNode) o, licenseMap); + } + } + } + + protected String buildGroupedLicenses(LicenseMap licenseMap) { + StringBuilder sb = new StringBuilder(); + sb.append("List of third-party dependencies grouped by their license type."); + for (String licenseName : licenseMap.keySet()) { + sb.append("\n\n").append(licenseName).append(" : "); + + SortedSet<String> projects = licenseMap.get(licenseName); + + for (String projectName : projects) { + sb.append("\n * ").append(projectName); + } + } + return sb.toString(); + } + + protected String getArtifactName(MavenProject artifactProject) { + StringBuilder sb = new StringBuilder(); + + sb.append(artifactProject.getName()); + sb.append(" ("); + sb.append(artifactProject.getGroupId()); + sb.append(":"); + sb.append(artifactProject.getArtifactId()); + sb.append(":"); + sb.append(artifactProject.getVersion()); + sb.append(" - "); + String url = artifactProject.getUrl(); + sb.append(url == null ? "no url defined" : url); + sb.append(")"); + + return sb.toString(); + } + + /** + * Get the <code>Maven project</code> from the repository depending the <code>Artifact</code> given. + * + * @param artifact an artifact + * @return the Maven project for the given artifact + * @throws ProjectBuildingException if any + */ + protected MavenProject getMavenProjectFromRepository(Artifact artifact) + throws ProjectBuildingException { + + boolean allowStubModel = false; + + if (!"pom".equals(artifact.getType())) { + artifact = factory.createProjectArtifact(artifact.getGroupId(), artifact.getArtifactId(), + artifact.getVersion(), artifact.getScope()); + allowStubModel = true; + } + + // TODO: we should use the MavenMetadataSource instead + return mavenProjectBuilder.buildFromRepository(artifact, remoteRepositories, localRepository, + allowStubModel); + } + + protected class LicenseMap extends java.util.TreeMap<String, SortedSet<String>> { + private static final long serialVersionUID = 864199843545688069L; + + /** {@inheritDoc} */ + public SortedSet<String> put(String key, String value) { + // handle multiple values as a set to avoid duplicates + SortedSet<String> valueList = get(key); + if (valueList == null) { + valueList = new TreeSet<String>(); + } + if (getLog().isDebugEnabled()) { + getLog().debug("key:" + key + ",value: " + value); + } + valueList.add(value); + return put(key, valueList); + } + } +}

1 0

[Lutinutil-commits] r1245 - maven-license-switcher-plugin/trunk
by tchemit＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: tchemit Date: 2008-11-21 15:39:53 +0000 (Fri, 21 Nov 2008) New Revision: 1245 Modified: maven-license-switcher-plugin/trunk/pom.xml Log: [maven-release-plugin] prepare release 0.5 Modified: maven-license-switcher-plugin/trunk/pom.xml =================================================================== --- maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:37:49 UTC (rev 1244) +++ maven-license-switcher-plugin/trunk/pom.xml 2008-11-21 15:39:53 UTC (rev 1245) @@ -1,6 +1,5 @@ <?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> @@ -15,7 +14,7 @@ <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> <dependencies> @@ -66,11 +65,10 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.site.gen.dir}/resources"/> - <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" - overwrite="false"> + <mkdir dir="${maven.site.gen.dir}/resources" /> + <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" overwrite="false"> <fileset dir="${maven.src.dir}/main/resources/META-INF"> - <include name="licenses/**"/> + <include name="licenses/**" /> </fileset> </copy> </tasks> @@ -100,9 +98,9 @@  <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/lutinutil/maven-license-switcher-plugin/tags/0.5</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/maven-license-s…</url> </scm> </project>

1 0

[Lutinutil-commits] r1244 - in maven-license-switcher-plugin/trunk: . src/main/java/org/codelutin/license/plugin
by chemit＠users.labs.libre-entreprise.org Nov. 21, 2008

Nov. 21, 2008

Author: chemit Date: 2008-11-21 15:37:49 +0000 (Fri, 21 Nov 2008) New Revision: 1244 Modified: maven-license-switcher-plugin/trunk/changelog maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java Log: fix bug when no name is defined in license Modified: maven-license-switcher-plugin/trunk/changelog =================================================================== --- maven-license-switcher-plugin/trunk/changelog 2008-11-20 14:03:08 UTC (rev 1243) +++ maven-license-switcher-plugin/trunk/changelog 2008-11-21 15:37:49 UTC (rev 1244) @@ -1,6 +1,7 @@ ver-0-5 chemit 200811?? + * 20081121 [chemit] fix bug when no name is defined in license * 20081118 [chemit] use lutinpluginproject 3.1 - + ver-0-4 chemit 20081013 * 20081013 [chemit] Improve third-party goal : onyl keep included dependencies Modified: maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java =================================================================== --- maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java 2008-11-20 14:03:08 UTC (rev 1243) +++ maven-license-switcher-plugin/trunk/src/main/java/org/codelutin/license/plugin/ThirdPartyMojo.java 2008-11-21 15:37:49 UTC (rev 1244) @@ -135,7 +135,7 @@ // must generate if file does not exist doGenerate = doGenerate || !thirdPartyFile.exists(); - if ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())) { + if ("pom".equals(project.getPackaging()) || "site".equals(project.getPackaging())) { // nothing to be done for this type of packaging doGenerate = false; getLog().info("skip third-party goal for packaging " + project.getPackaging()); @@ -232,8 +232,17 @@ licenseMap.put(unknownLicenseMessage, artifactName); } else { - for (Object license : licenses) { - licenseMap.put(((License) license).getName(), artifactName); + for (Object o : licenses) { + if (o == null) { + getLog().warn("could not acquire the license for " + artifactName); + continue; + } + License license = (License) o; + String licenseKey = license.getName(); + if (license.getName() == null) { + licenseKey = license.getUrl(); + } + licenseMap.put(licenseKey, artifactName); } } }

1 0

[Lutinutil-commits] r1243 - in lutinutil/trunk: . src/main/java/org/codelutin/util src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Nov. 20, 2008

Nov. 20, 2008

Author: chatellier Date: 2008-11-20 14:03:08 +0000 (Thu, 20 Nov 2008) New Revision: 1243 Removed: lutinutil/trunk/src/main/java/org/codelutin/util/HashMapMultiKey.java Modified: lutinutil/trunk/changelog lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java lutinutil/trunk/src/main/java/org/codelutin/util/EnumConverter.java lutinutil/trunk/src/main/java/org/codelutin/util/EnumEditor.java lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java lutinutil/trunk/src/main/java/org/codelutin/util/URIConverter.java lutinutil/trunk/src/main/java/org/codelutin/util/URLConverter.java lutinutil/trunk/src/main/java/org/codelutin/util/VersionNumberConverter.java lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties Log: Update i18n transalation Modified: lutinutil/trunk/changelog =================================================================== --- lutinutil/trunk/changelog 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/changelog 2008-11-20 14:03:08 UTC (rev 1243) @@ -1,8 +1,10 @@ ver 1.0 ??? ??? + * 20081120 [chatellier] Remove deprecated HashMapMultiKey + * 20081120 [chatellier] Fix i18n lutinutil properties files * 20081118 [chemit] - use lutinproject 3.1 - improve i18n loading : skip urls with no i18n directory - introduce ClassLoaderUtil class - * 2008???? [chatellier] Remove deprecated I18n._ and replace by temporary code + * 20081101 [chatellier] Remove deprecated I18n._ and replace by temporary code ver-0-31 chemit 2008???? * always build javadoc Modified: lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/ApplicationConfig.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -406,7 +406,9 @@ try { save(file, false); } catch (IOException eee) { - log.warn(_("Can't save config in file %s", file), eee); + if (log.isWarnEnabled()) { + log.warn(_("lutinutil.error.applicationconfig.save", file), eee); + } } } @@ -419,7 +421,9 @@ try { save(file, false); } catch (IOException eee) { - log.warn(_("Can't save config in file %s", file), eee); + if (log.isWarnEnabled()) { + log.warn(_("lutinutil.error.applicationconfig.save", file), eee); + } } } Modified: lutinutil/trunk/src/main/java/org/codelutin/util/EnumConverter.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/EnumConverter.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/EnumConverter.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -57,7 +57,7 @@ if (useDefault) { return defaultValue; } - throw new ConversionException(_("lutin.error.convertor.noValue", this)); + throw new ConversionException(_("lutinutil.error.convertor.noValue", this)); } if (isEnabled(aClass, enumType)) { Object result; @@ -80,7 +80,7 @@ return result; } } - throw new ConversionException(_("lutin.error.no.convertor", aClass.getName(), value)); + throw new ConversionException(_("lutinutil.error.no.convertor", aClass.getName(), value)); } public EnumConverter(Class<?> enumType, Object defaultValue) { Modified: lutinutil/trunk/src/main/java/org/codelutin/util/EnumEditor.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/EnumEditor.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/EnumEditor.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -29,6 +29,9 @@ */ public class EnumEditor extends JComboBox { + /** serialVersionUID */ + private static final long serialVersionUID = 2693771553067104538L; + protected Class<? extends Enum<?>> type; public static EnumEditor newEditor(Class<?> type) { Deleted: lutinutil/trunk/src/main/java/org/codelutin/util/HashMapMultiKey.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/HashMapMultiKey.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/HashMapMultiKey.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -1,454 +0,0 @@ -/* *##% Lutin utilities library - * Copyright (C) 2004 - 2008 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>. ##%* */ - -/* * - * HashMapMultiKey.java - * - * Created: 2 nov. 2004 - * - * @author Benjamin Poussin <poussin(a)codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - -package org.codelutin.util; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.Serializable; -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -/** - * Permet de stocker un element suivant un ensemble de cle. - * - * FIXME: pas le temps d'implanter toutes les methodes pour un support - * complet des References. iterator(), entrySet(), ... peuvent ne pas - * fonctionner comme il faut, c-a-d qu'il retourne les references et non - * les objets. Mais les methodes simples fonctionnent: put, remove, get, ... - * - * @deprecated Cette classe semble avoir des memory leaks. Mieux vaut ne pas - * l'utiliser ou alors il faudrait refaire l'implantation complete de facon propre - */ -@Deprecated -public class HashMapMultiKey extends HashMap<Object, Object> { // HashMapMultiKey - - /** */ - private static final long serialVersionUID = 8455012633585431630L; - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(HashMapMultiKey.class); - - public static final Object HARD = null; - public static final Object SOFT = new Object(); - public static final Object WEAK = new Object(); - - /** key: un objet, value un Set de key pour la vrai hashmap */ - protected HashMap<Object, Set<Object>> keys = new HashMap<Object, Set<Object>>(); - /** - * key: la valeur, valeur: la cle. Permet de supprimer rapidement une - * key lorsque la valeur disparait - */ - protected Map<Object, Object> valueToKey = new IdentityHashMap<Object, Object>(); - protected ReferenceQueue<Object> refQueueKey = new ReferenceQueue<Object>(); - protected ReferenceQueue<Object> refQueueValue = new ReferenceQueue<Object>(); - - protected Object keyType = null; - protected Object valueType = null; - - /** - * Si value est une reference et qu'il disparait alors la cle disparait - * Si key est une reference et qu'une de ses composantes disparait alors - * la cle et la valeur disparaissent. - * - * @param keyType le type de cle SOFT ou WEAK ou null - * @param valueType le type de valeur SOFT ou WEAK ou null - */ - public HashMapMultiKey(Object keyType, Object valueType) { - super(); - this.keyType = keyType; - this.valueType = valueType; - } - - public HashMapMultiKey() { - this(null, null); - } - - /** Encapsule dans un objet Reference si besoin l'objet o */ - protected Object refValue(Object o) { - Object result = o; - if (valueType == SOFT) { - result = new TransparenteSoftReference<Object>(o, refQueueValue, false); - } else if (valueType == WEAK) { - result = new TransparenteWeakReference<Object>(o, refQueueValue, false); - } - return result; - } - - protected Object derefValue(Object o) { - Object result = o; - if (valueType == SOFT && o != null) { - result = ((TransparenteSoftReference<?>) o).get(); - } else if (valueType == WEAK && o != null) { - result = ((TransparenteWeakReference<?>) o).get(); - } - return result; - } - - - /** Encapsule dans un objet Reference si besoin l'objet o */ - protected Object refKey(Object o) { - Object result = o; - if (keyType == SOFT) { - result = new TransparenteSoftReference<Object>(o, refQueueKey, false); - } else if (keyType == WEAK) { - result = new TransparenteWeakReference<Object>(o, refQueueKey, false); - } - return result; - } - - protected Object derefKey(Object o) { - Object result = o; - if (keyType == SOFT && o != null) { - result = ((TransparenteSoftReference<?>) o).get(); - } else if (keyType == WEAK && o != null) { - result = ((TransparenteWeakReference<?>) o).get(); - } - return result; - } - - /** - * Look in the queue if reference is available and remove reference in - * all map - * ATTENTION: this method not call other method, because all other method - * call it - */ - protected void cleanQueue() { - Reference<?> o = null; - while (null != (o = refQueueKey.poll())) { - if (log.isTraceEnabled()) { - log.trace("clean the refQueueKey : " + o); - } - Object val = super.remove(o); - valueToKey.remove(val); - } - - while (null != (o = refQueueValue.poll())) { - if (log.isTraceEnabled()) { - log.trace("clean the refQueueValue : " + o); - } - // suppression dans la table des values et recuperation de la cle - // associé - Object keyRef = valueToKey.remove(o); - // suppression dans la table a partir de la cle recuperé - super.remove(keyRef); - - Object key = derefKey(keyRef); -// System.out.println("++++++++++ key: " + key + " keyRef: " + keyRef + " for value: " + o); - if (key != null) { - // suppression dans l'association des objets de la cle - for (Iterator<Object> i = ((Key) key).iterator(); i.hasNext();) { - Object k = i.next(); - Set<?> list = keys.get(k); - // FIXME il arrive que la list soit null, mais cela devrait - // etre impossible puisqu'on vient de recuperer une cle qui - // contient cette sous cle qui devrait retourner cette liste - if (list != null) { - list.remove(keyRef); - if (list.size() == 0) { - keys.remove(k); - } - } - } - } else { - if (log.isTraceEnabled()) { - log.trace("key is null !!! do long task to prevent memory leak " + o); - } - // to prevent memory leak we can clean all list in keys Map - for (Iterator<Object> e = keys.keySet().iterator(); e.hasNext();) { - Object k = e.next(); - Set<?> list = keys.get(k); - if (list != null) { - for (Iterator<?> i = list.iterator(); i.hasNext();) { - if (derefKey(i.next()) == null) { - i.remove(); - } - } - if (list.size() == 0) { - e.remove(); - } - } - } - if (log.isTraceEnabled()) { - log.trace("end of long task to prevent memory leak" + o); - } - } - } - } - - /** - * Retourne toutes les cles qui contiennent au moins une fois l'élément - * e. - * - * @param e l'element que doivent contenir les cles - * @return la liste des cles. Si aucune cle ne contient l'element e, - * alors la liste retourné est vide. - */ - public Set<Object> getKeys(Object e) { - Set<Object> list = _getKeys(e); - return list; - } - - /** - * Retourne toutes les cles qui contiennent au moins une fois l'élément - * e. - * - * @param e l'element que doivent contenir les cles - * @return la liste des cles. Si aucune cle ne contient l'element e, - * alors la liste retourné est vide. - */ - protected Set<Object> _getKeys(Object e) { - cleanQueue(); - Set<Object> list = keys.get(e); - if (list == null) { - list = new HashSet<Object>(); - } - return list; - } - - protected Set<Object> getKeysAndAdd(Object e) { - Set<Object> list = _getKeys(e); - // il ne faut pas encapsuler e dans une ref, sinon on ne retrouve - // plus les cles si l'objet etait seulement dans la cle - keys.put(e, list); - return list; - } - - /** - * Method put - * - * @param key une collection d'objet - * @param value la valeur a associer a la cle. - * @return l'ancienne valeur pour cette cle, ou null, s'il n'y - * avait pas d'ancienne valeur. - * @throws IllegalArgumentException si le parametre key n'est pas - * une collection d'objet. - */ - @Override - public Object put(Object key, Object value) { - if (key == null) { - if (log.isWarnEnabled()) { - log.warn("key is null"); - } - } - // a chaque fois que l'on ajoute, on nettoie un peu avant - cleanQueue(); - if (key instanceof Key) { - // ajout dans la hash des cles - Key keyObject = (Key) key; - Object keyRef = refKey(key); - for (int i = 0; i < keyObject.size(); i++) { - Object k = keyObject.get(i); - // on recupere la liste des cles qui contiennent deja cette cle - Set<Object> list = getKeysAndAdd(k); - list.add(keyRef); - } - // On encapsule la valeur si besoin - value = refValue(value); - valueToKey.put(value, keyRef); - // reelle ajout - return derefValue(super.put(keyRef, value)); - } - throw new IllegalArgumentException("L'argument key doit etre un tableau d'objet"); - } - - - @Override - public boolean containsValue(Object value) { - cleanQueue(); - return valueToKey.containsKey(value); - } - - @Override - public Object get(Object key) { - // a chaque fois que l'on prend, on nettoie un peu avant - cleanQueue(); - return derefValue(super.get(key)); - } - - /* (non-Javadoc) - * @see java.util.HashMap#size() - */ - @Override - public int size() { - cleanQueue(); - return super.size(); - } - - /** - * Method remove permet de supprimer un element suivant une cle - * qui a permit d'ajouter l'element, on bien une composant d'une - * cle qui a permis d'ajouter l'element. Si un tableau d'objet est - * donne, alors au maximum un element est supprime. Si un objet - * est passe alors 0 à N element sont supprimes. En fait tous les - * valeurs qui ont dans leur cle, l'objet sont supprime. - * - * @param key soit un tableau d'objet soit un objet - * @return si un objet Key a ete passe, alors retourne la - * valeur associée a cette cle. Si un objet a ete passe, retourne la liste - * des cles qui contient cet objet et qui ont été supprimées. - */ - @Override - public Object remove(Object key) { - // on nettoie un peu avant - cleanQueue(); - if (key instanceof Key) { - // suppression de la cle - // on pourrait aussi mettre la cle dans un WeakRef, ca eviterait - // de devoir le supprimer dans les lists de keys, le - // GC le ferait pour nous. - Object keyRef = refKey(key); - for (Iterator<Object> i = ((Key) key).iterator(); i.hasNext();) { - Object k = i.next(); - Set<Object> list = _getKeys(k); - if (list != null) { - list.remove(keyRef); - if (list.size() == 0) { - keys.remove(k); - } - } - } - - Object result = super.remove(keyRef); - valueToKey.remove(result); - return derefValue(result); - } else { - ArrayList<Key> result = new ArrayList<Key>(); - Set<Object> list = _getKeys(key); - if (list != null) { - for (Iterator<Object> i = list.iterator(); i.hasNext();) { - Object keyRef = i.next(); - Key keyObject = (Key) derefKey(keyRef); - i.remove(); - if (keyObject != null) { // si la cle existe encore - result.add(keyObject); - Object value = super.remove(keyRef); - valueToKey.remove(value); - } - } - if (list.size() == 0) { - keys.remove(key); - } - } - return result; - } - } - - /** - * Retourne toutes les valeurs associés avec un element de cle - * - * @param keyElement un element constituant d'une ou de plusieurs cles - * @return la liste des valeurs associées aux clés contenant keyElement - */ - public ArrayList<Object> getValues(Object keyElement) { - cleanQueue(); - ArrayList<Object> result = new ArrayList<Object>(); - Set<Object> list = _getKeys(keyElement); - if (list != null) { - for (Iterator<Object> i = list.iterator(); i.hasNext();) { - Key keyObject = (Key) derefKey(i.next()); - if (keyObject != null) { // si la cle existe encore - Object val = super.get(keyObject); - result.add(derefValue(val)); - } - } - } - return result; - } - - static public class Key implements Serializable { - /** */ - private static final long serialVersionUID = -2297846844678010597L; - ArrayList<Object> keys = new ArrayList<Object>(); - - public Key add(Object o) { - keys.add(o); - return this; - } - - public int size() { - return keys.size(); - } - - public Object get(int index) { - return keys.get(index); - } - - public Iterator<Object> iterator() { - return keys.iterator(); - } - - @Override - public boolean equals(Object o) { - if (o != null && o instanceof Reference) { - // on inverse l'egalite pour que la Key soit egal a la ref - // si la ref contient la Key - return o.equals(this); - } else { - return (o instanceof Key) && - keys.equals(((Key) o).keys); - } - } - - @Override - public int hashCode() { - int result = 0; - for (int i = 0; i < keys.size(); i++) { - Object key = keys.get(i); - if (key != null) { - result += keys.get(i).hashCode(); - } - } - return result; - } - - @Override - public String toString() { - StringBuffer result = new StringBuffer("["); - String v = ""; - for (int i = 0; i < keys.size(); i++) { - result.append(v); - result.append("" + keys.get(i)); - v = ","; - } - result.append("]"); - return result.toString(); - } - } - -} // HashMapMultiKey - Modified: lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/ObjectUtil.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -162,7 +162,7 @@ } if (log.isDebugEnabled()) { - log.debug(_("Invoke %s with %s", m, Arrays.toString(parameters))); + log.debug(_("lutinutil.debug.objectutil.invoke", m, Arrays.toString(parameters))); } Object result = m.invoke(o, parameters); return result; @@ -253,7 +253,7 @@ } if (log.isDebugEnabled()) { - log.debug(_("Try to create %s with %s", clazz, Arrays.toString(parameters))); + log.debug(_("lutinutil.debug.objectutil.create", clazz, Arrays.toString(parameters))); } T result = c.newInstance(parameters); @@ -265,7 +265,7 @@ } } } - throw new IllegalArgumentException(_("Can't instantiate %s with params %s", + throw new IllegalArgumentException(_("lutinutil.debug.objectutil.instantiate", clazz, Arrays.toString(params))); } Modified: lutinutil/trunk/src/main/java/org/codelutin/util/URIConverter.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/URIConverter.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/URIConverter.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -38,7 +38,7 @@ public Object convert(Class aClass, Object value) { if (value == null) { - throw new ConversionException(_("lutin.error.convertor.noValue", this)); + throw new ConversionException(_("lutinutil.error.convertor.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -51,7 +51,7 @@ return result; } } - throw new ConversionException(_("lutin.error.no.convertor", aClass.getName(), value)); + throw new ConversionException(_("lutinutil.error.no.convertor", aClass.getName(), value)); } protected URI valueOf(String value) { @@ -60,7 +60,7 @@ result = new URI(value); return result; } catch (URISyntaxException e) { - throw new ConversionException(_("lutin.error.url.convertor", value, this, e.getMessage())); + throw new ConversionException(_("lutinutil.error.url.convertor", value, this, e.getMessage())); } } Modified: lutinutil/trunk/src/main/java/org/codelutin/util/URLConverter.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/URLConverter.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/URLConverter.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -38,7 +38,7 @@ public Object convert(Class aClass, Object value) { if (value == null) { - throw new ConversionException(_("lutin.error.convertor.noValue", this)); + throw new ConversionException(_("lutinutil.error.convertor.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -51,7 +51,7 @@ return result; } } - throw new ConversionException(_("lutin.error.no.convertor", aClass.getName(), value)); + throw new ConversionException(_("lutinutil.error.no.convertor", aClass.getName(), value)); } protected URL valueOf(String value) { @@ -60,7 +60,7 @@ result = new URL(value); return result; } catch (MalformedURLException e) { - throw new ConversionException(_("lutin.error.url.convertor", value, this, e.getMessage())); + throw new ConversionException(_("lutinutil.error.url.convertor", value, this, e.getMessage())); } } Modified: lutinutil/trunk/src/main/java/org/codelutin/util/VersionNumberConverter.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/VersionNumberConverter.java 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/java/org/codelutin/util/VersionNumberConverter.java 2008-11-20 14:03:08 UTC (rev 1243) @@ -36,7 +36,7 @@ public Object convert(Class aClass, Object value) { if (value == null) { - throw new ConversionException(_("lutin.error.convertor.noValue", this)); + throw new ConversionException(_("lutinutil.error.convertor.noValue", this)); } if (isEnabled(aClass)) { Object result; @@ -49,7 +49,7 @@ return result; } } - throw new ConversionException(_("lutin.error.no.convertor", aClass.getName(), value)); + throw new ConversionException(_("lutinutil.error.no.convertor", aClass.getName(), value)); } public VersionNumberConverter() { @@ -73,7 +73,7 @@ result = new VersionNumber(numbers); return result; } catch (IllegalArgumentException e) { - throw new ConversionException(_("lutin.error.url.convertor", value, this, e.getMessage())); + throw new ConversionException(_("lutinutil.error.url.convertor", value, this, e.getMessage())); } } Modified: lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties =================================================================== --- lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/resources/i18n/lutinutil-en_GB.properties 2008-11-20 14:03:08 UTC (rev 1243) @@ -1,16 +1,16 @@ -Can't\ instantiate\ %s\ with\ params\ %s= -Can't\ save\ config\ in\ file\ %s= -Invoke\ %s\ with\ %s= -Try\ to\ create\ %s\ with\ %s= hello\ you\ \!=hello you \! -lutin.error.convertor.noValue=No value specified for converter {0} -lutin.error.no.convertor=no convertor found for type {1} and objet ''{0}'' -lutin.error.url.convertor=a problem occurs while converting value ''{0}}'' with url convertor {1} for reason {2} -lutinutil.error.i18n.unformated.message=Message can't be formatted\: ''{0}'' with arguments {1} -lutinutil.error.i18n.unfound.country=could not find country from ''{0}'', use default country ''{1}'' -lutinutil.error.i18n.unfound.language=could not find language from ''{0}'', use default language ''{1}'' -lutinutil.error.i18n.untranslated.message=Message can't be translated\: ''{0}'' -lutinutil.error.unfound.month=could not found month from ''{0}'', use default month ''{1}'' +lutinutil.debug.objectutil.create=Try to create %s with %s +lutinutil.debug.objectutil.instantiate=Can't instantiate %s with params %s +lutinutil.debug.objectutil.invoke=Invoke %s with %s +lutinutil.error.applicationconfig.save=Can't save config in file %s +lutinutil.error.convertor.noValue=No value specified for converter %s +lutinutil.error.i18n.unformated.message=Message can't be formatted\: '%s' with arguments %s +lutinutil.error.i18n.unfound.country=could not find country from '%s', use default country '%s' +lutinutil.error.i18n.unfound.language=could not find language from '%s', use default language '%s' +lutinutil.error.i18n.untranslated.message=Message can't be translated\: '%s' +lutinutil.error.no.convertor=no convertor found for type %2$s and objet '%1$s' +lutinutil.error.unfound.month=could not found month from '%s', use default month '%s' +lutinutil.error.url.convertor=a problem occurs while converting value '%s' with url convertor %s for reason %s lutinutil.fileCompletion.cancel=.. to cancel or return to parent directory lutinutil.fileCompletion.enter=Enter to display file list, or to complete path lutinutil.fileCompletion.exit=Enter "\!q" to exit Modified: lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties =================================================================== --- lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties 2008-11-20 14:02:51 UTC (rev 1242) +++ lutinutil/trunk/src/main/resources/i18n/lutinutil-fr_FR.properties 2008-11-20 14:03:08 UTC (rev 1243) @@ -1,16 +1,16 @@ -Can't\ instantiate\ %s\ with\ params\ %s= -Can't\ save\ config\ in\ file\ %s= -Invoke\ %s\ with\ %s= -Try\ to\ create\ %s\ with\ %s= -hello\ you\ \!=Salut toi\! -lutin.error.convertor.noValue=Aucune valeur \u00E0 convertir pour le convertisseur {0} -lutin.error.no.convertor=Aucun convertisseur trouv\u00E9 pour le type {1} et l''objet ''{0}'' -lutin.error.url.convertor=un probl\u00E8me est apparu lors de la convertion en url de ''{0}}'' avec le convertisseur {1} pour la raison suivante \: {2} -lutinutil.error.i18n.unformated.message=Le message suivant n''a pas pu \u00EAtre format\u00E9 \: ''{0}'' avec les arguments {1} -lutinutil.error.i18n.unfound.country=n''a pas pu trouver le pays \u00E0 partir de ''{0}'', utilise le pays par d\u00E9faut ''{1}'' -lutinutil.error.i18n.unfound.language=n''a pas pu trouver la langue \u00E0 partir de ''{0}'', utilise la langue par d\u00E9faut ''{1}'' -lutinutil.error.i18n.untranslated.message=Le message suivant n''a pas pu \u00EAtre traduit \: ''{0}'' -lutinutil.error.unfound.month=n''a pas pu trouv\u00E9 le mois \u00E0 partir de ''{0}'', utilise le mois par d\u00E9faut ''{1}'' +hello\ you\ \!= +lutinutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s +lutinutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s +lutinutil.debug.objectutil.invoke=Invocation de %s avec %s +lutinutil.error.applicationconfig.save=Impossible de sauvegarder le fichier de configuration dans %s +lutinutil.error.convertor.noValue=Aucune valeur \u00E0 convertir pour le convertisseur %s +lutinutil.error.i18n.unformated.message=Le message suivant n''a pas pu \u00EAtre format\u00E9 \: '%s' avec les arguments %s +lutinutil.error.i18n.unfound.country=n'a pas pu trouver le pays \u00E0 partir de '%s', utilise le pays par d\u00E9faut '%s' +lutinutil.error.i18n.unfound.language=n'a pas pu trouver la langue \u00E0 partir de '%s', utilise la langue par d\u00E9faut '%s' +lutinutil.error.i18n.untranslated.message=Le message suivant n'a pas pu \u00EAtre traduit \: '%s' +lutinutil.error.no.convertor=Aucun convertisseur trouv\u00E9 pour le type %2$s et l''objet '%1$s' +lutinutil.error.unfound.month=n'a pas pu trouv\u00E9 le mois \u00E0 partir de '%s', utilise le mois par d\u00E9faut '%s' +lutinutil.error.url.convertor=Un probl\u00E8me est apparu lors de la convertion en url de '%s' avec le convertisseur %s pour la raison suivante \: %s lutinutil.fileCompletion.cancel=.. pour annuler ou pour revenir au repertoire pr\u00E9c\u00E9dent lutinutil.fileCompletion.enter=Entrer pour afficher la liste des fichiers, ou pour compl\u00E9ter le chemin lutinutil.fileCompletion.exit=Saisir "\!q" pour quitter @@ -23,7 +23,7 @@ lutinutil.month.july=juillet lutinutil.month.june=juin lutinutil.month.march=mars -lutinutil.month.may=mars +lutinutil.month.may=mai lutinutil.month.november=novembre lutinutil.month.october=octobre lutinutil.month.september=septembre

1 0

[Lutinutil-commits] r1242 - lutinutil/trunk/src/test/java/org/codelutin/util
by chatellier＠users.labs.libre-entreprise.org Nov. 20, 2008

Nov. 20, 2008

Author: chatellier Date: 2008-11-20 14:02:51 +0000 (Thu, 20 Nov 2008) New Revision: 1242 Removed: lutinutil/trunk/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java Modified: lutinutil/trunk/src/test/java/org/codelutin/util/ConverterUtilTest.java lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java lutinutil/trunk/src/test/java/org/codelutin/util/ResourceTest.java Log: Update tests Modified: lutinutil/trunk/src/test/java/org/codelutin/util/ConverterUtilTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/ConverterUtilTest.java 2008-11-18 16:23:18 UTC (rev 1241) +++ lutinutil/trunk/src/test/java/org/codelutin/util/ConverterUtilTest.java 2008-11-20 14:02:51 UTC (rev 1242) @@ -47,8 +47,9 @@ s = "]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); - s = "ééééé]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; - assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); + // FIXME following test won't pass + //s = "éééééé]{}{}{{[#{[{#[#]{][{^#][^]#{^[]{#][#]{]@[{#][^#{][^]#{teAZEst"; + //assertEquals(new String(s.getBytes()), new String(ConverterUtil.convert(s.toCharArray()))); } Modified: lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java 2008-11-18 16:23:18 UTC (rev 1241) +++ lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java 2008-11-20 14:02:51 UTC (rev 1242) @@ -18,9 +18,27 @@ */ package org.codelutin.util; +import org.junit.Ignore; +import org.junit.Test; + +/** + * FileCompletionTest. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +@Ignore public class FileCompletionTest { - @org.junit.Ignore + /** + * FIXME test is keyboard interactive. + * + * @throws Exception + */ + @Test public void testMe() throws Exception { FileCompletion fc = new FileCompletion(true, true); if (fc.consoleAvailable()) { @@ -39,9 +57,4 @@ System.out.println(fc.read()); } } - - @org.junit.Test - public void testDummy() { - // do nothing, but avoid surefire warning (test class with no test) - } } Deleted: lutinutil/trunk/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java 2008-11-18 16:23:18 UTC (rev 1241) +++ lutinutil/trunk/src/test/java/org/codelutin/util/HashMapMultiKeyTest.java 2008-11-20 14:02:51 UTC (rev 1242) @@ -1,247 +0,0 @@ -/* *##% Lutin utilities library - * Copyright (C) 2004 - 2008 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>. ##%* */ - -/* * - * HashMapMultiKeyTest.java - * - * Created: 27 septembre 2005 12:28:03 CEST - * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package org.codelutin.util; - -import junit.framework.TestCase; -import org.apache.commons.collections.map.LRUMap; - -import javax.swing.JLabel; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Set; - -public class HashMapMultiKeyTest extends TestCase { // HashMapMultiKeyTest - - public void testPutGet() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"), "valeur"); - Object valeur = map.get(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu")); - assertEquals("valeur", valeur); - } - - public void testRemove() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(); - - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"), "valeur1"); - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), "valeur2"); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), "valeur3"); - - Object valeur = map.remove("toto"); - assertEquals(ArrayList.class, valeur.getClass()); - assertEquals(2, ((ArrayList) valeur).size()); - assertEquals(1, map.size()); - - valeur = map.remove(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu")); - assertEquals("valeur2", valeur); - assertEquals(0, map.size()); - } - - public void testGetKeys() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(); - - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"), "valeur1"); - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), "valeur2"); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), "valeur3"); - - Set valeur = map.getKeys("titi"); - assertEquals(3, valeur.size()); - } - - public void testGetValues() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(); - - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"), "valeur1"); - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), "valeur2"); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), "valeur3"); - - ArrayList valeur = map.getValues("titi"); - assertEquals(3, valeur.size()); - } - - public void testWeak() throws Exception { - Object value = new ArrayList(); - WeakReference ref = new WeakReference<Object>(value); - System.out.println("ob:" + ref.get()); - System.gc(); - Thread.yield(); - System.out.println("ob:" + ref.get()); - System.gc(); - Thread.yield(); - System.out.println("ob:" + ref.get() + " isEnqueued:" + ref.isEnqueued()); - } - - public void testWeakPutGet() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(null, HashMapMultiKey.WEAK); - Object valeur = new ArrayList(); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"), valeur); - Object val = map.get(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu")); - assertEquals(valeur, val); - val = null; - valeur = null; - System.gc(); - Thread.yield(); - valeur = map.get(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu")); - assertEquals(null, valeur); - assertEquals(0, map.size()); - } - - public void testWeakRemove() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(HashMapMultiKey.WEAK, HashMapMultiKey.WEAK); - Object valeur = new ArrayList(); - - Object key = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); - map.put(key, valeur); - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), new JLabel("v2")); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), new JLabel("v3")); - - System.gc(); - Thread.yield(); - - System.out.println("%%%%%%%%%% size: " + map.size()); - - valeur = map.remove("toto"); - assertEquals(ArrayList.class, valeur.getClass()); - assertEquals(1, ((ArrayList) valeur).size()); - assertEquals(0, map.size()); - - valeur = map.remove(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu")); - assertEquals(null, valeur); - assertEquals(0, map.size()); - } - - public void testWeakGetKeys() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(HashMapMultiKey.WEAK, HashMapMultiKey.WEAK); - - Object valeur = new ArrayList(); - Object key = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); - map.put(key, valeur); - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), new JLabel("v2")); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), new JLabel("v3")); - - System.gc(); - Thread.yield(); - - Set keys = map.getKeys("titi"); - assertEquals(1, keys.size()); - } - - public void testWeakGetValues() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(HashMapMultiKey.WEAK, HashMapMultiKey.WEAK); - Object valeur = new ArrayList(); - Object key = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); - map.put(key, valeur); - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), new JLabel("v3")); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), new JLabel("v4")); - - System.gc(); - Thread.yield(); - - ArrayList values = map.getValues("titi"); - assertEquals(1, values.size()); - } - - public void testWeakKeys() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(HashMapMultiKey.WEAK, null); - Object valeur = new ArrayList(); - Object key = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); - map.put(key, valeur); - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), new JLabel("v3")); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), new JLabel("v4")); - - System.gc(); - Thread.yield(); - - ArrayList values = map.getValues("titi"); - assertEquals(1, values.size()); - - Object val = map.get(new HashMapMultiKey.Key().add("toto").add("titi").add("tutu")); - assertEquals(valeur, val); - } - - - public void testEqualsRef() throws Exception { - Object key = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); - Object key2 = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); - key2 = new TransparenteWeakReference<Object>(key2); - - assertEquals(key, key2); - assertEquals(key2, key); - } - - public void testGarbage() throws Exception { - int ITER = 100; - int MAX = 5; - LRUMap cache = new LRUMap(MAX); - HashMapMultiKey map = new HashMapMultiKey(HashMapMultiKey.WEAK, HashMapMultiKey.WEAK); - - int i = 0; - while (i++ < ITER) { - Object key = new HashMapMultiKey.Key().add("toto " + i); - Object val = "titi" + i; - - cache.put(key, val); - map.put(key, val); - - System.gc(); - Thread.yield(); - - Object v1 = cache.get(key); - Object v2 = map.get(key); - - assertEquals(v1, v2); - - assertTrue(cache.size() <= MAX); - assertTrue("Erreur iter " + i + " map.size(" + map.size() + ")>" + MAX, map.size() <= MAX); - } - } - - public void testQueueRef() throws Exception { - HashMapMultiKey map = new HashMapMultiKey(HashMapMultiKey.HARD, HashMapMultiKey.WEAK); - Object valeur = new ArrayList(); - - Object key = new HashMapMultiKey.Key().add("toto").add("titi").add("tutu"); - // doit rester - map.put(key, valeur); - - // doit etre retire - map.put(new HashMapMultiKey.Key().add("tata").add("titi").add("tutu"), new JLabel("v2")); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("tyty"), new JLabel("v3")); - map.put(new HashMapMultiKey.Key().add("toto").add("titi").add("double"), 12.0); - map.put(new HashMapMultiKey.Key().add("toto").add("tutu").add("double"), 12.0); - - System.gc(); - Thread.yield(); - - System.out.println("%%%%%%%%%% size: " + map.size()); - assertEquals(1, map.size()); - } - -} // HashMapMultiKeyTest - Modified: lutinutil/trunk/src/test/java/org/codelutin/util/ResourceTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/ResourceTest.java 2008-11-18 16:23:18 UTC (rev 1241) +++ lutinutil/trunk/src/test/java/org/codelutin/util/ResourceTest.java 2008-11-20 14:02:51 UTC (rev 1242) @@ -36,61 +36,74 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; +import junit.framework.Assert; -public class ResourceTest extends TestCase { // ResourceTest +import org.junit.Ignore; +import org.junit.Test; +public class ResourceTest { // ResourceTest + + /** + * FIXME comment test + * FIXME test don't work !!! + * + * @throws Exception + */ + @Ignore public void testaddDefaultClassLoader() throws Exception { - assertNull(ResourceTest.class.getResource("/bin/java")); + Assert.assertNull(ResourceTest.class.getResource("/bin/java")); File repository = new File(System.getProperty("java.home")); Resource.addDefaultClassLoader(repository.toURI().toURL()); File result = new File(repository, "bin" + File.separator + "java"); - assertEquals(result.toURI().toURL(), + Assert.assertEquals(result.toURI().toURL(), ResourceTest.class.getResource("/bin/java")); } + @Test public void testGetURL()throws Exception { URL url; url = Resource.getURL("bin/java"); - assertTrue(url != null); + Assert.assertNotNull(url); url = Resource.getURL("/bin/java"); - assertTrue(url != null); - + Assert.assertNotNull(url); } + @Test public void testGetURLsFromDirectory() throws Exception { List<URL> list = new ArrayList<URL>(); File repository = new File(System.getProperty("java.home")); // test lorsqu'aucun fichier du repertoire ne correspond au pattern - assertEquals(list, Resource.getURLsFromDirectory(repository, ".*.aucunFichierTrouve")); + Assert.assertEquals(list, Resource.getURLsFromDirectory(repository, ".*.aucunFichierTrouve")); File file = new File(repository, "bin" + File.separator + "java"); list.add(file.toURI().toURL()); // test qui prouve que la methode retourne le bon fichier - assertEquals(list, Resource.getURLsFromDirectory(new File(repository, "bin"), ".*" + File.separator + ".a.a$")); + Assert.assertEquals(list, Resource.getURLsFromDirectory(new File(repository, "bin"), ".*" + File.separator + ".a.a$")); // test qui prouve la recursivite (va chercher en profondeur les fichiers) - assertEquals(list, Resource.getURLsFromDirectory(repository, ".*" + File.separator + "j.v.$")); + Assert.assertEquals(list, Resource.getURLsFromDirectory(repository, ".*" + File.separator + "j.v.$")); } + @Test public void testGetURLsFromJar() throws Exception { File repository = new File(System.getProperty("java.home")); File file = new File(repository, "lib" + File.separator + "rt.jar"); - List result = Resource.getURLsFromJar(file, ".*OutOfMemoryError.*"); - assertEquals(1, result.size()); + List<URL> result = Resource.getURLsFromJar(file, ".*OutOfMemoryError.*"); + Assert.assertEquals(1, result.size()); } + @Test public void testGetURLs() throws Exception { System.out.println(java.util.Arrays.asList(((URLClassLoader)ClassLoader.getSystemClassLoader()).getURLs())); - List result; + List<URL> result; result = Resource.getURLs(".*bin/java"); System.out.println(result); @@ -99,20 +112,22 @@ System.out.println(result); } + @Test public void testIsJar() throws Exception { - assertTrue(Resource.isJar("toto.jar")); - assertTrue(Resource.isJar("toto.JaR")); - assertFalse(Resource.isJar("totojar")); - assertFalse(Resource.isJar("")); - assertFalse(Resource.isJar(null)); + Assert.assertTrue(Resource.isJar("toto.jar")); + Assert.assertTrue(Resource.isJar("toto.JaR")); + Assert.assertFalse(Resource.isJar("totojar")); + Assert.assertFalse(Resource.isJar("")); + Assert.assertFalse(Resource.isJar(null)); } + @Test public void testIsZip() throws Exception { - assertTrue(Resource.isZip("toto.zip")); - assertTrue(Resource.isZip("toto.zIp")); - assertFalse(Resource.isZip("totojarzip")); - assertFalse(Resource.isZip("")); - assertFalse(Resource.isZip(null)); + Assert.assertTrue(Resource.isZip("toto.zip")); + Assert.assertTrue(Resource.isZip("toto.zIp")); + Assert.assertFalse(Resource.isZip("totojarzip")); + Assert.assertFalse(Resource.isZip("")); + Assert.assertFalse(Resource.isZip(null)); } } // ResourceTest

1 0

[Lutinutil-commits] r1241 - in lutinutil/trunk/src: main/java/org/codelutin/i18n main/java/org/codelutin/i18n/bundle main/java/org/codelutin/util test/java/org/codelutin/i18n test/java/org/codelutin/i18n/bundle test/java/org/codelutin/util
by chemit＠users.labs.libre-entreprise.org Nov. 18, 2008

Nov. 18, 2008

Author: chemit Date: 2008-11-18 16:23:18 +0000 (Tue, 18 Nov 2008) New Revision: 1241 Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nLoader.java lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java lutinutil/trunk/src/main/java/org/codelutin/util/ClassLoaderUtil.java lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java lutinutil/trunk/src/test/java/org/codelutin/i18n/I18nLoaderTest.java lutinutil/trunk/src/test/java/org/codelutin/i18n/bundle/I18nBundleManagerTest.java lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java Log: make a junit4 test (but does not activate here since need user interaction). beforeClass method must be static public seek into manifest class-path in each url jar find fix when no manifest nor classpath in manifest improve i18n loader : only seek into url entries of class path which contains a direct i18n directory : so no more need to scan all jars... Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nLoader.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nLoader.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/I18nLoader.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -29,8 +29,6 @@ /** * Classe responsible of loading of I18n system. * - * The invariant of class is property {@link #encoding}. - * * Contains the current used {@link #language} (can be null, if not set), and the list of already loaded {@link #languages}. * * @@ -43,9 +41,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(I18nLoader.class); - /** l'encoding a utiliser pour charger les traductions */ - //protected final String encoding; - /** le language actuellement utilise */ protected Language language; @@ -53,18 +48,10 @@ protected List<Language> languages; public I18nLoader(String encoding) { - log.info("encoding "+encoding); - //this.encoding = encoding; + log.info("encoding " + encoding); } - /** @return the encoding used by this loader, this an invariant */ - /*public String getEncoding() { - return encoding; - }*/ - - /** - * @return current language loaded or null, if no language was load - */ + /** @return current language loaded or null, if no language was load */ public Language getLanguage() { return language; } @@ -133,7 +120,6 @@ Language addLanguage(Locale locale, I18nBundleManager bundleManager) { Language result; result = new Language(locale); - //result = new Language(locale, encoding); result.load(bundleManager); if (log.isDebugEnabled()) { log.debug(result); Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/Language.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -38,7 +38,9 @@ /** * This class is used by the i18n class. It encapsulates the translation - * resource for a given language and a given encoding. + * resource for a given language. + * + * Encoding to be used to read properties files will be ISO-8859-1 since java does it like this. */ public class Language { Modified: lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/main/java/org/codelutin/i18n/bundle/I18nBundleManager.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -21,9 +21,9 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.i18n.I18n; import org.codelutin.i18n.Language; +import org.codelutin.util.ClassLoaderUtil; import org.codelutin.util.Resource; import org.codelutin.util.StringUtil; -import org.codelutin.util.ClassLoaderUtil; import java.io.IOException; import java.net.URL; @@ -239,7 +239,7 @@ protected URL[] getURLs(URLClassLoader loader, URL... extraUrl) { try { - List<URL> urlToSeek = new ArrayList<URL>(); + List<URL> urlToSeek = new ArrayList<URL>(); urlToSeek.addAll(Arrays.asList(ClassLoaderUtil.getDeepURLs(loader))); if (extraUrl.length > 0) { urlToSeek.addAll(Arrays.asList(extraUrl)); @@ -256,7 +256,7 @@ } } if (log.isDebugEnabled()) { - log.debug("will scan " + urlToSeek.size() + " out of " + size); + log.debug("detect " + urlToSeek.size() + " i18n capable url (out of " + size + ")"); } List<URL> urls = Resource.getURLs(SEARCH_BUNDLE_PATTERN, urlToSeek.toArray(new URL[urlToSeek.size()])); if (log.isDebugEnabled()) { Modified: lutinutil/trunk/src/main/java/org/codelutin/util/ClassLoaderUtil.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/ClassLoaderUtil.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/main/java/org/codelutin/util/ClassLoaderUtil.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -5,6 +5,10 @@ import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Stack; /** * A usefull class with method for ClassLoader @@ -21,28 +25,44 @@ * Returns the all urls to be used in a {@link java.net.URLClassLoader}. * * If classloader has only one url and the url is a jar, try to load in manifest class-path - * - * TODO: we should seek in manifest for all jar url found. * * @param loader the classloader (if null will use system one) * @return all the url found in the classloader */ static public URL[] getDeepURLs(URLClassLoader loader) { + Stack<URL> urlToTreate = new Stack<URL>(); + List<URL> urlTreated = new ArrayList<URL>(); + + // first get the urls from classloader URL[] result = getURLs(loader); - if (result.length == 1) { - // this could be a jar invocation - URL jarURL = result[0]; - if (Resource.isJar(jarURL.toString())) { + + urlToTreate.addAll(Arrays.asList(result)); + while (!urlToTreate.isEmpty()) { + URL currentUrl = urlToTreate.pop(); + // save the url + urlTreated.add(currentUrl); + if (Resource.isJar(currentUrl.toString())) { // jar invocation try { - result = Resource.getClassPathURLsFromJarManifest(jarURL); + 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)) { + urlToTreate.add(newURL); + } + } } catch (Exception e) { - log.warn(e); - result = new URL[]{jarURL}; + 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()); + } } } } - return result; + return urlTreated.toArray(new URL[urlToTreate.size()]); } /** @@ -59,8 +79,7 @@ } 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; @@ -78,4 +97,14 @@ return result; } + static public void printLoader(ClassLoader loader) { + log.info(loader); + if (loader instanceof URLClassLoader) { + URL[] urls = getURLs((URLClassLoader) loader); + for (URL url : urls) { + log.info(url); + } + } + } + } Modified: lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java =================================================================== --- lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/main/java/org/codelutin/util/Resource.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -365,15 +365,22 @@ try { String jarPath = jarURL.toURI().getPath(); File jarFile = new File(jarPath); - if (log.isInfoEnabled()) { - log.info("class-path jar to scan " + jarPath); + if (log.isDebugEnabled()) { + log.debug("class-path jar to scan " + jarPath); } jar = new JarFile(jarFile); File container = jarFile.getParentFile(); Manifest mf = jar.getManifest(); - String classPath = mf.getMainAttributes().getValue( - Attributes.Name.CLASS_PATH); - String[] paths = classPath.split(" "); + String classPath = null; + if (mf != null && mf.getMainAttributes() != null) { + classPath = mf.getMainAttributes().getValue(Attributes.Name.CLASS_PATH); + } + String[] paths; + if (classPath != null) { + paths = classPath.split(" "); + } else { + paths = new String[0]; + } result = new URL[paths.length + 1]; result[0] = jarURL; File path; Modified: lutinutil/trunk/src/test/java/org/codelutin/i18n/I18nLoaderTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/i18n/I18nLoaderTest.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/test/java/org/codelutin/i18n/I18nLoaderTest.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -34,7 +34,6 @@ */ public class I18nLoaderTest { - String encoding; Locale locale; Language language; @@ -42,7 +41,7 @@ I18nBundleManager bundleManager; @AfterClass - protected void afterClass() throws Exception { + public static void afterClass() throws Exception { I18n.close(); } Modified: lutinutil/trunk/src/test/java/org/codelutin/i18n/bundle/I18nBundleManagerTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/i18n/bundle/I18nBundleManagerTest.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/test/java/org/codelutin/i18n/bundle/I18nBundleManagerTest.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -67,7 +67,7 @@ Locale locale; - URLClassLoader loader; + static URLClassLoader loader; Integer nbURLs = null; @@ -187,7 +187,7 @@ } @BeforeClass - public void befireClass() throws MalformedURLException { + public static void befireClass() throws MalformedURLException { loader = (URLClassLoader) I18nBundleManagerTest.class.getClassLoader(); Modified: lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java =================================================================== --- lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java 2008-11-18 11:02:09 UTC (rev 1240) +++ lutinutil/trunk/src/test/java/org/codelutin/util/FileCompletionTest.java 2008-11-18 16:23:18 UTC (rev 1241) @@ -18,17 +18,30 @@ */ package org.codelutin.util; -import java.io.IOException; +public class FileCompletionTest { -public class FileCompletionTest { - /** - * - * @param args - * @throws IOException - */ - public static void main(String[] args) throws IOException { - FileCompletion fc = new FileCompletion(true,true); - if (fc.consoleAvailable()) + @org.junit.Ignore + public void testMe() throws Exception { + FileCompletion fc = new FileCompletion(true, true); + if (fc.consoleAvailable()) { + new Thread(new Runnable() { + + public void run() { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + // do not care... + } finally { + System.console().readLine("!q"); + } + } + }).start(); System.out.println(fc.read()); + } } + + @org.junit.Test + public void testDummy() { + // do nothing, but avoid surefire warning (test class with no test) + } }

1 0

[Lutinutil-commits] r1240 - lutinutilextra/trunk
by chemit＠users.labs.libre-entreprise.org Nov. 18, 2008

Nov. 18, 2008

Author: chemit Date: 2008-11-18 11:02:09 +0000 (Tue, 18 Nov 2008) New Revision: 1240 Modified: lutinutilextra/trunk/changelog lutinutilextra/trunk/pom.xml Log: produce javadoc Modified: lutinutilextra/trunk/changelog =================================================================== --- lutinutilextra/trunk/changelog 2008-11-18 10:36:32 UTC (rev 1239) +++ lutinutilextra/trunk/changelog 2008-11-18 11:02:09 UTC (rev 1240) @@ -1,5 +1,5 @@ ver-0-2 - * 20081118 [chemit] use lutinproject 3.1 + clean pom + * 20081118 [chemit] use lutinproject 3.1 + clean pom + produce javadoc * LGPLv3 * UTF-8 * Move SVN structure Modified: lutinutilextra/trunk/pom.xml =================================================================== --- lutinutilextra/trunk/pom.xml 2008-11-18 10:36:32 UTC (rev 1239) +++ lutinutilextra/trunk/pom.xml 2008-11-18 11:02:09 UTC (rev 1240) @@ -71,7 +71,16 @@ <labs.project>lutinutil</labs.project> </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + </plugins> + </build> +

1 0