Author: ssteiner Date: Mon Jan 14 16:49:36 2019 New Revision: 1851281 URL: http://svn.apache.org/viewvc?rev=1851281&view=rev Log: FOP-2733: Drop dependency on Avalon-Framework
Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/ContainerUtil.java (with props) xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/Initializable.java (with props) xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configurable.java (with props) xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configuration.java (with props) xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/ConfigurationException.java (with props) xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfiguration.java (with props) xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfigurationBuilder.java (with props) xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/NullConfiguration.java (with props) Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/pom.xml xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/cli/Main.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/AvalonAdapter.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOPTestbed.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/FOProcessorImpl.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/IFProcessorImpl.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Main.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/threading/Processor.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BatchDiffer.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducer.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/BitmapProducerJava2D.java xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java xmlgraphics/fop/branches/Temp_Avalon/fop-servlet/pom.xml xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/pom.xml xmlgraphics/fop/branches/Temp_Avalon/fop-transcoder-allinone/src/tools/resources/assembly/assembly.xml xmlgraphics/fop/branches/Temp_Avalon/fop/build.xml xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/build.xml xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleAWTViewer.java xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleEPS.java xmlgraphics/fop/branches/Temp_Avalon/fop/examples/embedding/java/embedding/ExampleJava2D2PDF.java xmlgraphics/fop/branches/Temp_Avalon/fop/lib/README.txt xmlgraphics/fop/branches/Temp_Avalon/pom.xml Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/pom.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/pom.xml?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/pom.xml (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/pom.xml Mon Jan 14 16:49:36 2019 @@ -88,16 +88,6 @@ <version>1.8.2</version> </dependency> <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-api</artifactId> - <version>${avalon.version}</version> - </dependency> - <dependency> - <groupId>org.apache.avalon.framework</groupId> - <artifactId>avalon-framework-impl</artifactId> - <version>${avalon.version}</version> - </dependency> - <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>fontbox</artifactId> <version>2.0.13</version> Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/ContainerUtil.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/ContainerUtil.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/ContainerUtil.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/ContainerUtil.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.activity; + +import org.apache.fop.configuration.Configurable; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; + +public final class ContainerUtil { + + private ContainerUtil() { + // Never invoked. + } + + public static void configure(Configurable configurable, Configuration configuration) { + try { + configurable.configure(configuration); + } catch (ConfigurationException e) { + e.printStackTrace(); + throw new IllegalStateException(e); + } + } + + public static void initialize(Initializable initializable) { + try { + initializable.initialize(); + } catch (Exception e) { + e.printStackTrace(); + throw new IllegalStateException(e); + } + } +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/ContainerUtil.java ------------------------------------------------------------------------------ svn:eol-style = native Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/Initializable.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/Initializable.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/Initializable.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/Initializable.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.activity; + +public interface Initializable { + + void initialize() throws Exception; +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/activity/Initializable.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FOUserAgent.java Mon Jan 14 16:49:36 2019 @@ -30,8 +30,6 @@ import java.util.Map; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,6 +45,8 @@ import org.apache.fop.accessibility.Acce import org.apache.fop.accessibility.DummyStructureTreeEventHandler; import org.apache.fop.accessibility.StructureTreeEventHandler; import org.apache.fop.apps.io.InternalResourceResolver; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.events.DefaultEventBroadcaster; import org.apache.fop.events.Event; import org.apache.fop.events.EventBroadcaster; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopConfParser.java Mon Jan 14 16:49:36 2019 @@ -31,9 +31,6 @@ import java.util.Map; import org.xml.sax.SAXException; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,6 +40,9 @@ import org.apache.xmlgraphics.io.Resourc import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.apps.io.ResourceResolverFactory; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; +import org.apache.fop.configuration.DefaultConfigurationBuilder; import org.apache.fop.fonts.FontManagerConfigurator; import org.apache.fop.hyphenation.HyphenationTreeCache; import org.apache.fop.hyphenation.Hyphenator; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java Mon Jan 14 16:49:36 2019 @@ -30,7 +30,6 @@ import java.util.Set; import org.xml.sax.SAXException; -import org.apache.avalon.framework.configuration.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,6 +40,7 @@ import org.apache.xmlgraphics.util.UnitC import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.apps.io.ResourceResolverFactory; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fo.ElementMapping; import org.apache.fop.fo.ElementMappingRegistry; import org.apache.fop.fonts.FontManager; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryBuilder.java Mon Jan 14 16:49:36 2019 @@ -26,8 +26,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.xmlgraphics.image.loader.ImageContext; import org.apache.xmlgraphics.image.loader.ImageManager; import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver; @@ -35,6 +33,7 @@ import org.apache.xmlgraphics.io.Resourc import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.apps.io.ResourceResolverFactory; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontManager; import org.apache.fop.layoutmgr.LayoutManagerMaker; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/apps/FopFactoryConfig.java Mon Jan 14 16:49:36 2019 @@ -23,13 +23,12 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.xmlgraphics.image.loader.ImageManager; import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver; import org.apache.xmlgraphics.io.ResourceResolver; import org.apache.fop.apps.io.InternalResourceResolver; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontManager; import org.apache.fop.layoutmgr.LayoutManagerMaker; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/cli/Main.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/cli/Main.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/cli/Main.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/cli/Main.java Mon Jan 14 16:49:36 2019 @@ -112,9 +112,6 @@ public final class Main { try { //System.out.println(Thread.currentThread().getContextClassLoader()); Class clazz = Class.forName("org.apache.commons.io.IOUtils"); - if (clazz != null) { - clazz = Class.forName("org.apache.avalon.framework.configuration.Configuration"); - } return (clazz != null); } catch (Exception e) { return false; Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configurable.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configurable.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configurable.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configurable.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.configuration; + +public interface Configurable { + + void configure(Configuration cfg) throws ConfigurationException; +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configurable.java ------------------------------------------------------------------------------ svn:eol-style = native Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configuration.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configuration.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configuration.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configuration.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.configuration; + +public interface Configuration { + + Configuration getChild(String key); + + Configuration getChild(String key, boolean required); + + Configuration[] getChildren(String key); + + String[] getAttributeNames(); + + String getAttribute(String key) throws ConfigurationException; + + String getAttribute(String key, String defaultValue); + + boolean getAttributeAsBoolean(String key, boolean defaultValue); + + float getAttributeAsFloat(String key) throws ConfigurationException; + + float getAttributeAsFloat(String key, float defaultValue); + + int getAttributeAsInteger(String key, int defaultValue); + + String getValue() throws ConfigurationException; + + String getValue(String defaultValue); + + boolean getValueAsBoolean() throws ConfigurationException; + + boolean getValueAsBoolean(boolean defaultValue); + + int getValueAsInteger() throws ConfigurationException; + + int getValueAsInteger(int defaultValue); + + float getValueAsFloat() throws ConfigurationException; + + float getValueAsFloat(float defaultValue); + + String getLocation(); + +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/Configuration.java ------------------------------------------------------------------------------ svn:eol-style = native Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/ConfigurationException.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/ConfigurationException.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/ConfigurationException.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/ConfigurationException.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.configuration; + +public class ConfigurationException extends Exception { + + public ConfigurationException(String message) { + super(message); + } + + public ConfigurationException(String message, Throwable cause) { + super(message, cause); + } +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/ConfigurationException.java ------------------------------------------------------------------------------ svn:eol-style = native Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfiguration.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfiguration.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfiguration.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfiguration.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,289 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.configuration; + +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +public class DefaultConfiguration implements Configuration { + + static final DocumentBuilderFactory DBF = DocumentBuilderFactory.newInstance(); + + static { + DBF.setNamespaceAware(false); + DBF.setValidating(false); + DBF.setIgnoringComments(true); + DBF.setIgnoringElementContentWhitespace(true); + DBF.setExpandEntityReferences(true); + } + + /** + * @deprecated For debug only. + */ + public static String toString(Document document) { + try { + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + transformer.setOutputProperty(OutputKeys.INDENT, "yes"); + transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); + //initialize StreamResult with File object to save to file + StreamResult result = new StreamResult(new StringWriter()); + DOMSource source = new DOMSource(document); + transformer.transform(source, result); + return result.getWriter().toString(); + } catch (TransformerException e) { + throw new IllegalStateException(e); + } + } + + private Element element; + + public DefaultConfiguration(String key) { + DocumentBuilder builder = null; + try { + builder = DBF.newDocumentBuilder(); + } catch (ParserConfigurationException e) { + e.printStackTrace(); + throw new IllegalStateException(e); + } + Document doc = builder.newDocument(); + // create the root element node + element = doc.createElement(key); + doc.appendChild(element); + } + + DefaultConfiguration(Element element) { + this.element = element; + } + + Element getElement() { + return element; + } + + public void addChild(DefaultConfiguration configuration) { + Element node = (Element) element.getOwnerDocument().importNode(configuration.getElement(), true); + element.appendChild(node); + } + + String getValue0() { + String result = element.getTextContent(); + if (result == null) { + result = ""; + } + return result; + } + + @Override + public Configuration getChild(String key) { + NodeList nl = element.getElementsByTagName(key); + for (int i = 0; i < nl.getLength(); ++i) { + Node n = nl.item(i); + if (n.getNodeName().equals(key)) { + return new DefaultConfiguration((Element) n); + } + } + return NullConfiguration.INSTANCE; + } + + @Override + public Configuration getChild(String key, boolean required) { + Configuration result = getChild(key); + if (!required && result == NullConfiguration.INSTANCE) { + return null; + } + if (required && (result == null || result == NullConfiguration.INSTANCE)) { + // throw new IllegalStateException("No child '" + key + "'"); + return NullConfiguration.INSTANCE; + } + return result; + } + + @Override + public Configuration[] getChildren(String key) { + NodeList nl = element.getElementsByTagName(key); + Configuration[] result = new Configuration[nl.getLength()]; + for (int i = 0; i < nl.getLength(); ++i) { + Node n = nl.item(i); + result[i] = new DefaultConfiguration((Element) n); + } + return result; + } + + @Override + public String[] getAttributeNames() { + NamedNodeMap nnm = element.getAttributes(); + String[] result = new String[nnm.getLength()]; + for (int i = 0; i < nnm.getLength(); ++i) { + Node n = nnm.item(i); + result[i] = n.getNodeName(); + } + return result; + } + + @Override + public String getAttribute(String key) { + String result = element.getAttribute(key); + if ("".equals(result)) { + result = null; + } + return result; + } + + @Override + public String getAttribute(String key, String defaultValue) { + String result = getAttribute(key); + if (result == null || "".equals(result)) { + result = defaultValue; + } + return result; + } + + @Override + public boolean getAttributeAsBoolean(String key, boolean defaultValue) { + return Boolean.parseBoolean(getAttribute(key)); + } + + @Override + public float getAttributeAsFloat(String key) throws ConfigurationException { + return Float.parseFloat(getAttribute(key)); + } + + @Override + public float getAttributeAsFloat(String key, float defaultValue) { + String result = getAttribute(key); + if (result == null || "".equals(result)) { + return defaultValue; + } + return Float.parseFloat(result); + } + + @Override + public int getAttributeAsInteger(String key, int defaultValue) { + String result = getAttribute(key); + if (result == null || "".equals(result)) { + return defaultValue; + } + return Integer.parseInt(result); + } + + @Override + public String getValue() throws ConfigurationException { + String result = getValue0(); + if (result == null || "".equals(result)) { + throw new ConfigurationException("No value in " + element.getNodeName()); + } + return result; + } + + @Override + public String getValue(String defaultValue) { + String result = getValue0(); + if (result == null || "".equals(result)) { + result = defaultValue; + } + return result; + } + + @Override + public boolean getValueAsBoolean() throws ConfigurationException { + return Boolean.parseBoolean(getValue0()); + } + + @Override + public boolean getValueAsBoolean(boolean defaultValue) { + String result = getValue0(); + if (result == null || "".equals(result)) { + return defaultValue; + } + return Boolean.parseBoolean(result); + } + + @Override + public int getValueAsInteger() throws ConfigurationException { + try { + return Integer.parseInt(getValue0()); + } catch (NumberFormatException e) { + throw new ConfigurationException("Not an integer", e); + } + } + + @Override + public int getValueAsInteger(int defaultValue) { + String result = getValue0(); + if (result == null || "".equals(result)) { + return defaultValue; + } + return Integer.parseInt(result); + } + + @Override + public float getValueAsFloat() throws ConfigurationException { + try { + return Float.parseFloat(getValue0()); + } catch (NumberFormatException e) { + throw new ConfigurationException("Not a float", e); + } + } + + @Override + public float getValueAsFloat(float defaultValue) { + String result = getValue0(); + if (result == null || "".equals(result)) { + return defaultValue; + } + return Float.parseFloat(getValue0()); + } + + @Override + public String getLocation() { + List<String> path = new ArrayList<String>(); + for (Node el = element; el != null; el = el.getParentNode()) { + if (el instanceof Element) { + path.add(((Element) el).getTagName()); + } + } + Collections.reverse(path); + + StringBuilder sb = new StringBuilder(); + for (String s : path) { + if (sb.length() > 0) { + sb.append("/"); + } + sb.append(s); + } + return sb.toString(); + } +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfiguration.java ------------------------------------------------------------------------------ svn:eol-style = native Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfigurationBuilder.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfigurationBuilder.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfigurationBuilder.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfigurationBuilder.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.configuration; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.ParserConfigurationException; + +import org.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.xml.sax.SAXException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +public class DefaultConfigurationBuilder { + + private static final Log LOG = LogFactory.getLog(DefaultConfigurationBuilder.class.getName()); + + public DefaultConfiguration build(InputStream confStream) throws ConfigurationException { + try { + DocumentBuilder builder = DefaultConfiguration.DBF.newDocumentBuilder(); + Document document = builder.parse(confStream); + return new DefaultConfiguration(document.getDocumentElement()); + } catch (DOMException e) { + throw new ConfigurationException("xml parse error", e); + } catch (ParserConfigurationException e) { + throw new ConfigurationException("xml parse error", e); + } catch (IOException e) { + throw new ConfigurationException("xml parse error", e); + } catch (SAXException e) { + throw new ConfigurationException("xml parse error", e); + } finally { + try { + confStream.close(); + } catch (IOException e) { + throw new IllegalStateException(e); + } + } + } + + public DefaultConfiguration buildFromFile(File file) throws ConfigurationException { + try { + DocumentBuilder builder = DefaultConfiguration.DBF.newDocumentBuilder(); + Document document = builder.parse(file); + return new DefaultConfiguration(document.getDocumentElement()); + } catch (DOMException e) { + throw new ConfigurationException("xml parse error", e); + } catch (ParserConfigurationException e) { + throw new ConfigurationException("xml parse error", e); + } catch (IOException e) { + throw new ConfigurationException("xml parse error", e); + } catch (SAXException e) { + throw new ConfigurationException("xml parse error", e); + } + } +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/DefaultConfigurationBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Added: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/NullConfiguration.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/NullConfiguration.java?rev=1851281&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/NullConfiguration.java (added) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/NullConfiguration.java Mon Jan 14 16:49:36 2019 @@ -0,0 +1,124 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: Accessibility.java 1343632 2012-05-29 09:48:03Z vhennebert $ */ +package org.apache.fop.configuration; + +final class NullConfiguration implements Configuration { + + static final NullConfiguration INSTANCE = new NullConfiguration(); + + private NullConfiguration() { + + } + + @Override + public Configuration getChild(String key) { + return INSTANCE; + } + + @Override + public Configuration getChild(String key, boolean required) { + return INSTANCE; + } + + @Override + public Configuration[] getChildren(String key) { + return new Configuration[0]; + } + + @Override + public String[] getAttributeNames() { + return new String[0]; + } + + @Override + public String getAttribute(String key) throws ConfigurationException { + return ""; + } + + @Override + public String getAttribute(String key, String defaultValue) { + return defaultValue; + } + + @Override + public boolean getAttributeAsBoolean(String key, boolean defaultValue) { + return defaultValue; + } + + @Override + public float getAttributeAsFloat(String key) throws ConfigurationException { + return 0; + } + + @Override + public float getAttributeAsFloat(String key, float defaultValue) { + return defaultValue; + } + + @Override + public int getAttributeAsInteger(String key, int defaultValue) { + return defaultValue; + } + + @Override + public String getValue() throws ConfigurationException { + // return null; + throw new ConfigurationException("missing value"); + } + + @Override + public String getValue(String defaultValue) { + return defaultValue; + } + + @Override + public boolean getValueAsBoolean() throws ConfigurationException { + return false; + } + + @Override + public boolean getValueAsBoolean(boolean defaultValue) { + return defaultValue; + } + + @Override + public int getValueAsInteger() throws ConfigurationException { + return 0; + } + + @Override + public int getValueAsInteger(int defaultValue) { + return defaultValue; + } + + @Override + public float getValueAsFloat() throws ConfigurationException { + return 0; + } + + @Override + public float getValueAsFloat(float defaultValue) { + return defaultValue; + } + + @Override + public String getLocation() { + return "<no-location>"; + } +} Propchange: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/configuration/NullConfiguration.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/DefaultFontConfig.java Mon Jan 14 16:49:36 2019 @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.apps.FOPException; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.events.EventProducer; import org.apache.fop.util.LogUtil; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontConfig.java Mon Jan 14 16:49:36 2019 @@ -19,9 +19,8 @@ package org.apache.fop.fonts; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; +import org.apache.fop.configuration.Configuration; import org.apache.fop.events.EventProducer; /** @@ -45,6 +44,6 @@ public interface FontConfig { * @throws FOPException if an error occurs creating the font configuration object */ FontConfig parse(Configuration cfg, FontManager fontManager, boolean strict, - EventProducer eventProducer) throws FOPException; + EventProducer eventProducer) throws FOPException; } } Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java Mon Jan 14 16:49:36 2019 @@ -24,8 +24,6 @@ import java.net.URISyntaxException; import java.util.List; import java.util.regex.Pattern; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,6 +32,8 @@ import org.apache.xmlgraphics.io.Resourc import org.apache.fop.apps.FOPException; import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.apps.io.ResourceResolverFactory; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.fonts.substitute.FontSubstitutions; import org.apache.fop.fonts.substitute.FontSubstitutionsConfigurator; import org.apache.fop.util.LogUtil; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/fonts/substitute/FontSubstitutionsConfigurator.java Mon Jan 14 16:49:36 2019 @@ -19,9 +19,8 @@ package org.apache.fop.fonts.substitute; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; +import org.apache.fop.configuration.Configuration; /** * Configures a font substitution catalog Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfig.java Mon Jan 14 16:49:36 2019 @@ -19,10 +19,9 @@ package org.apache.fop.render; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontConfig; /** Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/RendererConfigOption.java Mon Jan 14 16:49:36 2019 @@ -26,4 +26,6 @@ package org.apache.fop.render; public interface RendererConfigOption { /** The name of the option. */ String getName(); + + Object getDefaultValue(); } Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/XMLHandlerConfigurator.java Mon Jan 14 16:49:36 2019 @@ -19,13 +19,13 @@ package org.apache.fop.render; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; /** * Configurator for XMLHandler objects. Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPFontConfig.java Mon Jan 14 16:49:36 2019 @@ -27,8 +27,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,6 +42,8 @@ import org.apache.fop.afp.fonts.RasterFo import org.apache.fop.afp.util.AFPResourceAccessor; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.io.InternalResourceResolver; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.events.EventProducer; import org.apache.fop.fonts.EmbedFontInfo; import org.apache.fop.fonts.FontConfig; @@ -85,7 +85,7 @@ public final class AFPFontConfig impleme /** {@inheritDoc}} */ public AFPFontConfig parse(Configuration cfg, FontManager fontManager, boolean strict, - EventProducer eventProducer) throws FOPException { + EventProducer eventProducer) throws FOPException { try { return new ParserHelper(cfg, fontManager, strict, (AFPEventProducer) eventProducer).fontConfig; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPInfo.java Mon Jan 14 16:49:36 2019 @@ -19,12 +19,11 @@ package org.apache.fop.render.afp; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.afp.AFPGraphics2D; import org.apache.fop.afp.AFPPaintingState; import org.apache.fop.afp.AFPResourceInfo; import org.apache.fop.afp.AFPResourceManager; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontInfo; /** Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -23,8 +23,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.EnumMap; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,6 +36,8 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.MimeConstants; import org.apache.fop.apps.io.InternalResourceResolver; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.fonts.FontManager; import org.apache.fop.render.RendererConfig; import org.apache.fop.render.afp.AFPFontConfig.AFPFontInfoConfigParser; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererContext.java Mon Jan 14 16:49:36 2019 @@ -21,12 +21,11 @@ package org.apache.fop.render.afp; import java.util.Map; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.afp.AFPPaintingState; import org.apache.fop.afp.AFPResourceInfo; import org.apache.fop.afp.AFPResourceManager; import org.apache.fop.afp.modca.ResourceObject; +import org.apache.fop.configuration.Configuration; import org.apache.fop.render.AbstractRenderer; import org.apache.fop.render.ImageHandlerUtil; import org.apache.fop.render.RendererContext; @@ -58,7 +57,7 @@ public class AFPRendererContext extends info.setHeight((Integer) getProperty(RendererContextConstants.HEIGHT)); info.setX((Integer) getProperty(RendererContextConstants.XPOS)); info.setY((Integer) getProperty(RendererContextConstants.YPOS)); - info.setHandlerConfiguration((Configuration)getProperty( + info.setHandlerConfiguration((Configuration) getProperty( RendererContextConstants.HANDLER_CONFIGURATION)); info.setFontInfo((org.apache.fop.fonts.FontInfo)getProperty( AFPRendererContextConstants.AFP_FONT_INFO)); Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPRendererOption.java Mon Jan 14 16:49:36 2019 @@ -61,4 +61,9 @@ public enum AFPRendererOption implements public Class<?> getType() { return type; } + + @Override + public Object getDefaultValue() { + return null; + } } Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/afp/AFPShadingMode.java Mon Jan 14 16:49:36 2019 @@ -49,7 +49,7 @@ public enum AFPShadingMode { * @return the enumeration object */ public static AFPShadingMode getValueOf(String name) { - if (COLOR.getName().equalsIgnoreCase(name)) { + if (name == null || "".equals(name) || COLOR.getName().equalsIgnoreCase(name)) { return COLOR; } else if (DITHERED.getName().equalsIgnoreCase(name)) { return DITHERED; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/BitmapRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -23,10 +23,9 @@ import java.awt.Color; import java.awt.image.BufferedImage; import java.util.EnumMap; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; @@ -170,7 +169,18 @@ public class BitmapRendererConfig implem } private String getValue(Configuration cfg, BitmapRendererOption option) { - return cfg.getChild(option.getName()).getValue(null); + Object defaultValue = option.getDefaultValue(); + Object result = cfg.getChild(option.getName()).getValue(null); + if (result == null || "".equals(result)) { + result = defaultValue; + } + if (result == null) { + return null; + } + if (result instanceof Color) { + return ColorUtil.colorToString((Color) result); + } + return result.toString(); } public String getMimeType() { Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/PNGRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -17,12 +17,11 @@ package org.apache.fop.render.bitmap; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.xmlgraphics.util.MimeConstants; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -21,13 +21,12 @@ package org.apache.fop.render.bitmap; import java.util.EnumMap; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.xmlgraphics.image.writer.Endianness; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.MimeConstants; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -19,10 +19,9 @@ package org.apache.fop.render.intermediate; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontConfig; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -21,10 +21,9 @@ package org.apache.fop.render.java2d; import java.util.EnumMap; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DRendererOption.java Mon Jan 14 16:49:36 2019 @@ -34,4 +34,9 @@ public enum Java2DRendererOption impleme public String getName() { return name; } + + @Override + public Object getDefaultValue() { + return null; + } } Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/Java2DRendererOption.java Mon Jan 14 16:49:36 2019 @@ -25,19 +25,25 @@ import org.apache.fop.render.RendererCon */ public enum Java2DRendererOption implements RendererConfigOption { - RENDERING_MODE("rendering", PCLRenderingMode.class), - TEXT_RENDERING("text-rendering", Boolean.class), - DISABLE_PJL("disable-pjl", Boolean.class), - OPTIMIZE_RESOURCES("optimize-resources", Boolean.class), - MODE_COLOR("color", Boolean.class); + RENDERING_MODE("rendering", PCLRenderingMode.class, PCLRenderingMode.QUALITY), + TEXT_RENDERING("text-rendering", Boolean.class, Boolean.FALSE), + DISABLE_PJL("disable-pjl", Boolean.class, Boolean.FALSE), + OPTIMIZE_RESOURCES("optimize-resources", Boolean.class, Boolean.FALSE), + MODE_COLOR("color", Boolean.class, Boolean.FALSE); private final String name; private final Class<?> type; - private Java2DRendererOption(String name, Class<?> type) { + private final Object defaultValue; + + private Java2DRendererOption(String name, Class<?> type, Object defaultValue) { this.name = name; this.type = type; + this.defaultValue = defaultValue; + if (defaultValue != null && !(type.isAssignableFrom(defaultValue.getClass()))) { + throw new IllegalArgumentException("default value " + defaultValue + " is not of type " + type); + } } /** {@inheritDoc} */ @@ -48,4 +54,9 @@ public enum Java2DRendererOption impleme Class<?> getType() { return type; } + + @Override + public Object getDefaultValue() { + return defaultValue; + } } Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -22,11 +22,10 @@ package org.apache.fop.render.pcl; import java.util.EnumMap; import java.util.Map; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.MimeConstants; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -25,15 +25,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.MimeConstants; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; @@ -217,7 +216,12 @@ public final class PDFRendererConfig imp private String parseConfig(Configuration cfg, RendererConfigOption option) { Configuration child = cfg.getChild(option.getName()); - return child.getValue(null); + String value = child.getValue(null); + if (value == null || "".equals(value)) { + Object v = option.getDefaultValue(); + return v == null ? null : v.toString(); + } + return value; } private boolean doesValueExist(Configuration cfg, RendererConfigOption option) { Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/pdf/PDFSVGHandler.java Mon Jan 14 16:49:36 2019 @@ -22,10 +22,10 @@ package org.apache.fop.render.pdf; import java.io.OutputStream; import java.util.Map; -import org.apache.avalon.framework.configuration.Configuration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontInfo; import org.apache.fop.pdf.PDFDocument; import org.apache.fop.pdf.PDFPage; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -22,14 +22,14 @@ package org.apache.fop.render.ps; import java.util.EnumMap; import java.util.Locale; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.MimeConstants; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/ps/PSSVGHandler.java Mon Jan 14 16:49:36 2019 @@ -26,8 +26,6 @@ import java.util.Map; import org.w3c.dom.Document; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.batik.bridge.BridgeContext; import org.apache.batik.bridge.GVTBuilder; import org.apache.batik.gvt.GraphicsNode; @@ -35,6 +33,7 @@ import org.apache.batik.gvt.GraphicsNode import org.apache.xmlgraphics.java2d.ps.PSGraphics2D; import org.apache.xmlgraphics.ps.PSGenerator; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontInfo; import org.apache.fop.image.loader.batik.BatikUtil; import org.apache.fop.render.AbstractGenericSVGHandler; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/render/txt/TxtRendererConfig.java Mon Jan 14 16:49:36 2019 @@ -21,11 +21,10 @@ package org.apache.fop.render.txt; import java.util.EnumMap; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.MimeConstants; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfig.DefaultFontConfigParser; import org.apache.fop.fonts.FontEventAdapter; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java Mon Jan 14 16:49:36 2019 @@ -28,10 +28,6 @@ import javax.xml.transform.stream.Stream import org.w3c.dom.DOMImplementation; import org.xml.sax.EntityResolver; -import org.apache.avalon.framework.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.impl.SimpleLog; @@ -55,6 +51,10 @@ import org.apache.xmlgraphics.image.load import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext; import org.apache.xmlgraphics.util.UnitConv; +import org.apache.fop.configuration.Configurable; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; +import org.apache.fop.configuration.DefaultConfiguration; import org.apache.fop.svg.font.FOPFontFamilyResolver; /** Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java Mon Jan 14 16:49:36 2019 @@ -23,12 +23,11 @@ import java.io.File; import java.net.URI; import java.util.List; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; - import org.apache.fop.apps.FOPException; import org.apache.fop.apps.io.InternalResourceResolver; import org.apache.fop.apps.io.ResourceResolverFactory; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.fonts.DefaultFontConfig; import org.apache.fop.fonts.DefaultFontConfigurator; import org.apache.fop.fonts.EmbedFontInfo; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java Mon Jan 14 16:49:36 2019 @@ -27,8 +27,6 @@ import java.io.OutputStream; import org.w3c.dom.Document; import org.w3c.dom.svg.SVGLength; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.batik.bridge.BridgeContext; import org.apache.batik.bridge.UnitProcessor; import org.apache.batik.ext.awt.RenderingHintsKeyExt; @@ -37,6 +35,7 @@ import org.apache.batik.transcoder.Trans import org.apache.batik.transcoder.image.ImageTranscoder; import org.apache.fop.Version; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontInfo; import org.apache.fop.svg.font.FOPFontFamilyResolverImpl; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfigParserTester.java Mon Jan 14 16:49:36 2019 @@ -22,10 +22,9 @@ package org.apache.fop.apps; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; - import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.configuration.DefaultConfigurationBuilder; import org.apache.fop.events.DefaultEventBroadcaster; import org.apache.fop.fonts.FontManager; import org.apache.fop.render.RendererConfig; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/AbstractRendererConfiguratorTest.java Mon Jan 14 16:49:36 2019 @@ -27,9 +27,8 @@ import org.xml.sax.SAXException; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.avalon.framework.configuration.ConfigurationException; - import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder; +import org.apache.fop.configuration.ConfigurationException; import org.apache.fop.render.PrintRendererConfigurator; import org.apache.fop.render.intermediate.IFDocumentHandler; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/apps/MutableConfig.java Mon Jan 14 16:49:36 2019 @@ -21,13 +21,12 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.apache.avalon.framework.configuration.Configuration; - import org.apache.xmlgraphics.image.loader.ImageManager; import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver; import org.apache.xmlgraphics.io.ResourceResolver; import org.apache.fop.apps.io.InternalResourceResolver; +import org.apache.fop.configuration.Configuration; import org.apache.fop.fonts.FontManager; import org.apache.fop.layoutmgr.LayoutManagerMaker; Modified: xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java?rev=1851281&r1=1851280&r2=1851281&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java (original) +++ xmlgraphics/fop/branches/Temp_Avalon/fop-core/src/test/java/org/apache/fop/config/BaseUserConfigTest.java Mon Jan 14 16:49:36 2019 @@ -25,11 +25,11 @@ import java.io.InputStream; import org.xml.sax.SAXException; -import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.configuration.DefaultConfigurationBuilder; import org.apache.fop.render.pdf.BasePDFTest; import static org.apache.fop.FOPTestUtils.getBaseDir; --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org