Author: cziegeler
Date: Tue May 29 07:04:09 2012
New Revision: 1343559
URL: http://svn.apache.org/viewvc?rev=1343559&view=rev
Log:
SLING-2396 : Add new resource provider interfaces (WiP)
Modified:
sling/whiteboard/SLING-2396/resourceresolver/pom.xml
Modified: sling/whiteboard/SLING-2396/resourceresolver/pom.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/pom.xml?rev=1343559&r1=1343558&r2=1343559&view=diff
==============================================================================
--- sling/whiteboard/SLING-2396/resourceresolver/pom.xml (original)
+++ sling/whiteboard/SLING-2396/resourceresolver/pom.xml Tue May 29 07:04:09
2012
@@ -79,40 +79,14 @@
<configuration>
<instructions>
<Import-Package>
- javax.script.*;
javax.annotation;resolution:=optional,
-
org.apache.sling.scripting.api.*;resolution:=optional,
-
org.apache.sling.api.resource;version="[$(version;==;$(@)),$(version;=+;$(@)))",
+ org.apache.sling.api.resource;provide:=true,
org.apache.sling.commons.osgi;version="$(@)",
*
</Import-Package>
- <DynamicImport-Package>
- org.apache.jackrabbit.api.observation
- </DynamicImport-Package>
- <Export-Package>
- org.apache.sling.jcr.resource;version=2.1
- </Export-Package>
<Private-Package>
- org.apache.sling.jcr.resource.internal.*
+ org.apache.sling.resourceresolver.impl.*
</Private-Package>
-
- <!-- Include URL support from Jackrabbit -->
- <Embed-Dependency>
-
jackrabbit-classloader;inline="org/apache/jackrabbit/net/**|org/apache/jackrabbit/classloader/Util.*",
-
jackrabbit-jcr-commons;inline="org/apache/jackrabbit/util/ISO9075.*|org/apache/jackrabbit/name/QName.*|org/apache/jackrabbit/util/XMLChar.*|org/apache/jackrabbit/util/Text.*",
- </Embed-Dependency>
-
- <Sling-Namespaces>
- sling=http://sling.apache.org/jcr/sling/1.0
- </Sling-Namespaces>
-
- <Sling-Nodetypes>
- SLING-INF/nodetypes/folder.cnd,
- SLING-INF/nodetypes/resource.cnd,
- SLING-INF/nodetypes/vanitypath.cnd,
- SLING-INF/nodetypes/redirect.cnd,
- SLING-INF/nodetypes/mapping.cnd
- </Sling-Nodetypes>
</instructions>
</configuration>
</plugin>
@@ -121,12 +95,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>2.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
@@ -150,24 +118,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.0.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.adapter</artifactId>
- <version>2.0.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -178,18 +128,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.auth.core</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.classloader</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
@@ -202,34 +140,14 @@
<scope>provided</scope>
</dependency>
- <!-- For the Console Plugin of the JcrResourceResolverFactoryImpl -->
+ <!-- For the Console Plugin of the ResourceResolverFactoryImpl -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
- <!-- for adapting JCR resources to URLs -->
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-classloader</artifactId>
- <version>1.5.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>2.0.0</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Testing -->
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.2</version>
@@ -241,17 +159,5 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.base</artifactId>
- <version>2.1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>3.0.8</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
