Author: tchemit Date: 2014-02-03 13:06:44 +0100 (Mon, 03 Feb 2014) New Revision: 2018 Url: http://nuiton.org/projects/i18n/repository/revisions/2018 Log: fixes #3020: Remove deprecated parser (jsp and tapestry) Removed: trunk/i18n-maven-plugin/src/it/parsers/newProject/src/main/webapp/ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/webapp/ Modified: trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/i18n-maven-plugin/src/it/settings.xml Modified: trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/newProject/pom.xml 2014-02-03 12:06:44 UTC (rev 2018) @@ -77,26 +77,10 @@ <goals> <goal>parserJava</goal> <goal>parserValidation</goal> - <goal>parserTapestry</goal> <goal>parserGWTJava</goal> </goals> </execution> <execution> - <id>jsp</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <jsp>http://java.sun.com/JSP/Page</jsp> - </namespaces> - </configuration> - </execution> - <execution> <id>gen</id> <goals> <goal>gen</goal> Modified: trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/newProject/verify.groovy 2014-02-03 12:06:44 UTC (rev 2018) @@ -48,12 +48,6 @@ assert checkKeysInFile('target/generated-sources/i18n/validation.getter', ['validationGetter.key1=', 'validationGetter.key2=']) -assert checkKeysInFile('target/generated-sources/i18n/jsp.getter', - ['jspGetter.key1=', 'jspGetter.key2=']) - -assert checkKeysInFile('target/generated-sources/i18n/tapestry.getter', - ['tmlGetter.key1=', 'tmlGetter.key2=']) - assert checkKeysInFile('target/generated-sources/i18n/gwt-java.getter', ['gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=']) @@ -61,8 +55,6 @@ [ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'validationGetter.key1=', 'validationGetter.key2=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) @@ -70,8 +62,6 @@ [ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'validationGetter.key1=', 'validationGetter.key2=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) Modified: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/pom.xml 2014-02-03 12:06:44 UTC (rev 2018) @@ -89,25 +89,9 @@ <goal>parserJava</goal> <goal>parserGWTJava</goal> <goal>parserValidation</goal> - <goal>parserTapestry</goal> </goals> </execution> <execution> - <id>jsp</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <jsp>http://java.sun.com/JSP/Page</jsp> - </namespaces> - </configuration> - </execution> - <execution> <id>first-gen</id> <goals> <goal>gen</goal> @@ -120,7 +104,6 @@ <goal>parserJava</goal> <goal>parserGWTJava</goal> <goal>parserValidation</goal> - <goal>parserTapestry</goal> <goal>gen</goal> </goals> <phase>compile</phase> Deleted: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp 2014-02-03 12:06:44 UTC (rev 2018) @@ -1,36 +0,0 @@ -<!-- - #%L - I18n :: Maven Plugin - - $Id$ - $HeadURL$ - %% - Copyright (C) 2007 - 2010 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><s:text name="jspGetter.key1"/></title> -</head> -<s:text name="jspGetter.key2"/> -<body> -</body> -</html> \ No newline at end of file Modified: trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy =================================================================== --- trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/parsers/withNewKeys/verify.groovy 2014-02-03 12:06:44 UTC (rev 2018) @@ -50,12 +50,6 @@ assert checkKeysInFile('target/generated-sources/i18n/validation.getter', ['validationGetter.key1=', 'validationGetter.key2=', 'validationGetter.key3=']) -assert checkKeysInFile('target/generated-sources/i18n/jsp.getter', - ['jspGetter.key1=', 'jspGetter.key2=']) - -assert checkKeysInFile('target/generated-sources/i18n/tapestry.getter', - ['tmlGetter.key1=', 'tmlGetter.key2=']) - assert checkKeysInFile('target/generated-sources/i18n/gwt-java.getter', ['gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=']) @@ -64,8 +58,6 @@ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'javaGetter.old.key1=', 'javaGetter.old.key2=', 'validationGetter.key1=', 'validationGetter.key2=', 'validationGetter.key3=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) @@ -73,72 +65,7 @@ [ 'javaGetter.key1=', 'javaGetter.key2=', 'javaGetter.key3=', 'validationGetter.key1=', 'validationGetter.key2=', - 'jspGetter.key1=', 'jspGetter.key2=', - 'tmlGetter.key1=', 'tmlGetter.key2=', 'gwtJavaGetter.key1=', 'gwtJavaGetter.key2=', 'gwtJavaGetter.key3=' ]) -// -//file = new File(basedir, 'target/generated-sources/i18n/java.getter'); -//assert file.exists(); -// -//content = file.text; -////assert content.contains( 'javaGetter.old.key1=' ); -////assert content.contains( 'javaGetter.old.key2=' ); -//assert content.contains( 'javaGetter.key1=' ); -//assert content.contains( 'javaGetter.key2=' ); -//assert content.contains( 'javaGetter.key3=' ); -//file = new File(basedir, 'target/generated-sources/i18n/validation.getter'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains( 'validationGetter.key1=' ); -//assert content.contains( 'validationGetter.key2=' ); -//assert content.contains( 'validationGetter.key3=' ); - -//file = new File(basedir, 'target/generated-sources/i18n/jsp.getter'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains( 'jspGetter.key1=' ); -//assert content.contains( 'jspGetter.key2=' ); -// -// -//file = new File(basedir, 'target/generated-sources/i18n/tapestry.getter'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains( 'tmlGetter.key1=' ); -//assert content.contains( 'tmlGetter.key2=' ); - -//file = new File(basedir, 'target/generated-sources/i18n/gwt-java.getter'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains( 'gwtJavaGetter.key1=' ); -//assert content.contains( 'gwtJavaGetter.key2=' ); -//assert content.contains( 'gwtJavaGetter.key3=' ); - -//file = new File(basedir, 'src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties'); -//assert file.exists(); -// -//content = file.text; -//assert content.contains('javaGetter.old.key1='); -//assert content.contains('javaGetter.old.key2='); -//assert content.contains('javaGetter.key1='); -//assert content.contains('javaGetter.key2='); -//assert content.contains('javaGetter.key3='); -//assert content.contains('validationGetter.key1='); -//assert content.contains('validationGetter.key2='); -//assert content.contains('validationGetter.key3='); -//assert content.contains('jspGetter.key1='); -//assert content.contains('jspGetter.key2='); -// -//assert content.contains('tmlGetter.key1='); -//assert content.contains('tmlGetter.key2='); -// -//assert content.contains('gwtJavaGetter.key1='); -//assert content.contains('gwtJavaGetter.key2='); -//assert content.contains('gwtJavaGetter.key3='); - return true; Modified: trunk/i18n-maven-plugin/src/it/settings.xml =================================================================== --- trunk/i18n-maven-plugin/src/it/settings.xml 2014-02-03 11:40:34 UTC (rev 2017) +++ trunk/i18n-maven-plugin/src/it/settings.xml 2014-02-03 12:06:44 UTC (rev 2018) @@ -35,7 +35,7 @@ <repositories> <repository> <id>local.central</id> - <url>file:///@localRepository@</url> + <url>file:///@localRepositoryUrl@</url> <releases> <enabled>true</enabled> </releases> @@ -47,7 +47,7 @@ <pluginRepositories> <pluginRepository> <id>local.central</id> - <url>file:///@localRepository@</url> + <url>file:///@localRepositoryUrl@</url> <releases> <enabled>true</enabled> </releases>