[jboss-cvs] JBossAS SVN: r112689 - projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Feb 23 22:39:28 EST 2012


Author: jeff.zhang
Date: 2012-02-23 22:39:27 -0500 (Thu, 23 Feb 2012)
New Revision: 112689

Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java
Log:
[JBJCA-750] include ironjacamar.xml in the artifact

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2012-02-23 21:20:47 UTC (rev 112688)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2012-02-24 03:39:27 UTC (rev 112689)
@@ -433,18 +433,37 @@
    {
       try
       {
-         outputDir = outputDir + File.separatorChar + "src" + File.separatorChar + 
+         String resourceDir = outputDir + File.separatorChar + "src" + File.separatorChar + 
             "main" + File.separatorChar + "resources";
-         FileWriter ijfw = Utils.createFile("ironjacamar.xml", outputDir + File.separatorChar + "META-INF");
-         IronjacamarXmlGen ijxGen = new IronjacamarXmlGen();
-         ijxGen.generate(def, ijfw);
-         ijfw.close();
+         writeIronjacamarXml(def, resourceDir);
+
+         if (def.getBuild().equals("maven"))
+         {
+            String rarDir = outputDir + File.separatorChar + "src" + File.separatorChar + 
+               "main" + File.separatorChar + "rar";
+            writeIronjacamarXml(def, rarDir);
+         }
       }
       catch (IOException ioe)
       {
          ioe.printStackTrace();
       }
    }
+
+
+   /**
+    * writeIronjacamarXml
+    * @param def Definition
+    * @param outputDir output directory
+    * @throws IOException output exception
+    */
+   private void writeIronjacamarXml(Definition def, String outputDir) throws IOException
+   {
+      FileWriter ijfw = Utils.createFile("ironjacamar.xml", outputDir + File.separatorChar + "META-INF");
+      IronjacamarXmlGen ijxGen = new IronjacamarXmlGen();
+      ijxGen.generate(def, ijfw);
+      ijfw.close();
+   }
    
    /**
     * generate mbean deployment xml



More information about the jboss-cvs-commits mailing list