Author: reto
Date: Tue Jul 27 09:39:54 2010
New Revision: 979619
URL: http://svn.apache.org/viewvc?rev=979619&view=rev
Log:
CLEREZZA-218: added to trunk and ensuring base content graph is not attempted
to access too early
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/
- copied from r979585,
incubator/clerezza/issues/CLEREZZA-218/org.apache.clerezza.platform.enrichment/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/
- copied from r979583,
incubator/clerezza/issues/CLEREZZA-218/org.apache.clerezza.platform.enrichment/src/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.enrichment/
(props changed)
- copied from r979585,
incubator/clerezza/issues/CLEREZZA-218/org.apache.clerezza.rdf.enrichment/
Removed:
incubator/clerezza/issues/CLEREZZA-218/
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java?rev=979619&r1=979583&r2=979619&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java
Tue Jul 27 09:39:54 2010
@@ -63,7 +63,6 @@ import org.apache.felix.scr.annotations.
@Service(WeightedTcProvider.class)
@References(
{
- @Reference(referenceInterface = TcManager.class, name =
"tcManager"),
@Reference(referenceInterface=Enricher.class, name="enricher",
cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE,
policy=ReferencePolicy.DYNAMIC)
@@ -79,7 +78,10 @@ public class EnrichmentTcProvider implem
private Collection<Enricher> enrichers =
Collections.synchronizedCollection(new HashSet<Enricher>());
@Reference
- ContentGraphProvider cgProvider;
+ private ContentGraphProvider cgProvider;
+
+ @Reference
+ private TcManager tcManager;
@Override
public Graph getGraph(UriRef name) throws NoSuchEntityException {
@@ -148,27 +150,12 @@ public class EnrichmentTcProvider implem
/**
* avtivates the component and adds the enrichment-graph to the virtual
- * content graph
- */
- protected void activate() {
- cgProvider.addTemporaryAdditionGraph(ENRICHMENT_GRAPH_URI);
- }
-
- /**
- * deactivates the compononent removing the enrichment-graph from the
- * virtual content graph
- */
- protected void deactivate() {
- cgProvider.removeTemporaryAdditionGraph(ENRICHMENT_GRAPH_URI);
- }
-
- /**
+ * content graph.
+ *
* gets the base content-graph from tcManager and sets the permission
* required to access the enrichment-graph accordingly
- *
- * @param tcManager
*/
- protected void bindTcManager(TcManager tcManager) {
+ protected void activate() {
contentGraph = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI);
Collection<Permission> requiredReadPermissions =
tcManager.getTcAccessController().getRequiredReadPermissions(Constants.CONTENT_GRAPH_URI);
@@ -181,12 +168,20 @@ public class EnrichmentTcProvider implem
tcManager.getTcAccessController().setRequiredReadPermissions(
ENRICHMENT_GRAPH_URI,
requiredReadPermissions);
}
+ cgProvider.addTemporaryAdditionGraph(ENRICHMENT_GRAPH_URI);
}
- protected void unbindTcManager(TcManager tcManager) {
+ /**
+ * deactivates the compononent removing the enrichment-graph from the
+ * virtual content graph
+ */
+ protected void deactivate() {
+ cgProvider.removeTemporaryAdditionGraph(ENRICHMENT_GRAPH_URI);
contentGraph = null;
}
+
+
protected void bindEnricher(Enricher enricher) {
enrichers.add(enricher);
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml?rev=979619&r1=979618&r2=979619&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
Tue Jul 27 09:39:54 2010
@@ -125,6 +125,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.enrichment</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.usermanager</artifactId>
<scope>runtime</scope>
</dependency>
@@ -165,6 +170,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.enrichment</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.jena.facade</artifactId>
<scope>runtime</scope>
</dependency>
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.enrichment/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 27 09:39:54 2010
@@ -0,0 +1,2 @@
+.pom.xml.swp
+target
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=979619&r1=979618&r2=979619&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Tue Jul 27
09:39:54 2010
@@ -49,6 +49,7 @@
<module>org.apache.clerezza.platform.dashboard</module>
<module>org.apache.clerezza.platform.documentation</module>
<module>org.apache.clerezza.platform.documentation.viewer</module>
+ <module>org.apache.clerezza.platform.enrichment</module>
<module>org.apache.clerezza.platform.graphprovider.content</module>
<module>org.apache.clerezza.platform.language</module>
<module>org.apache.clerezza.platform.launcher.sesame</module>
@@ -75,6 +76,7 @@
<module>org.apache.clerezza.platform.xhtml2html</module>
<module>org.apache.clerezza.rdf.core</module>
<module>org.apache.clerezza.rdf.core.test</module>
+ <module>org.apache.clerezza.rdf.enrichment</module>
<module>org.apache.clerezza.rdf.file.storage</module>
<module>org.apache.clerezza.rdf.jena.commons</module>
<module>org.apache.clerezza.rdf.jena.facade</module>
@@ -556,6 +558,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.rdf.enrichment</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.simple.storage</artifactId>
<version>0.7-incubating-SNAPSHOT</version>
</dependency>
@@ -651,6 +658,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+
<artifactId>org.apache.clerezza.platform.enrichment</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.usermanager.webinterface</artifactId>
<version>0.13-incubating-SNAPSHOT</version>
</dependency>
