Author: tv
Date: Wed May 2 03:40:04 2007
New Revision: 534381
URL: http://svn.apache.org/viewvc?view=rev&rev=534381
Log:
First step of updating the Torque dependency: 3.2
It obviously needs to be done in steps...
Removed:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineComponentService.properties
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/Log4j.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TorqueTest.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.properties
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/GroupPeer.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
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/om/security/peer/UserGroupRolePeer.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/id-table-schema.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/scheduler-schema.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/torque-security-schema.xml
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/TorqueLoadTest.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/TurbineResources.properties
Wed May 2 03:40:04 2007
@@ -330,9 +330,8 @@
# will be initialized. Keep this is mind if you have services
# that depend on other services during initialization.
# -------------------------------------------------------------------
-#
services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
+services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
-services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
@@ -1139,57 +1138,6 @@
#
url.case.folding=lower
-
-# -------------------------------------------------------------------
-#
-# C O M P O N E N T S E R V I C E
-#
-# -------------------------------------------------------------------
-# Components implementing the lifecycle interfaces can be loaded,
-# configured and initialized by Turbine
-# -------------------------------------------------------------------
-# THE COMPOINENTSERVICE IS DEPRECATED!!!!
-# You should use the AvalonComponentService instead!
-# -------------------------------------------------------------------
-
-#
-# Here you define the names of the various components to load. These
-# names are used as identifiers later so you can choose them freely. It
-# is, however, sensible to use the same names as the component projects
-# that you want to load.
-#
-services.ComponentService.name = torque
-
-#
-# This is the class of the component to be loaded.
-#
-# It must implement the org.apache.stratum.lifecycle.Initializable and
-# org.apache.stratum.lifecycle.Configurable interface to be loaded.
-#
-# It may implement the org.apache.stratum.lifecycle.Disposable interface.
-# If it does, the Component is disposed at shutdown (Servlet destroy()) time.
-#
-services.ComponentService.torque.classname = org.apache.torque.Torque
-
-#
-# This is the path to the Config file of the Component. It is relative
-# to the Root of the Application (either the Webroot given by the Servlet
-# Container or the Root given to TurbineConfig at startup time)
-#
-services.ComponentService.torque.config = /WEB-INF/conf/Torque.properties
-
-#
-# Properties can be given directly to Components. This sets the "foo"
-# property for torque to "bar".
-#
-# services.ComponentService.torque.property.foo = bar
-
-#
-# This is an example of how to load Fulcrum as a component
-#
-# services.ComponentService.name = fulcrum
-# services.ComponentService.fulcrum.classname = org.apache.fulcrum.Fulcrum
-# services.ComponentService.fulcrum.config = /WEB-INF/conf/Fulcrum.properties
# -------------------------------------------------------------------
#
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/Log4j.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/Log4j.properties?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/Log4j.properties
(original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/Log4j.properties
Wed May 2 03:40:04 2007
@@ -20,7 +20,7 @@
#
# ------------------------------------------------------------------------
-log4j.rootLogger = FATAL, log
+log4j.rootLogger = DEBUG, log
log4j.appender.log = org.apache.log4j.ConsoleAppender
log4j.appender.log.target = System.out
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TorqueTest.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TorqueTest.properties?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TorqueTest.properties
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TorqueTest.properties
Wed May 2 03:40:04 2007
@@ -26,23 +26,16 @@
# torque.defaults.pool.testOnBorrow=true
# torque.defaults.pool.validationQuery=SELECT 1
-torque.defaults.connection.user = sa
-torque.defaults.connection.password =
+torque.database.default = test
torque.idbroker.cleverquantity=true
torque.idbroker.prefetch=true
torque.idbroker.usenewconnection=true
-torque.database.default.adapter = hypersonic
-
-torque.dsfactory.default.factory =
org.apache.torque.dsfactory.TorqueDataSourceFactory
-torque.dsfactory.default.pool.defaultMaxConnections = 10
-torque.dsfactory.default.pool.maxExpiryTime = 3600
-torque.dsfactory.default.pool.connectionWaitTimeout = 10
-torque.dsfactory.default.connection.driver = org.hsqldb.jdbcDriver
-torque.dsfactory.default.connection.url = jdbc:hsqldb:.
-
-
-# torque.dsfactory.default.factory=
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-
+torque.database.test.adapter = hypersonic
+torque.dsfactory.test.factory =
org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.test.connection.driver = org.hsqldb.jdbcDriver
+torque.dsfactory.test.connection.url = jdbc:hsqldb:.
+torque.dsfactory.test.connection.user = sa
+torque.dsfactory.test.connection.password =
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResources.properties
Wed May 2 03:40:04 2007
@@ -276,7 +276,6 @@
# -------------------------------------------------------------------
services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
-#
services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/conf/test/TurbineResourcesWithIntake.properties
Wed May 2 03:40:04 2007
@@ -276,7 +276,6 @@
# -------------------------------------------------------------------
services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
-#
services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.properties?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.properties
(original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.properties Wed May
2 03:40:04 2007
@@ -64,7 +64,8 @@
maven.checkstyle.header.file = conf/checkstyle-license.txt
# Changes Plugin
-maven.changes.issue.template =
http://issues.apache.org/scarab/issues/id/%ISSUE%
+maven.changes.issue.template = http://issues.apache.org/jira/browse/%ISSUE%
+maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
# No ideology without asking
maven.xdoc.developmentProcessUrl=
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml Wed May 2
03:40:04 2007
@@ -660,20 +660,20 @@
</properties>
</dependency>
<dependency>
- <groupId>stratum</groupId>
- <artifactId>stratum</artifactId>
- <version>1.0</version>
- <url>http://jakarta.apache.org/turbine/stratum/</url>
+ <groupId>torque</groupId>
+ <artifactId>torque</artifactId>
+ <version>3.2</version>
+ <url>http://db.apache.org/torque/</url>
<type>jar</type>
<properties>
<dist.bundle>true</dist.bundle>
</properties>
</dependency>
<dependency>
- <groupId>torque</groupId>
- <artifactId>torque</artifactId>
- <version>3.1.1</version>
- <url>http://db.apache.org/torque/</url>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ <url>http://jakarta.apache.org/velocity/</url>
<type>jar</type>
<properties>
<dist.bundle>true</dist.bundle>
@@ -681,8 +681,8 @@
</dependency>
<dependency>
<groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
+ <artifactId>texen</artifactId>
+ <version>1.0</version>
<url>http://jakarta.apache.org/velocity/</url>
<type>jar</type>
<properties>
@@ -824,7 +824,7 @@
<dependency>
<groupId>torque</groupId>
<artifactId>maven-torque-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.2</version>
<type>plugin</type>
</dependency>
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
Wed May 2 03:40:04 2007
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import com.workingdogs.village.Record;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.NumberKey;
@@ -34,6 +34,8 @@
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.GroupSet;
+import com.workingdogs.village.Record;
+
/**
* This class handles all the database access for the Group table.
* This table contains all the Groups that a given member can play.
@@ -50,21 +52,38 @@
private static final long serialVersionUID = 2902002237040953323L;
/** The map builder for this Peer. */
- private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
- getMapBuilder(TurbineMapBuilder.class.getName());
+ private static final TurbineMapBuilder MAP_BUILDER;
/** The table name for this peer. */
- private static final String TABLE_NAME = MAP_BUILDER.getTableGroup();
+ private static final String TABLE_NAME;
/** The column name for the Group id field. */
- public static final String GROUP_ID = MAP_BUILDER.getGroup_GroupId();
+ public static final String GROUP_ID;
/** The column name for the name field. */
- public static final String NAME = MAP_BUILDER.getGroup_Name();
+ public static final String NAME;
/** The column name for the ObjectData field */
- public static final String OBJECTDATA = MAP_BUILDER.getGroup_ObjectData();
+ public static final String OBJECTDATA;
+ static
+ {
+ try
+ {
+ MAP_BUILDER = (TurbineMapBuilder)/* Torque.
*/getMapBuilder(TurbineMapBuilder.class.getName());
+ }
+ catch (TorqueException e)
+ {
+ log.error("Could not initialize Peer", e);
+ throw new RuntimeException(e);
+ }
+
+ TABLE_NAME = MAP_BUILDER.getTableGroup();
+ GROUP_ID = MAP_BUILDER.getGroup_GroupId();
+ NAME = MAP_BUILDER.getGroup_Name();
+ OBJECTDATA = MAP_BUILDER.getGroup_ObjectData();
+ }
+
/**
* Retrieves/assembles a GroupSet of all of the Groups.
*
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
Wed May 2 03:40:04 2007
@@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;
import java.util.Vector;
+
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.NumberKey;
@@ -35,6 +36,7 @@
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.PermissionSet;
+
import com.workingdogs.village.Record;
/**
@@ -52,24 +54,39 @@
/** Serial Version UID */
private static final long serialVersionUID = 2762005892291909743L;
- /** The map builder for this Peer. */
- private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
- getMapBuilder(TurbineMapBuilder.class.getName());
+ /** The map builder for this Peer. */
+ private static final TurbineMapBuilder MAP_BUILDER;
/** The table name for this peer. */
- private static final String TABLE_NAME = MAP_BUILDER.getTablePermission();
+ private static final String TABLE_NAME;
/** The column name for the permission id field. */
- public static final String PERMISSION_ID
- = MAP_BUILDER.getPermission_PermissionId();
-
- /** The column name for the name field. */
- public static final String NAME = MAP_BUILDER.getPermission_Name();
+ public static final String PERMISSION_ID;
/** The column name for the ObjectData field */
- public static final String OBJECTDATA
- = MAP_BUILDER.getPermission_ObjectData();
+ public static final String OBJECTDATA;
+
+ /** The column name for the name field. */
+ public static final String NAME;
+ static
+ {
+ try
+ {
+ MAP_BUILDER = (TurbineMapBuilder)/* Torque.
*/getMapBuilder(TurbineMapBuilder.class.getName());
+ }
+ catch (TorqueException e)
+ {
+ log.error("Could not initialize Peer", e);
+ throw new RuntimeException(e);
+ }
+
+ TABLE_NAME = MAP_BUILDER.getTablePermission();
+ PERMISSION_ID = MAP_BUILDER.getPermission_PermissionId();
+ NAME = MAP_BUILDER.getPermission_Name();
+ OBJECTDATA = MAP_BUILDER.getPermission_ObjectData();
+ }
+
/**
* Retrieves/assembles a PermissionSet
*
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePeer.java
Wed May 2 03:40:04 2007
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
import org.apache.torque.TorqueException;
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.NumberKey;
@@ -33,6 +34,7 @@
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.RoleSet;
+
import com.workingdogs.village.Record;
@@ -51,21 +53,38 @@
private static final long serialVersionUID = 8236100811297919996L;
/** The map builder for this Peer. */
- private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
- getMapBuilder(TurbineMapBuilder.class.getName());
+ private static final TurbineMapBuilder MAP_BUILDER;
/** The table name for this peer. */
- private static final String TABLE_NAME = MAP_BUILDER.getTableRole();
+ private static final String TABLE_NAME;
/** The column name for the role id field. */
- public static final String ROLE_ID = MAP_BUILDER.getRole_RoleId();
+ public static final String ROLE_ID;
/** The column name for the name field. */
- public static final String NAME = MAP_BUILDER.getRole_Name();
+ public static final String NAME;
/** The column name for the ObjectData field */
- public static final String OBJECTDATA = MAP_BUILDER.getRole_ObjectData();
+ public static final String OBJECTDATA;
+ static
+ {
+ try
+ {
+ MAP_BUILDER = (TurbineMapBuilder)/* Torque.
*/getMapBuilder(TurbineMapBuilder.class.getName());
+ }
+ catch (TorqueException e)
+ {
+ log.error("Could not initialize Peer", e);
+ throw new RuntimeException(e);
+ }
+
+ TABLE_NAME = MAP_BUILDER.getTableRole();
+ ROLE_ID = MAP_BUILDER.getRole_RoleId();
+ NAME = MAP_BUILDER.getRole_Name();
+ OBJECTDATA = MAP_BUILDER.getRole_ObjectData();
+ }
+
/**
* Retrieves/assembles a RoleSet based on the Criteria passed in
*
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
Wed May 2 03:40:04 2007
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
@@ -37,20 +38,35 @@
private static final long serialVersionUID = 4149656810524167640L;
/** The map builder for this Peer. */
- private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
- getMapBuilder(TurbineMapBuilder.class.getName());
+ private static final TurbineMapBuilder MAP_BUILDER;
/** The table name for this peer. */
- public static final String TABLE_NAME =
MAP_BUILDER.getTableRolePermission();
+ public static final String TABLE_NAME;
/** The column name for the permission id field. */
- public static final String PERMISSION_ID
- = MAP_BUILDER.getRolePermission_PermissionId();
+ public static final String PERMISSION_ID;
/** The column name for the role id field. */
- public static final String ROLE_ID =
MAP_BUILDER.getRolePermission_RoleId();
+ public static final String ROLE_ID;
+ static
+ {
+ try
+ {
+ MAP_BUILDER = (TurbineMapBuilder)/* Torque.
*/getMapBuilder(TurbineMapBuilder.class.getName());
+ }
+ catch (TorqueException e)
+ {
+ log.error("Could not initialize Peer", e);
+ throw new RuntimeException(e);
+ }
+
+ TABLE_NAME = MAP_BUILDER.getTableRolePermission();
+ PERMISSION_ID = MAP_BUILDER.getRolePermission_PermissionId();
+ ROLE_ID = MAP_BUILDER.getRolePermission_RoleId();
+ }
+
/**
* Deletes the mappings for a role_id.
*
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
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
Wed May 2 03:40:04 2007
@@ -17,29 +17,27 @@
*/
import java.sql.Connection;
-
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import com.workingdogs.village.Column;
-import com.workingdogs.village.Record;
-import com.workingdogs.village.Schema;
-import com.workingdogs.village.Value;
-
import org.apache.torque.TorqueException;
import org.apache.torque.map.TableMap;
import org.apache.torque.om.NumberKey;
import org.apache.torque.om.Persistent;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
-
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
+import com.workingdogs.village.Column;
+import com.workingdogs.village.Record;
+import com.workingdogs.village.Schema;
+import com.workingdogs.village.Value;
+
/**
* This class handles all the database access for the User/User
* table. This table contains all the information for a given user.
@@ -55,73 +53,102 @@
private static final long serialVersionUID = -5981268145973167352L;
/** The mapBuilder for this Peer. */
- private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
- getMapBuilder(TurbineMapBuilder.class.getName());
+ private static final TurbineMapBuilder MAP_BUILDER;
// column names
/** The column name for the visitor id field. */
- private static final String USER_ID_COLUMN = MAP_BUILDER.getUserId();
+ private static final String USER_ID_COLUMN;
/** This is the value that is stored in the database for confirmed users.
*/
- public static final String CONFIRM_DATA
- = org.apache.turbine.om.security.User.CONFIRM_DATA;
+ public static final String CONFIRM_DATA;
/** The column name for the visitor id field. */
- private static final String OBJECT_DATA_COLUMN =
MAP_BUILDER.getObjectData();
+ private static final String OBJECT_DATA_COLUMN;
/** The table name for this peer. */
- private static final String TABLE_NAME = MAP_BUILDER.getTableUser();
+ private static final String TABLE_NAME;
// Criteria Keys
/** The key name for the visitor id field. */
- public static final String USER_ID = MAP_BUILDER.getUser_UserId();
+ public static final String USER_ID;
/** The key name for the username field. */
- public static final String USERNAME = MAP_BUILDER.getUser_Username();
+ public static final String USERNAME;
/** The key name for the password field. */
- public static final String PASSWORD = MAP_BUILDER.getUser_Password();
+ public static final String PASSWORD;
/** The key name for the first name field. */
- public static final String FIRST_NAME = MAP_BUILDER.getUser_FirstName();
+ public static final String FIRST_NAME;
/** The key name for the last name field. */
- public static final String LAST_NAME = MAP_BUILDER.getUser_LastName();
+ public static final String LAST_NAME;
/** The key name for the modified field. */
- public static final String MODIFIED = MAP_BUILDER.getUser_Modified();
+ public static final String MODIFIED;
/** The key name for the created field. */
- public static final String CREATED = MAP_BUILDER.getUser_Created();
+ public static final String CREATED;
/** The key name for the email field. */
- public static final String EMAIL = MAP_BUILDER.getUser_Email();
+ public static final String EMAIL;
/** The key name for the last_login field. */
- public static final String LAST_LOGIN = MAP_BUILDER.getUser_LastLogin();
+ public static final String LAST_LOGIN;
/** The key name for the confirm_value field. */
- public static final String CONFIRM_VALUE
- = MAP_BUILDER.getUser_ConfirmValue();
+ public static final String CONFIRM_VALUE;
/** The key name for the object_data field. */
- public static final String OBJECT_DATA = MAP_BUILDER.getUser_ObjectData();
+ public static final String OBJECT_DATA;
/** The schema. */
- private static Schema schema = initTableSchema(TABLE_NAME);
+ private static Schema schema;
/** The columns. */
- private static Column[] columns
- = initTableColumns(schema);
+ private static Column[] columns;
/** The names of the columns. */
- public static String[] columnNames = initColumnNames(columns);
+ public static String[] columnNames;
/** The keys for the criteria. */
- public static String[] criteriaKeys
- = initCriteriaKeys(TABLE_NAME, columnNames);
-
+ public static String[] criteriaKeys;
+ static
+ {
+ try
+ {
+ MAP_BUILDER = (TurbineMapBuilder)/* Torque.
*/getMapBuilder(TurbineMapBuilder.class.getName());
+ }
+ catch (TorqueException e)
+ {
+ log.error("Could not initialize Peer", e);
+ throw new RuntimeException(e);
+ }
+
+ USER_ID_COLUMN = MAP_BUILDER.getUserId();
+ CONFIRM_DATA = org.apache.turbine.om.security.User.CONFIRM_DATA;
+ OBJECT_DATA_COLUMN = MAP_BUILDER.getObjectData();
+ TABLE_NAME = MAP_BUILDER.getTableUser();
+
+ USER_ID = MAP_BUILDER.getUser_UserId();
+ USERNAME = MAP_BUILDER.getUser_Username();
+ PASSWORD = MAP_BUILDER.getUser_Password();
+ FIRST_NAME = MAP_BUILDER.getUser_FirstName();
+ LAST_NAME = MAP_BUILDER.getUser_LastName();
+ MODIFIED = MAP_BUILDER.getUser_Modified();
+ CREATED = MAP_BUILDER.getUser_Created();
+ EMAIL = MAP_BUILDER.getUser_Email();
+ LAST_LOGIN = MAP_BUILDER.getUser_LastLogin();
+ CONFIRM_VALUE = MAP_BUILDER.getUser_ConfirmValue();
+ OBJECT_DATA = MAP_BUILDER.getUser_ObjectData();
+
+ schema = initTableSchema(TABLE_NAME);
+ columns = initTableColumns(schema);
+ columnNames = initColumnNames(columns);
+ criteriaKeys = initCriteriaKeys(TABLE_NAME, columnNames);
+ }
+
/**
* Get the name of this table.
*
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
Wed May 2 03:40:04 2007
@@ -16,8 +16,8 @@
* limitations under the License.
*/
+import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
-
import org.apache.turbine.util.db.map.TurbineMapBuilder;
/**
@@ -35,21 +35,38 @@
private static final long serialVersionUID = -9097451661613525751L;
/** The map builder for this Peer. */
- private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
- getMapBuilder(TurbineMapBuilder.class.getName());
+ private static final TurbineMapBuilder MAP_BUILDER;
/** The table name for this peer. */
- public static final String TABLE_NAME =
MAP_BUILDER.getTableUserGroupRole();
+ public static final String TABLE_NAME;
/** The column name for the visitor id field. */
- public static final String USER_ID = MAP_BUILDER.getUserGroupRole_UserId();
+ public static final String USER_ID;
/** The column name for the group id field. */
- public static final String GROUP_ID =
MAP_BUILDER.getUserGroupRole_GroupId();
+ public static final String GROUP_ID;
/** The column name for the role id field. */
- public static final String ROLE_ID = MAP_BUILDER.getUserGroupRole_RoleId();
+ public static final String ROLE_ID;
+ static
+ {
+ try
+ {
+ MAP_BUILDER = (TurbineMapBuilder)/* Torque.
*/getMapBuilder(TurbineMapBuilder.class.getName());
+ }
+ catch (TorqueException e)
+ {
+ log.error("Could not initialize Peer", e);
+ throw new RuntimeException(e);
+ }
+
+ TABLE_NAME = MAP_BUILDER.getTableUserGroupRole();
+ USER_ID = MAP_BUILDER.getUserGroupRole_UserId();
+ GROUP_ID = MAP_BUILDER.getUserGroupRole_GroupId();
+ ROLE_ID = MAP_BUILDER.getUserGroupRole_RoleId();
+ }
+
/**
* Get the name of this table.
*
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/id-table-schema.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/id-table-schema.xml?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/id-table-schema.xml
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/id-table-schema.xml
Wed May 2 03:40:04 2007
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd";>
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd";>
<!-- ==================================================================== -->
<!-- -->
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/scheduler-schema.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/scheduler-schema.xml?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/scheduler-schema.xml
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/scheduler-schema.xml
Wed May 2 03:40:04 2007
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd";>
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd";>
<!-- ==================================================================== -->
<!-- -->
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/torque-security-schema.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/torque-security-schema.xml?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/torque-security-schema.xml
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/schema/torque-security-schema.xml
Wed May 2 03:40:04 2007
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd";>
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd";>
<!-- ====================================================================
-->
<!--
-->
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test-cactus/testapp/WEB-INF/conf/TurbineComplete.properties
Wed May 2 03:40:04 2007
@@ -294,8 +294,8 @@
# will be initialized. Keep this is mind if you have services
# that depend on other services during initialization.
# -------------------------------------------------------------------
+services.AvalonComponentService.classname=org.apache.turbine.services.avaloncomponent.TurbineAvalonComponentService
services.CryptoService.classname=org.apache.turbine.services.crypto.TurbineCryptoService
-services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
services.RunDataService.classname=org.apache.turbine.services.rundata.TurbineRunDataService
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/TorqueLoadTest.java
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/TorqueLoadTest.java?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/TorqueLoadTest.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/TorqueLoadTest.java
Wed May 2 03:40:04 2007
@@ -20,6 +20,7 @@
import junit.framework.TestSuite;
import org.apache.torque.Torque;
+import org.apache.torque.avalon.TorqueComponent;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.test.BaseTestCase;
@@ -65,36 +66,8 @@
Torque.init("conf/test/TorqueTest.properties");
assertTrue("Torque must be initialized!", Torque.isInit());
Torque.shutdown();
- // Uncomment once we get a torque 3.1 release post alpha-2
- // Everything up to alpha-2 does not shut down Torque properly.
- // assertFalse("Torque did not shut down properly!", Torque.isInit());
- }
-
- /**
- * Load Torque with the ComponentService
- */
- public void testTorqueComponentServiceInit()
- throws Exception
- {
- assertFalse("Torque should not be initialized!", Torque.isInit());
- TurbineConfig tc = new TurbineConfig(".",
"/conf/test/TurbineComponentService.properties");
- try
- {
- tc.initialize();
- assertTrue("Torque must be initialized!", Torque.isInit());
- }
- catch (Exception e)
- {
- throw e;
- }
- finally
- {
- tc.dispose();
- }
- // Uncomment once we get a torque 3.1 release post alpha-2
- // Everything up to alpha-2 does not shut down Torque properly.
- // assertFalse("Torque did not shut down properly!", Torque.isInit());
+ assertFalse("Torque did not shut down properly!", Torque.isInit());
}
private AvalonComponentService getService()
@@ -103,39 +76,35 @@
.getService(AvalonComponentService.SERVICE_NAME);
}
- // Uncomment once we get a torque 3.1 release post alpha-2
- // The current version of Torque doesn't run right with the
AvalonComponentService
- //
- // /**
- // * Load Torque with the AvalonComponentService
- // */
- // public void testTorqueAvalonServiceInit()
- // throws Exception
- // {
- // assertFalse("Torque should not be initialized!",
Torque.isInit());
-
- // TurbineConfig tc = new TurbineConfig(".",
"/conf/test/TurbineAvalonService.properties");
-
- // try
- // {
- // tc.initialize();
- // assertTrue("Torque must be initialized!", Torque.isInit());
-
- // TorqueComponent toc =
- // (TorqueComponent)
getService().lookup("org.apache.torque.avalon.Torque");
- // assertTrue("TorqueComponent must be initialized!",
toc.isInit());
-
- // getService().release(toc);
- // }
- // catch (Exception e)
- // {
- // throw e;
- // }
- // finally
- // {
- // tc.dispose();
- // }
- // assertFalse("Torque did not shut down properly!",
Torque.isInit());
- // }
+ /**
+ * Load Torque with the AvalonComponentService
+ */
+ public void testTorqueAvalonServiceInit()
+ throws Exception
+ {
+ assertFalse("Torque should not be initialized!", Torque.isInit());
+ TurbineConfig tc = new TurbineConfig(".",
"/conf/test/TurbineAvalonService.properties");
+
+ try
+ {
+ tc.initialize();
+ assertTrue("Torque must be initialized!", Torque.isInit());
+
+ TorqueComponent toc =
+ (TorqueComponent)
getService().lookup("org.apache.torque.avalon.Torque");
+ assertTrue("TorqueComponent must be initialized!", toc.isInit());
+
+ getService().release(toc);
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ finally
+ {
+ tc.dispose();
+ }
+ assertFalse("Torque did not shut down properly!", Torque.isInit());
+ }
}
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml?view=diff&rev=534381&r1=534380&r2=534381
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml
(original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/xdocs/changes.xml Wed May
2 03:40:04 2007
@@ -25,6 +25,31 @@
<body>
<release version="2.3.3-dev" date="in Subversion">
+ <action type="remove" dev="tv">
+ Remove the ComponentService. This has been deprecated long ago.
+ It has been replaced by the different incarnations of
+ AvalonComponentService.
+ </action>
+ <action type="remove" dev="tv">
+ Remove long deprecated classes.
+ <ul>
+ <li>org.apache.turbine.util.SequencedHashtable</li>
+ <li>org.apache.turbine.util.StringStackBuffer</li>
+ <li>org.apache.turbine.util.FileUtils</li>
+ <li>org.apache.turbine.util.BufferCache</li>
+ <li>org.apache.turbine.util.QuickSort</li>
+ <li>org.apache.turbine.util.Comparable</li>
+ <li>org.apache.turbine.util.Log</li>
+ <li>org.apache.turbine.util.mail.*</li>
+ <li>org.apache.turbine.util.validation.*</li>
+ <li>org.apache.turbine.util.upload.*</li>
+ <li>org.apache.java.lang.*</li>
+ <li>org.apache.java.security.*</li>
+ <li>org.apache.turbine.util.db.*</li>
+ <li>org.apache.turbine.services.resources.TurbineResources</li>
+ <li>org.apache.turbine.services.db.*</li>
+ </ul>
+ </action>
<action type="add" dev="tv">
Extended HtmlPageAttributes to allow generic <link /> tags in the
HTML head section.
@@ -33,6 +58,9 @@
Added Thomas's variation on Siegfried's TurbineYaafiComponentService that
allows Fulcrum components to be used in Turbine 2.3 in a fulcrum-yaafi
container.
+ </action>
+ <action type="add" dev="tv">
+ Extended the LocalizationService to provide formatting facilities.
</action>
<action type="add" dev="tv">
Extended Intake to care for localization and to allow user-defined
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
