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:59:24 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting UserAdminDeleteAction.java UserAdminModifyAction.java
egli 2003/06/06 10:59:23
Modified: src/java/org/apache/lenya/cms/cocoon/acting
UserAdminDeleteAction.java
UserAdminModifyAction.java
Log:
Using the PublicationFactory to get the publication instead
of the PageEnvelope as it's not used otherwise.
Revision Changes Path
1.3 +4 -11 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminDeleteAction.java
Index: UserAdminDeleteAction.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminDeleteAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UserAdminDeleteAction.java 6 Jun 2003 17:47:30 -0000 1.2
+++ UserAdminDeleteAction.java 6 Jun 2003 17:59:23 -0000 1.3
@@ -61,8 +61,8 @@
import org.apache.lenya.cms.ac.AccessControlException;
import org.apache.lenya.cms.ac.User;
import org.apache.lenya.cms.ac.UserManager;
-import org.apache.lenya.cms.publication.PageEnvelope;
import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.publication.PublicationFactory;
/**
* @author egli
@@ -85,16 +85,9 @@
throws Exception {
Request request = ObjectModelHelper.getRequest(objectModel);
- PageEnvelope envelope = null;
- try {
- envelope = new PageEnvelope(objectModel);
- } catch (Exception e) {
- getLogger().error(e.getMessage(), e);
- return null;
- }
- Map emptyMap = Collections.EMPTY_MAP;
+ Publication publication = PublicationFactory.getPublication(objectModel);
- Publication publication = envelope.getPublication();
+ Map emptyMap = Collections.EMPTY_MAP;
String userId = request.getParameter(USER_ID);
1.4 +4 -11 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminModifyAction.java
Index: UserAdminModifyAction.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAdminModifyAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UserAdminModifyAction.java 6 Jun 2003 17:47:05 -0000 1.3
+++ UserAdminModifyAction.java 6 Jun 2003 17:59:23 -0000 1.4
@@ -63,8 +63,8 @@
import org.apache.lenya.cms.ac.GroupManager;
import org.apache.lenya.cms.ac.User;
import org.apache.lenya.cms.ac.UserManager;
-import org.apache.lenya.cms.publication.PageEnvelope;
import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.publication.PublicationFactory;
/**
* @author egli
@@ -87,16 +87,9 @@
throws Exception {
Request request = ObjectModelHelper.getRequest(objectModel);
- PageEnvelope envelope = null;
- try {
- envelope = new PageEnvelope(objectModel);
- } catch (Exception e) {
- getLogger().error(e.getMessage(), e);
- return null;
- }
- Map emptyMap = Collections.EMPTY_MAP;
+ Publication publication = PublicationFactory.getPublication(objectModel);
- Publication publication = envelope.getPublication();
+ Map emptyMap = Collections.EMPTY_MAP;
String userId = request.getParameter(USER_ID);
String fullName = request.getParameter(FULL_NAME);
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org