Author: gk
Date: Mon Oct 21 13:51:33 2019
New Revision: 1868706
URL: http://svn.apache.org/viewvc?rev=1868706&view=rev
Log:
- log4j2 (hibernate needs mapping 1.2 to 2)
Torque:
- Torque 4.1-SNAPSHOT, using PeerInterface in schema, removed classes as now
generated with PeerInterface.
- add TorqueException to method (TODO DataBackendException wanted)
- Dbcp2 v2.7.0
Added:
turbine/fulcrum/trunk/security/api/src/test/log4j2-test.xml (with props)
turbine/fulcrum/trunk/security/hibernate/src/test/log4j2-test.xml (with
props)
turbine/fulcrum/trunk/security/memory/src/test/log4j2-test.xml (with
props)
turbine/fulcrum/trunk/security/torque/src/test/log4j2-test.xml (with
props)
Removed:
turbine/fulcrum/trunk/security/api/src/test/Log4j.properties
turbine/fulcrum/trunk/security/hibernate/src/test/Log4j.properties
turbine/fulcrum/trunk/security/memory/src/test/Log4j.properties
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/om/TurbineGroupPeerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/om/TurbinePermissionPeerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/om/TurbineRolePeerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/om/TurbineUserGroupRolePeerImpl.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/om/TurbineUserPeerImpl.java
turbine/fulcrum/trunk/security/torque/src/test/log4j.properties
Modified:
turbine/fulcrum/trunk/security/hibernate/pom.xml
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
Added: turbine/fulcrum/trunk/security/api/src/test/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/log4j2-test.xml?rev=1868706&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/api/src/test/log4j2-test.xml (added)
+++ turbine/fulcrum/trunk/security/api/src/test/log4j2-test.xml Mon Oct 21
13:51:33 2019
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="info" verbose="true">
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </Console>
+ <File name="fulcrum" fileName="target/fulcrum.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ <File name="avalon" fileName="target/avalon.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.fulcrum" level="debug" additivity="false">
+ <AppenderRef ref="fulcrum"/>
+ </Logger>
+ <Logger name="avalon" level="info" additivity="false">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="avalon"/>
+ </Logger>
+ <Root level="error">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="fulcrum"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/api/src/test/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/security/hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/pom.xml?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/pom.xml (original)
+++ turbine/fulcrum/trunk/security/hibernate/pom.xml Mon Oct 21 13:51:33 2019
@@ -95,12 +95,12 @@
<scope>test</scope>
</dependency>
<!-- testing dependencies -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
@@ -111,19 +111,16 @@
<artifactId>fulcrum-yaafi</artifactId>
<scope>test</scope>
</dependency>
+ <!-- HIBERNATE LOGGER (log4j 1.2 mapper ) -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- <type>jar</type>
- <scope>test</scope>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <type>jar</type>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.28</version>
</dependency>
</dependencies>
</project>
Added: turbine/fulcrum/trunk/security/hibernate/src/test/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/hibernate/src/test/log4j2-test.xml?rev=1868706&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/hibernate/src/test/log4j2-test.xml (added)
+++ turbine/fulcrum/trunk/security/hibernate/src/test/log4j2-test.xml Mon Oct
21 13:51:33 2019
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="info" verbose="true">
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </Console>
+ <File name="fulcrum" fileName="target/fulcrum.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ <!-- seems to block jvm -->
+ <!--File name="hibernate" fileName="target/hibernate.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File-->
+ <File name="avalon" fileName="target/avalon.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.fulcrum" level="debug" additivity="false">
+ <AppenderRef ref="fulcrum"/>
+ </Logger>
+ <Logger name="avalon" level="info" additivity="false">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="avalon"/>
+ </Logger>
+ <Logger name="net.sf.hibernate" level="warn" additivity="false">
+ <AppenderRef ref="console"/>
+ </Logger>
+ <Logger name="net.sf.hibernate.type" level="info" additivity="false">
+ <AppenderRef ref="console"/>
+ </Logger>
+ <Logger name="net.sf.hibernate.ps.PreparedStatementCache" level="info"
additivity="false">
+ <AppenderRef ref="console"/>
+ </Logger>
+ <Root level="error">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="fulcrum"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/hibernate/src/test/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: turbine/fulcrum/trunk/security/memory/src/test/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/log4j2-test.xml?rev=1868706&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/memory/src/test/log4j2-test.xml (added)
+++ turbine/fulcrum/trunk/security/memory/src/test/log4j2-test.xml Mon Oct 21
13:51:33 2019
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="info" verbose="true">
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </Console>
+ <File name="fulcrum" fileName="target/fulcrum.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ <File name="avalon" fileName="target/avalon.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.fulcrum" level="debug" additivity="false">
+ <AppenderRef ref="fulcrum"/>
+ </Logger>
+ <Logger name="avalon" level="info" additivity="false">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="avalon"/>
+ </Logger>
+ <Root level="error">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="fulcrum"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/memory/src/test/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/fulcrum/trunk/security/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Mon Oct 21 13:51:33 2019
@@ -125,6 +125,12 @@
<version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Mon Oct 21 13:51:33 2019
@@ -36,7 +36,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Easy update of torque libs -->
- <torque.version>4.0</torque.version>
+ <torque.version>4.1-SNAPSHOT</torque.version>
<torque.om>org.apache.fulcrum.security.torque.om</torque.om>
<torque.om.path>org/apache/fulcrum/security/torque/om</torque.om.path>
</properties>
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.7.0</version>
</dependency>
<!-- testing dependencies -->
Modified:
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
(original)
+++
turbine/fulcrum/trunk/security/torque/schema/fulcrum-turbine-default-schema.xml
Mon Oct 21 13:51:33 2019
@@ -37,7 +37,9 @@
after Torque 4.1 is released, add attribute
peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer"
to tables TURBINE_PERMISSION,TURBINE_ROLE,TURBINE_GROUP,TURBINE_USER, cft.
https://issues.apache.org/jira/browse/TRB-92 and
https://issues.apache.org/jira/browse/TORQUE-309.
-->
- <table name="TURBINE_PERMISSION" javaName="TurbinePermission"
idMethod="native"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbinePermission">
+ <table name="TURBINE_PERMISSION" javaName="TurbinePermission"
idMethod="native"
+
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbinePermission"
+ peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer">
<column name="PERMISSION_ID" required="true" primaryKey="true"
type="INTEGER" javaName="EntityId" javaType="object"/>
<column name="PERMISSION_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
@@ -48,7 +50,8 @@
</table>
<table name="TURBINE_ROLE" javaName="TurbineRole" idMethod="native"
-
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineRole">
+
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineRole"
+
peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer">
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
<column name="ROLE_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
@@ -59,7 +62,8 @@
</table>
<table name="TURBINE_GROUP" javaName="TurbineGroup" idMethod="native"
-
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineGroup">
+
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineGroup"
+
peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer">
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
<column name="GROUP_NAME" required="true" type="VARCHAR" size="64"
javaName="EntityName"/>
@@ -71,7 +75,8 @@
<table name="TURBINE_USER" javaName="TurbineUser" idMethod="native"
baseClass="org.apache.fulcrum.security.torque.turbine.DefaultAbstractTurbineUser"
-
interface="org.apache.fulcrum.security.model.turbine.entity.TurbineUser">
+
interface="org.apache.fulcrum.security.model.turbine.entity.TurbineUser"
+
peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbinePeer">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"
javaName="EntityId" javaType="object"/>
<column name="LOGIN_NAME" required="true" size="64" type="VARCHAR"
javaName="EntityName"/>
<column name="PASSWORD_VALUE" required="true" size="16" type="VARCHAR"
javaName="Password"/>
@@ -100,7 +105,8 @@
</table>
<table name="TURBINE_USER_GROUP_ROLE" javaName="TurbineUserGroupRole"
idMethod="none"
-
interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper">
+
interface="org.apache.fulcrum.security.torque.peer.TurbineUserGroupRoleModelPeerMapper"
+
peerInterface="org.apache.fulcrum.security.torque.peer.TorqueTurbineUserGroupRolePeer">
<column name="USER_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
<column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"
javaType="object"/>
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/TorqueAbstractSecurityEntity.java
Mon Oct 21 13:51:33 2019
@@ -72,7 +72,7 @@ public abstract class TorqueAbstractSecu
* @param lazy if <code>true</code>, may load some or all relationships
later
* @throws TorqueException database not found exception
*/
- public abstract void retrieveAttachedObjects(Connection con, Boolean lazy)
throws DataBackendException;
+ public abstract void retrieveAttachedObjects(Connection con, Boolean lazy)
throws DataBackendException, TorqueException;
/**
@@ -80,8 +80,9 @@ public abstract class TorqueAbstractSecu
*
* @param con A database connection
* @throws DataBackendException wrapper exception: user information not
found exception
+ * @throws TorqueException
*/
- public abstract void retrieveAttachedObjects(Connection con) throws
DataBackendException;
+ public abstract void retrieveAttachedObjects(Connection con) throws
DataBackendException, TorqueException;
/**
* Update this instance to the database with all dependent objects
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/security/turbine/TorqueAbstractTurbineTurbineSecurityEntityDefault.java
Mon Oct 21 13:51:33 2019
@@ -49,7 +49,8 @@ public abstract class TorqueAbstractTurb
* @param lazy if <code>true</code>, fetches objects lazily
* @param ugrs The custom TurbineUserGroupRole set
* @throws DataBackendException if data connection or user information
(table objects) not found
+ * @throws TorqueException
*/
- public abstract <T extends TurbineUserGroupRoleModelPeerMapper> void
retrieveAttachedObjects( Connection con, Boolean lazy, List<T> ugrs ) throws
DataBackendException;
+ public abstract <T extends TurbineUserGroupRoleModelPeerMapper> void
retrieveAttachedObjects( Connection con, Boolean lazy, List<T> ugrs ) throws
DataBackendException, TorqueException;
}
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/turbine/DefaultAbstractTurbineUser.java
Mon Oct 21 13:51:33 2019
@@ -60,12 +60,13 @@ public abstract class DefaultAbstractTur
*
* @param criteria Criteria to define the selection of records
* @param con a database connection
- * @throws DataBackendException if any database error occurs
+ * @throws DataBackendException
*
* @return a list of User/Group/Role relations
+ * @throws TorqueException if any database error occurs
*/
protected <T extends TurbineUserGroupRoleModelPeerMapper> List<T>
getTurbineUserGroupRolesJoinTurbineRole(Criteria criteria, Connection con)
- throws DataBackendException
+ throws TorqueException, DataBackendException
{
criteria.and(TurbineUserGroupRolePeer.USER_ID, getEntityId() );
try {
@@ -79,7 +80,7 @@ public abstract class DefaultAbstractTur
* @see
org.apache.fulcrum.security.torque.security.turbine.TorqueAbstractTurbineTurbineSecurityEntityDefault#retrieveAttachedObjects(java.sql.Connection,
java.lang.Boolean, java.util.List)
*/
@Override
- public <T extends TurbineUserGroupRoleModelPeerMapper> void
retrieveAttachedObjects( Connection con, Boolean lazy, List<T> ugrs ) throws
DataBackendException
+ public <T extends TurbineUserGroupRoleModelPeerMapper> void
retrieveAttachedObjects( Connection con, Boolean lazy, List<T> ugrs ) throws
DataBackendException, TorqueException
{
if (!lazy ) { // !lazy
Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
@@ -98,7 +99,7 @@ public abstract class DefaultAbstractTur
* @see
org.apache.fulcrum.security.torque.security.TorqueAbstractSecurityEntity#retrieveAttachedObjects(java.sql.Connection,
java.lang.Boolean)
*/
@Override
- public void retrieveAttachedObjects( Connection con, Boolean lazy ) throws
DataBackendException
+ public void retrieveAttachedObjects( Connection con, Boolean lazy ) throws
TorqueException, DataBackendException
{
if (!lazy) {
Set<TurbineUserGroupRole> userGroupRoleSet = new
HashSet<TurbineUserGroupRole>();
@@ -117,7 +118,7 @@ public abstract class DefaultAbstractTur
*/
@Override
public void retrieveAttachedObjects( Connection con )
- throws DataBackendException
+ throws DataBackendException, TorqueException
{
retrieveAttachedObjects( con, false ); //false
}
Added: turbine/fulcrum/trunk/security/torque/src/test/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/log4j2-test.xml?rev=1868706&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/log4j2-test.xml (added)
+++ turbine/fulcrum/trunk/security/torque/src/test/log4j2-test.xml Mon Oct 21
13:51:33 2019
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="info" verbose="true">
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </Console>
+ <File name="fulcrum" fileName="target/fulcrum.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ <File name="torque" fileName="target/torque.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ <File name="avalon" fileName="target/avalon.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.fulcrum" level="debug" additivity="false">
+ <AppenderRef ref="fulcrum"/>
+ </Logger>
+ <Logger name="avalon" level="info" additivity="false">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="avalon"/>
+ </Logger>
+ <Logger name="org.apache.torque" level="debug" additivity="false">
+ <AppenderRef ref="torque"/>
+ </Logger>
+ <Root level="error">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="fulcrum"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: turbine/fulcrum/trunk/security/torque/src/test/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/AbstractTurbineUserManagerTest.java
Mon Oct 21 13:51:33 2019
@@ -42,6 +42,8 @@ import org.apache.fulcrum.security.util.
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.security.util.UserSet;
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.Test;
/**
@@ -65,6 +67,10 @@ public abstract class AbstractTurbineUse
protected Group group;
protected Role role;
+
+ protected Logger logger = LogManager.getLogger();
+
+
// requires default user in setup
@Test
Modified:
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineDefaultModelManagerTest.java
Mon Oct 21 13:51:33 2019
@@ -62,6 +62,7 @@ public class TurbineDefaultModelManagerT
// we have to use declared peers
this.setConfigurationFileName(
"src/test/TurbineDefaultWithPeersComponentConfig.xml" );
securityService = (SecurityService) lookup( SecurityService.ROLE );
+
super.setUp();
}
catch ( Exception e )
Modified:
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java?rev=1868706&r1=1868705&r2=1868706&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TurbineUserManagerDefaultPeerLazyTest.java
Mon Oct 21 13:51:33 2019
@@ -18,12 +18,14 @@ package org.apache.fulcrum.security.torq
* under the License.
*/
+import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;
import java.sql.Connection;
import java.sql.SQLException;
import org.apache.fulcrum.security.SecurityService;
+import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.model.turbine.TurbineModelManager;
import org.apache.fulcrum.security.torque.HsqlDB;
import org.apache.fulcrum.security.torque.om.TurbineGroupPeer;
@@ -38,6 +40,7 @@ import org.apache.torque.criteria.Criter
import org.apache.torque.util.Transaction;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test user with attached object (user-role-goup relationship)
@@ -76,6 +79,14 @@ public class TurbineUserManagerDefaultPe
fail( e.toString() );
}
}
+
+ @Test
+ public void dummyTest()
+ throws Exception
+ {
+ Group group =
securityService.getGroupManager().getGroupByName("TEST_GROUP" );
+ assertNotNull(group );
+ }
@Override
@AfterEach
