[jboss-cvs] JBossAS SVN: r110399 - in projects/jboss-jca/trunk/codegenerator/src/main: resources and 1 other directory.

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

Author: jeff.zhang
Date: 2011-01-18 04:18:57 -0500 (Tue, 18 Jan 2011)
New Revision: 110399

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/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-457] packaging layout


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-18 05:46:34 UTC (rev 110398)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java	2011-01-18 09:18:57 UTC (rev 110399)
@@ -53,8 +53,19 @@
       URL buildFile = BuildIvyXmlGen.class.getResource("/build.ivy.xml.template");
       String buildString = Utils.readFileIntoString(buildFile);
       
+      String defName = "jca-test";
+      if (def.getRaPackage() != null && !def.getRaPackage().equals(""))
+      {
+         if (def.getRaPackage().indexOf('.') >= 0)
+         {
+            defName = def.getRaPackage().substring(def.getRaPackage().lastIndexOf('.') + 1);
+         }
+         else
+            defName = def.getRaPackage();
+      }
+      
       Map<String, String> map = new HashMap<String, String>();
-      map.put("def.name", def.getDefaultValue().toLowerCase());
+      map.put("def.name", defName.toLowerCase());
       
       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-18 05:46:34 UTC (rev 110398)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java	2011-01-18 09:18:57 UTC (rev 110399)
@@ -53,8 +53,19 @@
       URL buildFile = BuildXmlGen.class.getResource("/build.xml.template");
       String buildString = Utils.readFileIntoString(buildFile);
       
+      String defName = "jca-test";
+      if (def.getRaPackage() != null && !def.getRaPackage().equals(""))
+      {
+         if (def.getRaPackage().indexOf('.') >= 0)
+         {
+            defName = def.getRaPackage().substring(def.getRaPackage().lastIndexOf('.') + 1);
+         }
+         else
+            defName = def.getRaPackage();
+      }
+      
       Map<String, String> map = new HashMap<String, String>();
-      map.put("def.name", def.getDefaultValue().toLowerCase());
+      map.put("def.name", defName.toLowerCase());
       
       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-18 05:46:34 UTC (rev 110398)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template	2011-01-18 09:18:57 UTC (rev 110399)
@@ -120,18 +120,15 @@
          basedir="${build.dir}"
          includes="**/*.class"
          excludes="**/mbean/*.class"/>
-    <jar destfile="${build.dir}/${def.name}.rar">
+    <jar destfile="${target.dir}/${def.name}.rar">
       <fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
       <fileset dir="${build.dir}" includes="${def.name}.jar"/>
     </jar>
-    <jar destfile="${build.dir}/${def.name}-mbean.jar"
+    <jar destfile="${target.dir}/${def.name}-mbean.jar"
          basedir="${build.dir}"
          includes="**/mbean/*.class"/>
-    <jar destfile="${target.dir}/jca-test.rar">
+    <copy todir="${target.dir}">
       <fileset dir="${basedir}/src/main/resources" includes="*.xml"/>
-      <fileset dir="${build.dir}" includes="*.rar"/>
-      <fileset dir="${build.dir}" includes="*-mbean.jar"/>
-    </jar>
   </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-18 05:46:34 UTC (rev 110398)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template	2011-01-18 09:18:57 UTC (rev 110399)
@@ -59,18 +59,16 @@
          basedir="${build.dir}"
          includes="**/*.class"
          excludes="**/mbean/*.class"/>
-    <jar destfile="${build.dir}/${def.name}.rar">
+    <jar destfile="${target.dir}/${def.name}.rar">
       <fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
       <fileset dir="${build.dir}" includes="${def.name}.jar"/>
     </jar>
-    <jar destfile="${build.dir}/${def.name}-mbean.jar"
+    <jar destfile="${target.dir}/${def.name}-mbean.jar"
          basedir="${build.dir}"
          includes="**/mbean/*.class"/>
-    <jar destfile="${target.dir}/jca-test.rar">
+    <copy todir="${target.dir}">
       <fileset dir="${basedir}/src/main/resources" includes="*.xml"/>
-      <fileset dir="${build.dir}" includes="*.rar"/>
-      <fileset dir="${build.dir}" includes="*-mbean.jar"/>
-    </jar>
+    </copy>
   </target>