You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2014/02/19 16:35:26 UTC
git commit: CLEREZZA-879: removed platform.content dependency (and
registration of Config Graph as part of ContentGraph)
Repository: clerezza
Updated Branches:
refs/heads/master e2469df77 -> 8d824291d
CLEREZZA-879: removed platform.content dependency (and registration of Config Graph as part of ContentGraph)
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/8d824291
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/8d824291
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/8d824291
Branch: refs/heads/master
Commit: 8d824291da7612d1bce43637c19b7ca679b68d54
Parents: e2469df
Author: retobg <re...@apache.org>
Authored: Wed Feb 19 16:32:48 2014 +0100
Committer: retobg <re...@apache.org>
Committed: Wed Feb 19 16:32:48 2014 +0100
----------------------------------------------------------------------
platform.config/pom.xml | 5 -----
.../apache/clerezza/platform/config/PlatformConfig.java | 12 ++----------
.../apache/clerezza/platform/config/SystemConfig.java | 2 --
3 files changed, 2 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/8d824291/platform.config/pom.xml
----------------------------------------------------------------------
diff --git a/platform.config/pom.xml b/platform.config/pom.xml
index 91fb06e..2975d32 100644
--- a/platform.config/pom.xml
+++ b/platform.config/pom.xml
@@ -67,11 +67,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.graphprovider.content</artifactId>
- <version>0.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>permissiondescriptions</artifactId>
<version>0.2-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/8d824291/platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
----------------------------------------------------------------------
diff --git a/platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java b/platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
index 6340d88..ebc0bf9 100644
--- a/platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
+++ b/platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
@@ -25,8 +25,6 @@ import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.locks.Lock;
import org.apache.clerezza.platform.Constants;
-import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
-import org.apache.clerezza.platform.graphprovider.content.GraphNameTransitioner;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -75,9 +73,6 @@ public class PlatformConfig {
@Reference
private TcManager tcManager;
- @Reference
- private ContentGraphProvider cgProvider;
-
/**
* Returns the default base URI of the Clerezza platform instance.
@@ -182,18 +177,15 @@ public class PlatformConfig {
}
protected void activate(ComponentContext componentContext) {
- GraphNameTransitioner.renameGraphsWithOldNames(tcManager);
this.context = componentContext.getBundleContext();
try {
- tcManager.getMGraph(CONFIG_GRAPH_URI);
+ tcManager.getMGraph(Constants.CONFIG_GRAPH_URI);
} catch (NoSuchEntityException nsee) {
- tcManager.createMGraph(CONFIG_GRAPH_URI);
+ tcManager.createMGraph(Constants.CONFIG_GRAPH_URI);
}
- cgProvider.addTemporaryAdditionGraph(CONFIG_GRAPH_URI);
}
protected void deactivate(ComponentContext componentContext) {
this.context = null;
- cgProvider.removeTemporaryAdditionGraph(CONFIG_GRAPH_URI);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/8d824291/platform.config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
----------------------------------------------------------------------
diff --git a/platform.config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java b/platform.config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
index eb7810f..a10aaa3 100644
--- a/platform.config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
+++ b/platform.config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
@@ -22,7 +22,6 @@ package org.apache.clerezza.platform.config;
import java.io.IOException;
import java.net.URL;
import org.apache.clerezza.platform.Constants;
-import org.apache.clerezza.platform.graphprovider.content.GraphNameTransitioner;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.osgi.service.component.ComponentContext;
@@ -71,7 +70,6 @@ public class SystemConfig {
private ParsingProvider parser;
protected void activate(ComponentContext componentContext) {
- GraphNameTransitioner.renameGraphsWithOldNames(tcManager);
try {
tcManager.getMGraph(Constants.SYSTEM_GRAPH_URI);
} catch (NoSuchEntityException nsee) {