Author: cziegeler Date: Mon Aug 14 09:43:56 2017 New Revision: 1804960 URL: http://svn.apache.org/viewvc?rev=1804960&view=rev Log: Add missing vendor property
Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/RewriterFilter.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlGeneratorFactory.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlSerializerFactory.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxHtmlSerializerFactory.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxXHtmlSerializerFactory.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XHtmlSerializerFactory.java sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XMLSerializerFactory.java Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/PipelineImpl.java Mon Aug 14 09:43:56 2017 @@ -39,7 +39,7 @@ import org.xml.sax.SAXException; */ public class PipelineImpl implements Processor { - private static Logger LOGGER = LoggerFactory.getLogger(PipelineImpl.class); + private final Logger LOGGER = LoggerFactory.getLogger(PipelineImpl.class); /** Empty array of transformers. */ private static final Transformer[] EMPTY_TRANSFORMERS = new Transformer[0]; @@ -69,6 +69,7 @@ public class PipelineImpl implements Pro /** * @see org.apache.sling.rewriter.Processor#init(org.apache.sling.rewriter.ProcessingContext, org.apache.sling.rewriter.ProcessorConfiguration) */ + @Override public void init(ProcessingContext processingContext, ProcessorConfiguration c) throws IOException { @@ -166,6 +167,7 @@ public class PipelineImpl implements Pro /** * @see org.apache.sling.rewriter.Processor#getWriter() */ + @Override public PrintWriter getWriter() { return this.generator.getWriter(); } @@ -173,6 +175,7 @@ public class PipelineImpl implements Pro /** * @see org.apache.sling.rewriter.Processor#getContentHandler() */ + @Override public ContentHandler getContentHandler() { return this.firstContentHandler; } @@ -180,6 +183,7 @@ public class PipelineImpl implements Pro /** * @see org.apache.sling.rewriter.Processor#finished(boolean) */ + @Override public void finished(final boolean errorOccured) throws IOException { try { // if an error occurred, we only clean up 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=1804960&r1=1804959&r2=1804960&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 Mon Aug 14 09:43:56 2017 @@ -43,6 +43,7 @@ import org.apache.sling.rewriter.Process import org.apache.sling.rewriter.ProcessorConfiguration; import org.apache.sling.rewriter.ProcessorManager; import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceRegistration; import org.osgi.service.component.ComponentContext; @@ -56,7 +57,10 @@ import org.slf4j.LoggerFactory; * This manager keeps track of configured processors. * */ -@Component(service = ProcessorManager.class) +@Component(service = ProcessorManager.class, + property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation" + }) public class ProcessorManagerImpl implements ProcessorManager, ResourceChangeListener, ExternalResourceChangeListener { @@ -75,10 +79,10 @@ public class ProcessorManagerImpl private ResourceResolverFactory resourceResolverFactory; /** loaded processor configurations */ - private final Map<String, ConfigEntry[]> processors = new HashMap<String, ConfigEntry[]>(); + private final Map<String, ConfigEntry[]> processors = new HashMap<>(); /** Ordered processor configurations. */ - private List<ProcessorConfiguration> orderedProcessors = new ArrayList<ProcessorConfiguration>(); + private List<ProcessorConfiguration> orderedProcessors = new ArrayList<>(); /** Event handler registration */ private volatile ServiceRegistration<ResourceChangeListener> eventHandlerRegistration; @@ -102,7 +106,7 @@ public class ProcessorManagerImpl // create array of search paths for actions and constraints this.searchPath = this.initProcessors(); // register event handler - final Dictionary<String, Object> props = new Hashtable<String, Object>(); + final Dictionary<String, Object> props = new Hashtable<>(); props.put(ResourceChangeListener.CHANGES, new String[] { ChangeType.ADDED.toString(), ChangeType.CHANGED.toString(), ChangeType.REMOVED.toString(), ChangeType.PROVIDER_ADDED.toString(), ChangeType.PROVIDER_REMOVED.toString() }); Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/RewriterFilter.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/RewriterFilter.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/RewriterFilter.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/RewriterFilter.java Mon Aug 14 09:43:56 2017 @@ -39,6 +39,7 @@ import org.osgi.service.component.annota @Component( service = Filter.class, property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", "sling.filter.scope=request", "sling.filter.scope=error", Constants.SERVICE_RANKING + ":Integer=2500" @@ -52,6 +53,7 @@ public class RewriterFilter implements F /** * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) */ + @Override public void init(FilterConfig config) throws ServletException { // nothing to do } @@ -59,6 +61,7 @@ public class RewriterFilter implements F /** * @see javax.servlet.Filter#destroy() */ + @Override public void destroy() { // nothing to do } @@ -66,6 +69,7 @@ public class RewriterFilter implements F /** * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlGeneratorFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlGeneratorFactory.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlGeneratorFactory.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlGeneratorFactory.java Mon Aug 14 09:43:56 2017 @@ -26,6 +26,7 @@ import org.apache.sling.rewriter.Generat import org.apache.sling.rewriter.GeneratorFactory; import org.apache.sling.rewriter.ProcessingComponentConfiguration; import org.apache.sling.rewriter.ProcessingContext; +import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; import org.xml.sax.ContentHandler; @@ -38,6 +39,7 @@ import org.xml.sax.SAXException; */ @Component(service = GeneratorFactory.class, property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", "pipeline.type=html-generator" }) public class HtmlGeneratorFactory implements GeneratorFactory { @@ -48,6 +50,7 @@ public class HtmlGeneratorFactory implem /** * @see org.apache.sling.rewriter.GeneratorFactory#createGenerator() */ + @Override public Generator createGenerator() { return new HtmlGenerator(htmlParser); } @@ -68,6 +71,7 @@ public class HtmlGeneratorFactory implem /** * @see org.apache.sling.rewriter.Generator#finished() */ + @Override public void finished() throws IOException, SAXException { this.htmlParser.parse(new ByteArrayInputStream(this.writer.toString().getBytes("UTF-8")), "UTF-8", this.contentHandler); } @@ -75,10 +79,12 @@ public class HtmlGeneratorFactory implem /** * @see org.apache.sling.rewriter.Generator#getWriter() */ + @Override public PrintWriter getWriter() { return new PrintWriter(writer); } + @Override public void init(ProcessingContext context, ProcessingComponentConfiguration config) throws IOException { @@ -88,6 +94,7 @@ public class HtmlGeneratorFactory implem /** * @see org.apache.sling.rewriter.Generator#setContentHandler(org.xml.sax.ContentHandler) */ + @Override public void setContentHandler(ContentHandler handler) { this.contentHandler = handler; } @@ -95,6 +102,7 @@ public class HtmlGeneratorFactory implem /** * @see org.apache.sling.rewriter.Generator#dispose() */ + @Override public void dispose() { // nothing to do } Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlSerializerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlSerializerFactory.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlSerializerFactory.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/HtmlSerializerFactory.java Mon Aug 14 09:43:56 2017 @@ -23,6 +23,7 @@ import org.apache.sling.rewriter.Process import org.apache.sling.rewriter.ProcessingContext; import org.apache.sling.rewriter.Serializer; import org.apache.sling.rewriter.SerializerFactory; +import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; /** @@ -30,6 +31,7 @@ import org.osgi.service.component.annota */ @Component(service = SerializerFactory.class, property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", "pipeline.type=html-serializer" }) public class HtmlSerializerFactory implements SerializerFactory { @@ -37,6 +39,7 @@ public class HtmlSerializerFactory imple /** * @see org.apache.sling.rewriter.SerializerFactory#createSerializer() */ + @Override public Serializer createSerializer() { return new HTMLSerializer(); } @@ -74,6 +77,7 @@ public class HtmlSerializerFactory imple /** * @see org.apache.sling.rewriter.Serializer#init(org.apache.sling.rewriter.ProcessingContext, org.apache.sling.rewriter.ProcessingComponentConfiguration) */ + @Override public void init(ProcessingContext context, ProcessingComponentConfiguration config) throws IOException { @@ -94,6 +98,7 @@ public class HtmlSerializerFactory imple /** * @see org.apache.sling.rewriter.Serializer#dispose() */ + @Override public void dispose() { // nothing to do } Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxHtmlSerializerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxHtmlSerializerFactory.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxHtmlSerializerFactory.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxHtmlSerializerFactory.java Mon Aug 14 09:43:56 2017 @@ -17,6 +17,7 @@ package org.apache.sling.rewriter.impl.components; import org.apache.sling.rewriter.SerializerFactory; +import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; @@ -25,6 +26,7 @@ import org.osgi.service.component.annota */ @Component(service = SerializerFactory.class, property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", "pipeline.type=trax-html-serializer" }) public class TraxHtmlSerializerFactory extends AbstractTraxSerializerFactory { @@ -34,10 +36,12 @@ public class TraxHtmlSerializerFactory e return "html"; } + @Override protected String getDoctypePublic() { return "-//W3C//DTD HTML 4.01 Transitional//EN"; } + @Override protected String getDoctypeSystem() { return "http://www.w3.org/TR/html4/loose.dtd"; } Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxXHtmlSerializerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxXHtmlSerializerFactory.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxXHtmlSerializerFactory.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/TraxXHtmlSerializerFactory.java Mon Aug 14 09:43:56 2017 @@ -17,6 +17,7 @@ package org.apache.sling.rewriter.impl.components; import org.apache.sling.rewriter.SerializerFactory; +import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; @@ -25,6 +26,7 @@ import org.osgi.service.component.annota */ @Component(service = SerializerFactory.class, property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", "pipeline.type=trax-xhtml-serializer" }) public class TraxXHtmlSerializerFactory extends AbstractTraxSerializerFactory { @@ -34,10 +36,12 @@ public class TraxXHtmlSerializerFactory return "xhtml"; } + @Override protected String getDoctypePublic() { return "-//W3C//DTD XHTML 1.0 Strict//EN"; } + @Override protected String getDoctypeSystem() { return "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; } Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XHtmlSerializerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XHtmlSerializerFactory.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XHtmlSerializerFactory.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XHtmlSerializerFactory.java Mon Aug 14 09:43:56 2017 @@ -23,6 +23,7 @@ import org.apache.sling.rewriter.Process import org.apache.sling.rewriter.ProcessingContext; import org.apache.sling.rewriter.Serializer; import org.apache.sling.rewriter.SerializerFactory; +import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; /** @@ -30,6 +31,7 @@ import org.osgi.service.component.annota */ @Component(service = SerializerFactory.class, property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", "pipeline.type=xhtml-serializer" }) public class XHtmlSerializerFactory implements SerializerFactory { @@ -37,6 +39,7 @@ public class XHtmlSerializerFactory impl /** * @see org.apache.sling.rewriter.SerializerFactory#createSerializer() */ + @Override public Serializer createSerializer() { return new XHTMLSerializer(); } @@ -72,6 +75,7 @@ public class XHtmlSerializerFactory impl /** * @see org.apache.sling.rewriter.Serializer#init(org.apache.sling.rewriter.ProcessingContext, org.apache.sling.rewriter.ProcessingComponentConfiguration) */ + @Override public void init(ProcessingContext context, ProcessingComponentConfiguration config) throws IOException { @@ -92,6 +96,7 @@ public class XHtmlSerializerFactory impl /** * @see org.apache.sling.rewriter.Serializer#dispose() */ + @Override public void dispose() { // nothing to do } Modified: sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XMLSerializerFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XMLSerializerFactory.java?rev=1804960&r1=1804959&r2=1804960&view=diff ============================================================================== --- sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XMLSerializerFactory.java (original) +++ sling/trunk/contrib/extensions/rewriter/src/main/java/org/apache/sling/rewriter/impl/components/XMLSerializerFactory.java Mon Aug 14 09:43:56 2017 @@ -23,6 +23,7 @@ import org.apache.sling.rewriter.Process import org.apache.sling.rewriter.ProcessingContext; import org.apache.sling.rewriter.Serializer; import org.apache.sling.rewriter.SerializerFactory; +import org.osgi.framework.Constants; import org.osgi.service.component.annotations.Component; /** @@ -30,6 +31,7 @@ import org.osgi.service.component.annota */ @Component(service = SerializerFactory.class, property = { + Constants.SERVICE_VENDOR + "=The Apache Software Foundation", "pipeline.type=xml-serializer" }) public class XMLSerializerFactory implements SerializerFactory { @@ -37,6 +39,7 @@ public class XMLSerializerFactory implem /** * @see org.apache.sling.rewriter.SerializerFactory#createSerializer() */ + @Override public Serializer createSerializer() { return new XMLSerializer(); } @@ -48,6 +51,7 @@ public class XMLSerializerFactory implem /** * @see org.apache.sling.rewriter.Serializer#init(org.apache.sling.rewriter.ProcessingContext, org.apache.sling.rewriter.ProcessingComponentConfiguration) */ + @Override public void init(ProcessingContext context, ProcessingComponentConfiguration config) throws IOException { @@ -66,6 +70,7 @@ public class XMLSerializerFactory implem /** * @see org.apache.sling.rewriter.Serializer#dispose() */ + @Override public void dispose() { // nothing to do }