You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by eg...@apache.org on 2003/06/06 19:22:51 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting UserAdminAddAction.java

egli        2003/06/06 10:22:50

  Modified:    src/java/org/apache/lenya/cms/cocoon/acting
                        UserAdminAddAction.java
  Log:
  Fetch the publication with the help of a PublicationFactory,
  i.e. no longer with a PageEnvelope as this doesn't seem
  to work in a global sitemap.
  
  Revision  Changes    Path
  1.2       +7 -11     cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminAddAction.java
  
  Index: UserAdminAddAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminAddAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UserAdminAddAction.java	6 Jun 2003 13:55:45 -0000	1.1
  +++ UserAdminAddAction.java	6 Jun 2003 17:22:50 -0000	1.2
  @@ -62,8 +62,8 @@
   import org.apache.lenya.cms.ac.FileUser;
   import org.apache.lenya.cms.ac.Group;
   import org.apache.lenya.cms.ac.GroupManager;
  -import org.apache.lenya.cms.publication.PageEnvelope;
   import org.apache.lenya.cms.publication.Publication;
  +import org.apache.lenya.cms.publication.PublicationFactory;
   
   /**
    * @author egli
  @@ -83,16 +83,10 @@
   		throws Exception {
   
   		Request request = ObjectModelHelper.getRequest(objectModel);
  -		PageEnvelope envelope = null;
  -		try {
  -			envelope = new PageEnvelope(resolver, request);
  -		} catch (Exception e) {
  -			getLogger().error(e.getMessage(), e);
  -			return null;
  -		}
  +
   		Map emptyMap = Collections.EMPTY_MAP;
   
  -		Publication publication = envelope.getPublication();
  +		Publication publication = PublicationFactory.getPublication(objectModel);
   
   		String userId = request.getParameter(USER_ID);
   		String fullName = request.getParameter(FULL_NAME);
  @@ -112,13 +106,15 @@
   			getLogger().error(e.getMessage(), e);
   			return null;
   		}
  +				
   		FileUser user =
   			new FileUser(publication, userId, fullName, email, password);
  -		String[] groups = request.getParameterValues(GROUP);
  +		String[] groups = request.getParameterValues(GROUPS);
   		for (int i = 0; i < groups.length; i++) {
   			Group group = (Group) manager.getGroup(groups[i]);
   			user.addGroup(group);
   		}
  +				
   		try {
   			user.save();
   		} catch (AccessControlException e) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org