[jboss-cvs] JBossAS SVN: r110818 - in projects/jboss-jca/trunk: doc/samples/helloworld and 1 other directories.

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

Author: jesper.pedersen
Date: 2011-03-02 13:56:56 -0500 (Wed, 02 Mar 2011)
New Revision: 110818

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/doc/samples/helloworld/build.xml
   projects/jboss-jca/trunk/web/src/main/resources/console/displaymbeans.jsp
   projects/jboss-jca/trunk/web/src/main/resources/console/displayopresult.jsp
   projects/jboss-jca/trunk/web/src/main/resources/console/error.jsp
   projects/jboss-jca/trunk/web/src/main/resources/console/inspectmbean.jsp
Log:
Make sure that the release target clears all temporary files

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2011-03-02 18:02:23 UTC (rev 110817)
+++ projects/jboss-jca/trunk/build.xml	2011-03-02 18:56:56 UTC (rev 110818)
@@ -409,7 +409,7 @@
   <!-- ================================= 
        Target: release
        ================================= -->
-  <target name="release" depends="sjc">
+  <target name="release" depends="clean,sjc">
     <delete dir="${build.dir}"/>
 
     <mkdir dir="${build.dir}" />
@@ -417,6 +417,8 @@
     <mkdir dir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc" />
     <mkdir dir="${build.dir}/${name}-${major}.${minor}.${patch}.${type}/doc/spec" />
 
+    <ant dir="${doc.dir}/samples/helloworld" target="clean" inheritRefs="false" inheritAll="false"/>
+
     <ant dir="${doc.dir}/developerguide" target="pdf" inheritRefs="false" inheritAll="false"/>
     <ant dir="${doc.dir}/userguide" target="pdf" inheritRefs="false" inheritAll="false"/>
 
@@ -446,6 +448,7 @@
       </fileset>
     </chmod>
 
+    <delete dir="${build.dir}/docbook"/>
 
     <zip destfile="${name}-${major}.${minor}.${patch}.${type}.zip"
          basedir="${build.dir}"/>

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/build.xml
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/build.xml	2011-03-02 18:02:23 UTC (rev 110817)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/build.xml	2011-03-02 18:56:56 UTC (rev 110818)
@@ -22,7 +22,7 @@
  */
 -->
 
-<project name="jca-test" basedir="." default="rar">
+<project name="helloworld" basedir="." default="rar">
 
   <!-- ================================= 
        Properties              
@@ -173,8 +173,18 @@
        Target: clean              
        ================================= -->
   <target name="clean">
+    <delete>
+      <fileset dir="${basedir}" defaultexcludes="no">
+        <include name="**/*~"/>
+        <include name="**/*.bak"/>
+      </fileset>
+    </delete>
+    <delete includeemptydirs="true">
+      <fileset dir="${lib.dir}" includes="**/*"/>
+    </delete>
     <delete dir="${build.dir}"/>
     <delete dir="${target.dir}"/>
+    <delete dir="${basedir}/reports"/>
   </target>
 
 </project>

Modified: projects/jboss-jca/trunk/web/src/main/resources/console/displaymbeans.jsp
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/console/displaymbeans.jsp	2011-03-02 18:02:23 UTC (rev 110817)
+++ projects/jboss-jca/trunk/web/src/main/resources/console/displaymbeans.jsp	2011-03-02 18:56:56 UTC (rev 110818)
@@ -70,7 +70,7 @@
   <table width="100%" class="copyright">
     <tr>
       <td class="copyright">
-        Copyright &#169; 2010  <a href="http://www.jboss.org/jca" target="_blank">JBoss, by Red Hat</a>
+        Copyright &#169; 2010  <a href="http://www.jboss.org/ironjacamar" target="_blank">JBoss, by Red Hat</a>
       </td>
     </tr>
   </table>

Modified: projects/jboss-jca/trunk/web/src/main/resources/console/displayopresult.jsp
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/console/displayopresult.jsp	2011-03-02 18:02:23 UTC (rev 110817)
+++ projects/jboss-jca/trunk/web/src/main/resources/console/displayopresult.jsp	2011-03-02 18:56:56 UTC (rev 110818)
@@ -94,7 +94,7 @@
   <table width="100%" class="copyright">
     <tr>
       <td class="copyright">
-        Copyright &#169; 2010  <a href="http://www.jboss.org/jca" target="_blank">JBoss, by Red Hat</a>
+        Copyright &#169; 2010  <a href="http://www.jboss.org/ironjacamar" target="_blank">JBoss, by Red Hat</a>
       </td>
     </tr>
   </table>

Modified: projects/jboss-jca/trunk/web/src/main/resources/console/error.jsp
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/console/error.jsp	2011-03-02 18:02:23 UTC (rev 110817)
+++ projects/jboss-jca/trunk/web/src/main/resources/console/error.jsp	2011-03-02 18:56:56 UTC (rev 110818)
@@ -21,7 +21,7 @@
     <table width="100%" class="copyright">
       <tr>
         <td class="copyright">
-          Copyright &#169; 2010  <a href="http://www.jboss.org/jca" target="_blank">JBoss, by Red Hat</a>
+          Copyright &#169; 2010  <a href="http://www.jboss.org/ironjacamar" target="_blank">JBoss, by Red Hat</a>
         </td>
       </tr>
     </table>

Modified: projects/jboss-jca/trunk/web/src/main/resources/console/inspectmbean.jsp
===================================================================
--- projects/jboss-jca/trunk/web/src/main/resources/console/inspectmbean.jsp	2011-03-02 18:02:23 UTC (rev 110817)
+++ projects/jboss-jca/trunk/web/src/main/resources/console/inspectmbean.jsp	2011-03-02 18:56:56 UTC (rev 110818)
@@ -402,7 +402,7 @@
   <table width="100%" class="copyright">
     <tr>
       <td class="copyright">
-        Copyright &#169; 2010  <a href="http://www.jboss.org/jca" target="_blank">JBoss, by Red Hat</a>
+        Copyright &#169; 2010  <a href="http://www.jboss.org/ironjacamar" target="_blank">JBoss, by Red Hat</a>
       </td>
     </tr>
   </table>