Author: tdraier
Date: Mon Nov 19 17:47:24 2007
New Revision: 19226
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19226&repname=
=3Djahia
Log:
upgrade to jackrabbit 595678 , use new apis
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/project.xml
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/=
jahia/services/content/JahiaAccessManager.java
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/project=
.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/jackrabbit-ext/project.xml&rev=3D19226&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/project.xml (=
original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/project.xml M=
on Nov 19 17:47:24 2007
@@ -28,42 +28,52 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-text-extractors</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webapp</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>1.4-562144</version>
+ <version>1.4-595678</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi</artifactId>
+ <version>1.4-595678</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi-commons</artifactId>
+ <version>1.4-595678</version>
</dependency>
=
<dependency>
@@ -76,7 +86,13 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
- </dependency> =
+ </dependency>
+
+ <dependency>
+ <id>commons-collections</id>
+ <version>3.1</version>
+ </dependency>
+
</dependencies>
=
<build>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/jav=
a/org/jahia/services/content/JahiaAccessManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/jahia/services/content/Ja=
hiaAccessManager.java&rev=3D19226&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/=
jahia/services/content/JahiaAccessManager.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/src/java/org/=
jahia/services/content/JahiaAccessManager.java Mon Nov 19 17:47:24 2007
@@ -1,15 +1,21 @@
package org.jahia.services.content;
=
+import org.apache.jackrabbit.conversion.DefaultNamePathResolver;
import org.apache.jackrabbit.core.HierarchyManager;
import org.apache.jackrabbit.core.ItemId;
import org.apache.jackrabbit.core.PropertyId;
import org.apache.jackrabbit.core.security.AMContext;
import org.apache.jackrabbit.core.security.AccessManager;
-import org.apache.jackrabbit.name.*;
+import org.apache.jackrabbit.name.PathFormat;
+import org.apache.jackrabbit.namespace.NamespaceResolver;
+import org.apache.jackrabbit.namespace.SessionNamespaceResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
+import org.jahia.api.Constants;
+import org.jahia.api.user.JahiaUserService;
import org.jahia.jaas.JahiaLoginModule;
import org.jahia.jaas.JahiaPrincipal;
-import org.jahia.api.user.JahiaUserService;
-import org.jahia.api.Constants;
+import org.apache.jackrabbit.conversion.PathResolver;
=
import javax.jcr.*;
import javax.naming.Context;
@@ -89,8 +95,11 @@
try {
Session s =3D getRepository().login(org.jahia.jaas.JahiaLoginM=
odule.getSystemCredentials());
NamespaceResolver nr =3D new SessionNamespaceResolver(s);
+ PathResolver pr =3D new DefaultNamePathResolver(nr);
+
Path path =3D getPath(id);
- String jcrPath =3D PathFormat.format(path,nr);
+
+ String jcrPath =3D pr.getJCRPath(path);
=
// Always deny write access on system folders
if (s.itemExists(jcrPath)) {
@@ -111,9 +120,9 @@
return true;
}
=
- Path.PathElement[] elements =3D path.getElements();
+ Path.Element[] elements =3D path.getElements();
if (elements.length > 1) {
- QName name =3D elements[1].getName();
+ Name name =3D elements[1].getName();
if (name.getNamespaceURI().equals("")) {
// Site administrators are always granted
if (service.isAdmin(p.getName(),name.getLocalName())) {
@@ -138,9 +147,10 @@
try {
Session s =3D getRepository().login(JahiaLoginModule.getSystem=
Credentials());
NamespaceResolver nr =3D new SessionNamespaceResolver(s);
+ PathResolver pr =3D new DefaultNamePathResolver(nr);
=
Path path =3D getPath(id);
- String jcrPath =3D PathFormat.format(path,nr);
+ String jcrPath =3D pr.getJCRPath(path);
=
ViewCommand vv =3D new ViewCommand();
recurseonACPs(jcrPath, s, vv);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
