svn commit: r882719 - /sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
Author: cziegeler
Date: Fri Nov 20 21:17:42 2009
New Revision: 882719
URL: http://svn.apache.org/viewvc?rev=882719&view=rev
Log:
Correctly unget services.
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java?rev=882719&r1=882718&r2=882719&view=diff
==
---
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
(original)
+++
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
Fri Nov 20 21:17:42 2009
@@ -264,6 +264,7 @@
final String type = this.getType(reference);
if ( type != null ) {
this.services.remove(type);
+this.context.ungetService(reference);
}
}
}
svn commit: r882699 - in /sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl: FactoryCache.java ProcessorManagerImpl.java
Author: cziegeler
Date: Fri Nov 20 20:02:26 2009
New Revision: 882699
URL: http://svn.apache.org/viewvc?rev=882699&view=rev
Log:
As factory cache is a private implementation detail there is no need for
protected methods etc.
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java?rev=882699&r1=882698&r2=882699&view=diff
==
---
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
(original)
+++
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/FactoryCache.java
Fri Nov 20 20:02:26 2009
@@ -68,19 +68,19 @@
private static final String PROPERTY_RESOURCE_TYPES =
"pipeline.resourceTypes";
/** The logger. */
-protected static final Logger LOGGER =
LoggerFactory.getLogger(FactoryCache.class);
+private static final Logger LOGGER =
LoggerFactory.getLogger(FactoryCache.class);
/** The tracker for generator factories. */
-protected final HashingServiceTrackerCustomizer
generatorTracker;
+private final HashingServiceTrackerCustomizer
generatorTracker;
/** The tracker for serializers factories. */
-protected final HashingServiceTrackerCustomizer
serializerTracker;
+private final HashingServiceTrackerCustomizer
serializerTracker;
/** The tracker for transformer factories. */
-protected final TransformerFactoryServiceTracker
transformerTracker;
+private final TransformerFactoryServiceTracker
transformerTracker;
/** The tracker for processor factories. */
-protected final HashingServiceTrackerCustomizer
processorTracker;
+private final HashingServiceTrackerCustomizer
processorTracker;
public FactoryCache(final BundleContext context)
throws InvalidSyntaxException {
@@ -190,7 +190,7 @@
* @param factories The transformer factories
* @return The transformer instances
*/
-protected Transformer[][] createTransformers(final TransformerFactory[][]
factories) {
+private Transformer[][] createTransformers(final TransformerFactory[][]
factories) {
if ( factories == EMPTY_DOUBLE_ARRAY ) {
return FactoryCache.EMPTY_DOUBLE_ARRAY;
}
@@ -219,7 +219,7 @@
/**
* This service tracker stores all services into a hash map.
*/
-protected static class HashingServiceTrackerCustomizer extends
ServiceTracker {
+private static class HashingServiceTrackerCustomizer extends
ServiceTracker {
/** The services hashed by their name property. */
private final Map services = new ConcurrentHashMap();
@@ -268,7 +268,7 @@
}
}
-protected static final class TransformerFactoryServiceTracker extends
HashingServiceTrackerCustomizer {
+private static final class TransformerFactoryServiceTracker extends
HashingServiceTrackerCustomizer {
private String getMode(final ServiceReference ref) {
final String mode = (String) ref.getProperty(PROPERTY_MODE);
@@ -295,13 +295,6 @@
}
/**
- * Is this cache still valid?
- */
-public boolean isCacheValid() {
-return this.cacheIsValid;
-}
-
-/**
* @see
org.osgi.util.tracker.ServiceTracker#addingService(org.osgi.framework.ServiceReference)
*/
public Object addingService(ServiceReference reference) {
@@ -417,7 +410,7 @@
/**
* Comparator for service references.
*/
-protected static final class ServiceReferenceComparator implements
Comparator {
+private static final class ServiceReferenceComparator implements
Comparator {
public static ServiceReferenceComparator INSTANCE = new
ServiceReferenceComparator();
public int compare(ServiceReference o1, ServiceReference o2) {
@@ -425,7 +418,7 @@
}
}
-protected static final class TransformerFactoryEntry {
+private static final class TransformerFactoryEntry {
public final TransformerFactory factory;
private final ProcessorConfiguration configuration;
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java?rev=882699&r1=882698&r2=882699&view=diff
==
---
sling/trunk/contrib/extensions/
svn commit: r882642 - /sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
Author: cziegeler
Date: Fri Nov 20 17:08:31 2009
New Revision: 882642
URL: http://svn.apache.org/viewvc?rev=882642&view=rev
Log:
No default configuration as this doesn't make sense
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
Modified:
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java?rev=882642&r1=882641&r2=882642&view=diff
==
---
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
(original)
+++
sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
Fri Nov 20 17:08:31 2009
@@ -130,7 +130,6 @@
this.initProcessors();
-this.addDefaultProcessors();
this.factoryCache.start();
}
@@ -143,24 +142,6 @@
}
/**
- * Add the default configurations.
- */
-protected void addDefaultProcessors() {
-// add default pipeline for html
-this.addProcessor("*", "", new ProcessorConfigurationImpl(
-new String[] {MIME_TYPE_HTML}, // content types
-null, // paths,
-new String[] {"html"}, // extensions
-null, // resource types
--1, // order
-new ProcessingComponentConfigurationImpl("html-generator",
null), // generator config
-null, // transformer config
-new ProcessingComponentConfigurationImpl("html-serializer",
null), // serializer config
-true // process error response
-));
-}
-
-/**
* Deactivate this component.
* @param ctx
*/
