Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv32203/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
Tag: b1_4
UserForm.java AbstractCommunityAction.java
UserAddInitAction.java UserAddAction.java
Added Files:
Tag: b1_4
GroupInitAction.java GroupAction.java GroupForm.java
DeleteGroupAction.java
Log Message:
CMSC-617 Personal Pages module
Backport to 1.4
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-617
GroupInitAction.java is new
GroupAction.java is new
GroupForm.java is new
DeleteGroupAction.java is new
Index: UserForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserForm.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- UserForm.java 29 Jan 2008 09:59:40 -0000 1.2
+++ UserForm.java 25 Feb 2008 16:26:17 -0000 1.2.2.1
@@ -1,12 +1,12 @@
/*
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
+ This software is OSI Certified Open Source Software.
+ OSI Certified is a certification mark of the Open Source Initiative.
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
+ The license (Mozilla version 1.0) can be read at the MMBase site.
+ See http://www.MMBase.org/license
-*/package com.finalist.cmsc.community.forms;
+ */package com.finalist.cmsc.community.forms;
import javax.servlet.http.HttpServletRequest;
@@ -25,13 +25,19 @@
private String action;
private String email;
+
private String password;
+
private String passwordConfirmation;
private String account;
+
private String voornaam;
+
private String tussenVoegsels;
+
private String achterNaam;
+
private String bedrijf;
public String getAction() {
@@ -117,9 +123,10 @@
if (passwordConfirmation.equals("")) {
actionErrors.add("passwordConfirmation", new
ActionMessage("passwordConfirmation.empty"));
}
- if (!password.equals("") && !passwordConfirmation.equals("") &&
!password.equals(passwordConfirmation) ) {
+ if (!password.equals("") && !passwordConfirmation.equals("") &&
!password.equals(passwordConfirmation)) {
actionErrors.add("password", new
ActionMessage("passwords.not_equal"));
}
return actionErrors;
}
+
}
Index: AbstractCommunityAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/AbstractCommunityAction.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- AbstractCommunityAction.java 31 Jan 2008 13:47:56 -0000 1.4
+++ AbstractCommunityAction.java 25 Feb 2008 16:26:17 -0000 1.4.2.1
@@ -15,12 +15,13 @@
import javax.servlet.http.HttpSession;
import org.apache.struts.action.ActionForm;
-import org.springframework.web.struts.ActionSupport;
import org.springframework.web.context.WebApplicationContext;
-import com.finalist.cmsc.services.community.security.AuthenticationService;
-import com.finalist.cmsc.services.community.security.AuthorityService;
+import org.springframework.web.struts.ActionSupport;
+
import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.cmsc.services.community.preferences.PreferenceService;
+import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.services.community.security.AuthorityService;
/**
* @author Remco Bos
@@ -33,8 +34,12 @@
protected static final String SUCCESS = "success";
+ protected static final String CANCEL = "cancel";
+
protected static final String USERID = "userid";
+ protected static final String GROUPID = "groupid";
+
protected AuthenticationService getAuthenticationService() {
WebApplicationContext ctx = getWebApplicationContext();
return (AuthenticationService)
ctx.getBean("authenticationService");
Index: UserAddInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddInitAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- UserAddInitAction.java 31 Jan 2008 13:47:27 -0000 1.3
+++ UserAddInitAction.java 25 Feb 2008 16:26:17 -0000 1.3.2.1
@@ -22,6 +22,7 @@
import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.services.community.security.AuthorityService;
/**
* @author Remco Bos
@@ -33,6 +34,8 @@
public ActionForward execute(ActionMapping actionMapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
+ AuthorityService aus = getAuthorityService();
+
String id = request.getParameter(USERID);
UserForm userForm = (UserForm) actionForm;
if (id != null) {
@@ -52,6 +55,7 @@
} else {
log.info("person failed");
}
+
} else {
log.info("auth failed");
}
Index: UserAddAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddAction.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- UserAddAction.java 31 Jan 2008 13:48:49 -0000 1.3
+++ UserAddAction.java 25 Feb 2008 16:26:17 -0000 1.3.2.1
@@ -19,6 +19,7 @@
import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.services.community.security.AuthorityService;
/**
* Add a Authentication and Person
@@ -36,31 +37,39 @@
if (!isCancelled(httpServletRequest)) {
UserForm userForm = (UserForm) actionForm;
+ String id = userForm.getEmail();
+
+ AuthorityService aus = getAuthorityService();
AuthenticationService as = getAuthenticationService();
PersonService ps = getPersonService();
if (userForm.getAction().equalsIgnoreCase(ACTION_ADD)) {
- Long check1 =
as.getAuthenticationIdForUserId(userForm.getEmail());
+ Long check1 =
as.getAuthenticationIdForUserId(id);
if (check1 == null) {
as.createAuthentication(userForm.getEmail(), userForm.getPassword());
- Long check2 =
as.getAuthenticationIdForUserId(userForm.getEmail());
+ Long check2 =
as.getAuthenticationIdForUserId(id);
if (check2 != null) {
-
-
ps.createPerson(userForm.getVoornaam(), userForm.getTussenVoegsels(),
userForm.getAchterNaam(), userForm
- .getEmail());
+
ps.createPerson(userForm.getVoornaam(), userForm.getTussenVoegsels(),
userForm.getAchterNaam(), id);
} else {
log.info("add check2 failed");
}
} else {
- log.info("add check1 failed");
+ log.info("add check1 failed for: " +
id);
}
+
} else if
(userForm.getAction().equalsIgnoreCase(ACTION_EDIT)) {
- Long check1 =
as.getAuthenticationIdForUserId(userForm.getEmail());
- if (check1 == null) {
- // as.updateAuthentication(userId,
oldPassword, newPassword)
+ Long check1 =
as.getAuthenticationIdForUserId(id);
+ if (check1 != null) {
+ String newPassword1 =
userForm.getPassword();
+ String newPassword2 =
userForm.getPasswordConfirmation();
+ if (newPassword1 != null &&
newPassword2 != null) {
+ if
(newPassword1.equalsIgnoreCase(newPassword2)) {
+
as.updateAuthenticationPassword(id, newPassword1);
+ }
+ }
} else {
- log.info("edit check1 failed");
+ log.info("edit check1 failed for: " +
id);
}
} else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
