You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by vr...@apache.org on 2012/02/07 00:55:16 UTC
svn commit: r1241270 - in /sling/whiteboard/resourceresolverfactory:
resourceresolverfactory/pom.xml
resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java
test-app/src/main/bundles/list.xml
Author: vramdal
Date: Mon Feb 6 23:55:16 2012
New Revision: 1241270
URL: http://svn.apache.org/viewvc?rev=1241270&view=rev
Log:
SLING-2396 - Working test app
Modified:
sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml
sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java
sling/whiteboard/resourceresolverfactory/test-app/src/main/bundles/list.xml
Modified: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml?rev=1241270&r1=1241269&r2=1241270&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml (original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/pom.xml Mon Feb 6 23:55:16 2012
@@ -27,7 +27,7 @@
</parent>
<artifactId>org.apache.sling.resourceresolverfactory</artifactId>
- <version>2.0.11-SNAPSHOT</version>
+ <version>2.0.11-WHITEBOARD</version>
<packaging>bundle</packaging>
<name>Apache Sling Resource Resolver Factory</name>
@@ -90,10 +90,10 @@
org.apache.jackrabbit.api.observation
</DynamicImport-Package>
<Export-Package>
- org.apache.sling.resourceresolverfactory;version=1.0
+ org.apache.sling.resourceresolverfactory;version=1.0,org.apache.sling.resourceresolverfactory.*;version=1.0
</Export-Package>
<Private-Package>
- org.apache.sling.jcr.resource.resourceresolverfactory.internal.*
+ <!--org.apache.sling.jcr.resource.resourceresolverfactory.internal.*-->
</Private-Package>
<!-- Include URL support from Jackrabbit -->
Modified: sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java?rev=1241270&r1=1241269&r2=1241270&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java (original)
+++ sling/whiteboard/resourceresolverfactory/resourceresolverfactory/src/main/java/org/apache/sling/resourceresolverfactory/resource/ResourceDecoratorTracker.java Mon Feb 6 23:55:16 2012
@@ -80,7 +80,7 @@ public class ResourceDecoratorTracker {
return this.resourceDecoratorsArray;
}
- protected void bindResourceDecorator(final ResourceDecorator decorator, final Map<String, Object> props) {
+ public void bindResourceDecorator(final ResourceDecorator decorator, final Map<String, Object> props) {
synchronized (this.resourceDecorators) {
this.resourceDecorators.add(new ResourceDecoratorEntry(decorator, OsgiUtil.getComparableForServiceRanking(props)));
Collections.sort(this.resourceDecorators);
@@ -88,7 +88,7 @@ public class ResourceDecoratorTracker {
}
}
- protected void unbindResourceDecorator(final ResourceDecorator decorator, final Map<String, Object> props) {
+ public void unbindResourceDecorator(final ResourceDecorator decorator, final Map<String, Object> props) {
synchronized (this.resourceDecorators) {
final Iterator<ResourceDecoratorEntry> i = this.resourceDecorators.iterator();
while (i.hasNext()) {
Modified: sling/whiteboard/resourceresolverfactory/test-app/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/resourceresolverfactory/test-app/src/main/bundles/list.xml?rev=1241270&r1=1241269&r2=1241270&view=diff
==============================================================================
--- sling/whiteboard/resourceresolverfactory/test-app/src/main/bundles/list.xml (original)
+++ sling/whiteboard/resourceresolverfactory/test-app/src/main/bundles/list.xml Mon Feb 6 23:55:16 2012
@@ -14,6 +14,16 @@
<bundles>
<startLevel level="0">
<bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.resourceresolverfactory</artifactId>
+ <version>2.0.11-WHITEBOARD</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.resource</artifactId>
+ <version>2.0.11-WHITEBOARD</version>
+ </bundle>
+ <bundle>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
<version>2.0.8</version>