You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/04/09 14:06:24 UTC
svn commit: r646295 - in
/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource:
./ internal/ internal/helper/jcr/ internal/helper/starresource/
Author: cziegeler
Date: Wed Apr 9 05:06:22 2008
New Revision: 646295
URL: http://svn.apache.org/viewvc?rev=646295&view=rev
Log:
Rename JcrDefaultResourceTypeProvider to JcrResourceTypeProvider.
Added:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceTypeProvider.java
- copied, changed from r646292, incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrDefaultResourceTypeProvider.java
Removed:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrDefaultResourceTypeProvider.java
Modified:
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderEntry.java
incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/starresource/StarResource.java
Copied: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceTypeProvider.java (from r646292, incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrDefaultResourceTypeProvider.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceTypeProvider.java?p2=incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceTypeProvider.java&p1=incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrDefaultResourceTypeProvider.java&r1=646292&r2=646295&rev=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrDefaultResourceTypeProvider.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/JcrResourceTypeProvider.java Wed Apr 9 05:06:22 2008
@@ -24,7 +24,7 @@
/** Provide a resourceType for JCR Nodes which do not have
* a sling:resourceType property.
*/
-public interface JcrDefaultResourceTypeProvider {
+public interface JcrResourceTypeProvider {
/** Return the default resource type to use for Node n, when
* n has not sling:resourceType property
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Wed Apr 9 05:06:22 2008
@@ -32,7 +32,7 @@
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
import org.apache.sling.jcr.resource.internal.helper.Mapping;
import org.apache.sling.jcr.resource.internal.helper.ResourceProviderEntry;
@@ -123,7 +123,7 @@
*
* @scr.reference cardinality="0..1" policy="dynamic"
*/
- private JcrDefaultResourceTypeProvider defaultResourceTypeProvider;
+ private JcrResourceTypeProvider defaultResourceTypeProvider;
// list of ResourceProvider services bound before activation of the
// component
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java Wed Apr 9 05:06:22 2008
@@ -30,7 +30,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
import org.apache.sling.jcr.resource.JcrResourceUtil;
abstract class JcrItemResource extends SlingAdaptable implements Resource {
@@ -46,10 +46,10 @@
private String resourceSuperType;
- protected final JcrDefaultResourceTypeProvider defaultResourceTypeProvider;
+ protected final JcrResourceTypeProvider defaultResourceTypeProvider;
protected JcrItemResource(ResourceResolver resourceResolver,
- String path, JcrDefaultResourceTypeProvider defaultResourceTypeProvider) {
+ String path, JcrResourceTypeProvider defaultResourceTypeProvider) {
this.resourceResolver = resourceResolver;
this.path = path;
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java Wed Apr 9 05:06:22 2008
@@ -39,7 +39,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +53,7 @@
private final String resourceType;
- JcrNodeResource(ResourceResolver resourceResolver, Node node, JcrDefaultResourceTypeProvider defaultResourceTypeProvider)
+ JcrNodeResource(ResourceResolver resourceResolver, Node node, JcrResourceTypeProvider defaultResourceTypeProvider)
throws RepositoryException {
super(resourceResolver, node.getPath(), defaultResourceTypeProvider);
this.node = node;
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceIterator.java Wed Apr 9 05:06:22 2008
@@ -25,7 +25,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,14 +49,14 @@
/** The prefetched next iterator entry, null at the end of iterating */
private Resource nextResult;
- private final JcrDefaultResourceTypeProvider defaultResourceTypeProvider;
+ private final JcrResourceTypeProvider defaultResourceTypeProvider;
/**
* Creates an instance using the given resource manager and the nodes
* provided as a node iterator.
*/
public JcrNodeResourceIterator(ResourceResolver resourceResolver,
- NodeIterator nodes, JcrDefaultResourceTypeProvider defaultResourceTypeProvider) {
+ NodeIterator nodes, JcrResourceTypeProvider defaultResourceTypeProvider) {
this.resourceResolver = resourceResolver;
this.nodes = nodes;
this.defaultResourceTypeProvider = defaultResourceTypeProvider;
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java Wed Apr 9 05:06:22 2008
@@ -32,7 +32,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@
private final String resourceType;
public JcrPropertyResource(ResourceResolver resourceResolver, String path,
- Property property, JcrDefaultResourceTypeProvider defaultResourceTypeProvider) throws RepositoryException {
+ Property property, JcrResourceTypeProvider defaultResourceTypeProvider) throws RepositoryException {
super(resourceResolver, path, defaultResourceTypeProvider);
this.property = property;
this.resourceType = getResourceTypeForNode(property.getParent())
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java Wed Apr 9 05:06:22 2008
@@ -31,7 +31,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,9 +47,9 @@
private final Logger log = LoggerFactory.getLogger(getClass());
private final Session session;
- private final JcrDefaultResourceTypeProvider defaultResourceTypeProvider;
+ private final JcrResourceTypeProvider defaultResourceTypeProvider;
- public JcrResourceProvider(Session session, JcrDefaultResourceTypeProvider defaultResourceTypeProvider) {
+ public JcrResourceProvider(Session session, JcrResourceTypeProvider defaultResourceTypeProvider) {
this.session = session;
this.defaultResourceTypeProvider = defaultResourceTypeProvider;
}
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderEntry.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderEntry.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderEntry.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderEntry.java Wed Apr 9 05:06:22 2008
@@ -20,17 +20,17 @@
import javax.jcr.Session;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
import org.apache.sling.jcr.resource.internal.helper.ResourceProviderEntry;
public class JcrResourceProviderEntry extends ResourceProviderEntry {
private final Session session;
- private final JcrDefaultResourceTypeProvider defaultResourceTypeProvider;
+ private final JcrResourceTypeProvider defaultResourceTypeProvider;
public JcrResourceProviderEntry(Session session,
- ResourceProviderEntry[] entries, JcrDefaultResourceTypeProvider defaultResourceTypeProvider) {
+ ResourceProviderEntry[] entries, JcrResourceTypeProvider defaultResourceTypeProvider) {
super("/", new JcrResourceProvider(session, defaultResourceTypeProvider), entries);
this.session = session;
@@ -41,7 +41,7 @@
return session;
}
- public JcrDefaultResourceTypeProvider getDefaultResourceTypeProvider() {
+ public JcrResourceTypeProvider getDefaultResourceTypeProvider() {
return defaultResourceTypeProvider;
}
}
Modified: incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/starresource/StarResource.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/starresource/StarResource.java?rev=646295&r1=646294&r2=646295&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/starresource/StarResource.java (original)
+++ incubator/sling/trunk/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/starresource/StarResource.java Wed Apr 9 05:06:22 2008
@@ -26,7 +26,7 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.SyntheticResource;
-import org.apache.sling.jcr.resource.JcrDefaultResourceTypeProvider;
+import org.apache.sling.jcr.resource.JcrResourceTypeProvider;
/** Used to provide the equivalent of an empty Node for GET requests
* to *.something (SLING-344)
@@ -60,7 +60,7 @@
return res.getPath().endsWith(PATH_CLEAN_SUFFIX);
}
- public StarResource(ResourceResolver resourceResolver, String path, JcrDefaultResourceTypeProvider drtp) throws SlingException {
+ public StarResource(ResourceResolver resourceResolver, String path, JcrResourceTypeProvider drtp) throws SlingException {
super(resourceResolver, convertPath(path), null);
// The only way we can set a meaningful resource type is via the drtp