Author: henning
Date: Mon Sep 12 00:57:42 2005
New Revision: 280284
URL: http://svn.apache.org/viewcvs?rev=280284&view=rev
Log:
JDK 1.3.1 compatibility fixes. While JDK 1.3.1 will start EOL process
pretty soon, it just took a few simple changes to make the Turbine
source code still compile under JDK 1.3.1.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DataStreamParser.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml?rev=280284&r1=280283&r2=280284&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml Mon Sep 12
00:57:42 2005
@@ -749,10 +749,12 @@
<url>http://jakarta.apache.org/commons/dbcp/</url>
<type>jar</type>
</dependency>
+ <!-- Don't move to newer versions!
+ Versions beyond 1.7.1 from ibiblio no longer support JDK 1.3.1 -->
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.7.3.3</version>
+ <version>1.7.1</version>
<url>http://hsqldb.sourceforge.net/</url>
<type>jar</type>
</dependency>
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java?rev=280284&r1=280283&r2=280284&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
Mon Sep 12 00:57:42 2005
@@ -300,7 +300,8 @@
}
if (value.isBoolean())
{
- obj2 = Boolean.valueOf(value.asBoolean());
+ // JDK 1.3 has no Boolean.valueOf(boolean)
+ obj2 = new Boolean(value.asBoolean());
}
if (value.isString())
{
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java?rev=280284&r1=280283&r2=280284&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java
Mon Sep 12 00:57:42 2005
@@ -67,7 +67,8 @@
{
if (method.equals("send"))
{
- obj = Boolean.valueOf(this.send((String) params.elementAt(0),
+ // JDK 1.3 has no Boolean.valueOf(boolean)
+ obj = new Boolean(this.send((String) params.elementAt(0),
(String) params.elementAt(1),
(String) params.elementAt(2)));
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java?rev=280284&r1=280283&r2=280284&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/BaseValueParser.java
Mon Sep 12 00:57:42 2005
@@ -466,7 +466,8 @@
*/
public Boolean getBool(String name, boolean defaultValue)
{
- return getBooleanObject(name, Boolean.valueOf(defaultValue));
+ // JDK 1.3 has no Boolean.valueOf(boolean)
+ return getBooleanObject(name, new Boolean(defaultValue));
}
/**
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DataStreamParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DataStreamParser.java?rev=280284&r1=280283&r2=280284&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DataStreamParser.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/parser/DataStreamParser.java
Mon Sep 12 00:57:42 2005
@@ -28,6 +28,8 @@
import java.util.List;
import java.util.NoSuchElementException;
+import org.apache.commons.lang.exception.NestableRuntimeException;
+
/**
* DataStreamParser is used to parse a stream with a fixed format and
* generate ValueParser objects which can be used to extract the values
@@ -343,7 +345,7 @@
}
catch (IOException e)
{
- throw new RuntimeException(e);
+ throw new NestableRuntimeException(e);
}
return hasNext;
@@ -367,7 +369,7 @@
}
catch (IOException e)
{
- throw new RuntimeException(e);
+ throw new NestableRuntimeException(e);
}
return nextRow;
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml?rev=280284&r1=280283&r2=280284&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
(original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml Mon Sep
12 00:57:42 2005
@@ -25,6 +25,9 @@
<body>
<release version="2.3.2-rc2" date="in Subversion">
+ <action type="update" dev="henning">
+ Make sure that the source can still be compiled and tested under JDK
1.3.1.
+ </action>
</release>
<release version="2.3.2-rc1" date="2005-09-11">
<action type="fix" dev="henning" issue="TTWS67" due-to="Paul Witherow">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
