jvanzyl 01/07/10 09:52:39
Modified: src/java/org/apache/turbine/flux/modules/actions
FluxAction.java FluxLogin.java FluxLogout.java
src/java/org/apache/turbine/flux/modules/actions/group
FluxGroupAction.java
src/java/org/apache/turbine/flux/modules/actions/permission
FluxPermissionAction.java
src/java/org/apache/turbine/flux/modules/actions/role
FluxRoleAction.java
src/java/org/apache/turbine/flux/modules/actions/user
FluxUserAction.java
src/java/org/apache/turbine/flux/modules/screens
FluxIndex.java FluxScreen.java
src/java/org/apache/turbine/flux/tools FluxTool.java
Log:
- updating flux to work with changes in head.
Revision Changes Path
1.2 +15 -33
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxAction.java
Index: FluxAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FluxAction.java 2001/03/26 00:49:40 1.1
+++ FluxAction.java 2001/07/10 16:50:34 1.2
@@ -54,35 +54,21 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
-import org.apache.turbine.modules.actions.VelocityAction;
-
-import org.apache.turbine.services.resources.TurbineResources;
-
-import org.apache.turbine.util.RunData;
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateAction;
+import org.apache.turbine.TemplateContext;
import org.apache.turbine.util.security.AccessControlList;
+import org.apache.turbine.services.resources.TurbineResources;
/**
* General Flux action.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class FluxAction extends VelocityAction
+public class FluxAction
+ extends TemplateAction
{
/**
- * Implement this to add information to the context.
- *
- * @param data Turbine information.
- * @param context Context for web pages.
- * @exception Exception, a generic exception.
- */
- public void doPerform( RunData data,Context context )
- throws Exception
- {
- }
-
- /**
* This currently only checks to make sure that user is allowed to
* view the storage area. If you create an action that requires more
* security then override this method.
@@ -97,20 +83,16 @@
AccessControlList acl = (AccessControlList)
data.getSession().getValue(AccessControlList.SESSION_KEY);
-
- /*
- * Grab the Flux Admin role listed in the Flux.properties
- * file that is included in the the standard
- * TurbineResources.properties file.
- */
- String fluxAdminRole = TurbineResources.getString("flux.admin.role");
- /*
- * This should be taken from a config file, this
- * hard coding is no good for widespread use
- * of the admin app. I think a permissions file
- * would be better for the whole system.
- */
+ // Grab the Flux Admin role listed in the Flux.properties
+ // file that is included in the the standard
+ // TurbineResources.properties file.
+ String fluxAdminRole = TurbineResources.getString("flux.admin.role");
+
+ // This should be taken from a config file, this
+ // hard coding is no good for widespread use
+ // of the admin app. I think a permissions file
+ // would be better for the whole system.
if (acl==null || ! acl.hasRole(fluxAdminRole))
{
isAuthorized = false;
1.2 +6 -17
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxLogin.java
Index: FluxLogin.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxLogin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FluxLogin.java 2001/03/26 00:49:40 1.1
+++ FluxLogin.java 2001/07/10 16:50:38 1.2
@@ -54,11 +54,10 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateAction;
+import org.apache.turbine.TemplateContext;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.modules.actions.VelocityAction;
-import org.apache.turbine.util.RunData;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.TurbineSecurityException;
import org.apache.turbine.services.resources.TurbineResources;
@@ -69,9 +68,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class FluxLogin extends VelocityAction
+public class FluxLogin
+ extends TemplateAction
{
- public void doPerform( RunData data, Context context ) throws Exception
+ public void doPerform( RunData data, TemplateContext context ) throws Exception
{
String username = data.getParameters().getString ( "username", "" );
String password = data.getParameters().getString ( "password", "" );
@@ -109,14 +109,3 @@
}
}
}
-
-
-
-
-
-
-
-
-
-
-
1.2 +6 -6
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxLogout.java
Index: FluxLogout.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/actions/FluxLogout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FluxLogout.java 2001/03/26 00:49:40 1.1
+++ FluxLogout.java 2001/07/10 16:50:44 1.2
@@ -54,10 +54,9 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
-import org.apache.turbine.modules.actions.VelocityAction;
-import org.apache.turbine.util.RunData;
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateAction;
+import org.apache.turbine.TemplateContext;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.services.resources.TurbineResources;
@@ -67,9 +66,10 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class FluxLogout extends VelocityAction
+public class FluxLogout
+ extends TemplateAction
{
- public void doPerform( RunData data, Context context ) throws Exception
+ public void doPerform( RunData data, TemplateContext context ) throws Exception
{
if (data.getSession().getAttribute(AccessControlList.SESSION_KEY)!=null)
data.getSession().removeAttribute(AccessControlList.SESSION_KEY);
1.3 +9 -8
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.3
diff -u -r1.2 -r1.3
--- FluxGroupAction.java 2001/04/15 20:12:19 1.2
+++ FluxGroupAction.java 2001/07/10 16:51:16 1.3
@@ -54,10 +54,10 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateContext;
import org.apache.turbine.om.security.Group;
-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;
@@ -69,13 +69,14 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class FluxGroupAction extends FluxAction
+public class FluxGroupAction
+ extends FluxAction
{
/**
* ActionEvent responsible for inserting a new user
* into the Turbine security system.
*/
- public void doInsert(RunData data, Context context)
+ public void doInsert(RunData data, TemplateContext context)
throws Exception
{
// Group group = new Group();
@@ -108,7 +109,7 @@
* for integrity before allowing the user info
* to be update in the database.
*/
- public void doUpdate(RunData data, Context context)
+ public void doUpdate(RunData data, TemplateContext context)
throws Exception
{
Group group = TurbineSecurity.getGroup(
@@ -134,7 +135,7 @@
* ActionEvent responsible for removing a user
* from the Tambora system.
*/
- public void doDelete(RunData data, Context context)
+ public void doDelete(RunData data, TemplateContext context)
throws Exception
{
Group group = TurbineSecurity.getGroup(
@@ -158,10 +159,10 @@
* Implement this to add information to the context.
*
* @param data Turbine information.
- * @param context Context for web pages.
+ * @param TemplateContext context for web pages.
* @exception Exception, a generic exception.
*/
- public void doPerform( RunData data,Context context )
+ public void doPerform( RunData data,TemplateContext context )
throws Exception
{
System.out.println("Running do perform!");
1.3 +9 -9
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
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FluxPermissionAction.java 2001/04/15 20:12:19 1.2
+++ FluxPermissionAction.java 2001/07/10 16:51:30 1.3
@@ -54,10 +54,9 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateContext;
import org.apache.turbine.om.security.Permission;
-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;
@@ -69,13 +68,14 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class FluxPermissionAction extends FluxAction
+public class FluxPermissionAction
+ extends FluxAction
{
/**
* ActionEvent responsible for inserting a new user
* into the Turbine security system.
*/
- public void doInsert(RunData data, Context context)
+ public void doInsert(RunData data, TemplateContext context)
throws Exception
{
//Permission permission = new Permission();
@@ -108,7 +108,7 @@
* for integrity before allowing the user info
* to be update in the database.
*/
- public void doUpdate(RunData data, Context context)
+ public void doUpdate(RunData data, TemplateContext context)
throws Exception
{
Permission permission = TurbineSecurity.getPermission(
@@ -134,7 +134,7 @@
* ActionEvent responsible for removing a user
* from the Tambora system.
*/
- public void doDelete(RunData data, Context context)
+ public void doDelete(RunData data, TemplateContext context)
throws Exception
{
Permission permission = TurbineSecurity.getPermission(
@@ -158,10 +158,10 @@
* Implement this to add information to the context.
*
* @param data Turbine information.
- * @param context Context for web pages.
+ * @param TemplateContext context for web pages.
* @exception Exception, a generic exception.
*/
- public void doPerform( RunData data,Context context )
+ public void doPerform( RunData data,TemplateContext context )
throws Exception
{
System.out.println("Running do perform!");
1.3 +8 -9
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.3
diff -u -r1.2 -r1.3
--- FluxRoleAction.java 2001/04/15 20:12:19 1.2
+++ FluxRoleAction.java 2001/07/10 16:51:45 1.3
@@ -54,11 +54,10 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateContext;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.Permission;
-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;
@@ -73,7 +72,7 @@
*/
public class FluxRoleAction extends FluxAction
{
- public void doInsert(RunData data, Context context)
+ public void doInsert(RunData data, TemplateContext context)
throws Exception
{
//Role role = new Role();
@@ -106,7 +105,7 @@
* for integrity before allowing the user info
* to be update in the database.
*/
- public void doUpdate(RunData data, Context context)
+ public void doUpdate(RunData data, TemplateContext context)
throws Exception
{
Role role = TurbineSecurity.getRole(
@@ -132,7 +131,7 @@
* ActionEvent responsible for removing a user
* from the Tambora system.
*/
- public void doDelete(RunData data, Context context)
+ public void doDelete(RunData data, TemplateContext context)
throws Exception
{
Role role = TurbineSecurity.getRole(
@@ -156,7 +155,7 @@
* Update the roles that are to assigned to a user
* for a project.
*/
- public void doPermissions(RunData data, Context context)
+ public void doPermissions(RunData data, TemplateContext context)
throws Exception
{
/*
@@ -217,10 +216,10 @@
* Implement this to add information to the context.
*
* @param data Turbine information.
- * @param context Context for web pages.
+ * @param TemplateContext context for web pages.
* @exception Exception, a generic exception.
*/
- public void doPerform( RunData data,Context context )
+ public void doPerform( RunData data,TemplateContext context )
throws Exception
{
System.out.println("Running do perform!");
1.2 +37 -51
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
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FluxUserAction.java 2001/03/26 00:49:41 1.1
+++ FluxUserAction.java 2001/07/10 16:51:57 1.2
@@ -55,13 +55,12 @@
*/
import java.util.Date;
-
-import org.apache.velocity.context.Context;
-
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateAction;
+import org.apache.turbine.TemplateContext;
import org.apache.turbine.om.security.User;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
-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;
@@ -73,57 +72,50 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class FluxUserAction extends FluxAction
+public class FluxUserAction
+ extends FluxAction
{
/**
* ActionEvent responsible for inserting a new user
* into the Turbine security system.
*/
- public void doInsert(RunData data, Context context)
+ public void doInsert(RunData data, TemplateContext context)
throws Exception
{
- /*
- * Create a TamboraUser object here, it will be
- * used even if there is an error. It will be
- * fed back into the context to give the user
- * the chance to correct any errors.
- */
+ // Create a User object here, it will be
+ // used even if there is an error. It will be
+ // fed back into the context to give the user
+ // the chance to correct any errors.
User user = TurbineSecurity.getUserInstance();
data.getParameters().setProperties(user);
- /*
- * Grab the username entered in the form.
- */
+ // Grab the username entered in the form.
String username = data.getParameters().getString("username");
String password = data.getParameters().getString("password");
if (password == null)
+ {
password = "";
+ }
- /*
- * Make sure this account doesn't already exist.
- * If the account already exists then alert
- * the user and make them change the username.
- */
+ // Make sure this account doesn't already exist.
+ // If the account already exists then alert
+ // the user and make them change the username.
if (TurbineSecurity.accountExists(username))
{
context.put("username", username);
context.put("errorTemplate", "/screens/user/FluxUserAlreadyExists.vm");
context.put("user", user);
- /*
- * We are still in insert mode. So keep this
- * value alive.
- */
+
+ // We are still in insert mode. So keep this
+ // value alive.
data.getParameters().add("mode", "insert");
setTemplate(data, "/user/FluxUserForm.vm");
}
else
{
- /*
- * Set some default date properties, this needs
- * to be more rigourous.
- */
-
+ // Set some default date properties, this needs
+ // to be more rigourous.
Date now = new Date();
//user.setModifiedDate(now);
@@ -140,7 +132,7 @@
* for integrity before allowing the user info
* to be update in the database.
*/
- public void doUpdate(RunData data, Context context)
+ public void doUpdate(RunData data, TemplateContext context)
throws Exception
{
User user =
TurbineSecurity.getUser(data.getParameters().getString("username"));
@@ -159,7 +151,7 @@
* ActionEvent responsible for removing a user
* from the Tambora system.
*/
- public void doDelete(RunData data, Context context)
+ public void doDelete(RunData data, TemplateContext context)
throws Exception
{
User user = TurbineSecurity.getUser(
@@ -172,23 +164,19 @@
* Update the roles that are to assigned to a user
* for a project.
*/
- public void doRoles(RunData data, Context context)
+ public void doRoles(RunData data, TemplateContext context)
throws Exception
{
- /*
- * Get the user we are trying to update. The username
- * has been hidden in the form so we will grab the
- * hidden username and use that to retrieve the
- * user.
- */
+ // Get the user we are trying to update. The username
+ // has been hidden in the form so we will grab the
+ // hidden username and use that to retrieve the
+ // user.
String username = data.getParameters().getString("username");
User user = TurbineSecurity.getUser(username);
AccessControlList acl = TurbineSecurity.getACL(user);
- /*
- * Grab all the Groups and Roles in the system.
- */
+ // Grab all the Groups and Roles in the system.
Group[] groups = TurbineSecurity.getAllGroups().getGroupsArray();
Role[] roles = TurbineSecurity.getAllRoles().getRolesArray();
@@ -198,14 +186,12 @@
for (int j = 0; j < roles.length; j++)
{
- /*
- * In the UserRoleForm.vm we made a checkbox
- * for every possible Group/Role combination
- * so we will compare every possible combination
- * with the values that were checked off in
- * the form. If we have a match then we will
- * grant the user the role in the group.
- */
+ // In the UserRoleForm.vm we made a checkbox
+ // for every possible Group/Role combination
+ // so we will compare every possible combination
+ // with the values that were checked off in
+ // the form. If we have a match then we will
+ // grant the user the role in the group.
String roleName = roles[j].getName();
String groupRole = groupName + roleName;
@@ -227,10 +213,10 @@
* Implement this to add information to the context.
*
* @param data Turbine information.
- * @param context Context for web pages.
+ * @param TemplateContext context for web pages.
* @exception Exception, a generic exception.
*/
- public void doPerform( RunData data,Context context )
+ public void doPerform( RunData data,TemplateContext context )
throws Exception
{
System.out.println("Running do perform!");
1.4 +10 -10
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.4
diff -u -r1.3 -r1.4
--- FluxIndex.java 2001/05/10 16:31:16 1.3
+++ FluxIndex.java 2001/07/10 16:52:10 1.4
@@ -54,12 +54,10 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
-import org.apache.turbine.modules.screens.VelocityScreen;
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateContext;
+import org.apache.turbine.TemplateScreen;
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;
/**
@@ -67,16 +65,17 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class FluxIndex extends VelocityScreen
+public class FluxIndex
+ extends TemplateScreen
{
/**
* Overide this to add information to the context.
*
* @param data Turbine information.
- * @param context Context for web pages.
+ * @param TemplateContext context for web pages.
* @exception Exception, a generic exception.
*/
- protected void doBuildTemplate( RunData data, Context context )
+ protected void doBuildTemplate( RunData data, TemplateContext context )
throws Exception
{
}
@@ -92,7 +91,7 @@
{
if ( isAuthorized( data ) )
{
- doBuildTemplate( data, TurbineVelocity.getContext( data ) );
+ doBuildTemplate( data, getTemplateContext( data ) );
}
}
@@ -103,7 +102,8 @@
* @return True if the user is authorized to access the screen.
* @exception Exception, a generic exception.
*/
- protected boolean isAuthorized( RunData data ) throws Exception
+ protected boolean isAuthorized( RunData data )
+ throws Exception
{
String fluxAdminRole = TurbineResources.getString("flux.admin.role");
1.3 +16 -19
jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxScreen.java
Index: FluxScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-flux/src/java/org/apache/turbine/flux/modules/screens/FluxScreen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FluxScreen.java 2001/06/21 13:53:30 1.2
+++ FluxScreen.java 2001/07/10 16:52:15 1.3
@@ -54,12 +54,10 @@
* <http://www.apache.org/>.
*/
-import org.apache.velocity.context.Context;
-
-import org.apache.turbine.modules.screens.VelocityScreen;
+import org.apache.turbine.RunData;
+import org.apache.turbine.TemplateContext;
+import org.apache.turbine.TemplateScreen;
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;
/**
@@ -67,7 +65,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public abstract class FluxScreen extends VelocityScreen
+public abstract class FluxScreen
+ extends TemplateScreen
{
private static final Boolean TRUE = new Boolean(true);
@@ -75,10 +74,10 @@
* Overide this to add information to the context.
*
* @param data Turbine information.
- * @param context Context for web pages.
+ * @param TemplateTemplateContext context for web pages.
* @exception Exception, a generic exception.
*/
- protected void doBuildTemplate( RunData data, Context context )
+ protected void doBuildTemplate( RunData data, TemplateContext context )
throws Exception
{
}
@@ -90,23 +89,20 @@
* @param data Turbine information.
* @exception Exception, a generic exception.
*/
- protected void doBuildTemplate( RunData data ) throws Exception
+ protected void doBuildTemplate( RunData data )
+ throws Exception
{
- Context context = TurbineVelocity.getContext( data );
+ TemplateContext context = getTemplateContext( data );
- /*
- * Check to see if the embedded menu should be
- * displayed in the templates.
- */
+ // Check to see if the embedded menu should be
+ // displayed in the templates.
if (TurbineResources.getBoolean("flux.embedded.show.menu", false))
{
context.put("showEmbeddedMenu", TRUE);
}
- /*
- * Check to see if we will display the finders
- * on the forms used in Flux.
- */
+ // Check to see if we will display the finders
+ // on the forms used in Flux.
if (TurbineResources.getBoolean("flux.ui.show.finder", false))
{
context.put("showFinder", TRUE);
@@ -126,7 +122,8 @@
* @return True if the user is authorized to access the screen.
* @exception Exception, a generic exception.
*/
- protected boolean isAuthorized( RunData data ) throws Exception
+ protected boolean isAuthorized( RunData data )
+ throws Exception
{
boolean isAuthorized = false;
1.4 +1 -46
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
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FluxTool.java 2001/06/12 22:29:14 1.3
+++ FluxTool.java 2001/07/10 16:52:30 1.4
@@ -56,18 +56,13 @@
import java.util.Vector;
import java.util.Iterator;
-
-import org.apache.velocity.context.Context;
-
+import org.apache.turbine.RunData;
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.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.turbine.util.db.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.util.pool.Recyclable;
@@ -232,46 +227,6 @@
throws Exception
{
return TurbineSecurity.getACL(getUser());
- }
-
-
-
- /**
- */
- public SelectorBox getFieldList() throws Exception
- {
- Object[] names = {"username", "firstname", "middlename", "lastname"};
- Object[] values =
- { "Username", "First Name", "Middle Name", "Last Name" };
- return new SelectorBox("fieldList", names, values);
- }
-
- /**
- */
- public SelectorBox getUserFieldList()
- throws Exception
- {
- /**
- * This is a tie to the DB implementation
- * something should be added the pluggable pieces
- * to allow decent parameterized searching.
- */
-
- Object[] names =
- {
- TurbineUserPeer.USERNAME,
- TurbineUserPeer.FIRST_NAME,
- TurbineUserPeer.LAST_NAME
- };
-
- Object[] values =
- {
- "User Name" ,
- "First Name",
- "Last Name"
- };
-
- return new SelectorBox("fieldList", names, values);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
