incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1345886 - in /sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal: JcrItemAdapterFactory.java JcrResourceResolverFactoryImpl.java LegacyJcrResourceResolverFactoryImpl.java
Date Mon, 04 Jun 2012 09:39:37 GMT
Author: cziegeler
Date: Mon Jun  4 09:39:36 2012
New Revision: 1345886

URL: http://svn.apache.org/viewvc?rev=1345886&view=rev
Log:
SLING-2396 : Add new resource provider interfaces (WiP)

Added:
    sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
  (contents, props changed)
      - copied, changed from r1345675, sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/LegacyJcrResourceResolverFactoryImpl.java
Removed:
    sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/LegacyJcrResourceResolverFactoryImpl.java
Modified:
    sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrItemAdapterFactory.java

Modified: sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrItemAdapterFactory.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrItemAdapterFactory.java?rev=1345886&r1=1345885&r2=1345886&view=diff
==============================================================================
--- sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrItemAdapterFactory.java
(original)
+++ sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrItemAdapterFactory.java
Mon Jun  4 09:39:36 2012
@@ -43,11 +43,11 @@ class JcrItemAdapterFactory implements A
 
     private final Logger logger = LoggerFactory.getLogger(JcrItemAdapterFactory.class);
 
-    private final LegacyJcrResourceResolverFactoryImpl resourceResolverFactory;
+    private final JcrResourceResolverFactoryImpl resourceResolverFactory;
 
     private ServiceRegistration serviceRegsitration;
 
-    public JcrItemAdapterFactory(BundleContext ctx, LegacyJcrResourceResolverFactoryImpl
resourceResolverFactory) {
+    public JcrItemAdapterFactory(BundleContext ctx, JcrResourceResolverFactoryImpl resourceResolverFactory)
{
         this.resourceResolverFactory = resourceResolverFactory;
         Dictionary<Object, Object> properties = new Hashtable<Object, Object>();
         properties.put(ADAPTABLE_CLASSES, new String[] { Node.class.getName(), Property.class.getName()
});

Copied: sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
(from r1345675, sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/LegacyJcrResourceResolverFactoryImpl.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java?p2=sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java&p1=sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/LegacyJcrResourceResolverFactoryImpl.java&r1=1345675&r2=1345886&rev=1345886&view=diff
==============================================================================
--- sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/LegacyJcrResourceResolverFactoryImpl.java
(original)
+++ sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
Mon Jun  4 09:39:36 2012
@@ -25,7 +25,6 @@ import javax.jcr.Session;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.ConfigurationPolicy;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
 import org.apache.felix.scr.annotations.Reference;
@@ -49,14 +48,14 @@ import org.osgi.service.component.Compon
  * <li><code>JcrResourceResolverFactory</code> service
  * </ul>
  */
-@Component(policy=ConfigurationPolicy.IGNORE)
+@Component(name = "org.apache.sling.jcr.resource.internal.LegacyJcrResourceResolverFactoryImpl")
 @Service(value = JcrResourceResolverFactory.class)
 @Properties({
         @Property(name = Constants.SERVICE_DESCRIPTION, value = "Apache Sling JcrResourceResolverFactory
Implementation"),
         @Property(name = Constants.SERVICE_VENDOR, value = "The Apache Software Foundation")
 
 })
-public class LegacyJcrResourceResolverFactoryImpl implements
+public class JcrResourceResolverFactoryImpl implements
         JcrResourceResolverFactory {
 
     @Reference

Propchange: sling/whiteboard/SLING-2396/jcr.resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message