Author: cziegeler
Date: Wed Dec 30 07:29:11 2015
New Revision: 1722275
URL: http://svn.apache.org/viewvc?rev=1722275&view=rev
Log:
Remove new query api and move it to the next API version
Rename JCRQueryProvider to QueryLanguageProvider
Move new utility classes to separate package
Added:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java
- copied, changed from r1722274,
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicJcrQueryProvider.java
Removed:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicJcrQueryProvider.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryProvider.java
Modified:
sling/trunk/bundles/jcr/resource/README.txt
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ObservationListenerSupport.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
Modified: sling/trunk/bundles/jcr/resource/README.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/README.txt?rev=1722275&r1=1722274&r2=1722275&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/README.txt (original)
+++ sling/trunk/bundles/jcr/resource/README.txt Wed Dec 30 07:29:11 2015
@@ -6,7 +6,7 @@ Getting Started
===============
This component uses a Maven 3 (http://maven.apache.org/) build
-environment. It requires a Java 5 JDK (or higher) and Maven
(http://maven.apache.org/)
+environment. It requires a Java 6 JDK (or higher) and Maven
(http://maven.apache.org/)
3.0.3 or later. We recommend to use the latest Maven version.
If you have Maven 3 installed, you can compile and
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ObservationListenerSupport.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ObservationListenerSupport.java?rev=1722275&r1=1722274&r2=1722275&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ObservationListenerSupport.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/ObservationListenerSupport.java
Wed Dec 30 07:29:11 2015
@@ -26,9 +26,9 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import org.apache.sling.api.resource.LoginException;
-import org.apache.sling.api.resource.PathSet;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.api.resource.util.PathSet;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.resource.JcrResourceConstants;
import org.osgi.framework.BundleContext;
Copied:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java
(from r1722274,
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicJcrQueryProvider.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java?p2=sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java&p1=sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicJcrQueryProvider.java&r1=1722274&r2=1722275&rev=1722275&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicJcrQueryProvider.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java
Wed Dec 30 07:29:11 2015
@@ -37,13 +37,13 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ValueMapDecorator;
import org.apache.sling.jcr.resource.JcrResourceUtil;
-import org.apache.sling.spi.resource.provider.JCRQueryProvider;
+import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
import org.apache.sling.spi.resource.provider.ProviderContext;
import org.apache.sling.spi.resource.provider.ResolverContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class BasicJcrQueryProvider implements
JCRQueryProvider<JcrProviderState> {
+public class BasicQueryLanguageProvider implements
QueryLanguageProvider<JcrProviderState> {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -59,7 +59,7 @@ public class BasicJcrQueryProvider imple
/** The provider context. */
private final ProviderContext providerContext;
- public BasicJcrQueryProvider(final ProviderContext ctx) {
+ public BasicQueryLanguageProvider(final ProviderContext ctx) {
this.providerContext = ctx;
}
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java?rev=1722275&r1=1722274&r2=1722275&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
Wed Dec 30 07:29:11 2015
@@ -25,9 +25,9 @@ import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
-import org.apache.sling.api.resource.PathSet;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.util.PathSet;
import org.apache.sling.jcr.resource.internal.HelperData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java?rev=1722275&r1=1722274&r2=1722275&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
Wed Dec 30 07:29:11 2015
@@ -65,7 +65,7 @@ import org.apache.sling.jcr.resource.int
import org.apache.sling.jcr.resource.internal.NodeUtil;
import org.apache.sling.jcr.resource.internal.OakResourceListener;
import org.apache.sling.jcr.resource.internal.ObservationListenerSupport;
-import org.apache.sling.spi.resource.provider.JCRQueryProvider;
+import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
import org.apache.sling.spi.resource.provider.ProviderContext;
import org.apache.sling.spi.resource.provider.ResolverContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
@@ -534,10 +534,10 @@ public class JcrResourceProvider extends
}
@Override
- public @CheckForNull JCRQueryProvider<JcrProviderState>
getJCRQueryProvider() {
+ public @CheckForNull QueryLanguageProvider<JcrProviderState>
getQueryLanguageProvider() {
final ProviderContext ctx = this.getProviderContext();
if ( ctx != null ) {
- return new BasicJcrQueryProvider(ctx);
+ return new BasicQueryLanguageProvider(ctx);
}
return null;
}
