Author: tdraier
Date: Thu Dec 27 11:52:22 2007
New Revision: 19420
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19420&repname=
=3Djahia
Log:
upgraded to jackrabbit 1.4 build 606918
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/project.xml
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/deployments/tomcat-jackrabbi=
t.txt
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/project.=
xml
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/src/java=
/org/apache/jackrabbit/core/security/JahiaAccessManager.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/server/projec=
t.xml
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/project.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/project.xml&rev=3D19420&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/core/project.xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/project.xml Thu Dec 27 =
11:52:22 2007
@@ -18,6 +18,46 @@
</repository>
=
<dependencies>
+ <!--<dependency>-->
+ <!--<groupId>drools</groupId>-->
+ <!--<artifactId>drools-core</artifactId>-->
+ <!--<version>4.0.3</version>-->
+ <!--<properties>-->
+ <!--<war.bundle>true</war.bundle>-->
+ <!--</properties>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>drools</groupId>-->
+ <!--<artifactId>drools-jsr94</artifactId>-->
+ <!--<version>4.0.3</version>-->
+ <!--<properties>-->
+ <!--<war.bundle>true</war.bundle>-->
+ <!--</properties>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>drools</groupId>-->
+ <!--<artifactId>drools-compiler</artifactId>-->
+ <!--<version>4.0.3</version>-->
+ <!--<properties>-->
+ <!--<war.bundle>true</war.bundle>-->
+ <!--</properties>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>drools</groupId>-->
+ <!--<artifactId>drools-decisiontables</artifactId>-->
+ <!--<version>4.0.3</version>-->
+ <!--<properties>-->
+ <!--<war.bundle>true</war.bundle>-->
+ <!--</properties>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jsr94</groupId>-->
+ <!--<artifactId>jsr94</artifactId>-->
+ <!--<version>1.1</version>-->
+ <!--<properties>-->
+ <!--<war.bundle>true</war.bundle>-->
+ <!--</properties>-->
+ <!--</dependency>-->
=
<dependency>
<groupId>activation</groupId>
@@ -325,7 +365,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
<war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
</properties>
@@ -333,7 +373,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
<war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
</properties>
@@ -341,7 +381,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
<war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
</properties>
@@ -349,7 +389,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-text-extractors</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
<war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
</properties>
@@ -357,7 +397,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
<war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
</properties>
@@ -365,7 +405,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
<war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
</properties>
@@ -373,7 +413,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi-commons</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
<war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
</properties>
@@ -398,25 +438,25 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
- <war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
- <war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webapp</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
<properties>
- <war.bundle>${jcr.embedded.jackrabbit}</war.bundle>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
=
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/deployments/tomcat-jac=
krabbit.txt
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/deployments/tomcat-jackrabbit.txt&rev=3D19420&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/deployments/tomcat-jackrabbi=
t.txt (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/deployments/tomcat-jackrabbi=
t.txt Thu Dec 27 11:52:22 2007
@@ -17,11 +17,9 @@
commons-httpclient-3.0.jar
commons-id-0.1-dev.jar
concurrent-1.3.4.jar
-geronimo-spec-jta-1.0-M1.jar
-jcr-1.0.jar
log4j-1.2.14.jar
lucene-core-2.2.0.jar
-nekohtml-0.9.4.jar
+nekohtml-0.9.5.jar
PDFBox-0.6.7a-patched.jar
poi-2.5.1-final-20040804.jar
slf4j-log4j12-1.3.0.jar
@@ -34,9 +32,12 @@
jackrabbit-jcr-commons-1.4-SNAPSHOT.jar
jackrabbit-jcr-rmi-1.4-SNAPSHOT.jar
jackrabbit-text-extractors-1.4-SNAPSHOT.jar
-jackrabbit-spi 4-SNAPSHOT.jar
+jackrabbit-spi-1.4-SNAPSHOT.jar
+jackrabbit-spi-commons-1.4-SNAPSHOT.jar
+jcr-1.0.jar
public-api-5.0-SNAPSHOT.jar
jackrabbit-core-ext-5.0-SNAPSHOT.jar
+geronimo-spec-jta-1.0-M1.jar
=
-Declare JNDI resources in server.xml file :
=
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/pr=
oject.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/project.xml&rev=3D19420&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/core/project.=
xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/project.=
xml Thu Dec 27 11:52:22 2007
@@ -25,52 +25,52 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-text-extractors</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webapp</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi-commons</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
=
<dependency>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/sr=
c/java/org/apache/jackrabbit/core/security/JahiaAccessManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/src/java/org/apache/jackrabbit/co=
re/security/JahiaAccessManager.java&rev=3D19420&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/core/src/java=
/org/apache/jackrabbit/core/security/JahiaAccessManager.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/core/src/java=
/org/apache/jackrabbit/core/security/JahiaAccessManager.java Thu Dec 27 11:=
52:22 2007
@@ -1,21 +1,18 @@
package org.apache.jackrabbit.core.security;
=
-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.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.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolve=
r;
+import org.apache.jackrabbit.spi.commons.conversion.PathResolver;
+import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
+import org.apache.jackrabbit.spi.commons.namespace.SessionNamespaceResolve=
r;
import org.jahia.api.Constants;
import org.jahia.api.user.JahiaUserService;
import org.jahia.jaas.JahiaLoginModule;
import org.jahia.jaas.JahiaPrincipal;
-import org.apache.jackrabbit.conversion.PathResolver;
=
import javax.jcr.*;
import javax.naming.Context;
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/server/=
project.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/jackrabbit-ext/server/project.xml&rev=3D19420&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/server/projec=
t.xml (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/jackrabbit-ext/server/projec=
t.xml Thu Dec 27 11:52:22 2007
@@ -25,52 +25,52 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-text-extractors</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webapp</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi-commons</artifactId>
- <version>1.4-595678</version>
+ <version>1.4-606918</version>
</dependency>
=
<dependency>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
