rpms/maven-doxia
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c8-stream-201902
Branches Tags
rpms:c8-stream-201902
rpms:stream-javapackages-tools-201902-rhel-8.9.0
rpms:stream-javapackages-tools-201801-rhel-8.10.0
rpms:stream-javapackages-tools-201801-rhel-8.9.0
rpms:c8s-stream-201902
rpms:c9s
rpms:c10s
rpms:c8-beta-stream-201801
rpms:c8-stream-201801
rpms:c8s-stream-201801
rpms:imports/c8s-stream-201902/maven-doxia-1.9-2.module+el8.3.0+7256+fe62c937
rpms:imports/c8-beta-stream-201801/maven-doxia-1.7-8.module+el8+2598+06babf2e
rpms:imports/c8-stream-201801/maven-doxia-1.7-8.module+el8+2598+06babf2e
rpms:imports/c8s-stream-201801/maven-doxia-1.7-8.module+el8+2598+06babf2e
rpms:imports/c8-stream-201902/maven-doxia-1.9-2.module+el8.2.0+4938+c0cffa5b
...
pull from: rpms:c8-stream-201801
Branches Tags
rpms:stream-javapackages-tools-201902-rhel-8.9.0
rpms:stream-javapackages-tools-201801-rhel-8.10.0
rpms:stream-javapackages-tools-201801-rhel-8.9.0
rpms:c8s-stream-201902
rpms:c9s
rpms:c10s
rpms:c8-beta-stream-201801
rpms:c8-stream-201801
rpms:c8s-stream-201801
rpms:c8-stream-201902
rpms:imports/c8s-stream-201902/maven-doxia-1.9-2.module+el8.3.0+7256+fe62c937
rpms:imports/c8-beta-stream-201801/maven-doxia-1.7-8.module+el8+2598+06babf2e
rpms:imports/c8-stream-201801/maven-doxia-1.7-8.module+el8+2598+06babf2e
rpms:imports/c8s-stream-201801/maven-doxia-1.7-8.module+el8+2598+06babf2e
rpms:imports/c8-stream-201902/maven-doxia-1.9-2.module+el8.2.0+4938+c0cffa5b

No commits in common. "c8-stream-201902" and "c8-stream-201801" have entirely different histories.
c8-stream- ... c8-stream-

6 changed files with 353 additions and 36 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/doxia-1.9-source-release.zip
SOURCES/doxia-1.7-source-release.zip

2
.maven-doxia.metadata
View File

@ -1 +1 @@
98f8133e9296fd13d0c95b5878caed075db0f92a SOURCES/doxia-1.9-source-release.zip
1971646a8a4b22cce7973889765fb69349c61cbe SOURCES/doxia-1.7-source-release.zip

100
SOURCES/0002-Update-to-Plexus-Container-1.5.5.patch Normal file
View File

@ -0,0 +1,100 @@
From 6a3583cafd46194b6c2c5f4db061f72f16d014ef Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 6 Nov 2013 12:46:26 +0100
Subject: [PATCH 2/4] Update to Plexus Container 1.5.5
---
.../java/org/apache/maven/doxia/module/AbstractIdentityTest.java | 3 ++-
.../test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java | 5 +++--
.../test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java | 3 ++-
pom.xml | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
index 2f4f495..540461d 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/module/AbstractIdentityTest.java
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.impl.SinkTestDocument;
import org.apache.maven.doxia.sink.impl.TextSink;
+import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.util.IOUtil;
/**
@@ -107,7 +108,7 @@ public abstract class AbstractIdentityTest
writer = new StringWriter();
sink = new TextSink( writer );
Parser parser = createParser();
- parser.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
+ parser.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
parser.parse( reader, sink );
String actual = writer.toString();
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
index a67a114..3ac8734 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
@@ -28,6 +28,7 @@ import org.apache.maven.doxia.logging.PlexusLoggerWrapper;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
+import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.util.IOUtil;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLUnit;
@@ -59,7 +60,7 @@ public abstract class AbstractSinkTest
testWriter.reset();
sink = createSink( testWriter );
- sink.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
+ sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ) );
}
/**
@@ -809,7 +810,7 @@ public abstract class AbstractSinkTest
testWriter.reset();
sink = createSink( testWriter );
- sink.enableLogging( new PlexusLoggerWrapper( getContainer().getLogger() ) );
+ sink.enableLogging( new PlexusLoggerWrapper( ( ( DefaultPlexusContainer )getContainer() ).getLogger() ));
comment = "-";
sink.comment( comment );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
index 5f9108e..88db2b4 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
@@ -31,6 +31,7 @@ import junit.framework.AssertionFailedError;
import org.apache.maven.doxia.parser.Parser;
+import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.logging.Logger;
@@ -96,7 +97,7 @@ public abstract class AbstractXmlValidator
public void testValidateFiles()
throws Exception
{
- final Logger logger = getContainer().getLoggerManager().getLoggerForComponent( Parser.ROLE );
+ final Logger logger = ( ( DefaultPlexusContainer )getContainer() ).getLoggerManager().getLoggerForComponent( Parser.ROLE );
for ( Iterator<Map.Entry<String, String>> it = getTestDocuments().entrySet().iterator(); it.hasNext(); )
{
diff --git a/pom.xml b/pom.xml
index 134f8b8..fcf4f32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-30</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
--
2.5.5

10
SOURCES/0003-Disable-tests-which-rely-on-ordering-in-set.patch
View File

@ -28,8 +28,8 @@ index 3ac8734..707cdf1 100644
public void testTable() throws Exception
{
String cell = "cell";
@@ -544,6 +543,7 @@ public abstract class AbstractSinkTest
assertEquals( actual, expected );
@@ -544,6 +546,7 @@ public abstract class AbstractSinkTest
assertEquals( "Wrong table!", expected, actual );
}
}
+ */
@ -48,9 +48,9 @@ index 847c341..729357b 100644
public void testFigureGraphics() throws Exception
{
try
@@ -188,6 +188,7 @@ public class FoAggregateSinkTest
assertThat ( wrapXml( actual ), CompareMatcher.isIdenticalTo( wrapXml( expected ) ));
@@ -187,6 +188,7 @@ public class FoAggregateSinkTest
Diff diff = XMLUnit.compareXML( wrapXml( expected ), wrapXml( actual ) );
assertTrue( "Wrong figure!", diff.identical() );
}
+ */

157
SOURCES/0004-Port-to-fop-2.0.patch Normal file
View File

@ -0,0 +1,157 @@
From b72bf32dbabf4c18cf48bdbc344227fb0b2d5110 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 17 Aug 2015 17:15:05 +0200
Subject: [PATCH 4/4] Port to fop-2.0
---
doxia-modules/doxia-module-fo/pom.xml | 2 +-
.../org/apache/maven/doxia/module/fo/FoUtils.java | 58 ++++++----------------
2 files changed, 16 insertions(+), 44 deletions(-)
diff --git a/doxia-modules/doxia-module-fo/pom.xml b/doxia-modules/doxia-module-fo/pom.xml
index e66c736..6d261c8 100644
--- a/doxia-modules/doxia-module-fo/pom.xml
+++ b/doxia-modules/doxia-module-fo/pom.xml
@@ -85,7 +85,7 @@ under the License.
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>0.95</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java
index 0e7efc1..c398eaf 100644
--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java
+++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoUtils.java
@@ -24,6 +24,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.net.URI;
import java.util.Date;
import javax.xml.transform.Result;
@@ -38,6 +39,7 @@ import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
+import org.apache.fop.apps.FopFactoryBuilder;
import org.apache.fop.apps.MimeConstants;
import org.apache.maven.doxia.document.DocumentModel;
import org.codehaus.plexus.util.IOUtil;
@@ -52,28 +54,11 @@ import org.codehaus.plexus.util.StringUtils;
*/
public class FoUtils
{
- /** To reuse the FopFactory **/
- private static final FopFactory FOP_FACTORY = FopFactory.newInstance();
-
/** To reuse the TransformerFactory **/
private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance();
- /**
- * Converts an FO file to a PDF file using FOP.
- *
- * @param fo the FO file, not null.
- * @param pdf the target PDF file, not null.
- * @param resourceDir The base directory for relative path resolution, could be null.
- * If null, defaults to the parent directory of fo.
- * @param documentModel the document model to add PDF metadatas like author, title and keywords, could be null.
- * @throws javax.xml.transform.TransformerException In case of a conversion problem.
- * @since 1.1.1
- */
- public static void convertFO2PDF( File fo, File pdf, String resourceDir, DocumentModel documentModel )
- throws TransformerException
- {
- FOUserAgent foUserAgent = getDefaultUserAgent( fo, resourceDir );
+ private static void prepareUserAgent( FOUserAgent foUserAgent, DocumentModel documentModel ) {
if ( documentModel != null && documentModel.getMeta() != null )
{
// http://xmlgraphics.apache.org/fop/embedding.html#user-agent
@@ -113,8 +98,6 @@ public class FoUtils
{
foUserAgent.setCreationDate( new Date() );
}
-
- convertFO2PDF( fo, pdf, resourceDir, foUserAgent );
}
/**
@@ -124,16 +107,13 @@ public class FoUtils
* @param pdf the target PDF file, not null.
* @param resourceDir The base directory for relative path resolution, could be null.
* If null, defaults to the parent directory of fo.
- * @param foUserAgent the FOUserAgent to use.
- * May be null, in which case a default user agent will be used.
+ * @param documentModel the document model to add PDF metadatas like author, title and keywords, could be null.
* @throws javax.xml.transform.TransformerException In case of a conversion problem.
* @since 1.1.1
*/
- public static void convertFO2PDF( File fo, File pdf, String resourceDir, FOUserAgent foUserAgent )
+ public static void convertFO2PDF( File fo, File pdf, String resourceDir, DocumentModel documentModel )
throws TransformerException
{
- FOUserAgent userAgent = ( foUserAgent == null ? getDefaultUserAgent( fo, resourceDir ) : foUserAgent );
-
OutputStream out = null;
try
{
@@ -149,7 +129,11 @@ public class FoUtils
Result res = null;
try
{
- Fop fop = FOP_FACTORY.newFop( MimeConstants.MIME_PDF, userAgent, out );
+ URI baseURI = getBaseURI( fo, resourceDir );
+ FopFactory fopFactory = new FopFactoryBuilder( baseURI ).build();
+ FOUserAgent userAgent = fopFactory.newFOUserAgent();
+ prepareUserAgent( userAgent, documentModel );
+ Fop fop = fopFactory.newFop( MimeConstants.MIME_PDF, userAgent, out );
res = new SAXResult( fop.getDefaultHandler() );
}
catch ( FOPException e )
@@ -193,34 +177,22 @@ public class FoUtils
}
/**
- * Returns a base URL to be used by the FOUserAgent.
+ * Returns a base URI.
*
* @param fo the FO file.
* @param resourceDir the resource directory.
- * @return String.
+ * @return URI.
*/
- private static String getBaseURL( File fo, String resourceDir )
+ private static URI getBaseURI( File fo, String resourceDir )
{
- String url = null;
-
if ( resourceDir == null )
{
- url = "file:///" + fo.getParent() + "/";
+ return fo.getParentFile().toURI();
}
else
{
- url = "file:///" + resourceDir + "/";
+ return new File( resourceDir + "/" ).toURI();
}
-
- return url;
- }
-
- private static FOUserAgent getDefaultUserAgent( File fo, String resourceDir )
- {
- FOUserAgent foUserAgent = FOP_FACTORY.newFOUserAgent();
- foUserAgent.setBaseURL( getBaseURL( fo, resourceDir ) );
-
- return foUserAgent;
}
private FoUtils()
--
2.5.5

118
SPECS/maven-doxia.spec
View File

@ -1,6 +1,11 @@
%bcond_without itext
%bcond_without markdown
%bcond_without fop
Name: maven-doxia
Version: 1.9
Release: 2%{?dist}
Version: 1.7
Release: 8%{?dist}
Epoch: 0
Summary: Content generation framework
License: ASL 2.0
URL: http://maven.apache.org/doxia/
@ -11,14 +16,20 @@ Source0: http://repo2.maven.org/maven2/org/apache/maven/doxia/doxia/%{ver
# https://issues.apache.org/jira/browse/DOXIA-53
Patch1: 0001-Fix-itext-dependency.patch
# Accepted upstream: DOXIA-504, https://issues.apache.org/jira/browse/DOXIA-504
Patch2: 0002-Update-to-Plexus-Container-1.5.5.patch
# Don't run bad tests which rely on ordering in set (they fail with Java 8)
Patch2: 0003-Disable-tests-which-rely-on-ordering-in-set.patch
Patch3: 0003-Disable-tests-which-rely-on-ordering-in-set.patch
# Not upstreamable due to higher Java version of fop's dependencies
Patch4: 0004-Port-to-fop-2.0.patch
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.commons:commons-lang3)
BuildRequires: mvn(org.apache.httpcomponents:httpclient)
BuildRequires: mvn(org.apache.httpcomponents:httpcore)
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
@ -27,8 +38,26 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: mvn(org.codehaus.plexus:plexus-container-default)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.xmlunit:xmlunit-core)
BuildRequires: mvn(org.xmlunit:xmlunit-matchers)
BuildRequires: mvn(xmlunit:xmlunit)
%if %{with fop}
BuildRequires: mvn(commons-collections:commons-collections)
BuildRequires: mvn(commons-configuration:commons-configuration)
BuildRequires: mvn(log4j:log4j:1.2.12)
BuildRequires: mvn(org.apache.xmlgraphics:fop)
%endif
%if %{with itext}
BuildRequires: mvn(com.lowagie:itext)
%endif
%if %{with markdown}
BuildRequires: mvn(org.pegdown:pegdown)
%endif
Obsoletes: maven-doxia-book < %{epoch}:%{version}-%{release}
Obsoletes: maven-doxia-maven-plugin < %{epoch}:%{version}-%{release}
%description
Doxia is a content generation framework which aims to provide its
@ -37,6 +66,7 @@ content. Doxia can be used to generate static sites in addition to
being incorporated into dynamic content generation systems like blogs,
wikis and content management systems.
%package core
Summary: Core module for %{name}
@ -73,6 +103,30 @@ Summary: FML module for %{name}
%description module-fml
This package provides %{summary}.
%if %{with fop}
%package module-fo
Summary: FO module for %{name}
%description module-fo
This package provides %{summary}.
%endif
%if %{with itext}
%package module-itext
Summary: iText module for %{name}
%description module-itext
This package provides %{summary}.
%endif
%if %{with markdown}
%package module-markdown
Summary: Markdown module for %{name}
%description module-markdown
This package provides %{summary}.
%endif
%package module-latex
Summary: Latex module for %{name}
@ -109,18 +163,18 @@ Summary: XHTML module for %{name}
%description module-xhtml
This package provides %{summary}.
%package module-xhtml5
Summary: XHTML5 module for %{name}
%description module-xhtml5
This package provides %{summary}.
%package sink-api
Summary: Sink-api module for %{name}
%description sink-api
This package provides %{summary}.
%package tests
Summary: Tests for %{name}
%description tests
This package provides %{summary}.
%package test-docs
Summary: Test-docs module for %{name}
@ -133,13 +187,13 @@ Summary: Javadoc for %{name}
%description javadoc
API documentation for %{name}.
%prep
%setup -q -n doxia-%{version}
find -name '*.java' -exec sed -i 's/\r//' {} +
find -name '*.xml' -exec sed -i 's/\r//' {} +
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
# we don't have clirr-maven-plugin
%pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml
@ -155,11 +209,17 @@ find -name '*.xml' -exec sed -i 's/\r//' {} +
# requires network
rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
%mvn_package :::tests: __noinstall
%mvn_package :::tests: tests
%if %{without itext}
%pom_disable_module doxia-module-itext doxia-modules
%endif
%if %{without markdown}
%pom_disable_module doxia-module-markdown doxia-modules
%endif
%if %{without fop}
%pom_disable_module doxia-module-fo doxia-modules
%endif
%build
%mvn_build -s
@ -167,7 +227,9 @@ rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
%install
%mvn_install
%files -f .mfiles-doxia
%dir %{_javadir}/%{name}
%doc LICENSE NOTICE
%files core -f .mfiles-doxia-core
%files logging-api -f .mfiles-doxia-logging-api
@ -176,32 +238,30 @@ rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java
%files module-confluence -f .mfiles-doxia-module-confluence
%files module-docbook-simple -f .mfiles-doxia-module-docbook-simple
%files module-fml -f .mfiles-doxia-module-fml
%if %{with fop}
%files module-fo -f .mfiles-doxia-module-fo
%endif
%if %{with itext}
%files module-itext -f .mfiles-doxia-module-itext
%endif
%if %{with markdown}
%files module-markdown -f .mfiles-doxia-module-markdown
%endif
%files module-latex -f .mfiles-doxia-module-latex
%files module-rtf -f .mfiles-doxia-module-rtf
%files modules -f .mfiles-doxia-modules
%files module-twiki -f .mfiles-doxia-module-twiki
%files module-xdoc -f .mfiles-doxia-module-xdoc
%files module-xhtml -f .mfiles-doxia-module-xhtml
%files module-xhtml5 -f .mfiles-doxia-module-xhtml5
%files sink-api -f .mfiles-doxia-sink-api
%files test-docs -f .mfiles-doxia-test-docs
%files tests -f .mfiles-tests
%doc LICENSE NOTICE
%files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-2
- Mass rebuild for javapackages-tools 201902
* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 1.9-1
- Update to upstream version 1.9
* Wed May 29 2019 Marian Koncek <mkoncek@redhat.com> - 0:1.8-1
- Update to upstream version 1.8
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-9
- Mass rebuild for javapackages-tools 201901
* Tue Jul 17 2018 Michael Simacek <msimacek@redhat.com> - 0:1.7-8
- Regenerate BuildRequires