You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by tv...@apache.org on 2007/07/01 18:26:41 UTC
svn commit: r552334 - in /db/torque: runtime/trunk/
runtime/trunk/src/java/org/apache/torque/manager/ site/trunk/xdocs/
Author: tv
Date: Sun Jul 1 09:26:41 2007
New Revision: 552334
URL: http://svn.apache.org/viewvc?view=rev&rev=552334
Log:
Upgraded JCS dependency to 1.3 and fixed related deprecation issues.
Modified:
db/torque/runtime/trunk/pom.xml
db/torque/runtime/trunk/project.xml
db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java
db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java
db/torque/site/trunk/xdocs/changes.xml
Modified: db/torque/runtime/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/pom.xml?view=diff&rev=552334&r1=552333&r2=552334
==============================================================================
--- db/torque/runtime/trunk/pom.xml (original)
+++ db/torque/runtime/trunk/pom.xml Sun Jul 1 09:26:41 2007
@@ -99,9 +99,9 @@
</dependency>
<dependency>
- <groupId>jcs</groupId>
+ <groupId>org.apache.jcs</groupId>
<artifactId>jcs</artifactId>
- <version>20030822.182132</version>
+ <version>1.3</version>
</dependency>
<!--dependency>
Modified: db/torque/runtime/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/project.xml?view=diff&rev=552334&r1=552333&r2=552334
==============================================================================
--- db/torque/runtime/trunk/project.xml (original)
+++ db/torque/runtime/trunk/project.xml Sun Jul 1 09:26:41 2007
@@ -17,213 +17,206 @@
specific language governing permissions and limitations
under the License.
-->
-
<project>
- <extend>common/project.xml</extend>
- <pomVersion>3</pomVersion>
- <id>torque</id>
- <name>Torque</name>
-
- <description>Torque is a persistence layer.</description>
- <shortDescription>Persistence Layer</shortDescription>
- <url>http://db.apache.org/torque/releases/torque-3.3/runtime/</url>
- <siteDirectory>/www/db.apache.org/torque/releases/torque-3.3/runtime/</siteDirectory>
-
- <repository>
- <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/runtime/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/runtime/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc</url>
- </repository>
-
- <dependencies>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <url>http://avalon.apache.org/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- <version>2.1</version>
- <type>jar</type>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>1.7.0</version>
- <url>http://jakarta.apache.org/commons/beanutils/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- <url>http://jakarta.apache.org/commons/collections/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.4</version>
- <url>http://jakarta.apache.org/commons/configuration/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- <url>http://jakarta.apache.org/commons/dbcp/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- <url>http://jakarta.apache.org/commons/lang/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.3</version>
- <url>http://jakarta.apache.org/commons/pool/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>jcs</groupId>
- <artifactId>jcs</artifactId>
- <version>20030822.182132</version>
- <url>http://jakarta.apache.org/jcs/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>jdbc</groupId>
- <artifactId>jdbc</artifactId>
- <version>2.0</version>
- <url>http://java.sun.com/products/jdbc/download.html#spec</url>
- </dependency>
-
- <dependency>
- <groupId>jndi</groupId>
- <artifactId>jndi</artifactId>
- <version>1.2.1</version>
- <url>http://java.sun.com/products/jndi/</url>
- </dependency>
-
- <dependency>
- <groupId>village</groupId>
- <artifactId>village</artifactId>
- <version>2.0</version>
- <url>http://www.softwareforge.de/projects/village</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
- <url>http://xerces.apache.org/xerces2-j/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
- <url>http://xml.apache.org/commons/</url>
- <properties>
- <dist.bundle>true</dist.bundle>
- </properties>
- </dependency>
-
- <!-- Needed only for testing -->
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.3</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <url>http://www.junit.org</url>
- </dependency>
- </dependencies>
-
- <build>
- <nagEmailAddress>torque-dev@db.apache.org</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <aspectSourceDirectory></aspectSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
- <excludes>
- <exclude>**/BaseTestCase.java</exclude>
- </excludes>
- </unitTest>
- <defaultGoal>jar:jar</defaultGoal>
- <resources/>
- </build>
-
+ <extend>common/project.xml</extend>
+ <pomVersion>3</pomVersion>
+ <artifactId>torque</artifactId>
+ <groupId>torque</groupId>
+ <id>torque</id>
+ <name>Torque</name>
+ <description>Torque is a persistence layer.</description>
+ <shortDescription>Persistence Layer</shortDescription>
+ <url>http://db.apache.org/torque/releases/torque-3.3/runtime/</url>
+ <siteDirectory>/www/db.apache.org/torque/releases/torque-3.3/runtime/</siteDirectory>
+ <repository>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/db/torque/runtime/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/db/torque/runtime/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc</url>
+ </repository>
+ <dependencies>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <type>jar</type>
+ <url>http://avalon.apache.org/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>2.1</version>
+ <type>jar</type>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/beanutils/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/collections/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.4</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/configuration/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/dbcp/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.3</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/lang/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.3</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/commons/pool/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jcs</groupId>
+ <artifactId>jcs</artifactId>
+ <version>1.3</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/jcs/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jdbc</groupId>
+ <artifactId>jdbc</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <url>http://java.sun.com/products/jdbc/download.html#spec</url>
+ </dependency>
+ <dependency>
+ <groupId>jndi</groupId>
+ <artifactId>jndi</artifactId>
+ <version>1.2.1</version>
+ <type>jar</type>
+ <url>http://java.sun.com/products/jndi/</url>
+ </dependency>
+ <dependency>
+ <groupId>village</groupId>
+ <artifactId>village</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <url>http://www.softwareforge.de/projects/village</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.6.2</version>
+ <type>jar</type>
+ <url>http://xerces.apache.org/xerces2-j/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ <type>jar</type>
+ <url>http://xml.apache.org/commons/</url>
+ <properties>
+ <dist.bundle>true</dist.bundle>
+ </properties>
+ </dependency>
+ <!-- Needed only for testing -->
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.4</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.3</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <type>jar</type>
+ <url>http://www.junit.org</url>
+ </dependency>
+ </dependencies>
+ <build>
+ <nagEmailAddress>torque-dev@db.apache.org</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/BaseTestCase.java</exclude>
+ </excludes>
+ </unitTest>
+ <defaultGoal>jar:jar</defaultGoal>
+ </build>
</project>
+
Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java?view=diff&rev=552334&r1=552333&r2=552334
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/AbstractBaseManager.java Sun Jul 1 09:26:41 2007
@@ -214,7 +214,7 @@
{
try
{
- cache.remove();
+ cache.clear();
}
catch (CacheException ce)
{
Modified: db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java?view=diff&rev=552334&r1=552333&r2=552334
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java (original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/manager/MethodResultCache.java Sun Jul 1 09:26:41 2007
@@ -73,7 +73,7 @@
{
try
{
- jcsCache.remove();
+ jcsCache.clear();
groups.clear();
}
catch (CacheException ce)
Modified: db/torque/site/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/changes.xml?view=diff&rev=552334&r1=552333&r2=552334
==============================================================================
--- db/torque/site/trunk/xdocs/changes.xml (original)
+++ db/torque/site/trunk/xdocs/changes.xml Sun Jul 1 09:26:41 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -31,6 +31,13 @@
<body>
<release version="3.3-RC3" date="in SVN">
+ <action type="update" dev="tv">
+ Updated JCS dependency to version 1.3 and fixed related deprecation
+ issues.
+ </action>
+ <action type="fix" dev="tv" issue="TORQUE-97" due-to="Markus Müller">
+ Avoid to call JDK 1.5 code when creating BigDecimals.
+ </action>
<action type="add" dev="tfischer" issue="TORQUE-89" due-to="Stefan Birrer">
OrderBy now accepts column names without a dot. No additional
processing is made for these.
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org