You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2005/07/30 06:27:32 UTC
svn commit: r226472 - in /struts/shale/trunk: clay-plugin/build.xml
core-library/build.xml default.properties test-framework/build.xml
use-cases/build.xml
Author: craigmcc
Date: Fri Jul 29 21:27:27 2005
New Revision: 226472
URL: http://svn.apache.org/viewcvs?rev=226472&view=rev
Log:
Add platform source and target properties (defaulting to 1.4 in both cases)
on all <javac> tasks. This allows developers to use JDK 5 locally without
compromising 1.4 compatibility of the Shale artifacts being built.
Modified:
struts/shale/trunk/clay-plugin/build.xml
struts/shale/trunk/core-library/build.xml
struts/shale/trunk/default.properties
struts/shale/trunk/test-framework/build.xml
struts/shale/trunk/use-cases/build.xml
Modified: struts/shale/trunk/clay-plugin/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/build.xml?rev=226472&r1=226471&r2=226472&view=diff
==============================================================================
--- struts/shale/trunk/clay-plugin/build.xml (original)
+++ struts/shale/trunk/clay-plugin/build.xml Fri Jul 29 21:27:27 2005
@@ -32,6 +32,11 @@
<property file="${user.home}/build.properties"/>
+ <!-- Platform defaults -->
+ <property name="platform.source" value="1.4"/>
+ <property name="platsform.target" value="1.4"/>
+
+
<!-- Dependency home directory defaults -->
<property name="jsf.home" value="E:/usr/local/jsf-1_1_01"/>
<property name="jstl.home" value="E:/usr/local/standard-1.0.3"/>
@@ -189,7 +194,9 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="compile.classpath" />
</javac>
@@ -280,7 +287,9 @@
destdir="${build.home}/test-classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="test.classpath" />
</javac>
Modified: struts/shale/trunk/core-library/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=226472&r1=226471&r2=226472&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Fri Jul 29 21:27:27 2005
@@ -32,6 +32,10 @@
<property file="${user.home}/build.properties"/>
+ <!-- Platform defaults -->
+ <property name="platform.source" value="1.4"/>
+ <property name="platsform.target" value="1.4"/>
+
<!-- Dependency home directory defaults -->
<property name="shale-test.home" value="${basedir}/../test-framework/dist"/>
@@ -259,7 +263,9 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="compile.classpath" />
<exclude name="org/apache/shale/spring/**"
unless="spring.present"/>
@@ -428,7 +434,9 @@
destdir="${build.home}/test-classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="test.classpath" />
</javac>
Modified: struts/shale/trunk/default.properties
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/default.properties?rev=226472&r1=226471&r2=226472&view=diff
==============================================================================
--- struts/shale/trunk/default.properties (original)
+++ struts/shale/trunk/default.properties Fri Jul 29 21:27:27 2005
@@ -51,6 +51,12 @@
# Directory (relative to Shale home) containing downloaded dependencies
lib.dir=lib
+# Java platform version which source code must conform to
+platform.source=1.4
+
+# Java platform version which generated class files must conform to
+platform.target=1.4
+
# State for the "halt on error" attribute for JUnit tests
test.haltonerror=true
Modified: struts/shale/trunk/test-framework/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/build.xml?rev=226472&r1=226471&r2=226472&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/build.xml (original)
+++ struts/shale/trunk/test-framework/build.xml Fri Jul 29 21:27:27 2005
@@ -32,6 +32,11 @@
<property file="${user.home}/build.properties"/>
+ <!-- Platform defaults -->
+ <property name="platform.source" value="1.4"/>
+ <property name="platsform.target" value="1.4"/>
+
+
<!-- Dependency home directory defaults -->
<property name="jsf.home" value="/usr/local/jsf-1_1_01"/>
<property name="jstl.home" value="/usr/local/standard-1.0.3"/>
@@ -182,7 +187,9 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="compile.classpath" />
</javac>
@@ -272,7 +279,9 @@
destdir="${build.home}/test-classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="test.classpath" />
</javac>
Modified: struts/shale/trunk/use-cases/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=226472&r1=226471&r2=226472&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Fri Jul 29 21:27:27 2005
@@ -32,6 +32,12 @@
<property file="../../../build.properties"/>
<property file="${user.home}/build.properties"/>
+
+ <!-- Platform defaults -->
+ <property name="platform.source" value="1.4"/>
+ <property name="platsform.target" value="1.4"/>
+
+
<!-- Dependency home directory defaults -->
<property name="chain.home" value="/usr/local/commons-chain-1.0"/>
<property name="htmlunit.home" value="/usr/local/htmlunit-1.6"/>
@@ -340,7 +346,9 @@
destdir="${build.home}/${context.path}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="compile.classpath" />
</javac>
@@ -466,7 +474,9 @@
destdir="${build.home}/test-classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="test.classpath" />
</javac>
@@ -514,7 +524,9 @@
destdir="${build.home}/systest-classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ source="${platform.source}"
+ target="${platform.target}">
<classpath refid="systest.classpath" />
</javac>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org