You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by mi...@apache.org on 2010/09/30 10:30:30 UTC

svn commit: r1002961 - in /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza: platform/rdf/enrichment/EnrichmentTcProvider.java rdf/

Author: mir
Date: Thu Sep 30 08:30:29 2010
New Revision: 1002961

URL: http://svn.apache.org/viewvc?rev=1002961&view=rev
Log:
fixed bug. activate- and deactivate-methode were missing the ComponentContext parameter

Removed:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza/rdf/
Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.enrichment/src/main/java/org/apache/clerezza/platform/rdf/enrichment/EnrichmentTcProvider.java

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=1002961&r1=1002960&r2=1002961&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 Thu Sep 30 08:30:29 2010
@@ -44,6 +44,7 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.ReferencePolicy;
 import org.apache.felix.scr.annotations.References;
 import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.ComponentContext;
 
 /**
  * Provides a read-only MGraph with the name http://zz.localhost/enrichment.graph
@@ -72,8 +73,6 @@ public class EnrichmentTcProvider implem
 
 	public static final UriRef ENRICHMENT_GRAPH_URI = new UriRef("http://zz.localhost/enrichment.graph");
 	
-	public static final String SYSTEM_GRAPH_FILTER =
-			"(name="+ Constants.SYSTEM_GRAPH_URI_STRING +")";
 	private LockableMGraph contentGraph;
 	private final Collection<Enricher> enrichers = Collections.synchronizedCollection(new HashSet<Enricher>());
 
@@ -155,7 +154,7 @@ public class EnrichmentTcProvider implem
 	 * gets the base content-graph from tcManager and sets the permission
 	 * required to access the enrichment-graph accordingly
 	 */
-	protected void activate() {
+	protected void activate(ComponentContext context) {
 		contentGraph = tcManager.getMGraph(Constants.CONTENT_GRAPH_URI);
 		Collection<Permission> requiredReadPermissions =
 				tcManager.getTcAccessController().getRequiredReadPermissions(Constants.CONTENT_GRAPH_URI);
@@ -175,7 +174,7 @@ public class EnrichmentTcProvider implem
 	 * deactivates the compononent removing the enrichment-graph from the
 	 * virtual content graph
 	 */
-	protected void deactivate() {
+	protected void deactivate(ComponentContext context) {
 		cgProvider.removeTemporaryAdditionGraph(ENRICHMENT_GRAPH_URI);
 		contentGraph = null;
 	}