Author: bblfish
Date: Fri Feb 25 23:04:59 2011
New Revision: 1074740
URL: http://svn.apache.org/viewvc?rev=1074740&view=rev
Log:
Small changes. Need to work on branches from now on in git, so that I don't
need to ci for unrelated reasons
Modified:
incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/testservlets/TestMe.scala
incubator/clerezza/trunk/parent/platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java
incubator/clerezza/trunk/parent/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebDescriptionProvider.scala
Modified:
incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/testservlets/TestMe.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/testservlets/TestMe.scala?rev=1074740&r1=1074739&r2=1074740&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/testservlets/TestMe.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/testservlets/TestMe.scala
Fri Feb 25 23:04:59 2011
@@ -56,8 +56,7 @@ class TestMe extends FileServer {
@Produces(Array("text/plain"))
def getTestMe(): String = {
try {
- val context = AccessController.getContext();
- var userName = UserUtil.getUserName(context);
+ var userName = UserUtil.getCurrentUserName();
val webid = AccessController.doPrivileged(new
PrivilegedAction[String]() {
@Override
def run(): String = {
Modified:
incubator/clerezza/trunk/parent/platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java?rev=1074740&r1=1074739&r2=1074740&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java
(original)
+++
incubator/clerezza/trunk/parent/platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java
Fri Feb 25 23:04:59 2011
@@ -44,7 +44,7 @@ public class UserUtil {
public static String getCurrentUserName() {
return getUserName(AccessController.getContext());
}
-
+
/**
* Returns the name of the user associtated with the specified
* <code>AccessControlContext</code>.
Modified:
incubator/clerezza/trunk/parent/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebDescriptionProvider.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebDescriptionProvider.scala?rev=1074740&r1=1074739&r2=1074740&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebDescriptionProvider.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebDescriptionProvider.scala
Fri Feb 25 23:04:59 2011
@@ -70,11 +70,12 @@ class WebDescriptionProvider {
protected def deactivate(context: ComponentContext) = {
authoritativeLocalGraphUnion = null
}
-
-
-
+
/**
- * @return a GraphNode describing uri
+ *
+ * @param uri the URI to fetch
+ * @param should the local graph be updated if need be
+ * @return GraphNode the cached Node
*/
def getWebDescription(uri: UriRef, update: Boolean): GraphNode = {
@@ -95,6 +96,6 @@ class WebDescriptionProvider {
new GraphNode(uri, tripleCollection)
}
-
+
}
