OFBiz › OFBiz - Commits

svn commit: r709627 - in /ofbiz/trunk: applications/content/build.xml framework/entity/build.xml framework/webapp/build.xml macros.xml specialpurpose/shark/build.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

doogie-3

svn commit: r709627 - in /ofbiz/trunk: applications/content/build.xml framework/entity/build.xml framework/webapp/build.xml macros.xml specialpurpose/shark/build.xml

Author: doogie
Date: Fri Oct 31 20:06:17 2008
New Revision: 709627

URL: http://svn.apache.org/viewvc?rev=709627&view=rev
Log:
Use pattern sets in <javac/>, to include/exclude files, and modify
all build.xml to override the sets, if nescessary.

Modified:
ofbiz/trunk/applications/content/build.xml
ofbiz/trunk/framework/entity/build.xml
ofbiz/trunk/framework/webapp/build.xml
ofbiz/trunk/macros.xml
ofbiz/trunk/specialpurpose/shark/build.xml

Modified: ofbiz/trunk/applications/content/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/build.xml?rev=709627&r1=709626&r2=709627&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/build.xml (original)
+++ ofbiz/trunk/applications/content/build.xml Fri Oct 31 20:06:17 2008
@@ -48,16 +48,18 @@
<fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
</path>

+ <patternset id="src.exc.set">
+ <exclude name="org/ofbiz/content/report/JREntityListIteratorDataSource.java"/>
+ <exclude name="org/ofbiz/content/report/JRMapCollectionDataSource.java"/>
+ <exclude name="org/ofbiz/content/openoffice/*.java"/>
+ </patternset>
+




<target name="classes" depends="prepare">
- <javac15>
- <exclude name="org/ofbiz/content/report/JREntityListIteratorDataSource.java"/>
- <exclude name="org/ofbiz/content/report/JRMapCollectionDataSource.java"/>
- <exclude name="org/ofbiz/content/openoffice/*.java"/>
- </javac15>
+ <javac15/>
</target>



Modified: ofbiz/trunk/framework/entity/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/build.xml?rev=709627&r1=709626&r2=709627&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/build.xml (original)
+++ ofbiz/trunk/framework/entity/build.xml Fri Oct 31 20:06:17 2008
@@ -39,15 +39,17 @@
<fileset dir="../base/build/lib" includes="*.jar"/>
</path>

+ <patternset id="src.exc.set">
+ <exclude name="org/ofbiz/entity/connection/XaPoolConnectionFactory.java"/>
+ <exclude name="org/ofbiz/entity/connection/TyrexConnectionFactory.java"/>
+ </patternset>
+




<target name="classes" depends="prepare">
- <javac15>
- <exclude name="org/ofbiz/entity/connection/XaPoolConnectionFactory.java"/>
- <exclude name="org/ofbiz/entity/connection/TyrexConnectionFactory.java"/>
- </javac15>
+ <javac15/>
</target>



Modified: ofbiz/trunk/framework/webapp/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/build.xml?rev=709627&r1=709626&r2=709627&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/build.xml (original)
+++ ofbiz/trunk/framework/webapp/build.xml Fri Oct 31 20:06:17 2008
@@ -46,25 +46,27 @@
<fileset dir="../common/build/lib" includes="*.jar"/>
</path>

+ <patternset id="src.exc.set">
+ 
+ <exclude name="org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java"/>
+ 
+ <exclude name="org/ofbiz/webapp/view/GenericViewRenderer.java"/>
+ <exclude name="org/ofbiz/webapp/view/JPublishViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/view/JPublishWrapper.java"/>
+ <exclude name="org/ofbiz/webapp/view/FopPdfViewHandler.java"/>
+ <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java"/>
+ <exclude name="org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java"/>
+ </patternset>
+




<target name="classes" depends="prepare">
- <javac15>
- 
- <exclude name="org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java"/>
- <exclude name="org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java"/>
- <exclude name="org/ofbiz/webapp/view/JasperReportsJXlsViewHandler.java"/>
- <exclude name="org/ofbiz/webapp/view/JasperReportsPoiXlsViewHandler.java"/>
- 
- <exclude name="org/ofbiz/webapp/view/GenericViewRenderer.java"/>
- <exclude name="org/ofbiz/webapp/view/JPublishViewHandler.java"/>
- <exclude name="org/ofbiz/webapp/view/JPublishWrapper.java"/>
- <exclude name="org/ofbiz/webapp/view/FopPdfViewHandler.java"/>
- <exclude name="org/ofbiz/webapp/ftl/FreeMarkerViewRenderer.java"/>
- <exclude name="org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java"/>
- </javac15>
+ <javac15/>
</target>



Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=709627&r1=709626&r2=709627&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Fri Oct 31 20:06:17 2008
@@ -31,6 +31,10 @@
</macrodef>

<path id="src-path"/>
+ <patternset id="src.inc.set">
+ <include name="**/*.java"/>
+ </patternset>
+ <patternset id="src.exc.set"/>

<path id="groovy.class.path">
<fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting/" includes="*.jar"/>
@@ -42,7 +46,10 @@
<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"/>
+ <javac debug="on" deprecation="on" destdir="${build.dir}/classes" srcdir="${src.dir}" classpathref="local.class.path">
+ <patternset refid="src.inc.set"/>
+ <patternset refid="src.exc.set"/>
+ </javac>
</presetdef>

<presetdef name="javac14">

Modified: ofbiz/trunk/specialpurpose/shark/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/build.xml?rev=709627&r1=709626&r2=709627&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/build.xml (original)
+++ ofbiz/trunk/specialpurpose/shark/build.xml Fri Oct 31 20:06:17 2008
@@ -44,6 +44,10 @@
<fileset dir="../common/build/lib" includes="*.jar"/>
</path>

+ <patternset id="src.exc.set">
+ <exclude name="org/ofbiz/shark/SharkGuiContainer.java"/>
+ </patternset>
+



@@ -51,7 +55,6 @@
<target name="classes" depends="prepare">
<javac15>
<src path="${src.dir}"/>
- <exclude name="org/ofbiz/shark/SharkGuiContainer.java"/>
</javac15>
</target>