Package Init

This commit is contained in:
qiegewala 2020-02-24 11:34:51 +08:00
parent 526d2402ed
commit 9cfe9e2d51
4 changed files with 191 additions and 0 deletions

View File

@ -0,0 +1,33 @@
From 2f2adbedfff4d846e039d06ef932c867a8616523 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 12 May 2016 08:28:17 +0200
Subject: [PATCH 1/2] Port to plexus-utils 3.0.24
---
.../apache/maven/doxia/siterenderer/DefaultSiteRenderer.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index 9bc3ef2..c31688d 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -559,7 +559,15 @@ public class DefaultSiteRenderer
// doxiaSiteRendererVersion
InputStream inputStream = this.getClass().getResourceAsStream( "/META-INF/"
+ "maven/org.apache.maven.doxia/doxia-site-renderer/pom.properties" );
- Properties properties = PropertyUtils.loadProperties( inputStream );
+ Properties properties;
+ try
+ {
+ properties = PropertyUtils.loadProperties( inputStream );
+ }
+ catch ( IOException exc )
+ {
+ properties = null;
+ }
if ( inputStream == null )
{
getLogger().debug( "pom.properties for doxia-site-renderer could not be found." );
--
2.9.3

View File

@ -0,0 +1,92 @@
From da397953bd73068c4ab8d219ec91e312fd3d5d55 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 6 Feb 2017 14:27:53 +0100
Subject: [PATCH 2/2] Remove dependency on velocity-tools
---
.../doxia/siterenderer/DefaultSiteRenderer.java | 58 +---------------------
1 file changed, 2 insertions(+), 56 deletions(-)
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index c31688d..58058b3 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -76,31 +76,11 @@ import org.apache.maven.doxia.parser.module.ParserModuleNotFoundException;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.doxia.util.XmlValidator;
import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.VelocityException;
-import org.apache.velocity.tools.Scope;
-import org.apache.velocity.tools.ToolManager;
-import org.apache.velocity.tools.config.ConfigurationUtils;
-import org.apache.velocity.tools.config.EasyFactoryConfiguration;
-import org.apache.velocity.tools.config.FactoryConfiguration;
-import org.apache.velocity.tools.generic.AlternatorTool;
-import org.apache.velocity.tools.generic.ClassTool;
-import org.apache.velocity.tools.generic.ComparisonDateTool;
-import org.apache.velocity.tools.generic.ContextTool;
-import org.apache.velocity.tools.generic.ConversionTool;
-import org.apache.velocity.tools.generic.DisplayTool;
-import org.apache.velocity.tools.generic.EscapeTool;
-import org.apache.velocity.tools.generic.FieldTool;
-import org.apache.velocity.tools.generic.LinkTool;
-import org.apache.velocity.tools.generic.LoopTool;
-import org.apache.velocity.tools.generic.MathTool;
-import org.apache.velocity.tools.generic.NumberTool;
-import org.apache.velocity.tools.generic.RenderTool;
-import org.apache.velocity.tools.generic.ResourceTool;
-import org.apache.velocity.tools.generic.SortTool;
-import org.apache.velocity.tools.generic.XmlTool;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -481,41 +461,7 @@ public class DefaultSiteRenderer
*/
protected Context createToolManagedVelocityContext( SiteRenderingContext siteRenderingContext )
{
- Locale locale = siteRenderingContext.getLocale();
- String dateFormat = siteRenderingContext.getDecoration().getPublishDate().getFormat();
-
- EasyFactoryConfiguration config = new EasyFactoryConfiguration( false );
- config.property( "safeMode", Boolean.FALSE );
- config.toolbox( Scope.REQUEST )
- .tool( ContextTool.class )
- .tool( LinkTool.class )
- .tool( LoopTool.class )
- .tool( RenderTool.class );
- config.toolbox( Scope.APPLICATION ).property( "locale", locale )
- .tool( AlternatorTool.class )
- .tool( ClassTool.class )
- .tool( ComparisonDateTool.class ).property( "format", dateFormat )
- .tool( ConversionTool.class ).property( "dateFormat", dateFormat )
- .tool( DisplayTool.class )
- .tool( EscapeTool.class )
- .tool( FieldTool.class )
- .tool( MathTool.class )
- .tool( NumberTool.class )
- .tool( ResourceTool.class ).property( "bundles", new String[] { "site-renderer" } )
- .tool( SortTool.class )
- .tool( XmlTool.class );
-
- FactoryConfiguration customConfig = ConfigurationUtils.findInClasspath( TOOLS_LOCATION );
-
- if ( customConfig != null )
- {
- config.addConfiguration( customConfig );
- }
-
- ToolManager manager = new ToolManager( false, false );
- manager.configure( config );
-
- return manager.createContext();
+ return new VelocityContext();
}
/**
--
2.9.3

Binary file not shown.

View File

@ -0,0 +1,66 @@
Name: maven-doxia-sitetools
Version: 1.7.5
Release: 5
Summary: Doxia content generation framework
License: ASL 2.0
URL: https://maven.apache.org/doxia/
Source0: http://archive.apache.org/dist/maven/doxia/doxia-sitetools-%{version}-source-release.zip
Patch0001: 0001-Port-to-plexus-utils-3.0.24.patch
Patch0002: 0002-Remove-dependency-on-velocity-tools.patch
BuildArch: noarch
BuildRequires: maven-local apache-commons-collections apache-commons-io apache-commons-lang
BuildRequires: maven-doxia-core maven-doxia-logging-api maven-doxia-module-apt plexus-i18n
BuildRequires: maven-doxia-module-fml maven-doxia-module-fo maven-doxia-module-markdown modello
BuildRequires: maven-doxia-module-xdoc maven-doxia-module-xhtml maven-doxia-sink-api velocity
BuildRequires: maven maven-artifact-manager maven-artifact maven-model maven-parent maven-project
BuildRequires: plexus-containers-component-annotations plexus-containers-component-metadata
BuildRequires: plexus-containers-container-default plexus-interpolation xml-commons-apis
BuildRequires: plexus-interpolation plexus-velocity xalan-j2 plexus-utils
Provides: maven-doxia-tools = %{version}-%{release}
Obsoletes: maven-doxia-tools < 1.7
Provides: %{name}-javadoc = %{version}-%{release}
Obsoletes: %{name}-javadoc < %{version}-%{release}
%description
Doxia is a content generation framework which aims to provide its users with powerful
techniques for generating static and dynamic content: Doxia can be used in web-based
publishing context to generate static sites, in addition to being incorporated into
dynamic content generation systems like blogs, wikis and content management systems.
%prep
%autosetup -n doxia-sitetools-%{version} -p1
%{_bindir}/python3 %{_datadir}/java-utils/pom_editor.py pom_remove_plugin :apache-rat-plugin
%{_bindir}/python3 %{_datadir}/java-utils/pom_editor.py pom_remove_plugin :maven-enforcer-plugin
%{_bindir}/python3 %{_datadir}/java-utils/pom_editor.py pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin
%{_bindir}/python3 %{_datadir}/java-utils/pom_editor.py pom_remove_dep net.sourceforge.htmlunit:htmlunit doxia-site-renderer/pom.xml
%{_bindir}/python3 %{_datadir}/java-utils/pom_editor.py pom_remove_dep -r :velocity-tools
%{_bindir}/python3 %{_datadir}/java-utils/pom_editor.py pom_xpath_inject 'pom:plugin[pom:artifactId[text()='\''modello-maven-plugin'\'']]/pom:configuration' \
"<useJava5>true</useJava5>" doxia-decoration-model
rm -rf $(find -type d -name itext)
%{_bindir}/python3 %{_datadir}/java-utils/pom_editor.py pom_remove_dep -r :doxia-module-itext
%{_bindir}/python3 %{_datadir}/java-utils/mvn_alias.py :doxia-integration-tools org.apache.maven.shared:maven-doxia-tools
%build
export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m"
%mvn_build -f
%install
%mvn_install
%files
%defattr(-,root,root)
%{_datadir}/java/*
%{_datadir}/javadoc/*
%{_datadir}/maven-poms/*
%{_datadir}/maven-metadata/*
%changelog
* Tue Feb 11 2020 lihao <lihao129@huawei.com> - 1.7.5-5
- Package init