Author: reto
Date: Sun Jul 18 13:35:17 2010
New Revision: 965228
URL: http://svn.apache.org/viewvc?rev=965228&view=rev
Log:
adaptation to new SecuredMGraph api
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/pom.xml?rev=965228&r1=965227&r2=965228&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/pom.xml
Sun Jul 18 13:35:17 2010
@@ -17,6 +17,10 @@
<dependencies>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.security.foafssl.ontologies</artifactId>
</dependency>
<dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala?rev=965228&r1=965227&r2=965228&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
Sun Jul 18 13:35:17 2010
@@ -22,6 +22,7 @@ import java.net.HttpURLConnection
import java.net.URL
import java.security.AccessController
import java.security.PrivilegedAction
+import org.apache.clerezza.platform.Constants
import org.apache.clerezza.platform.config.PlatformConfig
import org.apache.clerezza.platform.config.SystemConfig
import org.apache.clerezza.rdf.core.MGraph
@@ -29,6 +30,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.access.NoSuchEntityException
import org.apache.clerezza.rdf.core.access.SecuredMGraph
import org.apache.clerezza.rdf.core.access.TcManager
+import org.apache.clerezza.rdf.core.access.security.TcPermission
import org.apache.clerezza.rdf.core.impl.SimpleMGraph
import org.apache.clerezza.rdf.core.serializedform.Parser
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat
@@ -144,7 +146,13 @@ class WebIdGraphsService() {
val g = tcManager.getMGraph(localGraphUri)
g
} catch {
- case e: NoSuchEntityException =>
tcManager.createMGraph(localGraphUri)
+ case e: NoSuchEntityException => {
+ import
scala.collection.JavaConversions._
+ tcManager.getTcAccessController.
+
setRequiredReadWritePermissions(localGraphUri,
+ List(new
TcPermission(Constants.CONTENT_GRAPH_URI_STRING, TcPermission.READ).toString))
+ tcManager.createMGraph(localGraphUri)
+ }
}
lazy val representationGraphUri = {
@@ -217,7 +225,7 @@ class WebIdGraphsService() {
} else {
new
UnionMGraph(localGraph, localCache, systemTriples)
}
- new SecuredMGraph(unionGraph,
localGraphUri)
+ new SecuredMGraph(unionGraph,
localGraphUri, tcManager.getTcAccessController)
}
})
}