Merge pull request #108 from yumaoka/bug-105-parse-props

Fixed Java properties file parsing problem

Author: yumaoka

gp-cli/README.md

@@ -160,6 +160,8 @@ There are several different resource types available:
 
 * **JAVA** - Java property resource bundle file
 * **JAVAUTF8** - Java UTF8 property resource bundle file
+* **JAVAMSG** - Java property resource bundle file with MessageFormat pattern stirngs only
+* **JAVAMSGUTF8** - Java UTF8 property resource bundle file with MessageFormat pattern strings only
 * **JSON** - Resource string key/value pairs stored in JSON format. For now nested JSON object is not supported.
 * **AMDJS** - RequireJS I18N bundle file
 * **GLOBALIZEJS** - Globalize.js JSON resource bundle file

gp-maven-plugin/README.md

@@ -412,6 +412,9 @@ excludes all files with file name `config.json`.
 Specifies a resource type. Available options are
 
 * **JAVA** - Java property resource bundle file
+* **JAVAUTF8** - Java UTF8 property resource bundle file
+* **JAVAMSG** - Java property resource bundle file with MessageFormat pattern stirngs only
+* **JAVAMSGUTF8** - Java UTF8 property resource bundle file with MessageFormat pattern strings only
 * **JSON** - Resource string key/value pairs stored in JSON format. For now nested JSON object is not supported.
 * **AMDJS** - RequireJS I18N bundle file
 * **GLOBALIZEJS** - Globalize.js JSON resource bundle file

gp-res-filter/src/main/java/com/ibm/g11n/pipeline/resfilter/impl/DefaultResourceFilterProvider.java

@@ -25,6 +25,8 @@
 import com.ibm.g11n.pipeline.resfilter.MultiBundleResourceFilter;
 import com.ibm.g11n.pipeline.resfilter.ResourceFilter;
 import com.ibm.g11n.pipeline.resfilter.ResourceFilterProvider;
+import com.ibm.g11n.pipeline.resfilter.impl.JavaPropertiesResource.Encoding;
+import com.ibm.g11n.pipeline.resfilter.impl.JavaPropertiesResource.MessagePatternEscape;
 
 /**
  * The default {@link ResourceFilterProvider} implementation.
@@ -38,6 +40,8 @@ enum Filter {
         GLOBALIZEJS,
         IOS,
         JAVA,
+        JAVAMSG,
+        JAVAMSGUTF8,
         JAVAUTF8,
         JSON,
         PO,
@@ -90,10 +94,16 @@ public ResourceFilter getResourceFilter(String id) {
             result = new IOSStringsResource();
             break;
         case JAVA:
-            result = new JavaPropertiesResource(false);
+            result = new JavaPropertiesResource(Encoding.ISO_8859_1, MessagePatternEscape.AUTO);
+            break;
+        case JAVAMSG:
+            result = new JavaPropertiesResource(Encoding.ISO_8859_1, MessagePatternEscape.ALL);
+            break;
+        case JAVAMSGUTF8:
+            result = new JavaPropertiesResource(Encoding.UTF_8, MessagePatternEscape.ALL);
             break;
         case JAVAUTF8:
-            result = new JavaPropertiesResource(true);
+            result = new JavaPropertiesResource(Encoding.UTF_8, MessagePatternEscape.AUTO);
             break;
         case JSON:
             result = new JsonResource();