Author: gk
Date: Tue Dec 22 16:16:40 2020
New Revision: 1884710
URL: http://svn.apache.org/viewvc?rev=1884710&view=rev
Log:
- update changes.xml in root, remove superseded changes.xml in api module
- fix javadoc issues, cleanup javadoc configurationin poms
- update xdoc index.xml
- update commons/lang3 to 3.11
Removed:
turbine/fulcrum/trunk/security/api/src/changes/
Modified:
turbine/fulcrum/trunk/security/api/pom.xml
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicGroup.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java
turbine/fulcrum/trunk/security/memory/pom.xml
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/security/src/changes/changes.xml
turbine/fulcrum/trunk/security/torque/pom.xml
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineRolePermissionPeerMapper.java
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java
turbine/fulcrum/trunk/security/xdocs/index.xml
Modified: turbine/fulcrum/trunk/security/api/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/pom.xml?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/api/pom.xml (original)
+++ turbine/fulcrum/trunk/security/api/pom.xml Tue Dec 22 16:16:40 2020
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.11</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/GroupManager.java
Tue Dec 22 16:16:40 2020
@@ -51,7 +51,7 @@ public interface GroupManager extends Se
* This method calls getGroupClass, and then creates a new object using the
* default constructor.
*
- * @param <T>
+ * @param <T> The group extending {@link Group}
* @return an object implementing Group interface.
* @throws DataBackendException
* if the object could not be instantiated.
@@ -64,6 +64,7 @@ public interface GroupManager extends Se
* This method calls getGroupClass, and then creates a new object using the
* default constructor.
*
+ * @param <T> The group of type {@link Group}
* @param groupName
* The name of the Group
*
@@ -76,7 +77,7 @@ public interface GroupManager extends Se
/**
* Retrieve a Group object with specified name.
*
- * @param <T>
+ *@param <T> The group of type {@link Group}
* @param name
* the name of the Group.
* @return an object representing the Group with specified name.
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/PermissionManager.java
Tue Dec 22 16:16:40 2020
@@ -51,7 +51,7 @@ public interface PermissionManager exten
* This method calls getPermissionClass, and then creates a new object
using
* the default constructor.
*
- * @param <T>
+ * @param <T> permission type
* @return an object implementing Permission interface.
* @throws DataBackendException
* if there was an error accessing the
data backend.
@@ -64,7 +64,7 @@ public interface PermissionManager exten
* This method calls getPermissionClass, and then creates a new object
using
* the default constructor.
*
- * @param <T>
+ * @param <T> permission type
* @param permName
* The name of the Permission
*
@@ -77,7 +77,7 @@ public interface PermissionManager exten
/**
* Retrieve a Permission object with specified name.
*
- * @param <T>
+ * @param <T> permission type
* @param name
* the name of the Permission.
* @return an object representing the Permission with specified name.
@@ -91,7 +91,7 @@ public interface PermissionManager exten
/**
* Retrieve a Permission object with specified Id.
*
- * @param <T>
+ * @param <T> permission type
*
* @param id
* the Id of the Permission.
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/RoleManager.java
Tue Dec 22 16:16:40 2020
@@ -20,6 +20,7 @@ package org.apache.fulcrum.security;
*/
import java.io.Serializable;
+import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
@@ -50,6 +51,7 @@ public interface RoleManager extends Ser
* This method calls getRoleClass, and then creates a new object using the
* default constructor.
*
+ * @param <T> role type
* @return an object implementing Role interface.
* @throws DataBackendException if the object could not be instantiated
*/
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/UserManager.java
Tue Dec 22 16:16:40 2020
@@ -53,7 +53,7 @@ public interface UserManager extends Ser
* This method calls getUserClass, and then creates a new object using the
* default constructor.
*
- * @param <T> User
+ * @param <T> User type
* @return an object implementing User interface.
* @throws DataBackendException
* if the object could not be instantiated.
@@ -151,6 +151,7 @@ public interface UserManager extends Ser
/**
* Retrieves all users defined in the system.
*
+ * @param <T> User type
* @return the names of all users defined in the system.
* @throws DataBackendException
* if there was an error accessing the data backend.
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicGroup.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicGroup.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicGroup.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/basic/entity/BasicGroup.java
Tue Dec 22 16:16:40 2020
@@ -52,6 +52,7 @@ public interface BasicGroup extends Grou
/**
* Get the users that are part of this group as a Set
*
+ * @param <T> User type
* @return a set of users
*/
public <T extends User> Set<T> getUsersAsSet();
@@ -59,6 +60,7 @@ public interface BasicGroup extends Grou
/**
* Set the users that are part of this group as a Set
*
+ * @param <T> User type
* @param users
* a set of users
*/
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractRoleManager.java
Tue Dec 22 16:16:40 2020
@@ -39,7 +39,7 @@ public abstract class AbstractRoleManage
private static final long serialVersionUID = 1L;
/**
- * @param <T>
+ * @param <T> role type
* @param role to persist
* @return the Role object
* @throws DataBackendException if fail to connect to datasource
@@ -52,7 +52,7 @@ public abstract class AbstractRoleManage
* This method calls getRoleClass, and then creates a new object using the
* default constructor.
*
- * @param <T>
+ * @param <T> role type
* @return an object implementing Role interface.
* @throws DataBackendException
* if the object could not be instantiated.
@@ -78,7 +78,7 @@ public abstract class AbstractRoleManage
* This method calls getRoleClass, and then creates a new object using the
* default constructor.
*
- * @param <T>
+ * @param <T> type of role
*
* @param roleName
* The name of the role.
@@ -101,7 +101,7 @@ public abstract class AbstractRoleManage
*
* @see
org.apache.fulcrum.security.RoleManager#getRoleByName(java.lang.String)
*
- * @param <T>
+ * @param <T> type of role
*
* @param name
* the name of the Role.
@@ -127,7 +127,7 @@ public abstract class AbstractRoleManage
/**
* Retrieve a Role object with specified Id.
*
- * @param <T>
+ * @param <T> the role type
*
* @param id
* the ID of the Role.
@@ -154,7 +154,7 @@ public abstract class AbstractRoleManage
/**
* Creates a new role with specified attributes.
*
- * @param <T>
+ * @param <T> role type
*
* @param role
* the object describing the role to be created.
Modified: turbine/fulcrum/trunk/security/memory/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/pom.xml?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/memory/pom.xml (original)
+++ turbine/fulcrum/trunk/security/memory/pom.xml Tue Dec 22 16:16:40 2020
@@ -60,11 +60,11 @@
<dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.11</version>
+ </dependency>
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-security-api</artifactId>
Modified: turbine/fulcrum/trunk/security/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Tue Dec 22 16:16:40 2020
@@ -150,8 +150,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <detectJavaApiLink>false</detectJavaApiLink>
+ <source>1.8</source>
+ <detectJavaApiLink>false</detectJavaApiLink>
+ <!-- TODO : figure out why javadoc warnings are not
ignored
+ as this is breaking mvn site generation
+ The only 'warnings' that remain and are serious are
coming from
+ the OM generated classes
+ -->
+ <!-- worked on torque, but not here? -->
+ <doclint>none</doclint>
+
+ <!-- exclude generated sources for now (only works when
running mvn javadoc:javadoc, but not with mvn site? -->
+
<excludePackageNames>org.apache.fulcrum.security.torque.om.*</excludePackageNames>
</configuration>
</plugin>
</plugins>
@@ -193,6 +203,9 @@
<configuration>
<source>1.8</source>
<detectJavaApiLink>false</detectJavaApiLink>
+ <!-- required here -->
+ <doclint>none</doclint>
+
<excludePackageNames>org.apache.fulcrum.security.torque.om.*</excludePackageNames>
</configuration>
</plugin>
</plugins>
Modified: turbine/fulcrum/trunk/security/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/src/changes/changes.xml?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/security/src/changes/changes.xml Tue Dec 22 16:16:40
2020
@@ -23,15 +23,24 @@
<author email="[email protected]">Eric Pugh</author>
</properties>
<body>
- <release version="2.0.0" date="in Subversion">
+ <release version="2.0.0" description="In Subversion">
+ <action type="fix" dev="gk">
+ -Use of interfaces TurbineRolePermissionPeerMapper and
TurbineUserGroupRoleModelPeerMapper in fulcrum-turbine-schema.xml
+ and added implementtion in generated stubs, Fix Torque build
failures,
+ </action>
<action type="update" dev="gk">
+ Java Dependency updates: Update to hsqldb 2.5.1, Torque 5.0, dbcp2
2.8.0, javadoc 3.1.0, junit 5.7.0, mockito 3.5.13, Jackson2 2.10.3
+ turbine parent 7
+ </action>
+ <action type="fix" dev="gk">
- Removed id-check in group/permission/role spi managers - databases
may use native generator/autoincrement.
- Torque add model test
- fixed missing interface for Role/Group/Permission
DefaultAbstractTurbine*Managers, TurbineRolePermissionPeerMapper
</action>
+ <action type="update" dev="jpainter">Update commons-lang3 for all
fulcrum projects</action>
<action type="update" dev="gk">
Torque sub project:
- - Update to Torque 4.1, using PeerInterface in schema, removed classes
as now generated with PeerInterface.
+ - Update to Torque 5.0, using PeerInterface in schema, removed classes
as now generated with PeerInterface.
- add TorqueException to method (TODO DataBackendException wanted)
- Dbcp2 update to v2.7.0
</action>
@@ -40,13 +49,19 @@
</action>
</release>
<release version="1.1.3" date="2019-02-23">
- <action type="update" dev="jp">
+ <action type="update" dev="jpainter">
Update to commons-lang3, Java 8 by default
</action>
<action type="update" dev="gk">
- - TurbineAccessControlList interface with generic type bound
- - Java 8 by default
- - Fix Torque OM build lifecycle (depends on Torque 4.0)
+ -TurbineAccessControlList interface with generic type bound,
+ - Added replace role and revokeAll group/role methods in model
manager,
+ Methods getUserGroupRoleSet(), addUserGroupRole(),
removeUserGroupRole() now throw DataBackendException, changed interface
TurbineUserGroupRoleEntity,
+ -Update Tests to Junit 5,
+ - Java Dependency updates: Update to Fulcrum-yaafi to 1.0.8,
Fulcrum-testcontainer to 1.0.8
+ </action>
+ <action type="fix" dev="gk">
+ -Fix Torque OM build lifecycle (depends on Torque 4.0),
+ -Fix Torque build failures
</action>
</release>
<release version="1.1.2" date="2018-02-02">
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Tue Dec 22 16:16:40 2020
@@ -58,24 +58,6 @@
<forkCount>1</forkCount>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- TODO : figure out why javadoc warnings are not
ignored
- as this is breaking mvn site generation
- The only 'warnings' that remain and are serious are
coming from
- the OM generated classes
- -->
- <!-- worked on torque, but not here? -->
- <doclint>none</doclint>
-
- <!-- exclude generated sources for now (only works when
running mvn javadoc:javadoc, but not with mvn site? -->
-
<excludePackageNames>org.apache.fulcrum.security.torque.om*</excludePackageNames>
-
- </configuration>
- </plugin>
-
</plugins>
</build>
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineRolePermissionPeerMapper.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineRolePermissionPeerMapper.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineRolePermissionPeerMapper.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineRolePermissionPeerMapper.java
Tue Dec 22 16:16:40 2020
@@ -28,7 +28,6 @@ import org.apache.torque.TorqueException
* This extension to the marker interface {@linkplain Peer} is to allow for
swappable Peer implementations
* in Turbine Torque Manager Implementations.
*
- * @param <T> The data object type used by the Torque PeerImpl class.
*
* @author <a href="mailto:[email protected]";>Georg Kallidis</a>
* @version $Id$
Modified:
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java
(original)
+++
turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/TurbineUserGroupRoleModelPeerMapper.java
Tue Dec 22 16:16:40 2020
@@ -27,7 +27,7 @@ import org.apache.torque.TorqueException
/**
* This interface allows to retrieve user, group, role relationships either
from custom or the default OM in
*
- * @link org.apache.fulcrum.security.torque.om.
+ * It should be implemented by appopriate om classes (interface may be set in
schema).
*
* @author gk
* @Id $Id$
Modified: turbine/fulcrum/trunk/security/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/xdocs/index.xml?rev=1884710&r1=1884709&r2=1884710&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/security/xdocs/index.xml Tue Dec 22 16:16:40 2020
@@ -281,11 +281,11 @@
<subsection name="Torque Turbine Model Web App">
<p>Check out the Turbine Web App from the maven archetype catalog to
test a web app with example code. Find the archetype with
<source>
- // filter archeype catalog by groupid:artefactid =
org.apache.turbine:turbine-webapp-4.0
+ // filter archeype catalog by groupid:artefactid =
org.apache.turbine:turbine-webapp-5.1
mvn archetype:generate
- </source> or checkout and build turbine-webapp-4.0 based on Turbine
4 trunk:
+ </source> or checkout and build based on Turbine 5.1 trunk:
<source>
- svn co
https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0
+ git clone
https://gitbox.apache.org/repos/asf/turbine-archetypes.git
mvn clean install
</source>
If you check out from the trunk, you may have to build other sources
as well (any dependeny resource with a SNAPSHOT version).
