Author: dflorey
Date: Wed May 25 05:33:45 2005
New Revision: 178424
URL: http://svn.apache.org/viewcvs?rev=178424&view=rev
Log: (empty)
Removed:
jakarta/commons/sandbox/i18n/trunk/src/resources/messages.properties
jakarta/commons/sandbox/i18n/trunk/src/resources/messages_de.properties
jakarta/commons/sandbox/i18n/trunk/src/test/org/apache/commons/i18n/I18nTestSuite.java
Modified:
jakarta/commons/sandbox/i18n/trunk/build.xml
jakarta/commons/sandbox/i18n/trunk/project.xml
jakarta/commons/sandbox/i18n/trunk/src/java/org/apache/commons/i18n/MessageManager.java
jakarta/commons/sandbox/i18n/trunk/src/test/testMessages.xml
jakarta/commons/sandbox/i18n/trunk/src/test/variantTestMessages.xml
Modified: jakarta/commons/sandbox/i18n/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/i18n/trunk/build.xml?rev=178424&r1=178423&r2=178424&view=diff
==============================================================================
--- jakarta/commons/sandbox/i18n/trunk/build.xml (original)
+++ jakarta/commons/sandbox/i18n/trunk/build.xml Wed May 25 05:33:45 2005
@@ -1,105 +1,145 @@
<?xml version="1.0"?>
-<!-- <!DOCTYPE project SYSTEM "project.dtd"> -->
-
-<!--
- =======================================================================
- WebDAV projector build file
- =======================================================================
+<!--
+ And build script for Jakarta Commons i18n
-->
<project name="commons-i18n" default="jar" basedir=".">
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time it compiles it) -->
+ <!-- Give user a chance to override without editing this file
+ (and without typing -D each time it compiles it) -->
<property file="build.properties"/>
- <property file=".ant.properties" />
+ <property file=".ant.properties" />
- <property name="debug" value="true" />
- <property name="deprecation" value="true" />
- <property name="optimize" value="true" />
-
- <property name="version" value="0.3" />
- <property name="name" value="commons-i18n" />
- <!--
- ===================================================================
- Set the properties related to the source tree
- ===================================================================
- -->
- <property name="src.dir" value="src" />
- <property name="java.dir" value="${src.dir}/java" />
- <property name="lib.dir" value="lib" />
- <property name="docs.dir" value="doc" />
- <property name="dist.dir" value="dist" />
-
- <!--
- ===================================================================
- Set the properties for the build area
- ===================================================================
- -->
- <property name="build.dir" value="build" />
- <property name="build.classes" value="${build.dir}/classes" />
- <property name="build.lib" value="${build.dir}/lib" />
- <property name="build.javadocs" value="${docs.dir}/javadoc" />
-
- <path id="classpath">
- <pathelement location="${build.classes}" />
- <fileset dir="${lib.dir}" includes="*.jar" />
- </path>
- <!--
- ===================================================================
- Prepare the build
- ===================================================================
- -->
- <target name="prepare">
- <tstamp />
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.classes}" />
- <mkdir dir="${build.lib}" />
- </target>
- <!--
- ===================================================================
- Build the code
- ===================================================================
- -->
- <target name="build" depends="prepare">
- <javac destdir="${build.classes}" debug="${debug}"
deprecation="${deprecation}" optimize="${optimize}">
- <src path="${java.dir}" />
- <classpath refid="classpath" />
- </javac>
- </target>
-
- <!--
- ===================================================================
- Create the jar
- ===================================================================
- -->
- <target name="jar" depends="build">
- <jar jarfile="${build.lib}/${name}-${version}.jar"
basedir="${build.classes}">
- <include name="org/apache/commons/i18n/**" />
- </jar>
- </target>
-
- <!--
- ===================================================================
- Cleans up build directories
- ===================================================================
- -->
- <target name="clean">
- <delete dir="${build.dir}" />
- </target>
-
- <target name="clean-javadocs">
- <delete dir="${build.javadocs}" />
- </target>
-
- <target name="scrub" depends="clean, clean-javadocs">
- </target>
-
- <!--
- ===================================================================
- Creates the API documentation
- ===================================================================
- -->
+ <property name="debug" value="true" />
+ <property name="deprecation" value="true" />
+ <property name="optimize" value="true" />
+
+ <property name="version" value="0.3" />
+ <property name="name" value="commons-i18n" />
+
+ <!--
+ ===================================================================
+ Set the properties related to the source tree
+ ===================================================================
+ -->
+ <property name="src.dir" value="src" />
+ <property name="java.dir" value="${src.dir}/java" />
+ <property name="resources.dir" value="${src.dir}/resources" />
+ <property name="test.src.dir" value="${src.dir}/test" />
+ <property name="lib.dir" value="lib" />
+ <property name="docs.dir" value="doc" />
+ <property name="dist.dir" value="dist" />
+
+ <!--
+ ===================================================================
+ Set the properties for the build area
+ ===================================================================
+ -->
+ <property name="build.dir" value="build" />
+ <property name="build.classes" value="${build.dir}/classes" />
+ <property name="test.classes" value="${build.dir}/test-classes" />
+ <property name="build.lib" value="${build.dir}/lib" />
+ <property name="build.javadocs" value="${docs.dir}/javadoc" />
+
+ <path id="classpath">
+ <pathelement location="${build.classes}" />
+ <fileset dir="${lib.dir}" includes="*.jar" />
+ </path>
+
+ <!--
+ ===================================================================
+ Prepare the build
+ ===================================================================
+ -->
+ <target name="prepare">
+ <tstamp />
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${test.classes}" />
+ <mkdir dir="${build.lib}" />
+ </target>
+
+ <!--
+ ===================================================================
+ Build the code
+ ===================================================================
+ -->
+ <target name="build" depends="prepare">
+ <javac destdir="${build.classes}" debug="${debug}"
deprecation="${deprecation}" optimize="${optimize}">
+ <src path="${java.dir}" />
+ <classpath refid="classpath" />
+ </javac>
+ <copy todir="${build.classes}">
+ <fileset dir="${resources.dir}" />
+ </copy>
+ </target>
+
+ <!--
+ ===================================================================
+ Targets for testing
+ ===================================================================
+ -->
+
+ <target name="build.tests" depends="build">
+ <javac destdir="${test.classes}">
+ <src path="${test.src.dir}" />
+ <classpath refid="classpath" />
+ </javac>
+ <copy todir="${test.classes}">
+ <fileset dir="${test.src.dir}" excludes="**/*.java"/>
+ </copy>
+ </target>
+
+ <target name="test" depends="build.tests" description="Run JUnit tests
(without code coverage)">
+ <junit showoutput="true" haltonfailure="true">
+ <classpath>
+ <pathelement location="${build.classes}" />
+ <fileset dir="${lib.dir}" includes="*.jar" />
+ <pathelement location="${test.classes}" />
+ </classpath>
+ <!-- Formatter for console output -->
+ <formatter type="brief" usefile="false" />
+ <batchtest fork="${emma.enabled}">
+ <fileset dir="${test.classes}">
+ <include name="**/*Test.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
+ ===================================================================
+ Create the jar
+ ===================================================================
+ -->
+ <target name="jar" depends="build">
+ <jar jarfile="${build.lib}/${name}-${version}.jar"
basedir="${build.classes}">
+ <include name="org/apache/commons/i18n/**" />
+ <include name="i18n-messages*.properties" />
+ </jar>
+ </target>
+
+ <!--
+ ===================================================================
+ Cleans up build directories
+ ===================================================================
+ -->
+ <target name="clean">
+ <delete dir="${build.dir}" />
+ </target>
+
+ <target name="clean-javadocs">
+ <delete dir="${build.javadocs}" />
+ </target>
+
+ <target name="scrub" depends="clean, clean-javadocs">
+ </target>
+
+ <!--
+ ===================================================================
+ Creates the API documentation
+ ===================================================================
+ -->
<target name="javadocs" depends="build, clean-javadocs"
description="Creates the API documentation">
<mkdir dir="${build.javadocs}" />
<mkdir dir="${build.javadocs}" />
Modified: jakarta/commons/sandbox/i18n/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/i18n/trunk/project.xml?rev=178424&r1=178423&r2=178424&view=diff
==============================================================================
--- jakarta/commons/sandbox/i18n/trunk/project.xml (original)
+++ jakarta/commons/sandbox/i18n/trunk/project.xml Wed May 25 05:33:45 2005
@@ -22,108 +22,106 @@
-->
<project>
- <extend>../commons-build/sandbox-project.xml</extend>
- <name>Commons I18n</name>
- <id>commons-i18n</id>
- <logo>/images/i18n-logo-white.png</logo>
- <url>http://jakarta.apache.org/commons/sandbox/i18n/</url>
- <inceptionYear>2004</inceptionYear>
- <package>org.apache.commons.i18n</package>
- <shortDescription>Commons I18n</shortDescription>
- <description>Internationalization package</description>
- <siteAddress>cvs.apache.org</siteAddress>
-
- <currentVersion>20050221</currentVersion>
- <versions>
- </versions>
- <branches>
- </branches>
-
- <developers>
- <developer>
- <name>Daniel Florey</name>
- <id>dflorey</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Apache Software Foundation</organization>
- <timezone>+1</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Oliver Zeigermann</name>
- <id>ozeigermann</id>
- <email>[EMAIL PROTECTED]</email>
- <organization>Apache Software Foundation</organization>
- <timezone>+1</timezone>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- </developers>
-
- <contributors>
- <contributor>
- <name>Mattias Jiderhamn</name>
- <email>[EMAIL PROTECTED]</email>
- </contributor>
- <contributor>
- <name>Anaximandro (Woody)</name>
- <email>[EMAIL PROTECTED]</email>
- </contributor>
- </contributors>
-
- <dependencies>
- </dependencies>
-
- <build>
- <nagEmailAddress>[email protected]</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
- <!-- Unit test cases -->
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <resources>
- <resource>
- <directory>${basedir}/src/test</directory>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>${basedir}/src/resources</directory>
- </resource>
- </resources>
- </build>
-
- <reports>
- <report>maven-changelog-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jdepend-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-tasklist-plugin</report>
- <report>maven-jcoverage-plugin</report>
-
- <!--
- if you have trouble with findbugs plugin, execute this from the command
line
- (all on one line)
- maven plugin:download
- -Dmaven.repo.remote=http://www.ibiblio.org/maven/
- -DgroupId=maven-plugins
- -DartifactId=maven-findbugs-plugin
- -Dversion=0.8.4
-
- -->
- <report>maven-findbugs-plugin</report>
-
- </reports>
+ <extend>../commons-build/sandbox-project.xml</extend>
+ <name>Commons I18n</name>
+ <id>commons-i18n</id>
+ <logo>/images/i18n-logo-white.png</logo>
+ <url>http://jakarta.apache.org/commons/sandbox/i18n/</url>
+ <inceptionYear>2004</inceptionYear>
+ <package>org.apache.commons.i18n</package>
+ <shortDescription>Commons I18n</shortDescription>
+ <description>Internationalization package</description>
+ <siteAddress>cvs.apache.org</siteAddress>
+
+ <currentVersion>20050221</currentVersion>
+ <versions>
+ </versions>
+ <branches>
+ </branches>
+
+ <developers>
+ <developer>
+ <name>Daniel Florey</name>
+ <id>dflorey</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Apache Software Foundation</organization>
+ <timezone>+1</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Oliver Zeigermann</name>
+ <id>ozeigermann</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Apache Software Foundation</organization>
+ <timezone>+1</timezone>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <contributors>
+ <contributor>
+ <name>Mattias Jiderhamn</name>
+ <email>[EMAIL PROTECTED]</email>
+ </contributor>
+ <contributor>
+ <name>Anaximandro (Woody)</name>
+ <email>[EMAIL PROTECTED]</email>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ </dependencies>
+
+ <build>
+ <nagEmailAddress>[email protected]</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+ <!-- Unit test cases -->
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/src/resources</directory>
+ </resource>
+ </resources>
+ </build>
+
+ <reports>
+ <report>maven-changelog-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <report>maven-jcoverage-plugin</report>
+ <!--
+ if you have trouble with findbugs plugin, execute this from the
command line
+ (all on one line)
+ maven plugin:download
+ -Dmaven.repo.remote=http://www.ibiblio.org/maven/
+ -DgroupId=maven-plugins
+ -DartifactId=maven-findbugs-plugin
+ -Dversion=0.8.4
+ -->
+ <report>maven-findbugs-plugin</report>
+
+ </reports>
</project>
Modified:
jakarta/commons/sandbox/i18n/trunk/src/java/org/apache/commons/i18n/MessageManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/i18n/trunk/src/java/org/apache/commons/i18n/MessageManager.java?rev=178424&r1=178423&r2=178424&view=diff
==============================================================================
---
jakarta/commons/sandbox/i18n/trunk/src/java/org/apache/commons/i18n/MessageManager.java
(original)
+++
jakarta/commons/sandbox/i18n/trunk/src/java/org/apache/commons/i18n/MessageManager.java
Wed May 25 05:33:45 2005
@@ -54,7 +54,7 @@
static final String RESOURCE_BUNDLE_NOT_FOUND = "resourceBundleNotFound";
public static final String MESSAGE_PARSING_ERROR = "messageParsingError";
- public static final ResourceBundle INTERNAL_MESSAGES =
ResourceBundle.getBundle("messages", Locale.getDefault());
+ public static final ResourceBundle INTERNAL_MESSAGES =
ResourceBundle.getBundle("i18n-messages", Locale.getDefault());
private static Map messageProviders = new LinkedHashMap();
Modified: jakarta/commons/sandbox/i18n/trunk/src/test/testMessages.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/i18n/trunk/src/test/testMessages.xml?rev=178424&r1=178423&r2=178424&view=diff
==============================================================================
--- jakarta/commons/sandbox/i18n/trunk/src/test/testMessages.xml (original)
+++ jakarta/commons/sandbox/i18n/trunk/src/test/testMessages.xml Wed May 25
05:33:45 2005
@@ -1,57 +1,49 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<messages>
- <!-- Fell free to insert your locale or correct mispellings here -->
- <message id="helloWorld">
- <locale language="en">
- <entry key="title">hello world</entry>
- <entry key="text">hello world, we are in {0}.</entry>
- <entry key="summary">sample summary to test english
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils to test english
messages. Country = {0}, language = {1} and variant = {2}.</entry>
+ <!-- Feel free to insert your locale or correct mispellings here -->
+ <message id="helloWorld">
+ <locale language="en">
+ <entry key="title">hello world</entry>
+ <entry key="text">hello world, we are in {0}.</entry>
+ <entry key="summary">sample summary to test english messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ <entry key="details">sample deatils to test english messages.
Country = {0}, language = {1} and variant = {2}.</entry>
<entry key="notTranslated">This entry is not translated to any
other languages (XML)</entry>
- </locale>
- <!-- For Scottish translations, see
http://www.whoohoo.co.uk/main.asp?pageid=scottie&topic=translator -->
- <!--locale language="en" country="GB" variant="scottish">
- <entry key="title">Awrite warld</entry>
- <entry key="text">Awrite warld, we ur in {0}.</entry>
- <entry key="summary">sample summary tae test english messages.
Coontry = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils tae test english messages.
Coontry = {0}, language = {1} and variant = {2}.</entry>
- </locale-->
- <locale language="pt" country="br">
- <entry key="title">olo mundo</entry>
- <entry key="text">hello mundo, nós estamos no
{0}.</entry>
- <entry key="summary">sample summary to test portuguese
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils to test portuguese
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- </locale>
- <locale language="es">
- <entry key="title">hola mundo</entry>
- <entry key="text">hola mundo, estamos em los
{0}.</entry>
- <entry key="summary">sample summary to test spanish
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils to test spanish
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- </locale>
- <locale language="it">
- <entry key="title">ciao mondo</entry>
- <entry key="text">ciao mondo, siamo negli {0}.</entry>
- <entry key="summary">sample summary to test italian
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils to test italian
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- </locale>
- <locale language="fr">
- <entry key="title">bonjour monde</entry>
- <entry key="text">bonjour monde, nous sommes aux
{0}.</entry>
- <entry key="summary">sample summary to test francais
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils to test francais
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- </locale>
- <locale language="du">
- <entry key="title">hello wereld</entry>
- <entry key="text">hello wereld, zijn wij in de
{0}.</entry>
- <entry key="summary">sample summary to test dutch
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils to test dutch
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- </locale>
- <locale language="de">
- <entry key="title">Hallo Welt</entry>
- <entry key="text">Wir sind in {0}.</entry>
- <entry key="summary">sample summary to test german
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- <entry key="details">sample deatils to test german
messages. Country = {0}, language = {1} and variant = {2}.</entry>
- </locale>
- </message>
-</messages>
-
+ </locale>
+ <locale language="pt" country="br">
+ <entry key="title">olo mundo</entry>
+ <entry key="text">hello mundo, nós estamos no {0}.</entry>
+ <entry key="summary">sample summary to test portuguese messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ <entry key="details">sample deatils to test portuguese messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ </locale>
+ <locale language="es">
+ <entry key="title">hola mundo</entry>
+ <entry key="text">hola mundo, estamos em los {0}.</entry>
+ <entry key="summary">sample summary to test spanish messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ <entry key="details">sample deatils to test spanish messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ </locale>
+ <locale language="it">
+ <entry key="title">ciao mondo</entry>
+ <entry key="text">ciao mondo, siamo negli {0}.</entry>
+ <entry key="summary">sample summary to test italian messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ <entry key="details">sample deatils to test italian messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ </locale>
+ <locale language="fr">
+ <entry key="title">bonjour monde</entry>
+ <entry key="text">bonjour monde, nous sommes aux {0}.</entry>
+ <entry key="summary">sample summary to test francais messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ <entry key="details">sample deatils to test francais messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ </locale>
+ <locale language="du">
+ <entry key="title">hello wereld</entry>
+ <entry key="text">hello wereld, zijn wij in de {0}.</entry>
+ <entry key="summary">sample summary to test dutch messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ <entry key="details">sample deatils to test dutch messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ </locale>
+ <locale language="de">
+ <entry key="title">Hallo Welt</entry>
+ <entry key="text">Wir sind in {0}.</entry>
+ <entry key="summary">sample summary to test german messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ <entry key="details">sample deatils to test german messages.
Country = {0}, language = {1} and variant = {2}.</entry>
+ </locale>
+ </message>
+</messages>
\ No newline at end of file
Modified: jakarta/commons/sandbox/i18n/trunk/src/test/variantTestMessages.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/i18n/trunk/src/test/variantTestMessages.xml?rev=178424&r1=178423&r2=178424&view=diff
==============================================================================
--- jakarta/commons/sandbox/i18n/trunk/src/test/variantTestMessages.xml
(original)
+++ jakarta/commons/sandbox/i18n/trunk/src/test/variantTestMessages.xml Wed May
25 05:33:45 2005
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<messages>
- <message id="variants">
- <locale language="en">
- <entry key="theKey">hello world</entry>
- </locale>
+ <message id="variants">
+ <locale language="en">
+ <entry key="theKey">hello world</entry>
+ </locale>
<!-- For Scottish translations, see
http://www.whoohoo.co.uk/main.asp?pageid=scottie&topic=translator -->
<locale language="en" country="GB" variant="scottish">
<entry key="theKey">Awrite warld</entry>
@@ -14,6 +14,5 @@
<locale language="en" variant="baby">
<entry key="theKey">Ga, ga, ga</entry>
</locale>
- </message>
-</messages>
-
+ </message>
+</messages>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
