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 2006/06/22 12:09:44 UTC
svn commit: r416313 [2/2] - in /lenya/trunk/src:
impl/java/org/apache/lenya/ac/cache/ impl/java/org/apache/lenya/ac/cifs/
impl/java/org/apache/lenya/ac/file/ impl/java/org/apache/lenya/ac/impl/
impl/java/org/apache/lenya/ac/ldap/ impl/java/org/apache/l...
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Groups.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Groups.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Groups.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Groups.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,32 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.lenya.ac.Group;
+
+/**
+ * Manage groups.
+ *
+ * @version $Id: Groups.java 407305 2006-05-17 16:21:49Z andreas $
+ */
+public class Groups extends AccessControlUsecase {
+
+ protected static final String GROUPS = "groups";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+
+ Group[] groups = getGroupManager().getGroups();
+ List groupList = new ArrayList();
+ groupList.addAll(Arrays.asList(groups));
+ Collections.sort(groupList);
+ setParameter(GROUPS, groupList);
+ }
+}
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRange.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRange.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRange.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,30 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+/**
+ * Show information about an IP range.
+ *
+ * @version $Id: IPRange.java 407305 2006-05-17 16:21:49Z andreas $
+ */
+public class IPRange extends AccessControlUsecase {
+
+ protected static final String IP_RANGE_ID = "ipRangeId";
+ protected static final String IP_RANGE = "ipRange";
+
+ /**
+ * @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);
+
+ if (name.equals(IP_RANGE_ID)) {
+ String ipRangeId = (String) value;
+ org.apache.lenya.ac.IPRange ipRange = getIpRangeManager().getIPRange(ipRangeId);
+ if (ipRange == null) {
+ addErrorMessage("iprange_no_such_iprange", new String[] { ipRangeId });
+ } else {
+ setParameter(IP_RANGE, ipRange);
+ }
+ }
+ }
+}
\ No newline at end of file
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeGroups.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeGroups.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeGroups.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeGroups.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,121 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.lenya.ac.Group;
+import org.apache.lenya.ac.IPRange;
+import org.apache.lenya.cms.usecase.UsecaseException;
+
+/**
+ * Usecase to edit a IP range's group affiliation.
+ */
+public class IPRangeGroups extends AccessControlUsecase {
+
+ private IPRange ipRange;
+
+ protected static final String IP_RANGE_GROUPS = "ipRangeGroups";
+ protected static final String OTHER_GROUPS = "otherGroups";
+ protected static final String ADD = "add";
+ protected static final String REMOVE = "remove";
+ protected static final String IP_RANGE_GROUP = "ipRangeGroup";
+ protected static final String OTHER_GROUP = "otherGroup";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
+ */
+ protected void doExecute() throws Exception {
+ super.doExecute();
+
+ this.ipRange.removeFromAllGroups();
+
+ List ipRangeGroups = (List) getParameter(IP_RANGE_GROUPS);
+ for (Iterator i = ipRangeGroups.iterator(); i.hasNext(); ) {
+ Group group = (Group) i.next();
+ group.add(this.ipRange);
+ }
+ ipRange.save();
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.Usecase#advance()
+ */
+ public void advance() throws UsecaseException {
+ super.advance();
+
+ String add = getParameterAsString(ADD);
+ String remove = getParameterAsString(REMOVE);
+ if (add != null || remove != null) {
+
+ List ipRangeGroups = (List) getParameter(IP_RANGE_GROUPS);
+ List otherGroups = (List) getParameter(OTHER_GROUPS);
+
+ if (add != null) {
+ String groupId = getParameterAsString(OTHER_GROUP);
+ if (groupId != null) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("add group [" + groupId + "]");
+ }
+ Group group = getGroupManager().getGroup(groupId);
+ ipRangeGroups.add(group);
+ otherGroups.remove(group);
+ }
+ }
+
+ if (remove != null) {
+ String groupId = getParameterAsString(IP_RANGE_GROUP);
+ if (groupId != null) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("remove group [" + groupId + "]");
+ }
+ Group group = getGroupManager().getGroup(groupId);
+ otherGroups.add(group);
+ ipRangeGroups.remove(group);
+ }
+ }
+
+ deleteParameter(ADD);
+ deleteParameter(REMOVE);
+ deleteParameter(IP_RANGE_GROUP);
+ deleteParameter(OTHER_GROUP);
+ }
+
+ }
+
+ /**
+ * @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);
+ if (name.equals(IPRangeProfile.ID)) {
+ String ipRangeId = (String) value;
+ this.ipRange = getIpRangeManager().getIPRange(ipRangeId);
+ if (this.ipRange == null) {
+ throw new RuntimeException("IP range [" + ipRangeId + "] not found.");
+ }
+
+ Group[] ipRangeGroupArray = this.ipRange.getGroups();
+ List ipRangeGroups = new ArrayList(Arrays.asList(ipRangeGroupArray));
+
+ setParameter(IP_RANGE_GROUPS, ipRangeGroups);
+
+ Group[] allGroups = getGroupManager().getGroups();
+
+ List otherGroups = new ArrayList();
+
+ for (int i = 0; i < allGroups.length; i++) {
+ if (!ipRangeGroups.contains(allGroups[i])) {
+ otherGroups.add(allGroups[i]);
+ }
+ }
+
+ setParameter(OTHER_GROUPS, otherGroups);
+ }
+
+ }
+
+}
\ No newline at end of file
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,195 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.lenya.ac.IPRange;
+import org.apache.lenya.cms.usecase.AbstractUsecase;
+
+/**
+ * Usecase to change the profile of an IP range.
+ */
+public class IPRangeProfile extends AccessControlUsecase {
+
+ protected static final String ID = "ipRangeId";
+ protected static final String NAME = "name";
+ protected static final String DESCRIPTION = "description";
+ protected static final String NETWORK_ADDRESS = "networkAddress";
+ protected static final String SUBNET_MASK = "subnetMask";
+ protected static final String PART_NUMBERS = "partNumbers";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+ */
+ protected void doCheckExecutionConditions() throws Exception {
+ IPRangeProfile.validateAddresses(this);
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
+ */
+ protected void doExecute() throws Exception {
+ super.doExecute();
+
+ String name = getParameterAsString(NAME);
+ String description = getParameterAsString(DESCRIPTION);
+
+ IPRange ipRange = getIPRange();
+
+ ipRange.setName(name);
+ ipRange.setDescription(description);
+
+ String networkString = "";
+ String subnetString = "";
+
+ for (int i = 0; i < 4; i++) {
+ if (i > 0) {
+ networkString += ".";
+ subnetString += ".";
+ }
+ Part netPart = (Part) getParameter(IPRangeProfile.NETWORK_ADDRESS + "-" + i);
+ networkString += netPart.getValue();
+ Part subPart = (Part) getParameter(IPRangeProfile.SUBNET_MASK + "-" + i);
+ subnetString += subPart.getValue();
+ }
+
+ InetAddress networkAddress = InetAddress.getByName(networkString);
+ ipRange.setNetworkAddress(networkAddress.getAddress());
+
+ InetAddress subnetMask = InetAddress.getByName(subnetString);
+ ipRange.setSubnetMask(subnetMask.getAddress());
+
+ ipRange.save();
+
+ }
+
+ private IPRange ipRange;
+
+ /**
+ * @return The IP range.
+ */
+ protected IPRange getIPRange() {
+ return this.ipRange;
+ }
+
+ /**
+ * @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);
+
+ if (name.equals(ID)) {
+ String id = (String) value;
+ this.ipRange = getIpRangeManager().getIPRange(id);
+ if (this.ipRange == null) {
+ throw new RuntimeException("IP range [" + id + "] not found.");
+ }
+
+ setParameter(NAME, this.ipRange.getName());
+ setParameter(DESCRIPTION, this.ipRange.getDescription());
+
+ InetAddress networkAddress = this.ipRange.getNetworkAddress();
+ InetAddress subnetMask = this.ipRange.getSubnetMask();
+
+ List partNumbers = new ArrayList();
+ for (byte i = 0; i < 4; i++) {
+ setParameter(NETWORK_ADDRESS + "-" + i, new Part(i, ""
+ + networkAddress.getAddress()[i]));
+ setParameter(SUBNET_MASK + "-" + i, new Part(i, "" + subnetMask.getAddress()[i]));
+ partNumbers.add(new Integer(i));
+ }
+ setParameter(IPRangeProfile.PART_NUMBERS, partNumbers);
+
+ }
+ }
+
+ protected static void validateAddresses(AbstractUsecase usecase) {
+ String[] names = { "network address", "subnet mask" };
+ String[] params = { IPRangeProfile.NETWORK_ADDRESS, IPRangeProfile.SUBNET_MASK };
+
+ for (byte type = 0; type < names.length; type++) {
+ for (byte i = 0; i < 4; i++) {
+ String paramName = params[type] + "-" + i;
+ Part part = new Part(i);
+ part.setValue(usecase.getParameterAsString(paramName));
+ if (!part.isValid()) {
+ usecase.addErrorMessage("Part " + (i + 1) + " of the " + names[type]
+ + " is not valid.");
+ }
+ usecase.setParameter(paramName, part);
+ }
+ }
+ }
+
+ /**
+ * IP address part holder.
+ */
+ public static class Part {
+ private String value;
+ private byte position;
+
+ /**
+ * Ctor.
+ * @param _position The position.
+ * @param _value The value.
+ */
+ public Part(byte _position, String _value) {
+ this.value = _value;
+ this.position = _position;
+ }
+
+ /**
+ * Ctor.
+ * @param _position The position.
+ */
+ public Part(byte _position) {
+ this(_position, "0");
+ }
+
+ /**
+ * Returns the position
+ * @return The position
+ */
+ public byte getPosition() {
+ return this.position;
+ }
+
+ /**
+ * Returns the value
+ * @return The value
+ */
+ public String getValue() {
+ return this.value;
+ }
+
+ /**
+ * @param _value The value.
+ */
+ public void setValue(String _value) {
+ this.value = _value;
+ }
+
+ /**
+ * Checks if the part is valid.
+ * @return A boolean value.
+ */
+ public boolean isValid() {
+
+ boolean valid = true;
+ try {
+ int i = Integer.parseInt(this.value);
+ if (!(0 <= i && i <= 255)) {
+ valid = false;
+ }
+ } catch (NumberFormatException e) {
+ valid = false;
+ }
+
+ return valid;
+ }
+
+ }
+
+}
\ No newline at end of file
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRanges.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRanges.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRanges.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRanges.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,32 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.lenya.ac.IPRange;
+
+/**
+ * Manage IP ranges.
+ *
+ * @version $Id: IPRanges.java 407305 2006-05-17 16:21:49Z andreas $
+ */
+public class IPRanges extends AccessControlUsecase {
+
+ protected static final String IP_RANGES = "ipRanges";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+
+ IPRange[] ipRanges = getIpRangeManager().getIPRanges();
+ List ipRangeList = new ArrayList();
+ ipRangeList.addAll(Arrays.asList(ipRanges));
+ Collections.sort(ipRangeList);
+ setParameter(IP_RANGES, ipRangeList);
+ }
+}
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/SessionViewer.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,85 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import java.util.ArrayList;
+import java.util.WeakHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.servlet.http.*;
+
+import org.apache.lenya.ac.Identity;
+import org.apache.lenya.ac.User;
+import org.apache.lenya.cms.ac.usecases.AccessControlUsecase;
+import org.apache.lenya.cms.publication.URLInformation;
+import org.apache.lenya.util.SessionListener;
+
+/**
+ * SessionViewer usecase which gets all session objects from the SessionListener and extract the
+ * necessary informations.
+ *
+ * @version $Id: SessionViewer.java 407305 2006-05-17 16:21:49Z andreas $
+ */
+public class SessionViewer extends AccessControlUsecase {
+
+ private static final String IDENTITY = Identity.class.getName();
+
+ private static final String HISTORY = "org.apache.lenya.cms.cocoon.acting.History";
+
+ protected static final String USERS = "users";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+ this.getSourceURL();
+
+ SessionListener sessions = new SessionListener();
+ WeakHashMap allSessions = sessions.getAllSessions();
+ List userList = new ArrayList();
+
+ Iterator userit = allSessions.entrySet().iterator();
+ while (userit.hasNext()) {
+ Map.Entry entry = (Map.Entry) userit.next();
+ HttpSession nextsession = (HttpSession) entry.getValue();
+
+ Identity identity = (Identity) nextsession.getAttribute(IDENTITY);
+
+ User user = identity.getUser();
+ if (user != null) {
+ Vector history = (Vector) nextsession.getAttribute(HISTORY);
+ String publicationID = getPublicationIDfromHistory(history);
+ if (publicationID.equals(getPublicationIDfromURL())) {
+ userList.add(identity.getUser());
+ }
+ }
+ }
+ setParameter(USERS, userList);
+ }
+
+ /**
+ * Extract the publicationID from the history information stored in the session
+ *
+ * @param history The history stored in the session.. An entry looks like \/
+ * <publication-id>/authoring/index.html
+ * @return A publication ID.
+ */
+ private String getPublicationIDfromHistory(Vector history) {
+
+ String firstElement = history.firstElement().toString();
+ String publicationID = firstElement.substring(1, firstElement.indexOf("/", 1));
+
+ return publicationID;
+ }
+
+ /**
+ * @return The publicationID from an URL.
+ */
+ private String getPublicationIDfromURL() {
+ URLInformation info = new URLInformation(getSourceURL());
+ return info.getPublicationId();
+ }
+}
\ No newline at end of file
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/User.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/User.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/User.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/User.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,30 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+/**
+ * Display user information.
+ *
+ * @version $Id: User.java 407305 2006-05-17 16:21:49Z andreas $
+ */
+public class User extends AccessControlUsecase {
+
+ protected static final String USER_ID = "userId";
+ protected static final String USER = "user";
+
+ /**
+ * @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);
+
+ if (name.equals(USER_ID)) {
+ String userId = (String) value;
+ org.apache.lenya.ac.User user = getUserManager().getUser(userId);
+ if (user == null) {
+ addErrorMessage("user_no_such_user", new String[]{userId});
+ } else {
+ setParameter(USER, user);
+ }
+ }
+ }
+}
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserGroups.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserGroups.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserGroups.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserGroups.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,121 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.lenya.ac.Group;
+import org.apache.lenya.ac.User;
+import org.apache.lenya.cms.usecase.UsecaseException;
+
+/**
+ * Usecase to edit a user's group affiliation.
+ */
+public class UserGroups extends AccessControlUsecase {
+
+ private User user;
+
+ protected static final String USER_GROUPS = "userGroups";
+ protected static final String OTHER_GROUPS = "otherGroups";
+ protected static final String ADD = "add";
+ protected static final String REMOVE = "remove";
+ protected static final String USER_GROUP = "userGroup";
+ protected static final String OTHER_GROUP = "otherGroup";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
+ */
+ protected void doExecute() throws Exception {
+ super.doExecute();
+
+ this.user.removeFromAllGroups();
+
+ List userGroups = (List) getParameter(USER_GROUPS);
+ for (Iterator i = userGroups.iterator(); i.hasNext(); ) {
+ Group group = (Group) i.next();
+ group.add(this.user);
+ }
+ user.save();
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.Usecase#advance()
+ */
+ public void advance() throws UsecaseException {
+ super.advance();
+
+ String add = getParameterAsString(ADD);
+ String remove = getParameterAsString(REMOVE);
+ if (add != null || remove != null) {
+
+ List userGroups = (List) getParameter(USER_GROUPS);
+ List otherGroups = (List) getParameter(OTHER_GROUPS);
+
+ if (add != null) {
+ String groupId = getParameterAsString(OTHER_GROUP);
+ if (groupId != null) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("add group [" + groupId + "]");
+ }
+ Group group = getGroupManager().getGroup(groupId);
+ userGroups.add(group);
+ otherGroups.remove(group);
+ }
+ }
+
+ if (remove != null) {
+ String groupId = getParameterAsString(USER_GROUP);
+ if (groupId != null) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("remove group [" + groupId + "]");
+ }
+ Group group = getGroupManager().getGroup(groupId);
+ otherGroups.add(group);
+ userGroups.remove(group);
+ }
+ }
+
+ deleteParameter(ADD);
+ deleteParameter(REMOVE);
+ deleteParameter(USER_GROUP);
+ deleteParameter(OTHER_GROUP);
+ }
+
+ }
+
+ /**
+ * @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);
+ if (name.equals(UserProfile.USER_ID)) {
+ String userId = (String) value;
+ this.user = getUserManager().getUser(userId);
+ if (this.user == null) {
+ throw new RuntimeException("User [" + userId + "] not found.");
+ }
+
+ Group[] userGroupArray = this.user.getGroups();
+ List userGroups = new ArrayList(Arrays.asList(userGroupArray));
+
+ setParameter(USER_GROUPS, userGroups);
+
+ Group[] allGroups = getGroupManager().getGroups();
+
+ List otherGroups = new ArrayList();
+
+ for (int i = 0; i < allGroups.length; i++) {
+ if (!userGroups.contains(allGroups[i])) {
+ otherGroups.add(allGroups[i]);
+ }
+ }
+
+ setParameter(OTHER_GROUPS, otherGroups);
+ }
+
+ }
+
+}
\ No newline at end of file
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPassword.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPassword.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPassword.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPassword.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,79 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import org.apache.lenya.ac.User;
+
+/**
+ * Usecase to change a user's password.
+ */
+public class UserPassword extends AccessControlUsecase {
+
+ protected static final String NEW_PASSWORD = "password";
+ protected static final String CONFIRM_PASSWORD = "confirmPassword";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+ */
+ protected void doCheckExecutionConditions() throws Exception {
+ super.doCheckExecutionConditions();
+
+ if (this.user == null) {
+ addErrorMessage("The user ID has to be provided when executing this usecase.");
+ return;
+ }
+
+ checkNewPassword(this);
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
+ */
+ protected void doExecute() throws Exception {
+ super.doExecute();
+ this.user.setPassword(getParameterAsString(NEW_PASSWORD));
+ }
+
+ private User user;
+
+ protected User getUser() {
+ return this.user;
+ }
+
+ /**
+ * @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);
+
+ if (name.equals(UserProfile.USER_ID)) {
+ String userId = (String) value;
+ this.user = getUserManager().getUser(userId);
+ if (this.user == null) {
+ throw new RuntimeException("User [" + userId + "] not found.");
+ }
+ }
+ }
+
+ /**
+ * Checks a password and a confirmed password.
+ * @param usecase The usecase.
+ */
+ protected static void checkNewPassword(AccessControlUsecase usecase) {
+ String password = usecase.getParameterAsString(UserPassword.NEW_PASSWORD);
+ String confirmPassword = usecase.getParameterAsString(UserPassword.CONFIRM_PASSWORD);
+
+ if (!password.equals(confirmPassword)) {
+ usecase.addErrorMessage("Password and confirmed password are not equal.");
+ }
+
+ if (password.length() < 6) {
+ usecase.addErrorMessage("The password must be at least six characters long.");
+ }
+
+ if (!password.matches(".*\\d.*")) {
+ usecase.addErrorMessage("The password must contain at least one number.");
+ }
+ }
+
+}
\ No newline at end of file
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPasswordWithCheck.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPasswordWithCheck.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPasswordWithCheck.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserPasswordWithCheck.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,24 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+/**
+ * Usecase to change a user's password. The old password is checked.
+ */
+public class UserPasswordWithCheck extends UserPassword {
+
+ protected static final String OLD_PASSWORD = "oldPassword";
+
+ protected void doCheckExecutionConditions() throws Exception {
+
+ super.doCheckExecutionConditions();
+
+ if (getUser() != null) {
+ String oldPassword = getParameterAsString(OLD_PASSWORD);
+ boolean authenticated = getUser().authenticate(oldPassword);
+ if (!authenticated) {
+ addErrorMessage("The old password is not correct.");
+ }
+ }
+ }
+
+}
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/UserProfile.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,88 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import org.apache.lenya.ac.User;
+
+/**
+ * Usecase to edit a user's profile.
+ */
+public class UserProfile extends AccessControlUsecase {
+
+ protected static final String USER_ID = "userId";
+ protected static final String FULL_NAME = "fullName";
+ protected static final String EMAIL = "email";
+ protected static final String DESCRIPTION = "description";
+ protected static final String MENU_LOCALE = "defaultMenuLocale";
+ protected static final String DOCUMENT_LOCALE = "defaultDocumentLocale";
+
+ /**
+ * Ctor.
+ */
+ public UserProfile() {
+ super();
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doCheckExecutionConditions()
+ */
+ protected void doCheckExecutionConditions() throws Exception {
+
+ String email = getParameterAsString(UserProfile.EMAIL);
+ if (email.length() == 0) {
+ addErrorMessage("Please enter an e-mail address.");
+ }
+ }
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
+ */
+ protected void doExecute() throws Exception {
+ super.doExecute();
+
+ String fullName = getParameterAsString(UserProfile.FULL_NAME);
+ String description = getParameterAsString(UserProfile.DESCRIPTION);
+ String email = getParameterAsString(UserProfile.EMAIL);
+ String defaultMenuLocale = getParameterAsString(UserProfile.MENU_LOCALE);
+ String defaultDocumentLocale = getParameterAsString(UserProfile.DOCUMENT_LOCALE);
+
+ getUser().setEmail(email);
+ getUser().setName(fullName);
+ getUser().setDescription(description);
+ getUser().setDefaultMenuLocale(defaultMenuLocale);
+ getUser().setDefaultDocumentLocale(defaultDocumentLocale);
+ getUser().save();
+
+ }
+
+ private User user;
+
+ /**
+ * Returns the currently edited user.
+ * @return A user.
+ */
+ protected User getUser() {
+ return this.user;
+ }
+
+ /**
+ * @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);
+
+ if (name.equals(USER_ID)) {
+ String userId = (String) value;
+ this.user = getUserManager().getUser(userId);
+ if (this.user == null) {
+ throw new RuntimeException("User [" + userId + "] not found.");
+ }
+
+ setParameter(EMAIL, this.user.getEmail());
+ setParameter(DESCRIPTION, this.user.getDescription());
+ setParameter(MENU_LOCALE, this.user.getDefaultMenuLocale());
+ setParameter(DOCUMENT_LOCALE, this.user.getDefaultDocumentLocale());
+ setParameter(FULL_NAME, this.user.getName());
+ }
+ }
+
+}
Added: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java?rev=416313&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java (added)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/Users.java Thu Jun 22 03:09:34 2006
@@ -0,0 +1,51 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.cocoon.components.ContextHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+import org.apache.lenya.ac.Identity;
+import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserType;
+
+/**
+ * Manage users.
+ *
+ * @version $Id: Users.java 407305 2006-05-17 16:21:49Z andreas $
+ */
+public class Users extends AccessControlUsecase {
+
+ protected static final String USERS = "users";
+ protected static final String CURRENT_USER = "currentUser";
+ protected static final String USER_TYPES = "userTypes";
+
+ /**
+ * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+ */
+ protected void initParameters() {
+ super.initParameters();
+
+ User[] users = getUserManager().getUsers();
+ List userList = new ArrayList();
+ userList.addAll(Arrays.asList(users));
+ Collections.sort(userList);
+ setParameter(USERS, userList);
+
+ Request request = ContextHelper.getRequest(getContext());
+ Session session = request.getSession(false);
+ if (session != null) {
+ Identity identity = (Identity) session.getAttribute(Identity.class.getName());
+ if (identity != null) {
+ setParameter(CURRENT_USER, identity.getUser());
+ }
+ }
+
+ UserType[] types = getUserManager().getUserTypes();
+ setParameter(USER_TYPES, Arrays.asList(types));
+ }
+}
\ No newline at end of file
Copied: lenya/trunk/src/modules-core/administration/usecases/addGroup.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/addGroup.jx?p2=lenya/trunk/src/modules-core/administration/usecases/addGroup.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/addGroup.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/addGroup.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/addGroup.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/addIPRange.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx?p2=lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/addIPRange.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/addIPRange.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/addIPRange.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<page:page
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0"
Copied: lenya/trunk/src/modules-core/administration/usecases/addUser.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/addUser.jx?p2=lenya/trunk/src/modules-core/administration/usecases/addUser.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/addUser.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/addUser.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/addUser.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/changePassword.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/changePassword.jx?p2=lenya/trunk/src/modules-core/administration/usecases/changePassword.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/changePassword.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/changePassword.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/changePassword.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx?p2=lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/deleteGroup.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/deleteGroup.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx?p2=lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/deleteUser.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/deleteUser.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/emptyTrash.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx?p2=lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/emptyTrash.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/emptyTrash.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/emptyTrash.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/group.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/group.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/group.jx?p2=lenya/trunk/src/modules-core/administration/usecases/group.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/group.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/group.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/group.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/group.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx?p2=lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/groupMembers.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/groupMembers.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx?p2=lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/groupProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/groupProfile.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/groups.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/groups.jx?p2=lenya/trunk/src/modules-core/administration/usecases/groups.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/groups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/groups.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/groups.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/ipRange.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/ipRange.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRange.jx?p2=lenya/trunk/src/modules-core/administration/usecases/ipRange.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/ipRange.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/ipRange.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRange.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Copied: lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/ipRangeGroups.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx?p2=lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/ipRangeGroups.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/ipRangeGroups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRangeGroups.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Copied: lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/ipRangeProfile.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx?p2=lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/ipRangeProfile.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/ipRangeProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRangeProfile.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Copied: lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx?p2=lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/ipRanges.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/ipRanges.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx?p2=lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/serverStatus.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/serverStatus.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/sessions.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/sessions.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/sessions.jx?p2=lenya/trunk/src/modules-core/administration/usecases/sessions.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/sessions.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/sessions.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/sessions.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/sessions.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/siteOverview.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx?p2=lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/siteOverview.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/siteOverview.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/siteOverview.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Copied: lenya/trunk/src/modules-core/administration/usecases/usecase.xmap (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/usecase.xmap?p2=lenya/trunk/src/modules-core/administration/usecases/usecase.xmap&p1=lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/usecase.xmap (original)
+++ lenya/trunk/src/modules-core/administration/usecases/usecase.xmap Thu Jun 22 03:09:34 2006
@@ -24,7 +24,7 @@
<map:match pattern="status.xml">
<map:generate src="status" type="status"/>
- <map:transform src="fallback://lenya/xslt/admin/status2html.xslt">
+ <map:transform src="fallback://lenya/xslt/admin/status2html.xsl">
<map:parameter name="contextPath" value="{request:contextPath}"/>
</map:transform>
<map:serialize type="xml"/>
Propchange: lenya/trunk/src/modules-core/administration/usecases/user.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/userGroups.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/userGroups.jx?p2=lenya/trunk/src/modules-core/administration/usecases/userGroups.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/userGroups.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/userGroups.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/userGroups.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/userProfile.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/userProfile.jx?p2=lenya/trunk/src/modules-core/administration/usecases/userProfile.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/userProfile.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/userProfile.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/userProfile.jx
------------------------------------------------------------------------------
svn:keywords = Id
Copied: lenya/trunk/src/modules-core/administration/usecases/users.jx (from r415937, lenya/trunk/src/webapp/lenya/usecases/admin/users.jx)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/usecases/users.jx?p2=lenya/trunk/src/modules-core/administration/usecases/users.jx&p1=lenya/trunk/src/webapp/lenya/usecases/admin/users.jx&r1=415937&r2=416313&rev=416313&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/admin/users.jx (original)
+++ lenya/trunk/src/modules-core/administration/usecases/users.jx Thu Jun 22 03:09:34 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2005 The Apache Software Foundation
Propchange: lenya/trunk/src/modules-core/administration/usecases/users.jx
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org