// current state
private Node node;
private String state;
// current state
private Node node;
private String state;
- // private String page;
private Throwable exception;
private BrowserNavigation history;
private Throwable exception;
private BrowserNavigation history;
String previousState = this.state;
node = null;
String previousState = this.state;
node = null;
this.state = newState;
try {
this.state = newState;
try {
node = addNode(session, state, null);
else
node = session.getNode(state);
node = addNode(session, state, null);
else
node = session.getNode(state);
} else if (firstSlash > 0) {
String prefix = state.substring(0, firstSlash);
String path = state.substring(firstSlash);
} else if (firstSlash > 0) {
String prefix = state.substring(0, firstSlash);
String path = state.substring(firstSlash);
throw new CmsException("Data " + path
+ " does not exist");
}
throw new CmsException("Data " + path
+ " does not exist");
}
- throw new CmsException("Unsupported state prefix '" + prefix
- + "'");
- // page = prefix;
} else {
node = getDefaultNode(session);
} else {
node = getDefaultNode(session);
- // if (state.equals("~"))
- // page = "";
- // else
- // page = state;
}
if (log.isTraceEnabled())
}
if (log.isTraceEnabled())
- log.trace("node=" + node + ", state=" + state);
+ log.trace("node=" + node + ", state=" + state + " (page="
+ + page);
} catch (RepositoryException e) {
throw new CmsException("Cannot retrieve node", e);
} catch (RepositoryException e) {
throw new CmsException("Cannot retrieve node", e);
- // protected String getPage() {
import java.util.Dictionary;
import java.util.Dictionary;
-import org.osgi.service.useradmin.User;
+import org.argeo.security.ArgeoUser;
-abstract class AbstractJcrUser extends JcrRole implements User {
+abstract class AbstractJcrUser extends JcrRole implements ArgeoUser {
@Override
public Dictionary<String, Object> getCredentials() {
@Override
public Dictionary<String, Object> getCredentials() {
--- /dev/null
+package org.argeo.cms.internal.useradmin;
+
+import org.argeo.security.ArgeoUser;
+import org.springframework.security.core.userdetails.UserDetails;
+
+class JcrEndUser extends AbstractJcrUser {
+ private final UserDetails userDetails;
+
+ public JcrEndUser(UserDetails userDetails) {
+ this.userDetails = userDetails;
+ }
+
+ UserDetails getUserDetails() {
+ return userDetails;
+ }
+
+}
+++ /dev/null
-package org.argeo.cms.internal.useradmin;
-
-import org.springframework.security.core.userdetails.UserDetails;
-
-class JcrEnduser extends AbstractJcrUser {
- private final UserDetails userDetails;
-
- public JcrEnduser(UserDetails userDetails) {
- this.userDetails = userDetails;
- }
-
- UserDetails getUserDetails() {
- return userDetails;
- }
-
-}
session.getWorkspace().getVersionManager()
.checkin(userProfile.getPath());
userAdminService().createUser(userDetails);
session.getWorkspace().getVersionManager()
.checkin(userProfile.getPath());
userAdminService().createUser(userDetails);
- return new JcrEnduser(userDetails);
+ return new JcrEndUser(userDetails);
} else if (Role.GROUP == type) {
userAdminService().newRole(name);
return new JcrGroup(name);
} else if (Role.GROUP == type) {
userAdminService().newRole(name);
return new JcrGroup(name);
Role role = getRole(name);
if (role == null)
return false;
Role role = getRole(name);
if (role == null)
return false;
- if (role instanceof JcrEnduser)
+ if (role instanceof JcrEndUser)
userAdminService().deleteUser(role.getName());
else if (role instanceof JcrGroup)
userAdminService().deleteRole(role.getName());
userAdminService().deleteUser(role.getName());
else if (role instanceof JcrGroup)
userAdminService().deleteRole(role.getName());
try {
UserDetails userDetails = userAdminService().loadUserByUsername(
name);
try {
UserDetails userDetails = userAdminService().loadUserByUsername(
name);
- return new JcrEnduser(userDetails);
+ return new JcrEndUser(userDetails);
} catch (UsernameNotFoundException e) {
return null;
}
} catch (UsernameNotFoundException e) {
return null;
}
for (int i = 0; i < roles.size(); i++)
res[i] = new JcrGroup(roles.get(i));
for (int i = 0; i < users.size(); i++)
for (int i = 0; i < roles.size(); i++)
res[i] = new JcrGroup(roles.get(i));
for (int i = 0; i < users.size(); i++)
- res[roles.size() + i] = new JcrEnduser(userAdminService()
+ res[roles.size() + i] = new JcrEndUser(userAdminService()
.loadUserByUsername(users.get(i)));
return res;
}
.loadUserByUsername(users.get(i)));
return res;
}