You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2003/07/16 02:21:19 UTC
cvs commit: jakarta-turbine-flux/src/java/org/apache/turbine/flux/tools FluxTool.java
mpoeschl 2003/07/15 17:21:19
Modified: src/java/org/apache/turbine/flux/modules/actions/permission
Tag: T_2_1_BRANCH FluxPermissionAction.java
src/java/org/apache/turbine/flux/modules/screens Tag:
T_2_1_BRANCH FluxIndex.java FluxError.java
src/java/org/apache/turbine/flux/modules/actions/role Tag:
T_2_1_BRANCH FluxRoleAction.java
src/java/org/apache/turbine/flux/modules/actions/group Tag:
T_2_1_BRANCH FluxGroupAction.java
src/java/org/apache/turbine/flux/modules/actions/user Tag:
T_2_1_BRANCH FluxUserAction.java
src/java/org/apache/turbine/flux/tools Tag: T_2_1_BRANCH
FluxTool.java
Log:
organize imports
Revision Changes Path
No revision
No revision
1.2.2.2 +4 -6 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/permission/FluxPermissionAction.java
Index: FluxPermissionAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/permission/FluxPermissionAction.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- FluxPermissionAction.java 20 Aug 2001 02:55:11 -0000 1.2.2.1
+++ FluxPermissionAction.java 16 Jul 2003 00:21:14 -0000 1.2.2.2
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,15 +54,13 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
+import org.apache.turbine.flux.modules.actions.FluxAction;
import org.apache.turbine.om.security.Permission;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.util.security.PermissionSet;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.flux.modules.actions.FluxAction;
+import org.apache.velocity.context.Context;
/**
* Action to manage permissions in Turbine.
No revision
No revision
1.3.2.1 +2 -3 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxIndex.java
Index: FluxIndex.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxIndex.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- FluxIndex.java 10 May 2001 16:31:16 -0000 1.3
+++ FluxIndex.java 16 Jul 2003 00:21:14 -0000 1.3.2.1
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,13 +54,12 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
import org.apache.turbine.modules.screens.VelocityScreen;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.security.AccessControlList;
+import org.apache.velocity.context.Context;
/**
* Base screen for secure web access to the storage side of Tambora.
1.1.1.1.2.1 +1 -17 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/Attic/FluxError.java
Index: FluxError.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/Attic/FluxError.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- FluxError.java 26 Mar 2001 00:49:41 -0000 1.1.1.1
+++ FluxError.java 16 Jul 2003 00:21:14 -0000 1.1.1.1.2.1
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,13 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
import org.apache.turbine.modules.screens.VelocityErrorScreen;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.security.AccessControlList;
/**
* Base screen for secure web acces to the storage side of Tambora.
@@ -70,13 +64,3 @@
public class FluxError extends VelocityErrorScreen
{
}
-
-
-
-
-
-
-
-
-
-
No revision
No revision
1.2.2.1 +6 -8 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/role/FluxRoleAction.java
Index: FluxRoleAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/role/FluxRoleAction.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- FluxRoleAction.java 15 Apr 2001 20:12:19 -0000 1.2
+++ FluxRoleAction.java 16 Jul 2003 00:21:14 -0000 1.2.2.1
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,17 +54,15 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
-import org.apache.turbine.om.security.Role;
+import org.apache.turbine.flux.modules.actions.FluxAction;
import org.apache.turbine.om.security.Permission;
+import org.apache.turbine.om.security.Role;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.security.EntityExistsException;
-import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.util.security.RoleSet;
import org.apache.turbine.util.security.PermissionSet;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.flux.modules.actions.FluxAction;
+import org.apache.turbine.util.security.UnknownEntityException;
+import org.apache.velocity.context.Context;
/**
* Action to manager roles in Turbine.
No revision
No revision
1.2.2.1 +4 -6 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/group/FluxGroupAction.java
Index: FluxGroupAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/group/FluxGroupAction.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- FluxGroupAction.java 15 Apr 2001 20:12:19 -0000 1.2
+++ FluxGroupAction.java 16 Jul 2003 00:21:18 -0000 1.2.2.1
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,15 +54,13 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
+import org.apache.turbine.flux.modules.actions.FluxAction;
import org.apache.turbine.om.security.Group;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.UnknownEntityException;
-import org.apache.turbine.util.security.GroupSet;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.flux.modules.actions.FluxAction;
+import org.apache.velocity.context.Context;
/**
* Action to manage groups in Turbine.
No revision
No revision
1.1.1.1.2.1 +5 -8 jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/user/FluxUserAction.java
Index: FluxUserAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/user/FluxUserAction.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- FluxUserAction.java 26 Mar 2001 00:49:41 -0000 1.1.1.1
+++ FluxUserAction.java 16 Jul 2003 00:21:18 -0000 1.1.1.1.2.1
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,17 +56,14 @@
import java.util.Date;
-import org.apache.velocity.context.Context;
-
-import org.apache.turbine.om.security.User;
+import org.apache.turbine.flux.modules.actions.FluxAction;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
+import org.apache.turbine.om.security.User;
+import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.security.EntityExistsException;
-import org.apache.turbine.util.security.UnknownEntityException;
import org.apache.turbine.util.security.AccessControlList;
-import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.flux.modules.actions.FluxAction;
+import org.apache.velocity.context.Context;
/**
* Action to manage users in Turbine.
No revision
No revision
1.3.2.2 +8 -14 jakarta-turbine-flux/src/java/org/apache/turbine/flux/tools/FluxTool.java
Index: FluxTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/tools/FluxTool.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- FluxTool.java 12 Jul 2002 21:03:32 -0000 1.3.2.1
+++ FluxTool.java 16 Jul 2003 00:21:18 -0000 1.3.2.2
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,24 +54,18 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
-import java.util.Iterator;
-
-import org.apache.velocity.context.Context;
-
+import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Group;
-import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.Permission;
+import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.om.security.peer.TurbineUserPeer;
-import org.apache.turbine.util.RunData;
-import org.apache.torque.util.Criteria;
-import org.apache.turbine.util.template.SelectorBox;
-import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.pull.ApplicationTool;
+import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.util.RunData;
import org.apache.turbine.util.pool.Recyclable;
-import org.apache.turbine.util.Log;
+import org.apache.turbine.util.security.AccessControlList;
+import org.apache.turbine.util.template.SelectorBox;
/**
* The pull api for flux templates
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org