Author: mir
Date: Mon Mar 22 14:39:30 2010
New Revision: 926106
URL: http://svn.apache.org/viewvc?rev=926106&view=rev
Log:
CLEREZZA-165: introduced configuration graph
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/META-INF/config.rdf
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageDescription.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.manager/src/main/java/org/apache/clerezza/platform/typerendering/manager/RenderletManager.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringManagerTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml
Mon Mar 22 14:39:30 2010
@@ -31,6 +31,10 @@
<artifactId>org.apache.clerezza.rdf.utils</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
Mon Mar 22 14:39:30 2010
@@ -21,6 +21,7 @@ package org.apache.clerezza.platform.con
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -31,6 +32,8 @@ import org.apache.clerezza.rdf.core.NonL
import org.apache.clerezza.rdf.core.Resource;
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
@@ -50,6 +53,23 @@ public class PlatformConfig {
private MGraph systemGraph;
private BundleContext context;
private static String DEFAULT_PORT = "8080";
+ private static final String CONFIG_GRAPH_STRING =
+ "http://tpf.localhost/config.graph";;
+ public static final UriRef CONFIG_GRAPH_URI =
+ new UriRef(CONFIG_GRAPH_STRING);
+
+ /**
+ * A filter that can be used to get the config graph as OSGi service,
+ * that is provided by
<code>org.apache.clerezza.rdf.core.access.TcManager</code>.
+ */
+ public static final String CONFIG_GRAPH_FILTER =
+ "(name="+ CONFIG_GRAPH_STRING +")";
+
+ @Reference
+ private TcManager tcManager;
+
+ @Reference
+ private ContentGraphProvider cgProvider;
/**
@@ -116,16 +136,18 @@ public class PlatformConfig {
systemGraph.remove(new TripleImpl(getPlatformInstance(),
PLATFORM.baseUri, baseUri));
}
- /**
- * The activate method is called when SCR activates the component
configuration.
- *
- * @param componentContext
- */
protected void activate(ComponentContext componentContext) {
this.context = componentContext.getBundleContext();
+ try {
+ tcManager.getMGraph(CONFIG_GRAPH_URI);
+ } catch (NoSuchEntityException nsee) {
+ tcManager.createMGraph(CONFIG_GRAPH_URI);
+ cgProvider.addTemporaryAdditionGraph(CONFIG_GRAPH_URI);
+ }
}
protected void deactivate(ComponentContext componentContext) {
this.context = null;
+ cgProvider.removeTemporaryAdditionGraph(CONFIG_GRAPH_URI);
}
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/META-INF/config.rdf
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/META-INF/config.rdf?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/META-INF/config.rdf
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/META-INF/config.rdf
Mon Mar 22 14:39:30 2010
@@ -33,6 +33,9 @@
<perm:javaPermissionEntry>(org.apache.clerezza.rdf.core.access.security.TcPermission
"http://tpf.localhost/documentation.graph"; "read")</perm:javaPermissionEntry>
</perm:hasPermission>
<perm:hasPermission rdf:parseType="Resource">
+
<perm:javaPermissionEntry>(org.apache.clerezza.rdf.core.access.security.TcPermission
"http://tpf.localhost/config.graph"; "read")</perm:javaPermissionEntry>
+ </perm:hasPermission>
+ <perm:hasPermission rdf:parseType="Resource">
<perm:javaPermissionEntry>(org.apache.clerezza.platform.accountcontrolpanel.ChangePasswordPermission
"{username}" "")</perm:javaPermissionEntry>
</perm:hasPermission>
<perm:hasPermission rdf:parseType="Resource">
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/pom.xml
Mon Mar 22 14:39:30 2010
@@ -32,10 +32,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.typerendering.core</artifactId>
</dependency>
<dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageDescription.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageDescription.java?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageDescription.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageDescription.java
Mon Mar 22 14:39:30 2010
@@ -23,7 +23,6 @@ import org.apache.clerezza.rdf.core.Lang
import org.apache.clerezza.rdf.core.Literal;
import org.apache.clerezza.rdf.core.PlainLiteral;
import org.apache.clerezza.rdf.core.Resource;
-import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.ontologies.LINGVOJ;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.clerezza.rdf.utils.GraphNode;
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageService.java
Mon Mar 22 14:39:30 2010
@@ -27,11 +27,11 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.clerezza.platform.config.PlatformConfig;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.config.SystemConfig;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.Graph;
import org.osgi.service.component.ComponentContext;
@@ -63,10 +63,11 @@ public class LanguageService {
@Reference(target = SystemConfig.SYSTEM_GRAPH_FILTER)
private MGraph systemGraph;
- @Reference
- private ContentGraphProvider cgProvider;
+ @Reference(target = PlatformConfig.CONFIG_GRAPH_FILTER)
+ private MGraph configGraph;
- /** this is linked to the system-graph, accessing requires respective
+ /**
+ * this is linked to the system-graph, accessing requires respective
* permission
*/
private List<Resource> languageList;
@@ -96,7 +97,7 @@ public class LanguageService {
UriRef language = (UriRef) languages.next();
langList.add(
new LanguageDescription(new
GraphNode(language,
- cgProvider.getContentGraph())));
+ configGraph)));
}
return langList;
}
@@ -108,7 +109,7 @@ public class LanguageService {
*/
public LanguageDescription getDefaultLanguage() {
return new LanguageDescription(
- new GraphNode(languageListCache.get(0),
cgProvider.getContentGraph()));
+ new GraphNode(languageListCache.get(0),
configGraph));
}
/**
@@ -141,7 +142,7 @@ public class LanguageService {
public void addLanguage(UriRef languageUri) {
if (!languageListCache.contains(languageUri)) {
if(languageList.add(languageUri)) {
- addToContentGraph(languageUri);
+ addToConfigGraph(languageUri);
}
languageListCache.add(languageUri);
}
@@ -149,7 +150,7 @@ public class LanguageService {
private void synchronizeContentGraph() {
for (Resource resource : languageListCache) {
- addToContentGraph((UriRef)resource);
+ addToConfigGraph((UriRef)resource);
}
}
/**
@@ -158,10 +159,9 @@ public class LanguageService {
*
* @param languageUri
*/
- private void addToContentGraph(NonLiteral languageUri) {
- final MGraph contentGraph = cgProvider.getContentGraph();
- if (!contentGraph.filter(languageUri, LINGVOJ.iso1,
null).hasNext()) {
- contentGraph.addAll(getLanguageContext(languageUri));
+ private void addToConfigGraph(NonLiteral languageUri) {
+ if (!configGraph.filter(languageUri, LINGVOJ.iso1,
null).hasNext()) {
+ configGraph.addAll(getLanguageContext(languageUri));
}
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language/org.apache.clerezza.platform.language.core/src/main/java/org/apache/clerezza/platform/language/LanguageWidget.java
Mon Mar 22 14:39:30 2010
@@ -30,6 +30,7 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.MediaType;
+import org.apache.clerezza.platform.config.PlatformConfig;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
@@ -37,7 +38,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.osgi.service.component.ComponentContext;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.platform.language.ontologies.LANGUAGE;
import org.apache.clerezza.platform.typerendering.RenderletManager;
import org.apache.clerezza.platform.typerendering.UserContextProvider;
@@ -78,8 +78,9 @@ public class LanguageWidget implements U
private FileServer fileServer;
- @Reference
- protected ContentGraphProvider cgProvider;
+ @Reference(target = PlatformConfig.CONFIG_GRAPH_FILTER)
+ private MGraph configGraph;
+
@Reference
private RenderletManager renderletManager;
@Reference
@@ -123,12 +124,11 @@ public class LanguageWidget implements U
TripleCollection graph = node.getGraph();
BNode listNode = new BNode();
RdfList list = new RdfList(listNode, graph);
- MGraph contentGraph = cgProvider.getContentGraph();
for (LanguageDescription languageDescription : languages) {
NonLiteral languageUri = (NonLiteral)
languageDescription.getResource().getNode();
list.add(languageUri);
if (copyToNode) {
- graph.addAll(new GraphNode(languageUri, contentGraph).
+ graph.addAll(new GraphNode(languageUri, configGraph).
getNodeContext());
}
}
@@ -138,7 +138,7 @@ public class LanguageWidget implements U
graph.add(new TripleImpl(instance, PLATFORM.languages,
listNode));
graph.add(new TripleImpl(listNode, RDF.type,
LANGUAGE.LanguageList));
if (!copyToNode) {
- node = new GraphNode(node.getNode(), new
UnionMGraph(graph, contentGraph));
+ node = new GraphNode(node.getNode(), new
UnionMGraph(graph, configGraph));
}
return node;
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.manager/src/main/java/org/apache/clerezza/platform/typerendering/manager/RenderletManager.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.manager/src/main/java/org/apache/clerezza/platform/typerendering/manager/RenderletManager.java?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.manager/src/main/java/org/apache/clerezza/platform/typerendering/manager/RenderletManager.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.manager/src/main/java/org/apache/clerezza/platform/typerendering/manager/RenderletManager.java
Mon Mar 22 14:39:30 2010
@@ -53,9 +53,9 @@ import org.apache.clerezza.jaxrs.utils.R
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
import org.apache.clerezza.jaxrs.utils.form.FormFile;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
+import org.apache.clerezza.platform.config.PlatformConfig;
import org.apache.clerezza.platform.content.DiscobitsHandler;
import org.apache.clerezza.platform.dashboard.GlobalMenuItemsProvider;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
import org.apache.clerezza.platform.typerendering.ontology.RENDERLETMANAGER;
import
org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
@@ -90,9 +90,9 @@ import org.apache.felix.scr.annotations.
@Property(name="javax.ws.rs", boolValue=true)
@Path("/admin/renderlet-manager")
public class RenderletManager implements GlobalMenuItemsProvider{
-
- @Reference
- private ContentGraphProvider cgProvider;
+
+ @Reference(target = PlatformConfig.CONFIG_GRAPH_FILTER)
+ private MGraph configGraph;
@Reference
private DiscobitsHandler contentHandler;
@Reference
@@ -141,9 +141,8 @@ public class RenderletManager implements
@Path("overview")
public GraphNode overview(@Context UriInfo uriInfo) {
TrailingSlash.enforceNotPresent(uriInfo);
- MGraph contentGraph = cgProvider.getContentGraph();
MGraph additionGraph = new SimpleMGraph();
- UnionMGraph resultGraph = new UnionMGraph(additionGraph,
contentGraph);
+ UnionMGraph resultGraph = new UnionMGraph(additionGraph,
configGraph);
GraphNode resultNode = new GraphNode(new UriRef(
RdfTypePrioList), resultGraph);
resultNode.addProperty(RDF.type,
RENDERLETMANAGER.RenderletManagerPage);
@@ -310,9 +309,8 @@ public class RenderletManager implements
public Response down(@FormParam("renderedType") UriRef renderedType,
@Context UriInfo uriInfo) throws URISyntaxException {
TrailingSlash.enforceNotPresent(uriInfo);
- MGraph mGraph = cgProvider.getContentGraph();
List<Resource> rdfTypesPrioList = new RdfList(new UriRef(
- RdfTypePrioList), mGraph);
+ RdfTypePrioList), configGraph);
final int index = rdfTypesPrioList.indexOf(renderedType);
if (index < rdfTypesPrioList.size() - 1) {
rdfTypesPrioList.remove(renderedType);
@@ -334,7 +332,7 @@ public class RenderletManager implements
public Response up(@FormParam("renderedType") UriRef renderedType,
@Context UriInfo uriInfo) throws URISyntaxException {
TrailingSlash.enforceNotPresent(uriInfo);
- final MGraph mGraph = cgProvider.getContentGraph();
+ final MGraph mGraph = configGraph;
final List<Resource> rdfTypesPrioList = new RdfList(new UriRef(
RdfTypePrioList), mGraph);
final int index = rdfTypesPrioList.indexOf(renderedType);
@@ -363,14 +361,12 @@ public class RenderletManager implements
@Context UriInfo uriInfo) throws URISyntaxException {
logger.info("remove item");
TrailingSlash.enforceNotPresent(uriInfo);
- MGraph mGraph = cgProvider.getContentGraph();
-
List<Resource> renderletDefinitions = new RdfList(new UriRef(
- RdfTypePrioList), mGraph);
- final Resource resource = getDefinitionResource(mGraph,
renderlet,
+ RdfTypePrioList), configGraph);
+ final Resource resource = getDefinitionResource(configGraph,
renderlet,
renderSpec, renderedType, renderingMode,
mediaType);
- GraphNode node = new GraphNode((NonLiteral) resource, mGraph);
+ GraphNode node = new GraphNode((NonLiteral) resource,
configGraph);
node.deleteProperties(TYPERENDERING.renderlet);
node.deleteProperties(TYPERENDERING.renderingSpecification);
node.deleteProperties(TYPERENDERING.renderingMode);
@@ -413,12 +409,9 @@ public class RenderletManager implements
@QueryParam("mediaType") String mediaType,
@Context UriInfo uriInfo) {
TrailingSlash.enforceNotPresent(uriInfo);
- MGraph contentGraph = cgProvider.getContentGraph();
-
- final Resource resource = getDefinitionResource(contentGraph,
renderlet,
+ final Resource resource = getDefinitionResource(configGraph,
renderlet,
renderSpec, renderedType, renderingMode,
mediaType);
-
- GraphNode node = new GraphNode((NonLiteral) resource,
contentGraph);
+ GraphNode node = new GraphNode((NonLiteral) resource,
configGraph);
return node;
}
@@ -448,7 +441,6 @@ public class RenderletManager implements
@Override
public Set<GlobalMenuItem> getMenuItems() {
Set<GlobalMenuItem> items = new HashSet<GlobalMenuItem>();
-
items.add(new GlobalMenuItem("/admin/renderlet-manager/",
"RMR", "Renderlet Manager", 3,
"Main-Modules"));
return items;
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/pom.xml?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/pom.xml
Mon Mar 22 14:39:30 2010
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
+
<artifactId>org.apache.clerezza.platform.config</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
Mon Mar 22 14:39:30 2010
@@ -31,6 +31,7 @@ import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.ws.rs.core.MediaType;
+import org.apache.clerezza.platform.config.PlatformConfig;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
@@ -78,8 +79,10 @@ public class RenderletRendererFactoryImp
GraphListener {
private Logger logger =
LoggerFactory.getLogger(RenderletRendererFactoryImpl.class);
- @Reference
- private ContentGraphProvider contentGraphProvider;
+
+ @Reference(target = PlatformConfig.CONFIG_GRAPH_FILTER)
+ private MGraph configGraph;
+
private static final String RDF_TYPE_PRIO_LIST_URI =
"http://tpf.localhost/rdfTypePriorityList";;
/**
@@ -113,7 +116,6 @@ public class RenderletRendererFactoryImp
return AccessController.doPrivileged(new
PrivilegedAction<RendererImpl>() {
@Override
public RendererImpl run() {
- MGraph contentGraph =
contentGraphProvider.getContentGraph();
SortedSet<RendererImpl> configurationList =
new TreeSet<RendererImpl>();
for (Resource prioRdfType : rdfTypePrioList) {
@@ -121,14 +123,14 @@ public class RenderletRendererFactoryImp
continue;
}
Iterator<Triple> renderletDefs =
-
contentGraph.filter(null, TYPERENDERING.renderedType, prioRdfType);
+
configGraph.filter(null, TYPERENDERING.renderedType, prioRdfType);
while (renderletDefs.hasNext()) {
NonLiteral renderletDef =
renderletDefs.next().getSubject();
GraphNode renderletDefNode =
new GraphNode(renderletDef,
- contentGraph);
- String renderingModeStr =
getMode(contentGraph,
+ configGraph);
+ String renderingModeStr =
getMode(configGraph,
renderletDef);
- MediaType mediaTypeInGraph =
getMediaType(contentGraph, renderletDef);
+ MediaType mediaTypeInGraph =
getMediaType(configGraph, renderletDef);
int prio = -1;
for (int i = 0; i <
acceptableMediaTypes.size(); i++) {
MediaType
acceptableMediaType = acceptableMediaTypes.get(i);
@@ -141,13 +143,13 @@ public class RenderletRendererFactoryImp
continue;
}
if
(RenderletRendererFactoryImpl.equals(renderingModeStr, mode)) {
- final String
renderletName = getRenderletName(contentGraph, renderletDef);
+ final String
renderletName = getRenderletName(configGraph, renderletDef);
Renderlet renderlet =
renderletMap.get(renderletName);
if (renderlet == null) {
throw new
RenderletNotFoundException("Renderlet " + renderletName + " could not be
loaded.");
}
configurationList.add(new RendererImpl(
-
getRenderingSpecification(contentGraph, renderletDef),
+
getRenderingSpecification(configGraph, renderletDef),
renderlet,
mode,
mediaTypeInGraph,
@@ -253,22 +255,19 @@ public class RenderletRendererFactoryImp
UriRef rdfType,
String mode,
MediaType mediaType, boolean builtIn) {
- MGraph contentGraph = contentGraphProvider.getContentGraph();
-
- removeExisting(rdfType, mode, mediaType, builtIn, contentGraph);
-
+ removeExisting(rdfType, mode, mediaType, builtIn, configGraph);
BNode renderletDefinition = new BNode();
- GraphNode renderletDefinitionNode = new
GraphNode(renderletDefinition, contentGraph);
- contentGraph.add(new TripleImpl(renderletDefinition,
+ GraphNode renderletDefinitionNode = new
GraphNode(renderletDefinition, configGraph);
+ configGraph.add(new TripleImpl(renderletDefinition,
TYPERENDERING.renderlet,
LiteralFactory.getInstance().createTypedLiteral(renderlet)));
if (renderingSpecification != null) {
- contentGraph.add(new TripleImpl(renderletDefinition,
+ configGraph.add(new TripleImpl(renderletDefinition,
TYPERENDERING.renderingSpecification,
renderingSpecification));
}
- contentGraph.add(new TripleImpl(renderletDefinition,
+ configGraph.add(new TripleImpl(renderletDefinition,
TYPERENDERING.renderedType, rdfType));
- contentGraph.add(new TripleImpl(renderletDefinition,
+ configGraph.add(new TripleImpl(renderletDefinition,
TYPERENDERING.mediaType,
LiteralFactory.getInstance().createTypedLiteral(mediaType.toString())));
renderletDefinitionNode.addProperty(RDF.type,
TYPERENDERING.RenderletDefinition);
@@ -281,7 +280,7 @@ public class RenderletRendererFactoryImp
}
if (mode != null) {
- contentGraph.add(new TripleImpl(renderletDefinition,
+ configGraph.add(new TripleImpl(renderletDefinition,
TYPERENDERING.renderingMode,
LiteralFactory.getInstance().createTypedLiteral(mode)));
}
@@ -352,12 +351,12 @@ public class RenderletRendererFactoryImp
(o1 != null) && o1.equals(o2);
}
- protected void bindContentGraphProvider(ContentGraphProvider
contentGraphProvider) {
- this.contentGraphProvider = contentGraphProvider;
+ protected void bindConfigGraph(MGraph configGraph) {
+ this.configGraph = configGraph;
}
protected void unbindContentGraphProvider(ContentGraphProvider
contentGraphProvider) {
- this.contentGraphProvider = null;
+ this.configGraph = null;
}
protected void bindRenderlet(ServiceReference renderletRef) {
@@ -425,7 +424,7 @@ public class RenderletRendererFactoryImp
*/
protected void activate(ComponentContext componentContext) {
graphChanged(null);
- contentGraphProvider.getContentGraph().addGraphListener(this,
+ configGraph.addGraphListener(this,
new FilterTriple(null, RDF.first, null), 1000);
this.componentContext = componentContext;
registerRenderletsFromStore();
@@ -438,13 +437,12 @@ public class RenderletRendererFactoryImp
* @param componentContext
*/
protected void deactivate(ComponentContext componentContext) {
-
contentGraphProvider.getContentGraph().removeGraphListener(this);
+ configGraph.removeGraphListener(this);
}
@Override
public void graphChanged(List<GraphEvent> events) {
rdfTypePrioList = Collections.synchronizedList(
- new RdfList(new UriRef(RDF_TYPE_PRIO_LIST_URI),
- contentGraphProvider.getContentGraph()));
+ new RdfList(new UriRef(RDF_TYPE_PRIO_LIST_URI),
configGraph));
}
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringManagerTest.java?rev=926106&r1=926105&r2=926106&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringManagerTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringManagerTest.java
Mon Mar 22 14:39:30 2010
@@ -20,8 +20,6 @@ package org.apache.clerezza.platform.typ
import java.util.ArrayList;
import javax.ws.rs.ext.RuntimeDelegate;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.Resource;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.triaxrs.delegate.RuntimeDelegateImpl;
@@ -38,17 +36,9 @@ public class RendereringManagerTest exte
protected RenderletManager createNewRenderletManager() {
RenderletRendererFactoryImpl renderer = new
RenderletRendererFactoryImpl();
manager = renderer;
- renderer.rdfTypePrioList = new ArrayList<Resource>();
-
- final MGraph contentGraph = new SimpleMGraph();
- ContentGraphProvider contentGraphProvider = new
ContentGraphProvider() {
- @Override
- public MGraph getContentGraph() {
- return contentGraph;
- }
- };
+ renderer.rdfTypePrioList = new ArrayList<Resource>();
RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
- renderer.bindContentGraphProvider(contentGraphProvider);
+ renderer.bindConfigGraph(new SimpleMGraph());
renderer.registerRenderletService(renderletMockA.pid,
renderletMockA);
renderer.registerRenderletService(renderletMockB.pid,
renderletMockB);
return renderer;
