Author: tchemit Date: 2008-07-31 20:57:32 +0000 (Thu, 31 Jul 2008) New Revision: 954 Modified: trunk/lutinutil-no-i18n/pom.xml trunk/lutinutil/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java Log: utilisation du projet lutinutil-no-i18n pour les classes utilitaires sans i18n. et ceci pour casser le cycle entre lutinutil et maven-i18n-plugin Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-07-31 20:45:42 UTC (rev 953) +++ trunk/lutinutil/pom.xml 2008-07-31 20:57:32 UTC (rev 954) @@ -18,39 +18,39 @@ <artifactId>lutinutil</artifactId> <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil-no-i18n</artifactId> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <!--scope>compile</scope--> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <!--scope>compile</scope--> </dependency> <dependency> <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> - <!--scope>compile</scope--> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <!--scope>compile</scope--> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <!--scope>compile</scope--> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-toolchain</artifactId> - <!--scope>test</scope--> </dependency> </dependencies> @@ -198,6 +198,12 @@ <dependencies> <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil-no-i18n</artifactId> + <version>0.30-SNAPSHOT</version> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> Modified: trunk/lutinutil-no-i18n/pom.xml =================================================================== --- trunk/lutinutil-no-i18n/pom.xml 2008-07-31 20:45:42 UTC (rev 953) +++ trunk/lutinutil-no-i18n/pom.xml 2008-07-31 20:57:32 UTC (rev 954) @@ -15,7 +15,7 @@ </parent> <groupId>org.codelutin</groupId> - <artifactId>lutinutil-io</artifactId> + <artifactId>lutinutil-no-i18n</artifactId> <dependencies> <dependency> @@ -53,10 +53,11 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>Lutin io utilities library</name> + <name>Lutin utilities (no i18n) library</name> <version>0.30-SNAPSHOT</version> - <description>Library of usefull io class to be used in any project (with - no i18n).</description> + <description>Library of usefull class to be used in any project (with + no i18n mecanism). + </description> <inceptionYear>2004</inceptionYear> <!-- ************************************************************* --> @@ -126,7 +127,7 @@ <build> <plugins> - <!-- source --> + <!-- source --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2008-07-31 20:45:42 UTC (rev 953) +++ trunk/maven-i18n-plugin/pom.xml 2008-07-31 20:57:32 UTC (rev 954) @@ -33,7 +33,7 @@ <dependency> <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> + <artifactId>lutinutil-no-i18n</artifactId> <version>0.30-SNAPSHOT</version> <scope>compile</scope> </dependency> Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-07-31 20:45:42 UTC (rev 953) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-07-31 20:57:32 UTC (rev 954) @@ -21,8 +21,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.project.MavenProject; -import static org.codelutin.i18n.I18n._; -import org.codelutin.i18n.I18nable; import org.codelutin.i18n.plugin.core.AbstractI18nParser; import org.codelutin.i18n.plugin.core.ParserEvent; import org.codelutin.i18n.plugin.core.ParserException; @@ -44,9 +42,9 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import java.util.Collections; import java.util.List; import java.util.Set; -import java.util.Collections; import java.util.regex.Pattern; /** @@ -144,7 +142,7 @@ } protected List<String> initAnnotations() { - return Collections.singletonList(org.codelutin.i18n.I18nable.class.getName()); + return Collections.singletonList("org.codelutin.i18n.I18nable"); } @Override @@ -217,7 +215,7 @@ classname = classname.substring(0, classname.length() - 5); - getLog().info(getLogEntry("add annotation to class "+ classname,0,0,0)); + getLog().info(getLogEntry("add annotation to class " + classname, 0, 0, 0)); BufferedWriter outputStream = null; try { @@ -233,11 +231,11 @@ if (!foundDeclaration) { // test if the annotion already exist ? String line2 = line.trim(); - if (line2.startsWith("@I18nable") || line2.startsWith("@" + I18nable.class.getName())) { + if (line2.startsWith("@I18nable") || line2.startsWith("@org.codelutin.i18n.I18nable")) { foundDeclaration = true; } else if (TYPE_PATTERN.matcher(line2).matches()) { foundDeclaration = true; - outputStream.write('@' + I18nable.class.getName() + '\n'); + outputStream.write("@org.codelutin.i18n.I18nable\n"); } } outputStream.write(line); @@ -299,9 +297,9 @@ result = new URLClassLoader(url); } } catch (MalformedURLException eee) { - throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", cp, eee.getMessage()), eee); + throw new RuntimeException("Can't create ClassLoader for script, bad directory:" + cp + " for reason " + eee.getMessage(), eee); } catch (IOException e) { - throw new RuntimeException(_("Can't create ClassLoader for script, bad directory: {0} for reason {1}", cp, e.getMessage()), e); + throw new RuntimeException("Can't create ClassLoader for script, bad directory: " + cp + " for reason " + e.getMessage(), e); } loader = result; } Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java 2008-07-31 20:45:42 UTC (rev 953) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java 2008-07-31 20:57:32 UTC (rev 954) @@ -32,7 +32,7 @@ @Override protected java.util.List<String> initAnnotations() { - return Collections.singletonList(org.codelutin.i18n.I18nable.class.getName()); + return Collections.singletonList("org.codelutin.i18n.I18nable"); } }