[SCM] localizer packaging branch, upstream, updated. 59ef44d2c18f04c6c5f35a4d61cfde73e9f74d6b
James Page
jamespage-guest at alioth.debian.org
Fri Jun 10 21:59:50 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "localizer packaging".
The branch, upstream has been updated
via 59ef44d2c18f04c6c5f35a4d61cfde73e9f74d6b (commit)
from dc6c4f52dc156db1056d795b7ddad1aaa3bfa78d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
lib/pom.xml | 2 +-
.../java/org/jvnet/localizer/LocaleProvider.java | 23 ++++++++++++
.../main/java/org/jvnet/localizer/Localizable.java | 32 ++++++++++++++++-
.../org/jvnet/localizer/ResourceBundleHolder.java | 23 ++++++++++++
maven-plugin/pom.xml | 2 +-
.../main/java/org/jvnet/localizer/Generator.java | 23 ++++++++++++
.../java/org/jvnet/localizer/GeneratorMojo.java | 23 ++++++++++++
.../java/org/jvnet/localizer/GeneratorTask.java | 23 ++++++++++++
.../main/java/org/jvnet/localizer/Reporter.java | 23 ++++++++++++
pom.xml | 37 +++++++++----------
10 files changed, 189 insertions(+), 22 deletions(-)
diff --git a/lib/pom.xml b/lib/pom.xml
index 06f6e13..bf72125 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jvnet.localizer</groupId>
<artifactId>localizer-parent</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>localizer</artifactId>
diff --git a/lib/src/main/java/org/jvnet/localizer/LocaleProvider.java b/lib/src/main/java/org/jvnet/localizer/LocaleProvider.java
index b780923..50672e5 100644
--- a/lib/src/main/java/org/jvnet/localizer/LocaleProvider.java
+++ b/lib/src/main/java/org/jvnet/localizer/LocaleProvider.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2007-, the localizer project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.localizer;
import java.util.Locale;
diff --git a/lib/src/main/java/org/jvnet/localizer/Localizable.java b/lib/src/main/java/org/jvnet/localizer/Localizable.java
index b786371..eccbff7 100644
--- a/lib/src/main/java/org/jvnet/localizer/Localizable.java
+++ b/lib/src/main/java/org/jvnet/localizer/Localizable.java
@@ -1,8 +1,34 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2007-, the localizer project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.localizer;
import java.util.Locale;
import java.text.MessageFormat;
import java.io.Serializable;
+import java.util.MissingResourceException;
+
+import static java.util.Arrays.asList;
/**
* Captures the localizable string. Can be converted to a string just by
@@ -33,7 +59,11 @@ public class Localizable implements Serializable {
}
public String toString(Locale locale) {
- return MessageFormat.format(holder.get(locale).getString(key),args);
+ try {
+ return MessageFormat.format(holder.get(locale).getString(key),args);
+ } catch (MissingResourceException e) {
+ throw new RuntimeException("Failed to localize key="+key+",args="+ asList(args),e);
+ }
}
public String toString() {
diff --git a/lib/src/main/java/org/jvnet/localizer/ResourceBundleHolder.java b/lib/src/main/java/org/jvnet/localizer/ResourceBundleHolder.java
index e43dfa2..59d4d58 100644
--- a/lib/src/main/java/org/jvnet/localizer/ResourceBundleHolder.java
+++ b/lib/src/main/java/org/jvnet/localizer/ResourceBundleHolder.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2007-, the localizer project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.localizer;
import java.io.IOException;
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 3857cac..946d984 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jvnet.localizer</groupId>
<artifactId>localizer-parent</artifactId>
- <version>1.12</version>
+ <version>1.13</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>maven-localizer-plugin</artifactId>
diff --git a/maven-plugin/src/main/java/org/jvnet/localizer/Generator.java b/maven-plugin/src/main/java/org/jvnet/localizer/Generator.java
index 7b5cc97..9bff788 100644
--- a/maven-plugin/src/main/java/org/jvnet/localizer/Generator.java
+++ b/maven-plugin/src/main/java/org/jvnet/localizer/Generator.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2007-, the localizer project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.localizer;
import com.sun.codemodel.JClassAlreadyExistsException;
diff --git a/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorMojo.java b/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorMojo.java
index aa82cd9..f224749 100644
--- a/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorMojo.java
+++ b/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorMojo.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2007-, the localizer project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.localizer;
import org.apache.maven.model.Resource;
diff --git a/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorTask.java b/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorTask.java
index c39d8b8..52ea93f 100644
--- a/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorTask.java
+++ b/maven-plugin/src/main/java/org/jvnet/localizer/GeneratorTask.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2007-, the localizer project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.localizer;
import org.apache.tools.ant.taskdefs.MatchingTask;
diff --git a/maven-plugin/src/main/java/org/jvnet/localizer/Reporter.java b/maven-plugin/src/main/java/org/jvnet/localizer/Reporter.java
index 36c467f..c1e0d07 100644
--- a/maven-plugin/src/main/java/org/jvnet/localizer/Reporter.java
+++ b/maven-plugin/src/main/java/org/jvnet/localizer/Reporter.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2007-, the localizer project contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.localizer;
/**
diff --git a/pom.xml b/pom.xml
index 2c79bc7..50c65d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>org.jvnet.localizer</groupId>
<artifactId>localizer-parent</artifactId>
<packaging>pom</packaging>
- <version>1.12</version>
+ <version>1.13</version>
<name>Localizer parent POM</name>
<modules>
<module>lib</module>
@@ -12,10 +12,18 @@
</modules>
<scm>
- <connection>scm:svn:https://www.dev.java.net/svn/localizer/tags/localizer-parent-1.12</connection>
- <developerConnection>scm:svn:https://www.dev.java.net/svn/localizer/tags/localizer-parent-1.12</developerConnection>
+ <connection>scm:svn:https://svn.java.net/svn/localizer~svn/tags/localizer-parent-1.13</connection>
+ <developerConnection>scm:svn:https://svn.java.net/svn/localizer~svn/tags/localizer-parent-1.13</developerConnection>
</scm>
+ <licenses>
+ <license>
+ <name>The MIT license</name>
+ <url>http://www.opensource.org/licenses/mit-license.php</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<build>
<plugins>
<plugin>
@@ -26,28 +34,19 @@
</configuration>
</plugin>
</plugins>
-
- <extensions>
- <extension>
- <groupId>org.jvnet.wagon-svn</groupId>
- <artifactId>wagon-svn</artifactId>
- <version>1.9</version>
- </extension>
- </extensions>
</build>
<distributionManagement>
- <site>
- <id>xyz-www</id>
- <url>java-net:/localizer/trunk/www/</url>
- </site>
<repository>
- <uniqueVersion>false</uniqueVersion>
- <id>java.net-maven2-repository</id>
- <url>java-net:/maven2-repository/trunk/repository/</url>
+ <id>maven.jenkins-ci.org</id>
+ <url>http://maven.jenkins-ci.org:8081/content/repositories/releases</url>
</repository>
+ <snapshotRepository>
+ <id>maven.jenkins-ci.org</id>
+ <url>http://maven.jenkins-ci.org:8081/content/repositories/snapshots</url>
+ </snapshotRepository>
</distributionManagement>
-
+
<repositories>
<repository>
<id>java.net2</id>
hooks/post-receive
--
localizer packaging
More information about the pkg-java-commits
mailing list