Author: mir
Date: Wed Feb 10 15:26:25 2010
New Revision: 908537
URL: http://svn.apache.org/viewvc?rev=908537&view=rev
Log:
CLEREZZA-87: Menu has logout button only if a user is logged in
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
- copied unchanged from r908526,
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserLoginNode.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/
(props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 10 15:26:25 2010
@@ -0,0 +1 @@
+/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager:905960-908526
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/pom.xml?rev=908537&r1=908536&r2=908537&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/pom.xml
Wed Feb 10 15:26:25 2010
@@ -41,6 +41,14 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.config</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>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java?rev=908537&r1=908536&r2=908537&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
Wed Feb 10 15:26:25 2010
@@ -217,8 +217,7 @@
public void deleteAllPermissionsOfUser(String name);
/**
- * Retrieves all information associated with a user as GraphNode. The
GraphNode
- * consists of a UnionMGraph between a new SimpleMGraph and the system
graph.
+ * Retrieves all information associated with a user as GraphNode.
*
* @param name specifies the username of the user, may not be null
* @return GraphNode
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java?rev=908537&r1=908536&r2=908537&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
Wed Feb 10 15:26:25 2010
@@ -50,7 +50,6 @@
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.SIOC;
import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.clerezza.rdf.utils.UnionMGraph;
/**
* @author hasan, tio
@@ -543,10 +542,8 @@
public GraphNode run() {
NonLiteral user = getUserByName(name);
if(user != null) {
- GraphNode node = new GraphNode(user,
new UnionMGraph(
- new SimpleMGraph(), new
GraphNode(user, systemGraph)
- .getNodeContext()));
-
+ GraphNode node = new GraphNode(user,
new SimpleMGraph(
+ new GraphNode(user,
systemGraph).getNodeContext()));
return node;
} else {
throw new RuntimeException("No user
with username " + name + " exists");
