Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
2.4: Merged revisions 1228160 and 1230507 from trunk
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.4@1232528 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
jukka committed Jan 17, 2012
1 parent cd7618c commit ea36503
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
Expand Up @@ -25,30 +25,22 @@
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.security.TestPrincipal;
import org.apache.jackrabbit.core.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.core.security.user.action.AccessControlAction;
import org.apache.jackrabbit.core.security.user.action.AuthorizableAction;
import org.apache.jackrabbit.core.security.user.action.ClearMembershipAction;
import org.apache.jackrabbit.test.NotExecutableException;
import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
import org.apache.jackrabbit.test.NotExecutableException;

import javax.jcr.Credentials;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.Value;
import javax.jcr.Node;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.AccessControlPolicyIterator;
import java.security.Principal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.List;
import java.util.ArrayList;

/**
* <code>UserManagerImplTest</code>...
Expand Down
Expand Up @@ -32,8 +32,8 @@ public class SessionInfoImpl extends org.apache.jackrabbit.spi.commons.SessionIn
private final CredentialsWrapper credentials;
private final Set<String> sessionScopedTokens = new HashSet<String>();

// a globally unique URI identifiying this session
private final String sessionIdentifier = "urn:uuid" + UUID.randomUUID();
// a globally unique URI identifying this session
private final String sessionIdentifier = "urn:uuid:" + UUID.randomUUID();

private String lastBatchId;
private NamePathResolver resolver;
Expand Down

0 comments on commit ea36503

Please sign in to comment.