[jboss-cvs] JBossAS SVN: r110408 - in projects/jboss-jca/trunk/codegenerator/src/main: java/org/jboss/jca/codegenerator/xml and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2011-01-18 22:30:39 -0500 (Tue, 18 Jan 2011)
New Revision: 110408

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/xml/BuildIvyXmlGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
   projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template
Log:
[JBJCA-456] optional generate mbean files and change mbean xml name

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	2011-01-19 00:16:35 UTC (rev 110407)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2011-01-19 03:30:39 UTC (rev 110408)
@@ -341,11 +341,22 @@
     */
    void generateMbeanXml(Definition def, String outputDir)
    {
+      String mbeanName = def.getDefaultValue().toLowerCase();
+      if (def.getRaPackage() != null && !def.getRaPackage().equals(""))
+      {
+         if (def.getRaPackage().indexOf('.') >= 0)
+         {
+            mbeanName = def.getRaPackage().substring(def.getRaPackage().lastIndexOf('.') + 1);
+         }
+         else
+            mbeanName = def.getRaPackage();
+      }
+      
       try
       {
          outputDir = outputDir + File.separatorChar + "src" + File.separatorChar + 
             "main" + File.separatorChar + "resources";
-         FileWriter mbfw = Utils.createFile(def.getDefaultValue().toLowerCase() + ".xml", outputDir);
+         FileWriter mbfw = Utils.createFile(mbeanName + ".xml", outputDir);
          MbeanXmlGen mbGen = new MbeanXmlGen();
          mbGen.generate(def, mbfw);
          mbfw.close();

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java	2011-01-19 00:16:35 UTC (rev 110407)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java	2011-01-19 03:30:39 UTC (rev 110408)
@@ -66,6 +66,7 @@
       
       Map<String, String> map = new HashMap<String, String>();
       map.put("def.name", defName.toLowerCase());
+      map.put("mbean.class", def.getRaPackage() + ".mbean." + def.getMbeanInterfaceClass());
       
       Template template = new SimpleTemplate(buildString);
       template.process(map, out);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java	2011-01-19 00:16:35 UTC (rev 110407)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java	2011-01-19 03:30:39 UTC (rev 110408)
@@ -66,6 +66,7 @@
       
       Map<String, String> map = new HashMap<String, String>();
       map.put("def.name", defName.toLowerCase());
+      map.put("mbean.class", def.getRaPackage() + ".mbean." + def.getMbeanInterfaceClass());
       
       Template template = new SimpleTemplate(buildString);
       template.process(map, out);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template	2011-01-19 00:16:35 UTC (rev 110407)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template	2011-01-19 03:30:39 UTC (rev 110408)
@@ -124,11 +124,19 @@
       <fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
       <fileset dir="${build.dir}" includes="${def.name}.jar"/>
     </jar>
+
+    <available property="mbean.gen" classpath="${build.dir}"
+      classname="${mbean.class}"/>
+    <antcall target="mbean-pack"/>
+  </target>
+  
+  <target name="mbean-pack" if="mbean.gen">
     <jar destfile="${target.dir}/${def.name}-mbean.jar"
          basedir="${build.dir}"
          includes="**/mbean/*.class"/>
     <copy todir="${target.dir}">
       <fileset dir="${basedir}/src/main/resources" includes="*.xml"/>
+    </copy>
   </target>
   
       

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template	2011-01-19 00:16:35 UTC (rev 110407)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template	2011-01-19 03:30:39 UTC (rev 110408)
@@ -63,6 +63,13 @@
       <fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
       <fileset dir="${build.dir}" includes="${def.name}.jar"/>
     </jar>
+
+    <available property="mbean.gen" classpath="${build.dir}"
+      classname="${mbean.class}"/>
+    <antcall target="mbean-pack"/>
+  </target>
+  
+  <target name="mbean-pack" if="mbean.gen">
     <jar destfile="${target.dir}/${def.name}-mbean.jar"
          basedir="${build.dir}"
          includes="**/mbean/*.class"/>
@@ -70,7 +77,6 @@
       <fileset dir="${basedir}/src/main/resources" includes="*.xml"/>
     </copy>
   </target>
-  
       
   <!-- ================================= 
        Target: prepare-test
@@ -158,4 +164,4 @@
     <delete dir="${target.dir}"/>
   </target>
 
-</project>
\ No newline at end of file
+</project>