Author: painter
Date: Wed Oct 10 14:39:44 2018
New Revision: 1843457
URL: http://svn.apache.org/viewvc?rev=1843457&view=rev
Log:
Cleaning up poms, adding dependencies that get us closer to torque-4.1 but
security-torque tests are still breaking when trying to upgrade hsqldb > 2.0
which is required for torque-4.1 integration. All changes work fine in
torque-4.0 and clean build
Modified:
turbine/fulcrum/trunk/security/dist/pom.xml
turbine/fulcrum/trunk/security/hibernate/pom.xml
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
Modified: turbine/fulcrum/trunk/security/dist/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/dist/pom.xml?rev=1843457&r1=1843456&r2=1843457&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/dist/pom.xml (original)
+++ turbine/fulcrum/trunk/security/dist/pom.xml Wed Oct 10 14:39:44 2018
@@ -26,7 +26,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fulcrum-security-dist</artifactId>
- <version>1.1.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Fulcrum Security Distribution Build</name>
Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1843457&r1=1843456&r2=1843457&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Wed Oct 10 14:39:44 2018
@@ -26,7 +26,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fulcrum-security-hibernate</artifactId>
- <version>1.1.3-SNAPSHOT</version>
<name>Fulcrum Security Hibernate Impl</name>
<description>
Fulcrum Security Hibernate Impl is an implementation of the Fulcrum
Security API
@@ -68,8 +67,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
- <version>1.1.3-SNAPSHOT</version>
- </dependency>
+ </dependency>
<!-- Needed for the Hibernate SPI -->
<dependency>
@@ -110,13 +108,11 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1843457&r1=1843456&r2=1843457&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Wed Oct 10 14:39:44 2018
@@ -24,7 +24,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fulcrum-security-memory</artifactId>
- <version>1.1.3-SNAPSHOT</version>
<name>Fulcrum Security Memory Impl</name>
<description>
Fulcrum Security Memory Impl is an implementation of the Fulcrum
Security API
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1843457&r1=1843456&r2=1843457&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Wed Oct 10 14:39:44 2018
@@ -20,7 +20,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>fulcrum-security-torque</artifactId>
- <version>1.1.3-SNAPSHOT</version>
<name>Fulcrum Security Torque Impl</name>
<description>
Fulcrum Security Torque Impl is an implementation of the Fulcrum Security
API
@@ -72,12 +71,24 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+
<!-- testing dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -88,13 +99,11 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/Torque.properties?rev=1843457&r1=1843456&r2=1843457&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/Torque.properties (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/Torque.properties Wed Oct 10
14:39:44 2018
@@ -21,18 +21,20 @@
# $Id: Torque.properties 279964 2005-09-10 07:07:23Z tfischer $
#
+
torque.database.default = fulcrum
torque.database.fulcrum.adapter = hsqldb
# Using commons-dbcp
torque.dsfactory.fulcrum.factory =
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
torque.dsfactory.fulcrum.connection.driver = org.hsqldb.jdbcDriver
-torque.dsfactory.fulcrum.connection.url = jdbc:hsqldb:.
+torque.dsfactory.fulcrum.connection.url =jdbc:hsqldb:.
torque.dsfactory.fulcrum.connection.user = sa
-torque.dsfactory.fulcrum.connection.password =
-# torque.dsfactory.fulcrum.pool.validationQuery = SELECT 1
+torque.dsfactory.fulcrum.connection.password =
+
+torque.dsfactory.fulcrum.pool.validationQuery = CALL NOW
+torque.dsfactory.fulcrum.pool.defaultAutoCommit = false
# Determines whether the managers cache instances of the business objects.
# And also whether the MethodResultCache will really cache results.
-
torque.manager.useCache = true
