Author: reto
Date: Wed May 25 13:59:02 2011
New Revision: 1127537
URL: http://svn.apache.org/viewvc?rev=1127537&view=rev
Log:
CLEREZZA-304: switches to urn:x-localinstance both for resources and provided
graph
Modified:
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala
incubator/clerezza/trunk/parent/platform/src/main/java/org/apache/clerezza/platform/Constants.java
Modified:
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala?rev=1127537&r1=1127536&r2=1127537&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/BundleFsLoader.scala
Wed May 25 13:59:02 2011
@@ -44,13 +44,17 @@ import org.osgi.service.startlevel.Start
import org.slf4j.LoggerFactory
import scala.util._
-object BundleFsLoader {
- private val log = LoggerFactory.getLogger(classOf[BundleFsLoader])
-}
+/**
+ * This weighted TcProvider provides a graph named
urn:x-localinstance/web-resources.graph which contains descriptions
+ * of the files below the CLEREZZA-INF/web-resources directory in every
bundles. The
+ * name of these descriptions (i.e. the rdf resources) use the
urn:x-localinstance uri scheme to indicate that
+ * they are local to the instance and they will thus be returned as description
+ * for all uris with a local authority and the specified path-section.
+ */
class BundleFsLoader extends BundleListener with Logger with
WeightedTcProvider {
- private val RESOURCE_MGRAPH_URI = new
UriRef("http://zz.localhost/web-resources.graph";)
- private val cacheGraphPrefix =
"http://zz.localhost/web-resources-cache.graph";
+ private val RESOURCE_MGRAPH_URI = new
UriRef(Constants.URN_LOCAL_INSTANCE+"/web-resources.graph")
+ private val cacheGraphPrefix =
Constants.URN_LOCAL_INSTANCE+"/web-resources-cache.graph"
private var currentCacheUri: UriRef = null
private var tcManager: TcManager = null
@@ -253,3 +257,6 @@ class BundleFsLoader extends BundleListe
}
}
+object BundleFsLoader {
+ private val log = LoggerFactory.getLogger(classOf[BundleFsLoader])
+}
\ No newline at end of file
Modified:
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala?rev=1127537&r1=1127536&r2=1127537&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.content.fsadaptor/src/main/scala/org/apache/clerezza/platform/content/fsadaptor/PathNode2MGraph.scala
Wed May 25 13:59:02 2011
@@ -41,7 +41,7 @@ import org.wymiwyg.commons.util.dirbrows
*/
object PathNode2MGraph {
- private val URI_PREFIX = Constants.ALL_HOSTS_URI_PREFIX
+ private val URI_PREFIX = Constants.URN_LOCAL_INSTANCE
private val literalFactory = LiteralFactory.getInstance
@@ -100,7 +100,7 @@ object PathNode2MGraph {
val data = getData(file)
mGraph.add(new TripleImpl(resource,
DISCOBITS.infoBit, literalFactory.createTypedLiteral(data)))
mGraph.add(new TripleImpl(resource,
DISCOBITS.mediaType,
-
new PlainLiteralImpl(getMediaType(file))))
+
literalFactory.createTypedLiteral(getMediaType(file))));
}
}
}
Modified:
incubator/clerezza/trunk/parent/platform/src/main/java/org/apache/clerezza/platform/Constants.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform/src/main/java/org/apache/clerezza/platform/Constants.java?rev=1127537&r1=1127536&r2=1127537&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform/src/main/java/org/apache/clerezza/platform/Constants.java
(original)
+++
incubator/clerezza/trunk/parent/platform/src/main/java/org/apache/clerezza/platform/Constants.java
Wed May 25 13:59:02 2011
@@ -57,11 +57,21 @@ public class Constants {
*/
public static final UriRef CONTENT_GRAPH_URI =
new UriRef(CONTENT_GRAPH_URI_STRING);
+
+ /**
+ * all hosts uri-prefix, uri scheme for references relative to the local
+ * instance.
+ */
+ public static final String URN_LOCAL_INSTANCE = "urn:x-localinstance:";
+
/**
* all hosts uri-prefix, uri scheme for which the resource are also
named
* with the any schema/authority the instance can be reached with
instead
* of this prefix
+ *
+ * @deprecated use URN_LOCAL_INSTANCE
*/
- public static final String ALL_HOSTS_URI_PREFIX = "urn:x-allhosts:";
+ @Deprecated
+ public static final String ALL_HOSTS_URI_PREFIX = URN_LOCAL_INSTANCE;
}
