svn commit: r1128049 - in /ofbiz/trunk: build.xml common.xml macros.xml

[mrisaliti]

Author: mrisaliti
Date: Thu May 26 19:18:36 2011
New Revision: 1128049

URL: http://svn.apache.org/viewvc?rev=1128049&view=rev
Log:
Made working correctly ant build target docs and docs-all for javadoc documentation

Modified:
    ofbiz/trunk/build.xml
    ofbiz/trunk/common.xml
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1128049&r1=1128048&r2=1128049&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Thu May 26 19:18:36 2011
@@ -251,19 +251,36 @@ under the License.
         <echo message="[docs-all] ========== Start Building (JavaDoc) =========="/>
 
         <mkdir dir="${site.dir}/javadocs"/>
-        <default-javadoc packagenames="org.ofbiz.*"
-                destdir="${site.dir}/javadocs"
-                maxmemory="256M"
-                windowtitle="Open for Business - API"
-                useexternalfile="yes">
-            <fileset dir="${basedir}" defaultexcludes="yes">
-                <include name="**/*.java"/>
-                <exclude name="**/ControlApplet.java"/>
-                <exclude name="**/ShipmentScaleApplet.java"/>
-                <exclude name="**/test/"/>
-            </fileset>
-        </default-javadoc>
-
+        
+        <path id="local.class.path">
+          <fileset dir="${ofbiz.home.dir}/framework/base/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/base/lib/commons" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/base/lib/j2eespecs" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/birt/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/catalina/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/entity/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/geronimo/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/guiapp/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/jetty/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/service/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/testtools/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/webapp/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/webapp/build/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/framework/webslinger/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/specialpurpose/ebaystore/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/specialpurpose/googlecheckout/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/specialpurpose/ldap/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/specialpurpose/pos/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/applications/content/lib" includes="*.jar"/>
+          <fileset dir="${ofbiz.home.dir}/applications/product/lib" includes="*.jar"/>
+        </path>
+        
+        <property name="desc" value="API"/>
+        <property name="build.dir" value="${site.dir}"/>
+        
+        <default-javadoc/>
+        
         <echo message="[docs-all] ========== Done Building (JavaDocs) =========="/>
    </target>
 

Modified: ofbiz/trunk/common.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.xml?rev=1128049&r1=1128048&r2=1128049&view=diff
==============================================================================
--- ofbiz/trunk/common.xml (original)
+++ ofbiz/trunk/common.xml Thu May 26 19:18:36 2011
@@ -100,12 +100,7 @@ under the License.
     <!-- ================================================================== -->
 
     <target name="docs" depends="prepare-docs">
-        <default-javadoc sourcepathref="src-path">
-            <fileset dir="${src.dir}">
-                <patternset refid="src.inc.set"/>
-                <patternset refid="src.exc.set"/>
-            </fileset>
-        </default-javadoc>
+        <default-javadoc/>
     </target>
 
     <macrodef name="run-junit">

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1128049&r1=1128048&r2=1128049&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Thu May 26 19:18:36 2011
@@ -63,7 +63,6 @@ under the License.
   <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
  </path>
  <path id="local.class.path"/>
-
  <presetdef name="default-javac">
   <javac debug="on" deprecation="on" destdir="${build.dir}/classes" srcdir="${src.dir}" classpathref="local.class.path">
    <patternset refid="src.inc.set"/>
@@ -78,11 +77,42 @@ under the License.
  </presetdef>
 
  <presetdef name="default-javadoc">
-  <javadoc classpathref="local.class.path"
-           destdir="${build.dir}/javadocs"
-           Windowtitle="Open for Business - ${desc}">
-   <link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/>
-  </javadoc>
+    <javadoc classpathref="local.class.path"
+             destdir="${build.dir}/javadocs"
+             windowtitle="Open for Business - ${desc}"
+             useexternalfile="yes"
+             maxmemory="256M"
+             encoding="UTF-8"
+             packagenames="org.ofbiz.*">
+      <fileset dir="${basedir}" defaultexcludes="yes">
+        <include name="**/*.java"/>
+        <exclude name="**/ControlApplet.java"/>
+        <exclude name="**/ShipmentScaleApplet.java"/>
+        <exclude name="**/test/"/>
+        <exclude name="**/cybersource/"/>
+        <exclude name="**/PayPalServices.java"/>
+        <exclude name="**/ideal/"/>
+        <exclude name="**/orbital/"/>
+        <exclude name="**/securepay/"/>
+        <exclude name="**/verisign/"/>
+        <exclude name="**/JREntityListIteratorDataSource.java"/>
+        <exclude name="**/JRMapCollectionDataSource.java"/>
+        <exclude name="**/openoffice/"/>
+        <exclude name="**/XaPoolConnectionFactory.java"/>
+        <exclude name="**/JasperReportsPdfViewHandler.java"/>
+        <exclude name="**/JasperReportsXmlViewHandler.java"/>
+        <exclude name="**/JasperReportsJXlsViewHandler.java"/>
+        <exclude name="**/JasperReportsPoiXlsViewHandler.java"/>
+        <exclude name="**/GenericViewRenderer.java"/>
+        <exclude name="**/JPublishViewHandler.java"/>
+        <exclude name="**/JPublishWrapper.java"/>
+        <exclude name="**/FopPdfViewHandler.java"/>
+        <exclude name="**/FreeMarkerViewRenderer.java"/>
+        <exclude name="**/JpCacheIncludeTransform.java"/>            
+        <exclude name="**/shark/"/>
+      </fileset>
+      <link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/>
+    </javadoc>
  </presetdef>
 
  <macrodef name="main-jar">