Author: ito
Date: Wed Feb 3 11:28:36 2010
New Revision: 906009
URL: http://svn.apache.org/viewvc?rev=906009&view=rev
Log:
CLEREZZA-87: resolved
Added:
incubator/clerezza/issues/CLEREZZA-87/
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/
- copied from r905959,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
- copied unchanged from r905963,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserComparator.java
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
- copied unchanged from r905963,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
- copied unchanged from r905963,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.rdf.ontologies/
- copied from r905959,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/
- copied from r905959,
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/
Removed:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagementProvider.java
Modified:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/pom.xml
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Modified:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/pom.xml?rev=906009&r1=905959&r2=906009&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager/pom.xml
Wed Feb 3 11:28:36 2010
@@ -41,6 +41,10 @@
<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>
</dependencies>
<build>
<plugins>
Modified:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf?rev=906009&r1=905959&r2=906009&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
(original)
+++
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
Wed Feb 3 11:28:36 2010
@@ -91,4 +91,13 @@
<rdfs:range
rdf:resource="http://www.w3.org/2000/01/rdf-schema#Literal"/>
</rdf:Property>
+<rdf:Property rdf:about="http://clerezza.org/2009/08/platform#user";>
+ <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"; />
+ <rdfs:label xml:lang="en">User</rdfs:label>
+ <skos:definition xml:lang="en">Points to a platform user.
+ </skos:definition>
+ <rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/08/platform#";
/>
+ <rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
+</rdf:Property>
+
</rdf:RDF>
Modified:
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp?rev=906009&r1=905959&r2=906009&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
(original)
+++
incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
Wed Feb 3 11:28:36 2010
@@ -1,5 +1,9 @@
def menu(s: Any) = new UriRef("http://clerezza.org/2009/11/global-menu#"+s)
def rdfs(s: Any) = new UriRef("http://www.w3.org/2000/01/rdf-schema#"+s)
+def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
+
+resultDocModifier.addScriptReference("/style/scripts/login.js");
+
<div id="tx-system">
<div id="tx-globalsearch">
<form action="/globalsearch">
@@ -10,9 +14,15 @@
</div>
- <div id="tx-login"></div>
-
- <div id="tx-logo"><a href=""></a></div>
+ <div
id="tx-login"><span>{context/platform("user")/platform("userName")*}:
+
{if((context/platform("user")/platform("userName")*).equals("anonymous")) {
+ <a href="#"
id="tx-login-button">login</a>
+ } else {
+ <a href="/logout">logout</a>
+ }
+ }
+ </span>
+ </div>
<div id="tx-menu">
<ol>
@@ -33,7 +43,6 @@
</ol>
</li>
}
- <li><a href="/logout">Logout</a></li>
</ol>
</div>
</div>
\ No newline at end of file
