Author: fmeschbe
Date: Mon Dec 22 13:35:21 2008
New Revision: 728788
URL: http://svn.apache.org/viewvc?rev=728788&view=rev
Log:
SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and
new commons/testing
Removed:
incubator/sling/trunk/jcr/resource/src/test/test-config/
Modified:
incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
incubator/sling/trunk/jcr/ocm/pom.xml
incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/DefaultMappedObject.java
incubator/sling/trunk/jcr/resource/pom.xml
incubator/sling/trunk/jcr/webdav/pom.xml
Modified: incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/pom.xml?rev=728788&r1=728787&r2=728788&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/pom.xml Mon Dec 22 13:35:21 2008
@@ -65,10 +65,6 @@
<Private-Package>
org.apache.sling.jcr.jackrabbit.client
</Private-Package>
- <Import-Package>
- org.osgi.service.log,
- *
- </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -90,12 +86,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
<version>2.0.2-incubator</version>
Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=728788&r1=728787&r2=728788&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Mon Dec 22 13:35:21 2008
@@ -68,7 +68,7 @@
javax.naming.*, javax.xml.*,
javax.security.*,
org.apache.commons.collections.*,
- org.apache.jackrabbit.api,
+ org.apache.jackrabbit.api.*,
org.osgi.*,
org.slf4j, org.xml.sax, org.xml.sax.helpers
</Import-Package>
@@ -129,18 +129,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <!-- Export embedded repositories through RMI -->
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
@@ -148,31 +137,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-text-extractors</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.0.1-FINAL</version>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-scratchpad</artifactId>
- <version>3.0.1-FINAL</version>
- </dependency>
- <dependency>
- <groupId>pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- <version>0.7.1</version>
- </dependency>
- <dependency>
- <groupId>org.textmining</groupId>
- <artifactId>tm-extractors</artifactId>
- <!--
- NOTE: tm-extractors V0.4 is under Apache License,
- but later versions are not (SLING-494).
- -->
- <version>0.4</version>
+ <version>1.5.0</version>
</dependency>
<!-- Neko HTML Dependencies for bundle inclusion -->
Modified: incubator/sling/trunk/jcr/ocm/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/pom.xml?rev=728788&r1=728787&r2=728788&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/ocm/pom.xml (original)
+++ incubator/sling/trunk/jcr/ocm/pom.xml Mon Dec 22 13:35:21 2008
@@ -174,6 +174,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-ocm</artifactId>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -193,6 +194,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>1.5.0</version>
</dependency>
<dependency>
@@ -207,6 +209,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
+ <version>1.5.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/DefaultMappedObject.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/DefaultMappedObject.java?rev=728788&r1=728787&r2=728788&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/DefaultMappedObject.java
(original)
+++
incubator/sling/trunk/jcr/ocm/src/main/java/org/apache/sling/jcr/ocm/DefaultMappedObject.java
Mon Dec 22 13:35:21 2008
@@ -21,8 +21,11 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
+import org.apache.jackrabbit.ocm.manager.collectionconverter.ManageableMap;
+import
org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManageableMapImpl;
-import
org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ManagedHashMap;
/**
* The <code>DefaultMappedObject</code> is used by the JCR based resource
@@ -245,7 +248,7 @@
// versions. Version 1.7.1 will fix this again, though ...
if (FIELD_PROPERTIES.equals(key)) {
Object old = getProperties();
- setProperties((ManagedHashMap) value);
+ setProperties((ManageableMap) value);
return old;
}
@@ -290,9 +293,9 @@
*
collectionConverter="org.apache.jackrabbit.ocm.manager.collectionconverter.impl.ResidualPropertiesCollectionConverterImpl"
*/
@SuppressWarnings("unchecked")
- public void setProperties(ManagedHashMap contents) {
+ public void setProperties(ManageableMap contents) {
if (contents != null) {
- putAll(contents); // unchecked cast
+ putAll((Map<String, Object>) contents.getObjects()); // unchecked
cast
}
}
@@ -307,13 +310,13 @@
* This method returns a new instance of a <code>ManagedHashMap</code>
* containing a copy of the current properties on each call.
*/
- public ManagedHashMap getProperties() {
+ public ManageableMap getProperties() {
// a copy of this map with the special properties removed
- ManagedHashMap properties = new ManagedHashMap(this);
+ HashMap<String, Object> properties = new HashMap<String, Object>(this);
properties.remove(FIELD_PATH);
properties.remove(FIELD_PRIMARY_TYPE);
properties.remove(FIELD_MIXIN_TYPES);
- return properties;
+ return new ManageableMapImpl(properties);
}
/**
Modified: incubator/sling/trunk/jcr/resource/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/pom.xml?rev=728788&r1=728787&r2=728788&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/pom.xml (original)
+++ incubator/sling/trunk/jcr/resource/pom.xml Mon Dec 22 13:35:21 2008
@@ -36,9 +36,15 @@
</description>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/resource</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/resource</developerConnection>
-
<url>http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource</url>
+ <connection>
+
scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/resource
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/resource
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource
+ </url>
</scm>
<build>
@@ -57,10 +63,14 @@
org.apache.sling.jcr.resource;version=${pom.version}
</Export-Package>
<Private-Package>
- org.apache.sling.jcr.resource.internal.*,
- org.apache.jackrabbit.net
+ org.apache.sling.jcr.resource.internal.*
</Private-Package>
+ <!-- Include URL support from Jackrabbit -->
+ <Embed-Dependency>
+
jackrabbit-classloader;inline="org/apache/jackrabbit/net/**|org/apache/jackrabbit/classloader/Util.*"
+ </Embed-Dependency>
+
<Sling-Namespaces>
sling=http://sling.apache.org/jcr/sling/1.0
</Sling-Namespaces>
@@ -100,10 +110,6 @@
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.0.3-incubator-SNAPSHOT</version>
@@ -122,11 +128,21 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
+
+ <!--
+ VirtualURL BidiMap, to be removed once JcrResourceResolver
+ is removed and completely replaced by JcrResourceResolver2
+ -->
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- </dependency>
+ </dependency>
+ <!-- For the Console Plugin of the JcrResourceResolverFactoryImpl -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
@@ -135,37 +151,16 @@
<!-- for adapting JCR resources to URLs -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-classloader</artifactId>
- <scope>compile</scope>
+ <version>1.5.0</version>
+ <scope>provided</scope>
</dependency>
- <!-- Testing -->
+ <!-- Testing -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.2-incubator</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/sling/trunk/jcr/webdav/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav/pom.xml?rev=728788&r1=728787&r2=728788&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/webdav/pom.xml (original)
+++ incubator/sling/trunk/jcr/webdav/pom.xml Mon Dec 22 13:35:21 2008
@@ -135,19 +135,20 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<scope>compile</scope>
+ <version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
- <version>1.4</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
- <version>1.4</version>
+ <version>1.5.0</version>
<scope>compile</scope>
</dependency>
