Author: wsmoak
Date: Mon Mar 27 18:43:25 2006
New Revision: 389368
URL: http://svn.apache.org/viewcvs?rev=389368&view=rev
Log:
Add source and target attributes to all <javac> tasks to target JDK 1.3.
Both example webapps now deploy properly in Tomcat 4.1.31 using JDK 1.4.2.
Bug: 38955
Reported By: Roland <roland at gisplan.com.br>
Added:
struts/faces/trunk/default.properties (with props)
Modified:
struts/faces/trunk/core-library/build.xml
struts/faces/trunk/example1-webapp/build.xml
struts/faces/trunk/example2-webapp/build.xml
struts/faces/trunk/sysclient-app/build.xml
struts/faces/trunk/systest1-webapp/build.xml
Modified: struts/faces/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/faces/trunk/core-library/build.xml?rev=389368&r1=389367&r2=389368&view=diff
==============================================================================
--- struts/faces/trunk/core-library/build.xml (original)
+++ struts/faces/trunk/core-library/build.xml Mon Mar 27 18:43:25 2006
@@ -29,6 +29,7 @@
<property file="build.properties"/>
<property file="../build.properties"/>
<property file="../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
@@ -186,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>
@@ -296,7 +299,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>
Added: struts/faces/trunk/default.properties
URL:
http://svn.apache.org/viewcvs/struts/faces/trunk/default.properties?rev=389368&view=auto
==============================================================================
--- struts/faces/trunk/default.properties (added)
+++ struts/faces/trunk/default.properties Mon Mar 27 18:43:25 2006
@@ -0,0 +1,25 @@
+# default.properties
+# -----------------------
+#
+#
==============================================================================
+# Copyright 2006 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
==============================================================================
+
+# Java platform version which source code must conform to
+platform.source=1.3
+
+# Java platform version which generated class files must conform to
+platform.target=1.3
+
Propchange: struts/faces/trunk/default.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/faces/trunk/example1-webapp/build.xml
URL:
http://svn.apache.org/viewcvs/struts/faces/trunk/example1-webapp/build.xml?rev=389368&r1=389367&r2=389368&view=diff
==============================================================================
--- struts/faces/trunk/example1-webapp/build.xml (original)
+++ struts/faces/trunk/example1-webapp/build.xml Mon Mar 27 18:43:25 2006
@@ -29,6 +29,7 @@
<property file="build.properties"/>
<property file="../build.properties"/>
<property file="../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
@@ -272,7 +273,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>
Modified: struts/faces/trunk/example2-webapp/build.xml
URL:
http://svn.apache.org/viewcvs/struts/faces/trunk/example2-webapp/build.xml?rev=389368&r1=389367&r2=389368&view=diff
==============================================================================
--- struts/faces/trunk/example2-webapp/build.xml (original)
+++ struts/faces/trunk/example2-webapp/build.xml Mon Mar 27 18:43:25 2006
@@ -29,6 +29,7 @@
<property file="build.properties"/>
<property file="../build.properties"/>
<property file="../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
@@ -252,7 +253,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>
Modified: struts/faces/trunk/sysclient-app/build.xml
URL:
http://svn.apache.org/viewcvs/struts/faces/trunk/sysclient-app/build.xml?rev=389368&r1=389367&r2=389368&view=diff
==============================================================================
--- struts/faces/trunk/sysclient-app/build.xml (original)
+++ struts/faces/trunk/sysclient-app/build.xml Mon Mar 27 18:43:25 2006
@@ -27,6 +27,7 @@
<property file="build.properties"/>
<property file="../../build.properties"/>
<property file="../../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
@@ -156,7 +157,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="sysclient.classpath"/>
</javac>
Modified: struts/faces/trunk/systest1-webapp/build.xml
URL:
http://svn.apache.org/viewcvs/struts/faces/trunk/systest1-webapp/build.xml?rev=389368&r1=389367&r2=389368&view=diff
==============================================================================
--- struts/faces/trunk/systest1-webapp/build.xml (original)
+++ struts/faces/trunk/systest1-webapp/build.xml Mon Mar 27 18:43:25 2006
@@ -29,6 +29,7 @@
<property file="build.properties"/>
<property file="../build.properties"/>
<property file="../../build.properties"/>
+ <property file="../default.properties"/>
<property file="${user.home}/build.properties"/>
@@ -272,7 +273,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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
