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/10/11 10:27:07 UTC
svn commit: r1021280 -
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
Author: mir
Date: Mon Oct 11 08:27:07 2010
New Revision: 1021280
URL: http://svn.apache.org/viewvc?rev=1021280&view=rev
Log:
CLEREZZA-316: service depends on existence of system graph. Therefore getting the system graph over @Reference again
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java?rev=1021280&r1=1021279&r2=1021280&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java Mon Oct 11 08:27:07 2010
@@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.clerezza.platform.Constants;
+import org.apache.clerezza.platform.config.SystemConfig;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -45,6 +45,7 @@ import org.apache.clerezza.rdf.core.Reso
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.clerezza.rdf.core.access.SecuredMGraph;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
@@ -73,8 +74,11 @@ public class UserManagerImpl implements
private final Logger logger = LoggerFactory.getLogger(getClass());
+ @Reference(target = SystemConfig.SYSTEM_GRAPH_FILTER)
+ private MGraph securedSystemGraph;
+
private LockableMGraph getSystemGraph() {
- return tcManager.getMGraph(Constants.SYSTEM_GRAPH_URI);
+ return ((SecuredMGraph) securedSystemGraph).getUnsecuredMGraph();
}
@Override
Re: svn commit: r1021280 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
Posted by Reto Bachmann-Gmuer <re...@trialox.org>.
HI Manuel
This patch effectively causes the user to require write access where
they previously (and logical) only needed read-access.
Maybe getUnsecuredMGraph should be redefined (and possibly renamed
accordingly) to return a read-only-mgraph if write right cannot be
granted.
Cheers,
reto
On Mon, Oct 11, 2010 at 10:27 AM, <mi...@apache.org> wrote:
> Author: mir
> Date: Mon Oct 11 08:27:07 2010
> New Revision: 1021280
>
> URL: http://svn.apache.org/viewvc?rev=1021280&view=rev
> Log:
> CLEREZZA-316: service depends on existence of system graph. Therefore getting the system graph over @Reference again
>
> Modified:
> incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
>
> Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
> URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java?rev=1021280&r1=1021279&r2=1021280&view=diff
> ==============================================================================
> --- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java (original)
> +++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java Mon Oct 11 08:27:07 2010
> @@ -30,7 +30,7 @@ import java.util.Iterator;
> import java.util.List;
> import java.util.Set;
> import java.util.concurrent.locks.Lock;
> -import org.apache.clerezza.platform.Constants;
> +import org.apache.clerezza.platform.config.SystemConfig;
> import org.apache.felix.scr.annotations.Component;
> import org.apache.felix.scr.annotations.Reference;
> import org.apache.felix.scr.annotations.Service;
> @@ -45,6 +45,7 @@ import org.apache.clerezza.rdf.core.Reso
> import org.apache.clerezza.rdf.core.Triple;
> import org.apache.clerezza.rdf.core.UriRef;
> import org.apache.clerezza.rdf.core.access.LockableMGraph;
> +import org.apache.clerezza.rdf.core.access.SecuredMGraph;
> import org.apache.clerezza.rdf.core.access.TcManager;
> import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
> import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
> @@ -73,8 +74,11 @@ public class UserManagerImpl implements
>
> private final Logger logger = LoggerFactory.getLogger(getClass());
>
> + @Reference(target = SystemConfig.SYSTEM_GRAPH_FILTER)
> + private MGraph securedSystemGraph;
> +
> private LockableMGraph getSystemGraph() {
> - return tcManager.getMGraph(Constants.SYSTEM_GRAPH_URI);
> + return ((SecuredMGraph) securedSystemGraph).getUnsecuredMGraph();
> }
>
> @Override
>
>
>