You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/05/24 18:01:55 UTC
svn commit: r178196 - in /lenya/trunk/src:
java/org/apache/lenya/cms/ac/usecases/
java/org/apache/lenya/cms/site/usecases/ java/org/apache/lenya/cms/usecase/
webapp/lenya/usecases/
Author: andreas
Date: Tue May 24 09:01:54 2005
New Revision: 178196
URL: http://svn.apache.org/viewcvs?rev=178196&view=rev
Log:
added AbstractUsecase.setExitUsecase() method
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddGroup.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddUser.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteGroup.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteIPRange.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteUser.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupMembers.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupProfile.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Groups.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/IPRanges.java
lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Users.java
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
lenya/trunk/src/webapp/lenya/usecases/usecases.js
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AccessControl.java Tue May 24 09:01:54 2005
@@ -83,6 +83,8 @@
protected void initParameters() {
super.initParameters();
+ setExitUsecase(getName(), null);
+
try {
URLInformation info = new URLInformation(getSourceURL());
setParameter(COMPLETE_AREA, info.getCompleteArea());
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddGroup.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddGroup.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddGroup.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddGroup.java Tue May 24 09:01:54 2005
@@ -17,6 +17,8 @@
package org.apache.lenya.cms.ac.usecases;
import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.lenya.ac.Group;
import org.apache.lenya.ac.file.FileGroup;
@@ -75,6 +77,10 @@
group.save();
getGroupManager().add(group);
+
+ Map parameters = new HashMap();
+ parameters.put(GroupProfile.ID, id);
+ setExitUsecase("admin.group", parameters);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddIPRange.java Tue May 24 09:01:54 2005
@@ -22,7 +22,9 @@
import java.io.File;
import java.net.InetAddress;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.lenya.ac.IPRange;
@@ -93,6 +95,10 @@
ipRange.save();
getIpRangeManager().add(ipRange);
+
+ Map parameters = new HashMap();
+ parameters.put(IPRangeProfile.ID, id);
+ setExitUsecase("admin.ipRange", parameters);
}
/**
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddUser.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddUser.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddUser.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/AddUser.java Tue May 24 09:01:54 2005
@@ -17,6 +17,8 @@
package org.apache.lenya.cms.ac.usecases;
import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.lenya.ac.AccessControlException;
@@ -34,13 +36,6 @@
*/
public class AddUser extends AccessControlUsecase {
- /**
- * Ctor.
- */
- public AddUser() {
- super();
- }
-
protected static final String CLASS_NAME = "className";
protected static final String LDAP_ID = "ldapId";
@@ -125,5 +120,9 @@
user.setDescription(description);
user.save();
getUserManager().add(user);
+
+ Map parameters = new HashMap();
+ parameters.put(UserProfile.USER_ID, userId);
+ setExitUsecase("admin.user", parameters);
}
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteGroup.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteGroup.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteGroup.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteGroup.java Tue May 24 09:01:54 2005
@@ -26,6 +26,14 @@
public class DeleteGroup extends AccessControlUsecase {
/**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+ setExitUsecase("admin.groups", null);
+ }
+
+ /**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
protected void doExecute() throws Exception {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteIPRange.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteIPRange.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteIPRange.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteIPRange.java Tue May 24 09:01:54 2005
@@ -21,6 +21,14 @@
*
* @version $Id:$
*/
-public class DeleteIPRange {
+public class DeleteIPRange extends AccessControlUsecase {
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+ setExitUsecase("admin.ipRanges", null);
+ }
+
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteUser.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteUser.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteUser.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/DeleteUser.java Tue May 24 09:01:54 2005
@@ -26,6 +26,14 @@
public class DeleteUser extends AccessControlUsecase {
/**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+ setExitUsecase("admin.users", null);
+ }
+
+ /**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
protected void doExecute() throws Exception {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Group.java Tue May 24 09:01:54 2005
@@ -27,6 +27,14 @@
protected static final String GROUP = "group";
/**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+ setExitUsecase("admin.groups", null);
+ }
+
+ /**
* @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String, java.lang.Object)
*/
public void setParameter(String name, Object value) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupMembers.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupMembers.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupMembers.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupMembers.java Tue May 24 09:01:54 2005
@@ -17,8 +17,10 @@
package org.apache.lenya.cms.ac.usecases;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.lenya.ac.Group;
import org.apache.lenya.ac.Groupable;
@@ -27,7 +29,7 @@
/**
* Usecase to change the members of a group.
- *
+ *
* @version $Id:$
*/
public class GroupMembers extends AccessControlUsecase {
@@ -42,18 +44,28 @@
protected static final String OTHER_USER = "otherUser";
/**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+ Map parameters = new HashMap();
+ parameters.put(GroupProfile.ID, getParameterAsString(GroupProfile.ID));
+ setExitUsecase("admin.groups", parameters);
+ }
+
+ /**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
*/
protected void doExecute() throws Exception {
super.doExecute();
-
+
this.group.removeAllMembers();
-
+
List groupUsers = (List) getParameter(GROUP_USERS);
- for (Iterator i = groupUsers.iterator(); i.hasNext(); ) {
+ for (Iterator i = groupUsers.iterator(); i.hasNext();) {
User user = (User) i.next();
this.group.add(user);
- user.save();
+ user.save();
}
}
@@ -69,7 +81,7 @@
List groupUsers = (List) getParameter(GROUP_USERS);
List otherUsers = (List) getParameter(OTHER_USERS);
-
+
if (add != null) {
String userId = getParameterAsString(OTHER_USER);
if (userId != null) {
@@ -93,7 +105,7 @@
groupUsers.remove(user);
}
}
-
+
deleteParameter(ADD);
deleteParameter(REMOVE);
deleteParameter(GROUP_USER);
@@ -103,8 +115,7 @@
}
/**
- * @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String,
- * java.lang.Object)
+ * @see org.apache.lenya.cms.usecase.Usecase#setParameter(java.lang.String, java.lang.Object)
*/
public void setParameter(String name, Object value) {
super.setParameter(name, value);
@@ -114,7 +125,7 @@
if (this.group == null) {
throw new RuntimeException("Group [" + groupId + "] not found.");
}
-
+
Groupable[] members = this.group.getMembers();
List groupUsers = new ArrayList();
for (int i = 0; i < members.length; i++) {
@@ -139,5 +150,4 @@
}
-
-}
+}
\ No newline at end of file
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupProfile.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupProfile.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupProfile.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/GroupProfile.java Tue May 24 09:01:54 2005
@@ -20,7 +20,7 @@
/**
* Usecase to change the profile of a group.
- *
+ *
* @version $Id:$
*/
public class GroupProfile extends AccessControlUsecase {
@@ -28,19 +28,19 @@
protected static final String ID = "groupId";
protected static final String NAME = "name";
protected static final String DESCRIPTION = "description";
-
+
private Group group;
-
+
protected void doExecute() throws Exception {
super.doExecute();
-
+
String name = getParameterAsString(NAME);
String description = getParameterAsString(DESCRIPTION);
-
+
this.group.setName(name);
this.group.setDescription(description);
- this.group.save();
+ this.group.save();
}
/**
@@ -48,16 +48,16 @@
*/
public void setParameter(String name, Object value) {
super.setParameter(name, value);
-
+
if (name.equals(ID)) {
String id = (String) value;
this.group = getGroupManager().getGroup(id);
if (this.group == null) {
throw new RuntimeException("Group [" + id + "] not found.");
}
-
+
setParameter(DESCRIPTION, this.group.getDescription());
setParameter(NAME, this.group.getName());
}
}
-}
+}
\ No newline at end of file
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Groups.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Groups.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Groups.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Groups.java Tue May 24 09:01:54 2005
@@ -38,6 +38,8 @@
protected void initParameters() {
super.initParameters();
+ setExitUsecase(getName(), null);
+
Group[] groups = getGroupManager().getGroups();
List groupList = new ArrayList();
groupList.addAll(Arrays.asList(groups));
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/IPRanges.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/IPRanges.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/IPRanges.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/IPRanges.java Tue May 24 09:01:54 2005
@@ -37,6 +37,8 @@
*/
protected void initParameters() {
super.initParameters();
+
+ setExitUsecase(getName(), null);
IPRange[] ipRanges = getIpRangeManager().getIPRanges();
List ipRangeList = new ArrayList();
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Users.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Users.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Users.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Users.java Tue May 24 09:01:54 2005
@@ -44,6 +44,8 @@
*/
protected void initParameters() {
super.initParameters();
+
+ setExitUsecase(getName(), null);
User[] users = getUserManager().getUsers();
List userList = new ArrayList();
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/SiteUsecase.java Tue May 24 09:01:54 2005
@@ -38,6 +38,9 @@
*/
protected void initParameters() {
super.initParameters();
+
+ setExitUsecase(getName(), null);
+
WorkflowResolver resolver = null;
try {
resolver = (WorkflowResolver) this.manager.lookup(WorkflowResolver.ROLE);
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Tue May 24 09:01:54 2005
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -78,14 +79,14 @@
}
/**
- * Determine if the usecase has error messages.
- * Provides a way of checking for errors without actually retrieving them.
+ * Determine if the usecase has error messages. Provides a way of checking for errors without
+ * actually retrieving them.
* @return true if the usecase resulted in error messages.
*/
public boolean hasErrors() {
boolean ret = false;
if (this.errorMessages != null)
- ret = ! this.errorMessages.isEmpty();
+ ret = !this.errorMessages.isEmpty();
if (getLogger().isDebugEnabled())
getLogger().debug("AbstractUsecase::hasErrors() called, returning " + ret);
@@ -94,14 +95,14 @@
}
/**
- * Determine if the usecase has info messages.
- * Provides a way of checking for info messages without actually retrieving them.
+ * Determine if the usecase has info messages. Provides a way of checking for info messages
+ * without actually retrieving them.
* @return true if the usecase resulted in info messages being generated.
*/
public boolean hasInfoMessages() {
boolean ret = false;
if (this.infoMessages != null)
- ret = ! this.infoMessages.isEmpty();
+ ret = !this.infoMessages.isEmpty();
return ret;
}
@@ -433,7 +434,7 @@
if (url == null) {
url = getSourceURL();
}
- return url;
+ return url + getExitUsecaseQueryString();
}
/**
@@ -607,13 +608,11 @@
}
/**
- * Lock the objects, for example when you need to change them
- * (for example, delete). If you know when entering the usecase
- * what these objects are, you do not need to call this, the
- * framework will take of it if you implement getObjectsToLock().
- * If you do not know in advance what the objects are, you can
- * call this method explicitly when appropriate.
- *
+ * Lock the objects, for example when you need to change them (for example, delete). If you know
+ * when entering the usecase what these objects are, you do not need to call this, the framework
+ * will take of it if you implement getObjectsToLock(). If you do not know in advance what the
+ * objects are, you can call this method explicitly when appropriate.
+ *
* @param objects the transactionable objects to lock
* @see #lockInvolvedObjects()
* @see #getObjectsToLock()
@@ -621,7 +620,9 @@
public final void lockInvolvedObjects(Transactionable[] objects) throws UsecaseException {
if (getLogger().isDebugEnabled())
- getLogger().debug("AbstractUsecase::lockInvolvedObjects() called, are there objects to lock ? " + (objects != null));
+ getLogger()
+ .debug("AbstractUsecase::lockInvolvedObjects() called, are there objects to lock ? "
+ + (objects != null));
try {
boolean canExecute = true;
@@ -629,7 +630,9 @@
for (int i = 0; i < objects.length; i++) {
if (objects[i].isCheckedOut()) {
if (getLogger().isDebugEnabled())
- getLogger().debug("AbstractUsecase::lockInvolvedObjects() can not execute, object [" + objects[i] + "] is already checked out");
+ getLogger()
+ .debug("AbstractUsecase::lockInvolvedObjects() can not execute, object ["
+ + objects[i] + "] is already checked out");
canExecute = false;
}
@@ -638,7 +641,8 @@
if (canExecute) {
for (int i = 0; i < objects.length; i++) {
if (getLogger().isDebugEnabled())
- getLogger().debug("AbstractUsecase::lockInvolvedObjects() locking " + objects[i]);
+ getLogger().debug("AbstractUsecase::lockInvolvedObjects() locking "
+ + objects[i]);
objects[i].lock();
if (!isOptimistic()) {
@@ -665,4 +669,27 @@
throw new UsecaseException(e);
}
}
-}
+
+ private String exitUsecaseName = null;
+ private Map exitUsecaseParameters = new HashMap();
+
+ protected void setExitUsecase(String usecaseName, Map parameters) {
+ this.exitUsecaseName = usecaseName;
+ if (parameters != null) {
+ this.exitUsecaseParameters = parameters;
+ }
+ }
+
+ protected String getExitUsecaseQueryString() {
+ String queryString = "";
+ if (this.exitUsecaseName != null) {
+ queryString = "?lenya.usecase=" + this.exitUsecaseName;
+ for (Iterator i = this.exitUsecaseParameters.keySet().iterator(); i.hasNext(); ) {
+ String key = (String) i.next();
+ String value = (String) this.exitUsecaseParameters.get(key);
+ queryString += "&" + key + "=" + value;
+ }
+ }
+ return queryString;
+ }
+}
\ No newline at end of file
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java Tue May 24 09:01:54 2005
@@ -118,7 +118,7 @@
documentArea = Publication.INFO_AREA_PREFIX + documentArea;
}
String url = "/" + document.getPublication().getId() + "/" + documentArea + documentUrl;
- return url;
+ return url + getExitUsecaseQueryString();
}
/**
Modified: lenya/trunk/src/webapp/lenya/usecases/usecases.js
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/usecases.js?rev=178196&r1=178195&r2=178196&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/usecases.js (original)
+++ lenya/trunk/src/webapp/lenya/usecases/usecases.js Tue May 24 09:01:54 2005
@@ -41,17 +41,6 @@
}
-/* Returns the query string to attach to the target URL. This is used in the site area. */
-function getTargetQueryString(usecaseName) {
- var isTabUsecase = new Packages.java.lang.String(usecaseName).startsWith('tab');
- var queryString = "";
- if (isTabUsecase) {
- queryString = "?lenya.usecase=" + usecaseName;
- }
- return queryString;
-}
-
-
/*
* Main function to execute a usecase.
*
@@ -212,7 +201,7 @@
}
}
- var url = request.getContextPath() + targetUrl + getTargetQueryString(usecaseName);
+ var url = request.getContextPath() + targetUrl;
if (cocoon.log.isDebugEnabled())
cocoon.log.debug("usecases.js::executeUsecase() in usecase " + usecaseName + ", completed, redirecting to url = [" + url + "]");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org