svn commit: r910263 - in /incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager: ./ src/main/java/org/apache/clerezza/platform/usermanager/

[mir]

Author: mir
Date: Mon Feb 15 17:10:24 2010
New Revision: 910263

URL: http://svn.apache.org/viewvc?rev=910263&view=rev
Log:
CLEREZZA-107: merged with trunk

Added:
    
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
      - copied unchanged from r910211, 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
Modified:
    
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/
   (props changed)
    
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/pom.xml
    
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java

Propchange: 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 15 17:10:24 2010
@@ -0,0 +1,2 @@
+/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager:905960-908526
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager:908104-910211

Modified: 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/pom.xml?rev=910263&r1=910262&r2=910263&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/pom.xml
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/pom.xml
 Mon Feb 15 17:10:24 2010
@@ -45,6 +45,14 @@
                        <groupId>org.apache.clerezza</groupId>
                        
<artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.clerezza</groupId>
+                       
<artifactId>org.apache.clerezza.platform.typerendering.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.clerezza</groupId>
+                       
<artifactId>org.apache.clerezza.platform.security</artifactId>
+               </dependency>
        </dependencies>
        <build>
                <plugins>
@@ -68,4 +76,4 @@
                        </plugin>
                </plugins>
        </build>
-</project>
\ No newline at end of file
+</project>

Modified: 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java?rev=910263&r1=910262&r2=910263&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
 Mon Feb 15 17:10:24 2010
@@ -581,14 +581,23 @@
        }
 
        @Override
-       public GraphNode getUserGraphNode(String name) {
-               GraphNode userNodeInSystemGraph = new 
GraphNode(getUserByName(name), systemGraph);
-               if (userNodeInSystemGraph == null) {
-                       return null;
-               }
-               MGraph copiedUserContext = new 
SimpleMGraph(userNodeInSystemGraph.
-                               getNodeContext());
-               return new GraphNode(userNodeInSystemGraph.getNode(), 
copiedUserContext);
+       public GraphNode getUserGraphNode(final String name) {
+               return AccessController.doPrivileged(new 
PrivilegedAction<GraphNode>() {
+                       @Override
+                       public GraphNode run() {
+                               NonLiteral user = getUserByName(name);
+                               if (user != null) {
+                                       GraphNode userNodeInSystemGraph =
+                                                       new 
GraphNode(getUserByName(name), systemGraph);
+                                       MGraph copiedUserContext = new 
SimpleMGraph
+                                                       
(userNodeInSystemGraph.getNodeContext());
+                                       return new 
GraphNode(userNodeInSystemGraph.getNode(),
+                                                       copiedUserContext);
+                               } else {
+                                       return null;
+                               }
+                       }
+               });
        }
 
 }