You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/09/18 10:05:31 UTC
cvs commit: jakarta-turbine-fulcrum/workflow/example/src/java/org/apache/fulcrum/workflow/example/tools WorkflowTool.java
epugh 2003/09/18 01:05:31
Modified: workflow/example/src/java/org/apache/fulcrum/workflow/example/modules/actions
WorkflowAction.java
workflow/example/src/webapp/templates/app/navigations
Menu.vm
workflow/example/xdocs changes.xml
workflow/example/src/java/org/apache/fulcrum/workflow/example/tools
WorkflowTool.java
Log:
Fix bug when multiple users attempt to login as test/test
Revision Changes Path
1.2 +22 -4 jakarta-turbine-fulcrum/workflow/example/src/java/org/apache/fulcrum/workflow/example/modules/actions/WorkflowAction.java
Index: WorkflowAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/workflow/example/src/java/org/apache/fulcrum/workflow/example/modules/actions/WorkflowAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowAction.java 14 Sep 2003 13:30:16 -0000 1.1
+++ WorkflowAction.java 18 Sep 2003 08:05:30 -0000 1.2
@@ -36,8 +36,24 @@
System.out.println("Doperform called");
data.setScreenTemplate("Index.vm");
}
+
+ /**
+ * This sets logs you in as user "test"
+ *
+ * @param data Current RunData information
+ * @param context Context to populate
+ * @exception Exception Thrown on error
+ */
+ public void doLogin(RunData data, Context context) throws Exception
+ {
+ data.getUser().setName("test");
+
+
+ data.getMessages().setMessage("", "INFO", "You are logged in as user test!");
+ }
+
/**
- * This guy deals with actions related to workflows.
+ * This sets up the user "test/test"
*
* @param data Current RunData information
* @param context Context to populate
@@ -45,7 +61,7 @@
*/
public void doSetupuser(RunData data, Context context) throws Exception
{
- System.out.println("Doperform called");
+
data.setScreenTemplate("Index.vm");
UserManager um = UserManager.getInstance();
User test = um.createUser("test");
@@ -56,9 +72,11 @@
test.addToGroup(foos);
test.addToGroup(bars);
test.addToGroup(bazs);
- data.getUser().setName("test");
- data.getMessages().setMessage("", "INFO", "User test/test is setup!");
+
+ data.getMessages().setMessage("", "INFO", "User test/test is setup in system. Don't forget to login!");
}
+
+
/**
* Create a new Workflow
*
1.2 +4 -1 jakarta-turbine-fulcrum/workflow/example/src/webapp/templates/app/navigations/Menu.vm
Index: Menu.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/workflow/example/src/webapp/templates/app/navigations/Menu.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Menu.vm 14 Sep 2003 13:30:16 -0000 1.1
+++ Menu.vm 18 Sep 2003 08:05:31 -0000 1.2
@@ -6,8 +6,11 @@
<div class="label"><strong>Workflow Tools</strong></div>
<div class="body">
<div>
- <A href="$link.setAction("WorkflowAction").addPathInfo("eventSubmit_doSetupuser", "foo")">Setup User</A>
+ <A href="$link.setAction("WorkflowAction").addPathInfo("eventSubmit_doSetupuser", "foo")">Setup Permissions</A>
</div>
+ <div>
+ <A href="$link.setAction("WorkflowAction").addPathInfo("eventSubmit_doLogin", "foo")">Login</A>
+ </div>
<div>
<A href="$link.setAction("WorkflowAction").addPathInfo("eventSubmit_doNew", "foo")">Create New</A>
</div>
1.2 +4 -0 jakarta-turbine-fulcrum/workflow/example/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/workflow/example/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 14 Sep 2003 13:30:15 -0000 1.1
+++ changes.xml 18 Sep 2003 08:05:31 -0000 1.2
@@ -7,6 +7,10 @@
<body>
<release version="Not applicable" date="">
+ <action dev="epugh" type="fix">
+ Fixed bug with multiple users trying to access the system. Broke the setup
+ process into two steps, setup and login. Thanks to Tom Herrick.
+ </action>
<action dev="epugh" type="add">
Initial work on the Example Application
</action>
1.2 +3 -2 jakarta-turbine-fulcrum/workflow/example/src/java/org/apache/fulcrum/workflow/example/tools/WorkflowTool.java
Index: WorkflowTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/workflow/example/src/java/org/apache/fulcrum/workflow/example/tools/WorkflowTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowTool.java 14 Sep 2003 13:30:15 -0000 1.1
+++ WorkflowTool.java 18 Sep 2003 08:05:31 -0000 1.2
@@ -138,8 +138,9 @@
public List retrieveWorkflows(String status) throws WorkflowException{
List workflows = new ArrayList();
- long workflowIds []= getWorkflowService().retrieveWorkflows(user.getName(),status);
- Workflow workflow = getWorkflowService().retrieveWorkflow(user.getName());
+ String caller = user.getName();
+ long workflowIds []= getWorkflowService().retrieveWorkflows(caller,status);
+ Workflow workflow = getWorkflowService().retrieveWorkflow(caller);
for (int i =0;i<workflowIds.length;i++) {
WorkflowInstance workflowInstance = new WorkflowInstance(workflow,workflowIds[i]);
workflows.add(workflowInstance);
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org