You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/11/24 18:04:24 UTC

svn commit: r597888 - in /myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts: AbstractGenerateSourcesMojo.java GenerateSourcesMojo.java GenerateTestSourcesMojo.java ListRTSWriter.java

Author: matzew
Date: Sat Nov 24 09:04:24 2007
New Revision: 597888

URL: http://svn.apache.org/viewvc?rev=597888&view=rev
Log:
TRINIDAD-823 - Maven-xrts-plugin should generate stub ResourceBundles for default locale

thx to Bud for his patch

Modified:
    myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java
    myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java
    myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java
    myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java

Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java?rev=597888&r1=597887&r2=597888&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/AbstractGenerateSourcesMojo.java Sat Nov 24 09:04:24 2007
@@ -64,6 +64,8 @@
 
   abstract protected String getTargetType();
 
+  abstract protected String[] getDefaultLocales();
+
   abstract protected String[] getExcludes();
 
   abstract protected File getSourceDirectory();
@@ -132,7 +134,7 @@
             params.put("outName", baseName);
             params.put("srcName", baseName);
             params.put("quietMode", Boolean.TRUE);
-
+            params.put("defaultLocales", getDefaultLocales());
             InputSource source = new InputSource(new FileInputStream(sourceFile));
             // setup relative systemId resolution for local rts.dtd files.
             source.setSystemId(sourceFile.getParentFile().toURL().toString());

Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java?rev=597888&r1=597887&r2=597888&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateSourcesMojo.java Sat Nov 24 09:04:24 2007
@@ -47,6 +47,11 @@
   /**
    * @parameter
    */
+  private String[] defaultLocales;
+
+  /**
+   * @parameter
+   */
   private String[] excludes;
 
   /**
@@ -60,6 +65,11 @@
    * @required
    */
   private File targetDirectory;
+
+  protected String[] getDefaultLocales()
+  {
+    return defaultLocales;
+  }
 
   protected String[] getExcludes()
   {

Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java?rev=597888&r1=597887&r2=597888&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/GenerateTestSourcesMojo.java Sat Nov 24 09:04:24 2007
@@ -47,6 +47,11 @@
   /**
    * @parameter
    */
+  private String[] defaultLocales;
+
+  /**
+   * @parameter
+   */
   private String[] testExcludes;
 
   /**
@@ -60,6 +65,11 @@
    * @required
    */
   private File targetDirectory;
+
+  protected String[] getDefaultLocales()
+  {
+    return defaultLocales;
+  }
 
   protected String[] getExcludes()
   {

Modified: myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java?rev=597888&r1=597887&r2=597888&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java (original)
+++ myfaces/trinidad-maven/trunk/maven-xrts-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/xrts/ListRTSWriter.java Sat Nov 24 09:04:24 2007
@@ -80,6 +80,7 @@
     _pw.println("// ");
 
     String packageName = (String)parms.get("pkgName");
+    boolean validPackage = false;
     if (packageName == null)
       if (meta != null)
         if (meta.get("package") != null)
@@ -90,6 +91,7 @@
     {
       _pw.println("package " + packageName + ";");
       _pw.println("");
+      validPackage = true;
     }
 
     _pw.println("import java.util.ListResourceBundle;");
@@ -101,6 +103,40 @@
     _pw.println("  @Override");
     _pw.println("  public Object[][] getContents() {");
     _pw.println("    return new Object[][] {");
+
+    if (outName.indexOf('_') < 0)
+    {
+      // This is the base bundle. If any default locales are requested,
+      // they'll extend this bundle. Create them here because we have all
+      // the needed info.
+      String[] locales = (String[]) parms.get("defaultLocales");
+      File targDir = outFile.getParentFile();
+      if ((locales != null) && (targDir != null))
+      {
+        for (int l = 0; l < locales.length; l++)
+        {
+          String cName = outName + '_' + locales[l];
+          File locF = new File(targDir, cName + ".java");
+          
+          PrintWriter locWri; 
+          locWri = new PrintWriter(new BufferedWriter(new FileWriter(locF)));
+
+          locWri.println("// Do not edit this file!");
+          locWri.println("// This file has been automatically generated.");
+
+          if (validPackage)
+          {
+            locWri.println("package " + packageName + ";");
+            locWri.println("");
+          }
+          locWri.println("public class " + cName + " extends " + outName);
+          locWri.println("{");
+          locWri.println("}");
+          locWri.close();
+        }
+      }
+    }
+    
   }
 
   protected void writeImports(Map parms, Map meta)