You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2013/07/08 11:33:51 UTC
svn commit: r1500631 [1/2] - in /turbine/fulcrum/trunk/security:
api/src/changes/ torque/ torque/schema/
torque/src/java/org/apache/fulcrum/security/torque/
torque/src/java/org/apache/fulcrum/security/torque/basic/
torque/src/java/org/apache/fulcrum/se...
Author: tv
Date: Mon Jul 8 09:33:50 2013
New Revision: 1500631
URL: http://svn.apache.org/r1500631
Log:
Update fulcrum-security-torque to use Torque 4.0.
Modified:
turbine/fulcrum/trunk/security/api/src/changes/changes.xml
turbine/fulcrum/trunk/security/torque/.classpath
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml
turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
turbine/fulcrum/trunk/security/torque/src/test/Torque.properties
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/basic/TorqueBasicModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorqueTurbineModelManagerTest.java
Modified: turbine/fulcrum/trunk/security/api/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/changes/changes.xml?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/security/api/src/changes/changes.xml Mon Jul 8 09:33:50 2013
@@ -26,7 +26,10 @@
<body>
<release version="1.1.0" date="">
<action type="update" dev="tv">
- Update fulcrum-hibernate to use a recent version of Hibernate (3.6.7-Final).
+ Update fulcrum-security-torque to use Torque 4.0.
+ </action>
+ <action type="update" dev="tv">
+ Update fulcrum-security-hibernate to use a recent version of Hibernate (3.6.7-Final).
</action>
<action type="update" dev="tv">
Move all builds to Maven2
Modified: turbine/fulcrum/trunk/security/torque/.classpath
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/.classpath?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/.classpath (original)
+++ turbine/fulcrum/trunk/security/torque/.classpath Mon Jul 8 09:33:50 2013
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test"/>
- <classpathentry kind="src" path="target/generated-sources/torque"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Mon Jul 8 09:33:50 2013
@@ -59,101 +59,6 @@
<forkMode>perTest</forkMode>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.torque</groupId>
- <artifactId>torque-maven-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <targetDatabase>mysql</targetDatabase>
- <schemaDir>${project.basedir}/schema</schemaDir>
- </configuration>
- <executions>
- <execution>
- <id>torque-om</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>om</goal>
- </goals>
- <configuration>
- <targetPackage>org.apache.fulcrum.security.torque.om</targetPackage>
- <correctGetters>true</correctGetters>
- <addGetByNameMethod>false</addGetByNameMethod>
- <addRetrievableInterface>false</addRetrievableInterface>
- <saveException>TorqueException</saveException>
- <baseOutputDir>${project.build.directory}/generated-sources/torque</baseOutputDir>
- <outputDir>${project.build.sourceDirectory}</outputDir>
- <reportFile>../../target/torque/report.${project.artifact.artifactId}.om.generation</reportFile>
- <runOnlyOnSchemaChange>true</runOnlyOnSchemaChange>
- <enableJava5Features>true</enableJava5Features>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-mysql</id>
- <phase>package</phase>
- <goals>
- <goal>sql</goal>
- <goal>id-table-init-sql</goal>
- </goals>
- <configuration>
- <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
- <outputDir>${project.build.directory}/generated-sql/torque/mysql</outputDir>
- <targetDatabase>mysql</targetDatabase>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-derby</id>
- <phase>package</phase>
- <goals>
- <goal>sql</goal>
- <goal>id-table-init-sql</goal>
- </goals>
- <configuration>
- <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
- <outputDir>${project.build.directory}/generated-sql/torque/derby</outputDir>
- <targetDatabase>derby</targetDatabase>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-oracle</id>
- <phase>package</phase>
- <goals>
- <goal>sql</goal>
- <goal>id-table-init-sql</goal>
- </goals>
- <configuration>
- <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
- <outputDir>${project.build.directory}/generated-sql/torque/oracle</outputDir>
- <targetDatabase>oracle</targetDatabase>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-postgresql</id>
- <phase>package</phase>
- <goals>
- <goal>sql</goal>
- <goal>id-table-init-sql</goal>
- </goals>
- <configuration>
- <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
- <outputDir>${project.build.directory}/generated-sql/torque/postgresql</outputDir>
- <targetDatabase>postgresql</targetDatabase>
- </configuration>
- </execution>
- <execution>
- <id>torque-sql-mssql</id>
- <phase>package</phase>
- <goals>
- <goal>sql</goal>
- <goal>id-table-init-sql</goal>
- </goals>
- <configuration>
- <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
- <outputDir>${project.build.directory}/generated-sql/torque/mssql</outputDir>
- <targetDatabase>mssql</targetDatabase>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -171,9 +76,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <artifactId>hsqldb</artifactId>
- <groupId>hsqldb</groupId>
- <version>1.8.0.7</version>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ <type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
@@ -201,42 +107,10 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- <version>2.2.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.torque</groupId>
- <artifactId>village</artifactId>
- <version>3.3.1</version>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.torque</groupId>
<artifactId>torque-runtime</artifactId>
- <version>3.3</version>
+ <version>4.0</version>
<type>jar</type>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework-api</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-logkit</artifactId>
- <groupId>avalon-logkit</groupId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
@@ -252,6 +126,237 @@
</site>
</distributionManagement>
</profile>
+ <profile>
+ <id>torque-generate-off</id>
+ </profile>
+ <profile>
+ <id>torque-generate</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-maven-plugin</artifactId>
+ <version>4.0</version>
+ <executions>
+ <execution>
+ <id>torque-om</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.om</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mysql</torque.database>
+ <torque.om.package>org.apache.fulcrum.security.torque.om</torque.om.package>
+ <torque.om.addGetByNameMethods>false</torque.om.addGetByNameMethods>
+ <torque.om.save.saveException>TorqueException</torque.om.save.saveException>
+ <torque.om.useIsForBooleanGetters>true</torque.om.useIsForBooleanGetters>
+ </options>
+ <outputDirMap>
+ <modifiable>${project.build.sourceDirectory}</modifiable>
+ </outputDirMap>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-mysql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/mysql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mysql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-derby</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/derby</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>derby</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-oracle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/oracle</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>oracle</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-postgresql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/postgresql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>postgresql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-sql-mssql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.sql</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/mssql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mssql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>torque-idtable-mysql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/mysql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mysql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-derby</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/derby</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>derby</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-oracle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/oracle</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>oracle</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-postgresql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/postgresql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>postgresql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ <execution>
+ <id>torque-idtable-mssql</id>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <packaging>classpath</packaging>
+ <configPackage>org.apache.torque.templates.idtable</configPackage>
+ <sourceDir>${project.basedir}/schema</sourceDir>
+ <defaultOutputDir>${project.build.directory}/generated-sql/torque/mssql</defaultOutputDir>
+ <defaultOutputDirUsage>none</defaultOutputDirUsage>
+ <loglevel>error</loglevel>
+ <options>
+ <torque.database>mssql</torque.database>
+ </options>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.torque</groupId>
+ <artifactId>torque-templates</artifactId>
+ <version>4.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<properties>
Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-basic-schema.xml Mon Jul 8 09:33:50 2013
@@ -17,8 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd">
-
<!-- ==================================================================== -->
<!-- -->
<!-- F U L C R U M B A S I C S E C U R I T Y S C H E M A -->
@@ -27,8 +25,12 @@
<!-- @author: <a href="mailto:tv@apache.org">Thomas Vandahl</a> -->
<!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
<!-- ==================================================================== -->
-
-<database name="fulcrum">
+<database name="fulcrum"
+ defaultIdMethod="none"
+ xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database.xsd">
<table name="FULCRUM_BASIC_GROUP" javaName="TorqueBasicGroup" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.basic.TorqueAbstractBasicGroup">
Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-dynamic-schema.xml Mon Jul 8 09:33:50 2013
@@ -17,8 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd">
-
<!-- ==================================================================== -->
<!-- -->
<!-- F U L C R U M D Y N A M I C S E C U R I T Y S C H E M A -->
@@ -28,7 +26,12 @@
<!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
<!-- ==================================================================== -->
-<database name="fulcrum">
+<database name="fulcrum"
+ defaultIdMethod="none"
+ xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database.xsd">
<table name="FULCRUM_DYNAMIC_PERMISSION" javaName="TorqueDynamicPermission" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.dynamic.TorqueAbstractDynamicPermission">
Modified: turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-schema.xml Mon Jul 8 09:33:50 2013
@@ -17,8 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd">
-
<!-- ==================================================================== -->
<!-- -->
<!-- F U L C R U M T U R B I N E S E C U R I T Y S C H E M A -->
@@ -28,7 +26,12 @@
<!-- @version $Id: torque-security-schema.xml,v 1.1 2005/09/26 14:10:04 tvan Exp $ -->
<!-- ==================================================================== -->
-<database name="fulcrum">
+<database name="fulcrum"
+ defaultIdMethod="none"
+ xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database.xsd">
<table name="FULCRUM_TURBINE_PERMISSION" javaName="TorqueTurbinePermission" idMethod="idbroker"
baseClass="org.apache.fulcrum.security.torque.turbine.TorqueAbstractTurbinePermission">
Modified: turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml (original)
+++ turbine/fulcrum/trunk/security/torque/schema/id-table-schema.xml Mon Jul 8 09:33:50 2013
@@ -17,8 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd">
-
<!-- ==================================================================== -->
<!-- -->
<!-- I D B R O K E R S C H E M A -->
@@ -31,7 +29,13 @@
<!-- @version $Id: id-table-schema.xml,v 1.2 2005/09/23 12:19:52 tvan Exp $ -->
<!-- ==================================================================== -->
-<database name="fulcrum">
+<database name="fulcrum"
+ defaultIdMethod="none"
+ xmlns="http://db.apache.org/torque/4.0/templates/database"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+ http://db.apache.org/torque/4.0/templates/database.xsd">
+
<table name="ID_TABLE" idMethod="idbroker">
<column name="ID_TABLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="TABLE_NAME" required="true" size="255" type="VARCHAR"/>
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/TorqueAbstractSecurityEntity.java Mon Jul 8 09:33:50 2013
@@ -21,15 +21,15 @@ import java.sql.Connection;
import org.apache.fulcrum.security.entity.SecurityEntity;
import org.apache.torque.TorqueException;
-import org.apache.torque.om.BaseObject;
+import org.apache.torque.om.Persistent;
/**
* This abstract class provides the SecurityInterface to the managers.
*
* @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
* @version $Id:$
*/
-public abstract class TorqueAbstractSecurityEntity extends BaseObject
- implements SecurityEntity
+public abstract class TorqueAbstractSecurityEntity
+ implements SecurityEntity, Persistent
{
/** Serial version */
private static final long serialVersionUID = -4052254585021044275L;
@@ -70,7 +70,7 @@ public abstract class TorqueAbstractSecu
public abstract void retrieveAttachedObjects(Connection con) throws TorqueException;
/**
- * Update this instance to the database with all dependend objects
+ * Update this instance to the database with all dependent objects
*
* @param con A database connection
*/
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicGroup.java Mon Jul 8 09:33:50 2013
@@ -29,8 +29,9 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueBasicUserGroupPeer;
import org.apache.fulcrum.security.util.UserSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
+
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -53,11 +54,12 @@ public abstract class TorqueAbstractBasi
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueBasicUserGroup> getTorqueBasicUserGroupsJoinTorqueBasicUser(Criteria criteria)
+ protected abstract List<TorqueBasicUserGroup> getTorqueBasicUserGroupsJoinTorqueBasicUser(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -132,9 +134,8 @@ public abstract class TorqueAbstractBasi
{
this.userSet = new UserSet();
- // the generated method that allows a Connection parameter is missing
List<TorqueBasicUserGroup> usergroups =
- getTorqueBasicUserGroupsJoinTorqueBasicUser(new Criteria());
+ getTorqueBasicUserGroupsJoinTorqueBasicUser(new Criteria(), con);
for (TorqueBasicUserGroup tbug : usergroups)
{
@@ -154,7 +155,7 @@ public abstract class TorqueAbstractBasi
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueBasicUserGroupPeer.GROUP_ID, getEntityId());
+ criteria.where(TorqueBasicUserGroupPeer.GROUP_ID, getEntityId());
TorqueBasicUserGroupPeer.doDelete(criteria, con);
for (User u : userSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueAbstractBasicUser.java Mon Jul 8 09:33:50 2013
@@ -29,8 +29,9 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
+
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -52,11 +53,12 @@ public abstract class TorqueAbstractBasi
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueBasicUserGroup> getTorqueBasicUserGroupsJoinTorqueBasicGroup(Criteria criteria)
+ protected abstract List<TorqueBasicUserGroup> getTorqueBasicUserGroupsJoinTorqueBasicGroup(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -131,7 +133,7 @@ public abstract class TorqueAbstractBasi
{
this.groupSet = new GroupSet();
- List<TorqueBasicUserGroup> usergroups = getTorqueBasicUserGroupsJoinTorqueBasicGroup(new Criteria());
+ List<TorqueBasicUserGroup> usergroups = getTorqueBasicUserGroupsJoinTorqueBasicGroup(new Criteria(), con);
for (TorqueBasicUserGroup tbug : usergroups)
{
@@ -151,7 +153,7 @@ public abstract class TorqueAbstractBasi
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueBasicUserGroupPeer.USER_ID, getEntityId());
+ criteria.where(TorqueBasicUserGroupPeer.USER_ID, getEntityId());
TorqueBasicUserGroupPeer.doDelete(criteria, con);
for (Group g : groupSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicGroupManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -22,12 +22,12 @@ import java.util.List;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.torque.TorqueAbstractGroupManager;
-import org.apache.fulcrum.security.torque.om.TorqueBasicGroup;
import org.apache.fulcrum.security.torque.om.TorqueBasicGroupPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
+
/**
* This implementation persists to a database via Torque.
*
@@ -66,17 +66,16 @@ public class TorqueBasicGroupManagerImpl
throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueBasicGroupPeer.DATABASE_NAME);
- criteria.add(TorqueBasicGroupPeer.GROUP_NAME, name);
+ criteria.where(TorqueBasicGroupPeer.GROUP_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List<TorqueBasicGroup> groups = TorqueBasicGroupPeer.doSelect(criteria, con);
-
- if (groups.isEmpty())
+ T t = (T)TorqueBasicGroupPeer.doSelectSingleRecord(criteria, con);
+ if (t == null)
{
throw new NoRowsException(name);
}
- return (T)groups.get(0);
+ return t;
}
}
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/basic/TorqueBasicUserManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -22,12 +22,12 @@ import java.util.List;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.torque.TorqueAbstractUserManager;
-import org.apache.fulcrum.security.torque.om.TorqueBasicUser;
import org.apache.fulcrum.security.torque.om.TorqueBasicUserPeer;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
+
/**
* This implementation persists to a database via Torque.
*
@@ -63,17 +63,16 @@ public class TorqueBasicUserManagerImpl
protected <T extends User> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueBasicUserPeer.DATABASE_NAME);
- criteria.add(TorqueBasicUserPeer.LOGIN_NAME, name);
+ criteria.where(TorqueBasicUserPeer.LOGIN_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
- List<TorqueBasicUser> users = TorqueBasicUserPeer.doSelect(criteria, con);
-
- if (users.isEmpty())
+ T t = (T)TorqueBasicUserPeer.doSelectSingleRecord(criteria, con);
+ if (t == null)
{
throw new NoRowsException(name);
}
- return (T) users.get(0);
+ return t;
}
}
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicGroup.java Mon Jul 8 09:33:50 2013
@@ -33,8 +33,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.UserSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -60,11 +60,12 @@ public abstract class TorqueAbstractDyna
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueDynamicUserGroup> getTorqueDynamicUserGroupsJoinTorqueDynamicUser(Criteria criteria)
+ protected abstract List<TorqueDynamicUserGroup> getTorqueDynamicUserGroupsJoinTorqueDynamicUser(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -74,11 +75,12 @@ public abstract class TorqueAbstractDyna
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of Role/Group relations
*/
- protected abstract List<TorqueDynamicGroupRole> getTorqueDynamicGroupRolesJoinTorqueDynamicRole(Criteria criteria)
+ protected abstract List<TorqueDynamicGroupRole> getTorqueDynamicGroupRolesJoinTorqueDynamicRole(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -226,8 +228,7 @@ public abstract class TorqueAbstractDyna
{
this.userSet = new UserSet();
- // the generated method that allows a Connection parameter is missing
- List<TorqueDynamicUserGroup> usergroups = getTorqueDynamicUserGroupsJoinTorqueDynamicUser(new Criteria());
+ List<TorqueDynamicUserGroup> usergroups = getTorqueDynamicUserGroupsJoinTorqueDynamicUser(new Criteria(), con);
for (TorqueDynamicUserGroup tdug : usergroups)
{
@@ -236,8 +237,7 @@ public abstract class TorqueAbstractDyna
this.roleSet = new RoleSet();
- // the generated method that allows a Connection parameter is missing
- List<TorqueDynamicGroupRole> grouproles = getTorqueDynamicGroupRolesJoinTorqueDynamicRole(new Criteria());
+ List<TorqueDynamicGroupRole> grouproles = getTorqueDynamicGroupRolesJoinTorqueDynamicRole(new Criteria(), con);
for (TorqueDynamicGroupRole tdgr : grouproles)
{
@@ -255,7 +255,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicUserGroupPeer.GROUP_ID, getEntityId());
+ criteria.where(TorqueDynamicUserGroupPeer.GROUP_ID, getEntityId());
TorqueDynamicUserGroupPeer.doDelete(criteria, con);
for (User u : userSet)
@@ -272,7 +272,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, getEntityId());
+ criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, getEntityId());
TorqueDynamicGroupRolePeer.doDelete(criteria, con);
for (Role r : roleSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicPermission.java Mon Jul 8 09:33:50 2013
@@ -29,8 +29,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueDynamicRolePermissionPeer;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -52,11 +52,12 @@ public abstract class TorqueAbstractDyna
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueDynamicRolePermission> getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(Criteria criteria)
+ protected abstract List<TorqueDynamicRolePermission> getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -139,8 +140,7 @@ public abstract class TorqueAbstractDyna
{
this.roleSet = new RoleSet();
- // the generated method that allows a Connection parameter is missing
- List<TorqueDynamicRolePermission> rolepermissions = getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(new Criteria());
+ List<TorqueDynamicRolePermission> rolepermissions = getTorqueDynamicRolePermissionsJoinTorqueDynamicRole(new Criteria(), con);
for (TorqueDynamicRolePermission tdrp : rolepermissions)
{
@@ -158,7 +158,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicRolePermissionPeer.PERMISSION_ID, getEntityId());
+ criteria.where(TorqueDynamicRolePermissionPeer.PERMISSION_ID, getEntityId());
TorqueDynamicRolePermissionPeer.doDelete(criteria, con);
for (Role r : roleSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicRole.java Mon Jul 8 09:33:50 2013
@@ -34,8 +34,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -61,11 +61,12 @@ public abstract class TorqueAbstractDyna
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueDynamicRolePermission> getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(Criteria criteria)
+ protected abstract List<TorqueDynamicRolePermission> getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -75,11 +76,12 @@ public abstract class TorqueAbstractDyna
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of Group/Role relations
*/
- protected abstract List<TorqueDynamicGroupRole> getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(Criteria criteria)
+ protected abstract List<TorqueDynamicGroupRole> getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -227,8 +229,7 @@ public abstract class TorqueAbstractDyna
{
this.permissionSet = new PermissionSet();
- // the generated method that allows a Connection parameter is missing
- List<TorqueDynamicRolePermission> rolepermissions = getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(new Criteria());
+ List<TorqueDynamicRolePermission> rolepermissions = getTorqueDynamicRolePermissionsJoinTorqueDynamicPermission(new Criteria(), con);
for (TorqueDynamicRolePermission tdrp : rolepermissions)
{
@@ -237,8 +238,7 @@ public abstract class TorqueAbstractDyna
this.groupSet = new GroupSet();
- // the generated method that allows a Connection parameter is missing
- List<TorqueDynamicGroupRole> grouproles = getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(new Criteria());
+ List<TorqueDynamicGroupRole> grouproles = getTorqueDynamicGroupRolesJoinTorqueDynamicGroup(new Criteria(), con);
for (TorqueDynamicGroupRole tdgr : grouproles)
{
@@ -256,7 +256,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, getEntityId());
+ criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, getEntityId());
TorqueDynamicRolePermissionPeer.doDelete(criteria, con);
for (Permission p : permissionSet)
@@ -273,7 +273,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicGroupRolePeer.ROLE_ID, getEntityId());
+ criteria.where(TorqueDynamicGroupRolePeer.ROLE_ID, getEntityId());
TorqueDynamicGroupRolePeer.doDelete(criteria, con);
for (Group g : groupSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueAbstractDynamicUser.java Mon Jul 8 09:33:50 2013
@@ -33,8 +33,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.UserSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -63,11 +63,12 @@ public abstract class TorqueAbstractDyna
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Group relations
*/
- protected abstract List<TorqueDynamicUserGroup> getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(Criteria criteria)
+ protected abstract List<TorqueDynamicUserGroup> getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -77,11 +78,12 @@ public abstract class TorqueAbstractDyna
* TorqueDynamicUserDelegates objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Delegator relations
*/
- protected abstract List<TorqueDynamicUserDelegates> getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(Criteria criteria)
+ protected abstract List<TorqueDynamicUserDelegates> getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -91,11 +93,12 @@ public abstract class TorqueAbstractDyna
* TorqueDynamicUserDelegates objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Delegator relations
*/
- protected abstract List<TorqueDynamicUserDelegates> getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(Criteria criteria)
+ protected abstract List<TorqueDynamicUserDelegates> getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -236,7 +239,7 @@ public abstract class TorqueAbstractDyna
{
this.groupSet = new GroupSet();
- List<TorqueDynamicUserGroup> usergroups = getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(new Criteria());
+ List<TorqueDynamicUserGroup> usergroups = getTorqueDynamicUserGroupsJoinTorqueDynamicGroup(new Criteria(), con);
for (TorqueDynamicUserGroup tdug : usergroups)
{
@@ -245,7 +248,7 @@ public abstract class TorqueAbstractDyna
this.delegators = new UserSet();
- List<TorqueDynamicUserDelegates> delegatorlist = getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(new Criteria());
+ List<TorqueDynamicUserDelegates> delegatorlist = getTorqueDynamicUserDelegatessRelatedByDelegateeUserIdJoinTorqueDynamicUserRelatedByDelegatorUserId(new Criteria(), con);
for (TorqueDynamicUserDelegates tdud : delegatorlist)
{
@@ -254,7 +257,7 @@ public abstract class TorqueAbstractDyna
this.delegatees = new UserSet();
- List<TorqueDynamicUserDelegates> delegateelist = getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(new Criteria());
+ List<TorqueDynamicUserDelegates> delegateelist = getTorqueDynamicUserDelegatessRelatedByDelegatorUserIdJoinTorqueDynamicUserRelatedByDelegateeUserId(new Criteria(), con);
for (TorqueDynamicUserDelegates tdud : delegateelist)
{
@@ -272,7 +275,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicUserGroupPeer.USER_ID, getEntityId());
+ criteria.where(TorqueDynamicUserGroupPeer.USER_ID, getEntityId());
TorqueDynamicUserGroupPeer.doDelete(criteria, con);
for (Group g : groupSet)
@@ -289,7 +292,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, getEntityId());
+ criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, getEntityId());
TorqueDynamicUserDelegatesPeer.doDelete(criteria, con);
for (User u : delegators)
@@ -306,7 +309,7 @@ public abstract class TorqueAbstractDyna
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATOR_USER_ID, getEntityId());
+ criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATOR_USER_ID, getEntityId());
TorqueDynamicUserDelegatesPeer.doDelete(criteria, con);
for (User u : delegatees)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicGroupManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueDynamicGroupManagerIm
protected <T extends Group> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicGroupPeer.DATABASE_NAME);
- criteria.add(TorqueDynamicGroupPeer.GROUP_NAME, name);
+ criteria.where(TorqueDynamicGroupPeer.GROUP_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicPermissionManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueDynamicPermissionMana
protected <T extends Permission> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicPermissionPeer.DATABASE_NAME);
- criteria.add(TorqueDynamicPermissionPeer.PERMISSION_NAME, name);
+ criteria.where(TorqueDynamicPermissionPeer.PERMISSION_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicRoleManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueDynamicRoleManagerImp
protected <T extends Role> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicRolePeer.DATABASE_NAME);
- criteria.add(TorqueDynamicRolePeer.ROLE_NAME, name);
+ criteria.where(TorqueDynamicRolePeer.ROLE_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/dynamic/TorqueDynamicUserManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueDynamicUserManagerImp
protected <T extends User> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueDynamicUserPeer.DATABASE_NAME);
- criteria.add(TorqueDynamicUserPeer.LOGIN_NAME, name);
+ criteria.where(TorqueDynamicUserPeer.LOGIN_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineGroup.java Mon Jul 8 09:33:50 2013
@@ -28,8 +28,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRole;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -49,11 +49,12 @@ public abstract class TorqueAbstractTurb
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Group/Role relations
*/
- protected abstract List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria)
+ protected abstract List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -71,8 +72,7 @@ public abstract class TorqueAbstractTurb
{
Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
- // the generated method that allows a Connection parameter is missing
- List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new Criteria());
+ List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new Criteria(), con);
for (TorqueTurbineUserGroupRole ttugr : ugrs)
{
@@ -97,7 +97,7 @@ public abstract class TorqueAbstractTurb
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueTurbineUserGroupRolePeer.GROUP_ID, getEntityId());
+ criteria.where(TorqueTurbineUserGroupRolePeer.GROUP_ID, getEntityId());
TorqueTurbineUserGroupRolePeer.doDelete(criteria, con);
for (TurbineUserGroupRole ugr : userGroupRoleSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbinePermission.java Mon Jul 8 09:33:50 2013
@@ -29,8 +29,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueTurbineRolePermissionPeer;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -53,11 +53,12 @@ public abstract class TorqueAbstractTurb
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueTurbineRolePermission> getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(Criteria criteria)
+ protected abstract List<TorqueTurbineRolePermission> getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -140,8 +141,7 @@ public abstract class TorqueAbstractTurb
{
this.roleSet = new RoleSet();
- // the generated method that allows a Connection parameter is missing
- List<TorqueTurbineRolePermission> rolepermissions = getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(new Criteria());
+ List<TorqueTurbineRolePermission> rolepermissions = getTorqueTurbineRolePermissionsJoinTorqueTurbineRole(new Criteria(), con);
for (TorqueTurbineRolePermission ttrp : rolepermissions)
{
@@ -159,7 +159,7 @@ public abstract class TorqueAbstractTurb
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueTurbineRolePermissionPeer.PERMISSION_ID, getEntityId());
+ criteria.where(TorqueTurbineRolePermissionPeer.PERMISSION_ID, getEntityId());
TorqueTurbineRolePermissionPeer.doDelete(criteria, con);
for (Role r : roleSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineRole.java Mon Jul 8 09:33:50 2013
@@ -32,8 +32,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -56,11 +56,12 @@ public abstract class TorqueAbstractTurb
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of Role/Permission relations
*/
- protected abstract List<TorqueTurbineRolePermission> getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(Criteria criteria)
+ protected abstract List<TorqueTurbineRolePermission> getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -70,11 +71,12 @@ public abstract class TorqueAbstractTurb
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Group/Role relations
*/
- protected abstract List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria)
+ protected abstract List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -157,8 +159,7 @@ public abstract class TorqueAbstractTurb
{
this.permissionSet = new PermissionSet();
- // the generated method that allows a Connection parameter is missing
- List<TorqueTurbineRolePermission> rolepermissions = getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(new Criteria());
+ List<TorqueTurbineRolePermission> rolepermissions = getTorqueTurbineRolePermissionsJoinTorqueTurbinePermission(new Criteria(), con);
for (TorqueTurbineRolePermission ttrp : rolepermissions)
{
@@ -167,8 +168,7 @@ public abstract class TorqueAbstractTurb
Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
- // the generated method that allows a Connection parameter is missing
- List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(new Criteria());
+ List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineGroup(new Criteria(), con);
for (TorqueTurbineUserGroupRole ttugr : ugrs)
{
@@ -192,7 +192,7 @@ public abstract class TorqueAbstractTurb
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueTurbineRolePermissionPeer.ROLE_ID, getEntityId());
+ criteria.where(TorqueTurbineRolePermissionPeer.ROLE_ID, getEntityId());
TorqueTurbineRolePermissionPeer.doDelete(criteria, con);
for (Permission p : permissionSet)
@@ -210,7 +210,7 @@ public abstract class TorqueAbstractTurb
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueTurbineUserGroupRolePeer.ROLE_ID, getEntityId());
+ criteria.where(TorqueTurbineUserGroupRolePeer.ROLE_ID, getEntityId());
TorqueTurbineUserGroupRolePeer.doDelete(criteria, con);
for (TurbineUserGroupRole ugr : userGroupRoleSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueAbstractTurbineUser.java Mon Jul 8 09:33:50 2013
@@ -28,8 +28,8 @@ import org.apache.fulcrum.security.torqu
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserGroupRolePeer;
import org.apache.fulcrum.security.torque.om.TorqueTurbineUserPeer;
import org.apache.torque.TorqueException;
+import org.apache.torque.criteria.Criteria;
import org.apache.torque.om.SimpleKey;
-import org.apache.torque.util.Criteria;
/**
* This abstract class provides the SecurityInterface to the managers.
*
@@ -49,11 +49,12 @@ public abstract class TorqueAbstractTurb
* objects.
*
* @param criteria Criteria to define the selection of records
+ * @param con a database connection
* @throws TorqueException
*
* @return a list of User/Group/Role relations
*/
- protected abstract List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria)
+ protected abstract List<TorqueTurbineUserGroupRole> getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(Criteria criteria, Connection con)
throws TorqueException;
/**
@@ -71,8 +72,7 @@ public abstract class TorqueAbstractTurb
{
Set<TurbineUserGroupRole> userGroupRoleSet = new HashSet<TurbineUserGroupRole>();
- // the generated method that allows a Connection parameter is missing
- List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new Criteria());
+ List<TorqueTurbineUserGroupRole> ugrs = getTorqueTurbineUserGroupRolesJoinTorqueTurbineRole(new Criteria(), con);
for (TorqueTurbineUserGroupRole ttugr : ugrs)
{
@@ -97,7 +97,7 @@ public abstract class TorqueAbstractTurb
Criteria criteria = new Criteria();
/* remove old entries */
- criteria.add(TorqueTurbineUserGroupRolePeer.USER_ID, getEntityId());
+ criteria.where(TorqueTurbineUserGroupRolePeer.USER_ID, getEntityId());
TorqueTurbineUserGroupRolePeer.doDelete(criteria, con);
for (TurbineUserGroupRole ugr : userGroupRoleSet)
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineGroupManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueTurbineGroupManagerIm
protected <T extends Group> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineGroupPeer.DATABASE_NAME);
- criteria.add(TorqueTurbineGroupPeer.GROUP_NAME, name);
+ criteria.where(TorqueTurbineGroupPeer.GROUP_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbinePermissionManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueTurbinePermissionMana
protected <T extends Permission> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbinePermissionPeer.DATABASE_NAME);
- criteria.add(TorqueTurbinePermissionPeer.PERMISSION_NAME, name);
+ criteria.where(TorqueTurbinePermissionPeer.PERMISSION_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineRoleManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueTurbineRoleManagerImp
protected <T extends Role> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineRolePeer.DATABASE_NAME);
- criteria.add(TorqueTurbineRolePeer.ROLE_NAME, name);
+ criteria.where(TorqueTurbineRolePeer.ROLE_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/TorqueTurbineUserManagerImpl.java Mon Jul 8 09:33:50 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.torqu
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.TorqueException;
-import org.apache.torque.util.Criteria;
+import org.apache.torque.criteria.Criteria;
/**
* This implementation persists to a database via Torque.
*
@@ -63,7 +63,7 @@ public class TorqueTurbineUserManagerImp
protected <T extends User> T doSelectByName(String name, Connection con) throws NoRowsException, TooManyRowsException, TorqueException
{
Criteria criteria = new Criteria(TorqueTurbineUserPeer.DATABASE_NAME);
- criteria.add(TorqueTurbineUserPeer.LOGIN_NAME, name);
+ criteria.where(TorqueTurbineUserPeer.LOGIN_NAME, name);
criteria.setIgnoreCase(true);
criteria.setSingleRecord(true);
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=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/Torque.properties (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/Torque.properties Mon Jul 8 09:33:50 2013
@@ -22,7 +22,7 @@
#
torque.database.default = fulcrum
-torque.database.fulcrum.adapter = hypersonic
+torque.database.fulcrum.adapter = hsqldb
# Using commons-dbcp
torque.dsfactory.fulcrum.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java?rev=1500631&r1=1500630&r2=1500631&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java Mon Jul 8 09:33:50 2013
@@ -58,35 +58,35 @@ public class TorqueGroupManagerTest exte
try
{
Criteria criteria = new Criteria();
- criteria.add(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicUserGroupPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicGroupRolePeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicRolePermissionPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicUserDelegatesPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
TorqueUserPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
TorqueGroupPeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
TorqueRolePeer.doDelete(criteria);
criteria.clear();
- criteria.add(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
+ criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
TorquePermissionPeer.doDelete(criteria);
}
catch (TorqueException e)