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 2014/11/18 16:52:25 UTC
svn commit: r1640377 - in
/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal:
JcrResourceResolverFactoryImpl.java helper/jcr/JcrItemAdapterFactory.java
Author: cziegeler
Date: Tue Nov 18 15:52:25 2014
New Revision: 1640377
URL: http://svn.apache.org/r1640377
Log:
SLING-3867 : Remove node/property adaptions
Removed:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemAdapterFactory.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java?rev=1640377&r1=1640376&r2=1640377&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java (original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceResolverFactoryImpl.java Tue Nov 18 15:52:25 2014
@@ -23,7 +23,6 @@ import java.util.Map;
import javax.jcr.Session;
-import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
@@ -37,9 +36,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.commons.classloader.DynamicClassLoaderManager;
import org.apache.sling.jcr.resource.JcrResourceConstants;
import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
-import org.apache.sling.jcr.resource.internal.helper.jcr.JcrItemAdapterFactory;
import org.osgi.framework.Constants;
-import org.osgi.service.component.ComponentContext;
/**
* The <code>JcrResourceResolverFactoryImpl</code> is the
@@ -66,22 +63,6 @@ public class JcrResourceResolverFactoryI
@Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY, policy = ReferencePolicy.DYNAMIC)
private volatile DynamicClassLoaderManager dynamicClassLoaderManager;
- private JcrItemAdapterFactory jcrItemAdapterFactory;
-
- @Activate
- protected void activate(final ComponentContext componentContext) {
- jcrItemAdapterFactory = new JcrItemAdapterFactory(
- componentContext.getBundleContext(), this);
- }
-
- /** Deativates this component, called by SCR to take out of service */
- protected void deactivate(final ComponentContext componentContext) {
- if (jcrItemAdapterFactory != null) {
- jcrItemAdapterFactory.dispose();
- jcrItemAdapterFactory = null;
- }
- }
-
/** Get the dynamic class loader if available */
public ClassLoader getDynamicClassLoader() {
final DynamicClassLoaderManager dclm = this.dynamicClassLoaderManager;