You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ch...@apache.org on 2005/11/07 23:35:48 UTC
svn commit: r331627 - in /lenya/trunk/src:
java/org/apache/lenya/cms/usecase/AbstractUsecase.java
webapp/WEB-INF/cocoon-xconf.xsl
Author: chestnut
Date: Mon Nov 7 14:35:43 2005
New Revision: 331627
URL: http://svn.apache.org/viewcvs?rev=331627&view=rev
Log:
Usecase exit parameters can now be supplied without a value in the xconf,
the value will be picked up from the parameters passed to the usecase.
This fixes Bug 37362
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
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=331627&r1=331626&r2=331627&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 Mon Nov 7 14:35:43 2005
@@ -336,6 +336,10 @@
getLogger().debug("Setting parameter [" + name + "] = [" + value + "]");
}
this.parameters.put(name, value);
+ // set any exit parameters that are missing values
+ if (this.exitUsecaseParameters.containsKey(name) && this.exitUsecaseParameters.get(name)==null) {
+ setExitParameter(name,value.toString());
+ }
}
private boolean parametersInitialized = false;
@@ -621,7 +625,12 @@
Configuration[] exitParameterConfigs = exitConfig.getChildren(ELEMENT_PARAMETER);
for (int i = 0; i < exitParameterConfigs.length; i++) {
String name = exitParameterConfigs[i].getAttribute(ATTRIBUTE_NAME);
- String value = exitParameterConfigs[i].getAttribute(ATTRIBUTE_VALUE);
+ String value = null;
+ String[] attributeNames = exitParameterConfigs[i].getAttributeNames();
+ for (int j=0; j < attributeNames.length; j++) {
+ if (attributeNames[j].equals(ATTRIBUTE_VALUE))
+ value = exitParameterConfigs[i].getAttribute(ATTRIBUTE_VALUE);
+ }
setExitParameter(name, value);
}
}
Modified: lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl?rev=331627&r1=331626&r2=331627&view=diff
==============================================================================
--- lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl (original)
+++ lenya/trunk/src/webapp/WEB-INF/cocoon-xconf.xsl Mon Nov 7 14:35:43 2005
@@ -294,7 +294,9 @@
<view template="usecases/admin/userGroups.jx" menu="true">
<tab group="admin" name="users"/>
</view>
- <exit usecase="admin.user"/>
+ <exit usecase="admin.user">
+ <parameter name="userId"/>
+ </exit>
</component-instance>
<component-instance name="admin.deleteUser" logger="lenya.admin" class="org.apache.lenya.cms.ac.usecases.DeleteUser">
<view template="usecases/admin/deleteUser.jx" menu="true">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org