jon 01/07/20 14:32:49
Modified: src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/modules/actions
AccessController.java
src/java/org/apache/turbine/modules/actions/sessionvalidator
TemplateSecureSessionValidator.java
TemplateSessionValidator.java
src/java/org/apache/turbine/services/db/map ColumnMap.java
DatabaseMap.java MapBuilder.java TableMap.java
src/java/org/apache/turbine/services/db/om BaseObject.java
src/java/org/apache/turbine/services/db/util BasePeer.java
Criteria.java IDBroker.java Query.java
SqlExpression.java
src/java/org/apache/turbine/services/jsp JspService.java
TurbineJspService.java
src/java/org/apache/turbine/services/security/entity
Permission.java Role.java User.java
src/java/org/apache/turbine/services/security/impl/db
DBUserManager.java
src/java/org/apache/turbine/services/security/impl/db/entity
SecurityObject.java TurbineGroupPeer.java
TurbinePermission.java TurbinePermissionPeer.java
TurbineRole.java TurbineRolePeer.java
TurbineUser.java TurbineUserPeer.java
src/java/org/apache/turbine/services/security/util
AccessControlList.java GroupSet.java
PermissionSet.java RoleSet.java
src/java/org/apache/turbine/services/template
TemplateService.java TurbineTemplate.java
TurbineTemplateService.java
src/java/org/apache/turbine/services/velocity
TurbineVelocity.java VelocityService.java
src/java/org/apache/turbine/util RunDataFactory.java
Log:
changed John's email address to be an address which doesn't bounce.
-jon
Revision Changes Path
1.77 +2 -2 jakarta-turbine/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Turbine.java 2001/07/17 23:03:42 1.76
+++ Turbine.java 2001/07/20 21:32:47 1.77
@@ -104,11 +104,11 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Ritter</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Turbine.java,v 1.76 2001/07/17 23:03:42 jvanzyl Exp $
+ * @version $Id: Turbine.java,v 1.77 2001/07/20 21:32:47 jon Exp $
*/
public class Turbine
extends HttpServlet
1.12 +2 -2
jakarta-turbine/src/java/org/apache/turbine/modules/actions/AccessController.java
Index: AccessController.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/AccessController.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AccessController.java 2001/07/17 11:37:28 1.11
+++ AccessController.java 2001/07/20 21:32:47 1.12
@@ -88,9 +88,9 @@
* This action is special in that it should only be executed by the
* Turbine servlet.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: AccessController.java,v 1.11 2001/07/17 11:37:28 jvanzyl Exp $
+ * @version $Id: AccessController.java,v 1.12 2001/07/20 21:32:47 jon Exp $
*/
public class AccessController
extends Action
1.13 +2 -2
jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java
Index: TemplateSecureSessionValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSecureSessionValidator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TemplateSecureSessionValidator.java 2001/07/17 11:37:29 1.12
+++ TemplateSecureSessionValidator.java 2001/07/20 21:32:47 1.13
@@ -75,9 +75,9 @@
* Note that you will need to set the template.login property to the
* login template.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateSecureSessionValidator.java,v 1.12 2001/07/17 11:37:29
jvanzyl Exp $
+ * @version $Id: TemplateSecureSessionValidator.java,v 1.13 2001/07/20 21:32:47 jon
Exp $
*/
public class TemplateSecureSessionValidator
extends TemplateSessionValidator
1.15 +2 -2
jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
Index: TemplateSessionValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TemplateSessionValidator.java 2001/07/17 11:37:29 1.14
+++ TemplateSessionValidator.java 2001/07/20 21:32:47 1.15
@@ -69,9 +69,9 @@
* because of the way it handles screens.
*
* @see TemplateSecureSessionValidator
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateSessionValidator.java,v 1.14 2001/07/17 11:37:29 jvanzyl
Exp $
+ * @version $Id: TemplateSessionValidator.java,v 1.15 2001/07/20 21:32:47 jon Exp $
*/
public class TemplateSessionValidator
extends SessionValidator
1.2 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/map/ColumnMap.java
Index: ColumnMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/map/ColumnMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ColumnMap.java 2001/06/25 05:13:04 1.1
+++ ColumnMap.java 2001/07/20 21:32:47 1.2
@@ -57,8 +57,8 @@
/**
* ColumnMap is used to model a column of a table in a database.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: ColumnMap.java,v 1.1 2001/06/25 05:13:04 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: ColumnMap.java,v 1.2 2001/07/20 21:32:47 jon Exp $
*/
public class ColumnMap
{
1.2 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/map/DatabaseMap.java
Index: DatabaseMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/map/DatabaseMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseMap.java 2001/06/25 05:13:04 1.1
+++ DatabaseMap.java 2001/07/20 21:32:47 1.2
@@ -64,8 +64,8 @@
/**
* DatabaseMap is used to model a database.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: DatabaseMap.java,v 1.1 2001/06/25 05:13:04 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: DatabaseMap.java,v 1.2 2001/07/20 21:32:47 jon Exp $
*/
public class DatabaseMap
{
1.2 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/map/MapBuilder.java
Index: MapBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/map/MapBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MapBuilder.java 2001/06/25 05:13:04 1.1
+++ MapBuilder.java 2001/07/20 21:32:47 1.2
@@ -60,8 +60,8 @@
* your own MapBuilders. The MapBuilder interface exists to support ease of
* casting.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: MapBuilder.java,v 1.1 2001/06/25 05:13:04 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: MapBuilder.java,v 1.2 2001/07/20 21:32:47 jon Exp $
*/
public interface MapBuilder
{
1.2 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/map/TableMap.java
Index: TableMap.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/map/TableMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TableMap.java 2001/06/25 05:13:04 1.1
+++ TableMap.java 2001/07/20 21:32:47 1.2
@@ -64,8 +64,8 @@
/**
* TableMap is used to model a table in a database.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: TableMap.java,v 1.1 2001/06/25 05:13:04 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: TableMap.java,v 1.2 2001/07/20 21:32:47 jon Exp $
*/
public class TableMap
{
1.2 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/om/BaseObject.java
Index: BaseObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/om/BaseObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseObject.java 2001/06/25 05:13:05 1.1
+++ BaseObject.java 2001/07/20 21:32:47 1.2
@@ -62,8 +62,8 @@
* business objects within the system.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: BaseObject.java,v 1.1 2001/06/25 05:13:05 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: BaseObject.java,v 1.2 2001/07/20 21:32:47 jon Exp $
*/
public abstract class BaseObject implements Persistent, Serializable
{
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/util/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/BasePeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasePeer.java 2001/07/17 21:19:06 1.2
+++ BasePeer.java 2001/07/20 21:32:47 1.3
@@ -113,9 +113,9 @@
* the implementation of concrete Peers.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.2 2001/07/17 21:19:06 knielsen Exp $
+ * @version $Id: BasePeer.java,v 1.3 2001/07/20 21:32:47 jon Exp $
*/
public abstract class BasePeer
{
1.5 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/util/Criteria.java
Index: Criteria.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/Criteria.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Criteria.java 2001/07/17 20:36:04 1.4
+++ Criteria.java 2001/07/20 21:32:47 1.5
@@ -92,11 +92,11 @@
* NOTE: other methods will be added as needed and as time permits.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Eric Dobbs</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
- * @version $Id: Criteria.java,v 1.4 2001/07/17 20:36:04 jmcnally Exp $
+ * @version $Id: Criteria.java,v 1.5 2001/07/20 21:32:47 jon Exp $
*/
public class Criteria extends Hashtable
{
1.10 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/util/IDBroker.java
Index: IDBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/IDBroker.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IDBroker.java 2001/07/20 21:27:52 1.9
+++ IDBroker.java 2001/07/20 21:32:47 1.10
@@ -113,8 +113,8 @@
* does not support transactions should be limited to a single JVM.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: IDBroker.java,v 1.9 2001/07/20 21:27:52 jon Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: IDBroker.java,v 1.10 2001/07/20 21:32:47 jon Exp $
*/
public class IDBroker
implements Runnable, IdGenerator
1.2 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/util/Query.java
Index: Query.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/Query.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Query.java 2001/06/25 05:13:09 1.1
+++ Query.java 2001/07/20 21:32:47 1.2
@@ -63,8 +63,8 @@
* appended to buffers which only accept unique entries. This class
* is used primarily by BasePeer.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: Query.java,v 1.1 2001/06/25 05:13:09 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: Query.java,v 1.2 2001/07/20 21:32:47 jon Exp $
*/
public class Query
{
1.2 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/db/util/SqlExpression.java
Index: SqlExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/db/util/SqlExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SqlExpression.java 2001/06/25 05:13:09 1.1
+++ SqlExpression.java 2001/07/20 21:32:47 1.2
@@ -77,9 +77,9 @@
* </pre>
* This class is used primarily by {@link org.apache.turbine.om.peer.BasePeer}.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: SqlExpression.java,v 1.1 2001/06/25 05:13:09 jvanzyl Exp $
+ * @version $Id: SqlExpression.java,v 1.2 2001/07/20 21:32:47 jon Exp $
*/
public class SqlExpression
{
1.7 +1 -1
jakarta-turbine/src/java/org/apache/turbine/services/jsp/JspService.java
Index: JspService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/JspService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspService.java 2001/07/14 19:36:32 1.6
+++ JspService.java 2001/07/20 21:32:47 1.7
@@ -62,7 +62,7 @@
/**
* Implementations of the JspService interface.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
*/
public interface JspService extends Service
{
1.20 +1 -1
jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurbineJspService.java 2001/07/14 19:36:32 1.19
+++ TurbineJspService.java 2001/07/20 21:32:47 1.20
@@ -71,7 +71,7 @@
* This is a Service that can process JSP templates from within a Turbine
* screen.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
*/
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/entity/Permission.java
Index: Permission.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/entity/Permission.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Permission.java 2001/07/15 18:05:34 1.2
+++ Permission.java 2001/07/20 21:32:48 1.3
@@ -63,9 +63,9 @@
* be in alphabetical order by name.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: Permission.java,v 1.2 2001/07/15 18:05:34 mpoeschl Exp $
+ * @version $Id: Permission.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public interface Permission extends SecurityEntity
{
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/entity/Role.java
Index: Role.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/entity/Role.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Role.java 2001/07/15 18:05:33 1.2
+++ Role.java 2001/07/20 21:32:48 1.3
@@ -62,9 +62,9 @@
* current Session.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: Role.java,v 1.2 2001/07/15 18:05:33 mpoeschl Exp $
+ * @version $Id: Role.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public interface Role extends SecurityEntity
{
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/entity/User.java
Index: User.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/entity/User.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- User.java 2001/07/15 18:05:34 1.2
+++ User.java 2001/07/20 21:32:48 1.3
@@ -65,10 +65,10 @@
* Turbine system require.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Craig D. Berry</a>
- * @version $Id: User.java,v 1.2 2001/07/15 18:05:34 mpoeschl Exp $
+ * @version $Id: User.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public interface User
extends HttpSessionBindingListener, Serializable, SecurityEntity
1.4 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/DBUserManager.java
Index: DBUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/DBUserManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DBUserManager.java 2001/07/17 23:01:07 1.3
+++ DBUserManager.java 2001/07/20 21:32:48 1.4
@@ -83,11 +83,11 @@
* {@link org.apache.turbine.om.BaseObject}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Craig D. Berry</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: DBUserManager.java,v 1.3 2001/07/17 23:01:07 jvanzyl Exp $
+ * @version $Id: DBUserManager.java,v 1.4 2001/07/20 21:32:48 jon Exp $
*/
public class DBUserManager implements UserManager
{
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/SecurityObject.java
Index: SecurityObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/SecurityObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityObject.java 2001/07/15 18:08:42 1.2
+++ SecurityObject.java 2001/07/20 21:32:48 1.3
@@ -63,10 +63,10 @@
* This class represents a generic object used in the Access Control Lists.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: SecurityObject.java,v 1.2 2001/07/15 18:08:42 mpoeschl Exp $
+ * @version $Id: SecurityObject.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public abstract class SecurityObject
extends BaseObject
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineGroupPeer.java
Index: TurbineGroupPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineGroupPeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineGroupPeer.java 2001/07/17 20:36:08 1.2
+++ TurbineGroupPeer.java 2001/07/20 21:32:48 1.3
@@ -70,11 +70,11 @@
* This table contains all the Groups that a given member can play.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineGroupPeer.java,v 1.2 2001/07/17 20:36:08 jmcnally Exp $
+ * @version $Id: TurbineGroupPeer.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public class TurbineGroupPeer
extends org.apache.turbine.services.security.impl.db.entity.BaseTurbineGroupPeer
1.4 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbinePermission.java
Index: TurbinePermission.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbinePermission.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbinePermission.java 2001/07/18 03:13:47 1.3
+++ TurbinePermission.java 2001/07/20 21:32:48 1.4
@@ -66,10 +66,10 @@
* be in alphabetical order by name.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbinePermission.java,v 1.3 2001/07/18 03:13:47 mpoeschl Exp $
+ * @version $Id: TurbinePermission.java,v 1.4 2001/07/20 21:32:48 jon Exp $
*/
public class TurbinePermission
extends
org.apache.turbine.services.security.impl.db.entity.BaseTurbinePermission
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbinePermissionPeer.java
Index: TurbinePermissionPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbinePermissionPeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbinePermissionPeer.java 2001/07/17 20:36:08 1.2
+++ TurbinePermissionPeer.java 2001/07/20 21:32:48 1.3
@@ -73,10 +73,10 @@
* the system.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbinePermissionPeer.java,v 1.2 2001/07/17 20:36:08 jmcnally Exp $
+ * @version $Id: TurbinePermissionPeer.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public class TurbinePermissionPeer
extends
org.apache.turbine.services.security.impl.db.entity.BaseTurbinePermissionPeer
1.4 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineRole.java
Index: TurbineRole.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineRole.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineRole.java 2001/07/18 03:13:47 1.3
+++ TurbineRole.java 2001/07/20 21:32:48 1.4
@@ -67,10 +67,10 @@
* current Session.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineRole.java,v 1.3 2001/07/18 03:13:47 mpoeschl Exp $
+ * @version $Id: TurbineRole.java,v 1.4 2001/07/20 21:32:48 jon Exp $
*/
public class TurbineRole
extends org.apache.turbine.services.security.impl.db.entity.BaseTurbineRole
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineRolePeer.java
Index: TurbineRolePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineRolePeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineRolePeer.java 2001/07/17 20:36:08 1.2
+++ TurbineRolePeer.java 2001/07/20 21:32:48 1.3
@@ -74,10 +74,10 @@
* This table contains all the roles that a given member can play.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineRolePeer.java,v 1.2 2001/07/17 20:36:08 jmcnally Exp $
+ * @version $Id: TurbineRolePeer.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public class TurbineRolePeer
extends org.apache.turbine.services.security.impl.db.entity.BaseTurbineRolePeer
1.5 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineUser.java
Index: TurbineUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineUser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineUser.java 2001/07/18 03:13:47 1.4
+++ TurbineUser.java 2001/07/20 21:32:48 1.5
@@ -71,11 +71,11 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Josh Lucas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Craig D. Berry</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineUser.java,v 1.4 2001/07/18 03:13:47 mpoeschl Exp $
+ * @version $Id: TurbineUser.java,v 1.5 2001/07/20 21:32:48 jon Exp $
*/
public class TurbineUser
extends org.apache.turbine.services.security.impl.db.entity.BaseTurbineUser
1.4 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineUserPeer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineUserPeer.java 2001/07/17 20:36:09 1.3
+++ TurbineUserPeer.java 2001/07/20 21:32:48 1.4
@@ -67,10 +67,10 @@
* table. This table contains all the information for a given user.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineUserPeer.java,v 1.3 2001/07/17 20:36:09 jmcnally Exp $
+ * @version $Id: TurbineUserPeer.java,v 1.4 2001/07/20 21:32:48 jon Exp $
*/
public class TurbineUserPeer
extends org.apache.turbine.services.security.impl.db.entity.BaseTurbineUserPeer
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/util/AccessControlList.java
Index: AccessControlList.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/util/AccessControlList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AccessControlList.java 2001/07/15 18:03:43 1.2
+++ AccessControlList.java 2001/07/20 21:32:48 1.3
@@ -71,11 +71,11 @@
* particular User has a given Permission. It also determines if a
* User has a a particular Role.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Ritter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: AccessControlList.java,v 1.2 2001/07/15 18:03:43 mpoeschl Exp $
+ * @version $Id: AccessControlList.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public class AccessControlList implements Serializable
{
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/util/GroupSet.java
Index: GroupSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/util/GroupSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GroupSet.java 2001/07/15 18:03:42 1.2
+++ GroupSet.java 2001/07/20 21:32:48 1.3
@@ -70,9 +70,9 @@
* are available. TreeSet's contain only unique Objects (no
* duplicates).
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: GroupSet.java,v 1.2 2001/07/15 18:03:42 mpoeschl Exp $
+ * @version $Id: GroupSet.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public class GroupSet implements Serializable
{
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/util/PermissionSet.java
Index: PermissionSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/util/PermissionSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PermissionSet.java 2001/07/15 18:03:41 1.2
+++ PermissionSet.java 2001/07/20 21:32:48 1.3
@@ -72,9 +72,9 @@
* are available. TreeSet's contain only unique Objects (no
* duplicates).
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: PermissionSet.java,v 1.2 2001/07/15 18:03:41 mpoeschl Exp $
+ * @version $Id: PermissionSet.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public class PermissionSet implements Serializable
{
1.3 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/util/RoleSet.java
Index: RoleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/util/RoleSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RoleSet.java 2001/07/15 18:03:40 1.2
+++ RoleSet.java 2001/07/20 21:32:48 1.3
@@ -71,9 +71,9 @@
* allowed in the set and only relevant methods are available.
* TreeSet's contain only unique Objects (no duplicates).
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: RoleSet.java,v 1.2 2001/07/15 18:03:40 mpoeschl Exp $
+ * @version $Id: RoleSet.java,v 1.3 2001/07/20 21:32:48 jon Exp $
*/
public class RoleSet implements Serializable
{
1.22 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java
Index: TemplateService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TemplateService.java 2001/07/17 11:35:36 1.21
+++ TemplateService.java 2001/07/20 21:32:48 1.22
@@ -66,11 +66,11 @@
* template structure. It also performs caching if turned on in the
* properties file.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: TemplateService.java,v 1.21 2001/07/17 11:35:36 jvanzyl Exp $
+ * @version $Id: TemplateService.java,v 1.22 2001/07/20 21:32:48 jon Exp $
*/
public interface TemplateService
extends Service
1.15 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplate.java
Index: TurbineTemplate.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplate.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TurbineTemplate.java 2001/07/17 11:35:36 1.14
+++ TurbineTemplate.java 2001/07/20 21:32:48 1.15
@@ -63,8 +63,8 @@
* This is a simple static accessor to common TemplateService tasks such as
* getting a Screen that is associated with a screen template.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: TurbineTemplate.java,v 1.14 2001/07/17 11:35:36 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: TurbineTemplate.java,v 1.15 2001/07/20 21:32:48 jon Exp $
*/
public abstract class TurbineTemplate
{
1.54 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
Index: TurbineTemplateService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TurbineTemplateService.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- TurbineTemplateService.java 2001/07/17 11:35:36 1.53
+++ TurbineTemplateService.java 2001/07/20 21:32:48 1.54
@@ -98,12 +98,12 @@
* 3./about_us/default.vm
* 4./default.vm
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
- * @version $Id: TurbineTemplateService.java,v 1.53 2001/07/17 11:35:36 jvanzyl Exp
$
+ * @version $Id: TurbineTemplateService.java,v 1.54 2001/07/20 21:32:48 jon Exp $
*/
public class TurbineTemplateService
extends BaseService
1.19 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocity.java
Index: TurbineVelocity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocity.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TurbineVelocity.java 2001/07/17 11:37:32 1.18
+++ TurbineVelocity.java 2001/07/20 21:32:49 1.19
@@ -72,10 +72,10 @@
* data.getPage().getBody().addElement(results);
* </pre>
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TurbineVelocity.java,v 1.18 2001/07/17 11:37:32 jvanzyl Exp $
+ * @version $Id: TurbineVelocity.java,v 1.19 2001/07/20 21:32:49 jon Exp $
*/
public abstract class TurbineVelocity
{
1.20 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java
Index: VelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- VelocityService.java 2001/07/17 11:37:32 1.19
+++ VelocityService.java 2001/07/20 21:32:49 1.20
@@ -64,10 +64,10 @@
/**
* Implementations of the VelocityService interface.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: VelocityService.java,v 1.19 2001/07/17 11:37:32 jvanzyl Exp $
+ * @version $Id: VelocityService.java,v 1.20 2001/07/20 21:32:49 jon Exp $
*/
public interface VelocityService extends Service
{
1.17 +2 -2
jakarta-turbine/src/java/org/apache/turbine/util/RunDataFactory.java
Index: RunDataFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/RunDataFactory.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RunDataFactory.java 2001/07/14 21:29:42 1.16
+++ RunDataFactory.java 2001/07/20 21:32:49 1.17
@@ -75,8 +75,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: RunDataFactory.java,v 1.16 2001/07/14 21:29:42 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
+ * @version $Id: RunDataFactory.java,v 1.17 2001/07/20 21:32:49 jon Exp $
*/
public class RunDataFactory
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
