Author: cziegeler
Date: Thu Mar 4 16:09:05 2010
New Revision: 919045
URL: http://svn.apache.org/viewvc?rev=919045&view=rev
Log:
SLING-1262 : First simple implementation of the resource resolver factory.
Added:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
(with props)
Modified:
sling/trunk/bundles/jcr/resource/pom.xml
sling/trunk/launchpad/builder/src/main/bundles/list.xml
Modified: sling/trunk/bundles/jcr/resource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=919045&r1=919044&r2=919045&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/pom.xml (original)
+++ sling/trunk/bundles/jcr/resource/pom.xml Thu Mar 4 16:09:05 2010
@@ -108,6 +108,12 @@
</reporting>
<dependencies>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
@@ -122,7 +128,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.8</version>
+ <version>2.0.9-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Added:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java?rev=919045&view=auto
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
(added)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
Thu Mar 4 16:09:05 2010
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.resource.internal;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.jcr.Credentials;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
+
+/**
+ * First attempt of an resource resolver factory implementation.
+ * WORK IN PROGRESS - see SLING-1262
+ */
+...@component
+...@service(value=ResourceResolverFactory.class)
+public class ResourceResolverFactoryImpl implements ResourceResolverFactory {
+
+ @Reference
+ private SlingRepository repository;
+
+ @Reference
+ private JcrResourceResolverFactory factory;
+
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getAdministrativeResourceResolver(java.util.Map)
+ */
+ public ResourceResolver getAdministrativeResourceResolver(final
Map<String, Object> authenticationInfo)
+ throws LoginException {
+ final String workspace = getWorkspace(authenticationInfo);
+ final Session session;
+ try {
+ session = this.repository.loginAdministrative(workspace);
+ } catch (RepositoryException re) {
+ throw getLoginException(re);
+ }
+ return factory.getResourceResolver(handleSudo(session,
authenticationInfo));
+ }
+
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getResourceResolver(java.util.Map)
+ */
+ public ResourceResolver getResourceResolver(final Map<String, Object>
authenticationInfo)
+ throws LoginException {
+ final Credentials credentials = getCredentials(authenticationInfo);
+ final String workspace = getWorkspace(authenticationInfo);
+ final Session session;
+ try {
+ if ( credentials == null ) {
+ session = this.repository.loginAdministrative(workspace);
+ } else {
+ session = this.repository.login(credentials, workspace);
+ }
+ } catch (RepositoryException re) {
+ throw getLoginException(re);
+ }
+ return factory.getResourceResolver(handleSudo(session,
authenticationInfo));
+ }
+
+ private LoginException getLoginException(final RepositoryException re) {
+ if ( re instanceof javax.jcr.LoginException ) {
+ return new LoginException(re.getMessage(), re.getCause());
+ }
+ return new LoginException("Unable to login " + re.getMessage(), re);
+ }
+
+ private String getWorkspace(final Map<String, Object> authenticationInfo) {
+ if ( authenticationInfo != null ) {
+ return (String) authenticationInfo.get("user.jcr.workspace");
+ }
+ return null;
+ }
+
+ private String getSudoUser(final Map<String, Object> authenticationInfo) {
+ if ( authenticationInfo != null ) {
+ return (String)
authenticationInfo.get(ResourceResolverFactory.SUDO_USER_ID);
+ }
+ return null;
+ }
+
+ private Session handleSudo(final Session session, final Map<String,
Object> authenticationInfo)
+ throws LoginException {
+ final String sudoUser = getSudoUser(authenticationInfo);
+ if ( sudoUser != null ) {
+ try {
+ final SimpleCredentials creds = new
SimpleCredentials(sudoUser, new char[0]);
+ return session.impersonate(creds);
+ } catch ( RepositoryException re) {
+ throw getLoginException(re);
+ } finally {
+ session.logout();
+ }
+ }
+ return session;
+ }
+
+ private Credentials getCredentials(final Map<String, Object>
authenticationInfo) {
+ if ( authenticationInfo == null ) {
+ return null;
+ }
+ Credentials credentials = (Credentials)
authenticationInfo.get("user.jcr.credentials");
+ if ( credentials == null ) {
+ // otherwise try to create SimpleCredentials if the userId is set
+ final String userId = (String) authenticationInfo.get("user.name");
+ if (userId != null) {
+ final char[] password = (char[])
authenticationInfo.get("user.password");
+ credentials = new SimpleCredentials(userId, (password == null)
+ ? new char[0]
+ : password);
+
+ // add attributes
+ final Iterator<Map.Entry<String, Object>> i =
authenticationInfo.entrySet().iterator();
+ while (i.hasNext() ) {
+ final Map.Entry<String, Object> current = i.next();
+
((SimpleCredentials)credentials).setAttribute(current.getKey(),
current.getValue());
+ }
+ }
+ }
+ return credentials;
+ }
+}
Propchange:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ResourceResolverFactoryImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=919045&r1=919044&r2=919045&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Mar 4 16:09:05
2010
@@ -41,7 +41,7 @@
<bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.8</version>
+ <version>2.0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.sling</groupId>
