You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by df...@apache.org on 2004/09/30 22:13:44 UTC
cvs commit: jakarta-slide/projector/src/java/org/apache/slide/projector/processor/security CreateRole.java CreateUser.java DeleteRole.java
dflorey 2004/09/30 13:13:44
Modified: projector/src/java/org/apache/slide/projector/processor/security
CreateRole.java CreateUser.java DeleteRole.java
Log:
Error handling when creating users/roles improved
Revision Changes Path
1.5 +3 -6 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/security/CreateRole.java
Index: CreateRole.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/security/CreateRole.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CreateRole.java 30 Sep 2004 19:25:07 -0000 1.4
+++ CreateRole.java 30 Sep 2004 20:13:44 -0000 1.5
@@ -16,6 +16,7 @@
import org.apache.slide.projector.i18n.ParameterMessage;
import org.apache.slide.projector.processor.Processor;
import org.apache.slide.projector.processor.Result;
+import org.apache.slide.projector.repository.RepositoryException;
import org.apache.slide.projector.repository.RoleExistsException;
/**
@@ -47,13 +48,9 @@
Object role = null;
try {
role = Projector.getRepository().createRole(rolename, context.getCredentials());
- } catch ( RoleExistsException exception ) {
+ } catch ( RepositoryException exception ) {
context.addInformation(new Information(Information.ERROR, exception.getErrorMessage(), new String[] { ROLENAME }));
state = FAILED;
- }
- if ( role == null ) {
- context.addInformation(new Information(Information.ERROR, new ErrorMessage("createRole/failed"), new String[0]));
- state = FAILED;
}
return new Result(state, ROLE, role);
}
1.6 +0 -5 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/security/CreateUser.java
Index: CreateUser.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/security/CreateUser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CreateUser.java 30 Sep 2004 20:09:40 -0000 1.5
+++ CreateUser.java 30 Sep 2004 20:13:44 -0000 1.6
@@ -18,10 +18,6 @@
import org.apache.slide.projector.processor.Result;
import org.apache.slide.projector.repository.RepositoryException;
-/**
- * @version $Revision$
- */
-
public class CreateUser implements Processor {
private final static String USERNAME = "username";
private final static String PASSWORD = "password";
@@ -50,7 +46,6 @@
String retypedPassword = parameter.get(RETYPE_PASSWORD).toString();
String password = parameter.get(PASSWORD).toString();
String state = OK;
- // Check spelling
Object user = null;
if ( !password.equals(retypedPassword) ) {
context.addInformation(new Information(Information.ERROR, new ErrorMessage("register/passwordsNotIdentical"), new String[] { PASSWORD, RETYPE_PASSWORD }));
1.5 +4 -3 jakarta-slide/projector/src/java/org/apache/slide/projector/processor/security/DeleteRole.java
Index: DeleteRole.java
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/security/DeleteRole.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteRole.java 30 Sep 2004 19:25:07 -0000 1.4
+++ DeleteRole.java 30 Sep 2004 20:13:44 -0000 1.5
@@ -45,6 +45,7 @@
private final static ParameterDescriptor[] parameterDescriptors = new ParameterDescriptor[] {
new ParameterDescriptor(ROLE, new ParameterMessage("deleteRole/parameter/role"), new URIConstraints())
};
+
private final static ResultDescriptor[] resultDescriptors = new ResultDescriptor[] {
ResultDescriptor.OK
};
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org