You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/21 17:34:44 UTC
svn commit: r1604423 - in
/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools:
DefaultSiteTool.java SiteTool.java
Author: hboutemy
Date: Sat Jun 21 15:34:44 2014
New Revision: 1604423
URL: http://svn.apache.org/r1604423
Log:
[DOXIATOOLS-47] removed encoding parameters from site descriptor methods
Modified:
maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1604423&r1=1604422&r2=1604423&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Sat Jun 21 15:34:44 2014
@@ -383,15 +383,13 @@ public class DefaultSiteTool
public DecorationModel getDecorationModel( MavenProject project, List<MavenProject> reactorProjects,
ArtifactRepository localRepository,
List<ArtifactRepository> repositories, String siteDirectory,
- Locale locale, String inputEncoding, String outputEncoding )
+ Locale locale )
throws SiteToolException
{
checkNotNull( "project", project );
checkNotNull( "reactorProjects", reactorProjects );
checkNotNull( "localRepository", localRepository );
checkNotNull( "repositories", repositories );
- checkNotNull( "inputEncoding", inputEncoding );
- checkNotNull( "outputEncoding", outputEncoding );
final Locale llocale = ( locale == null ) ? Locale.getDefault() : locale;
@@ -405,7 +403,7 @@ public class DefaultSiteTool
DecorationModel decorationModel =
getDecorationModel( project, parentProject, reactorProjects, localRepository, repositories, siteDirectory,
- llocale, props, inputEncoding, outputEncoding );
+ llocale, props );
if ( decorationModel == null )
{
@@ -427,8 +425,7 @@ public class DefaultSiteTool
IOUtil.close( in );
}
- siteDescriptorContent = getInterpolatedSiteDescriptorContent( props, project, siteDescriptorContent,
- inputEncoding, outputEncoding );
+ siteDescriptorContent = getInterpolatedSiteDescriptorContent( props, project, siteDescriptorContent );
decorationModel = readDecorationModel( siteDescriptorContent );
}
@@ -503,15 +500,12 @@ public class DefaultSiteTool
/** {@inheritDoc} */
public String getInterpolatedSiteDescriptorContent( Map<String, String> props, MavenProject aProject,
- String siteDescriptorContent, String inputEncoding,
- String outputEncoding )
+ String siteDescriptorContent )
throws SiteToolException
{
checkNotNull( "props", props );
checkNotNull( "aProject", aProject );
checkNotNull( "siteDescriptorContent", siteDescriptorContent );
- checkNotNull( "inputEncoding", inputEncoding );
- checkNotNull( "outputEncoding", outputEncoding );
// MSITE-201: The ObjectBasedValueSource( aProject ) below will match
// ${modules} to aProject.getModules(), so we need to interpolate that
@@ -552,10 +546,6 @@ public class DefaultSiteTool
throw new SiteToolException( "Cannot interpolate site descriptor: " + e.getMessage(), e );
}
- props.put( "inputEncoding", inputEncoding );
-
- props.put( "outputEncoding", outputEncoding );
-
// Legacy for the old ${parentProject} syntax
props.put( "parentProject", "<menu ref=\"parent\"/>" );
@@ -1029,16 +1019,13 @@ public class DefaultSiteTool
* @param siteDirectory not null
* @param locale not null
* @param origProps not null
- * @param inputEncoding not null
- * @param outputEncoding not null
* @return the decoration model depending the locale
* @throws SiteToolException if any
*/
private DecorationModel getDecorationModel( MavenProject project, MavenProject parentProject,
List<MavenProject> reactorProjects, ArtifactRepository localRepository,
List<ArtifactRepository> repositories, String siteDirectory,
- Locale locale, Map<String, String> origProps, String inputEncoding,
- String outputEncoding )
+ Locale locale, Map<String, String> origProps )
throws SiteToolException
{
Map<String, String> props = new HashMap<String, String>( origProps );
@@ -1087,8 +1074,7 @@ public class DefaultSiteTool
DecorationModel decoration = null;
if ( siteDescriptorContent != null )
{
- siteDescriptorContent = getInterpolatedSiteDescriptorContent( props, project, siteDescriptorContent,
- inputEncoding, outputEncoding );
+ siteDescriptorContent = getInterpolatedSiteDescriptorContent( props, project, siteDescriptorContent );
decoration = readDecorationModel( siteDescriptorContent );
decoration.setLastModified( siteDescriptorLastModified );
@@ -1102,7 +1088,7 @@ public class DefaultSiteTool
DecorationModel parent =
getDecorationModel( parentProject, parentParentProject, reactorProjects, localRepository, repositories,
- siteDirectory, locale, props, inputEncoding, outputEncoding );
+ siteDirectory, locale, props );
// MSHARED-116 requires an empty decoration model (instead of a null one)
// MSHARED-145 requires us to do this only if there is a parent to merge it with
Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java?rev=1604423&r1=1604422&r2=1604423&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java Sat Jun 21 15:34:44 2014
@@ -137,16 +137,13 @@ public interface SiteTool
* @param siteDirectory The path to the directory containing the <code>site.xml</code> file, relative to the
* project base directory. If null, using by default "src/site".
* @param locale the locale used for the i18n in DecorationModel. If null, using the default locale in the jvm.
- * @param inputEncoding the input encoding of the site descriptor, not null.
- * @param outputEncoding the output encoding wanted, not null.
* @return the <code>DecorationModel</code> object corresponding to the <code>site.xml</code> file with some
* interpolations.
* @throws SiteToolException if any
*/
DecorationModel getDecorationModel( MavenProject project, List<MavenProject> reactorProjects,
ArtifactRepository localRepository, List<ArtifactRepository> repositories,
- String siteDirectory, Locale locale, String inputEncoding,
- String outputEncoding )
+ String siteDirectory, Locale locale )
throws SiteToolException;
/**
@@ -192,8 +189,7 @@ public interface SiteTool
* @throws SiteToolException if errors happened during the interpolation.
*/
String getInterpolatedSiteDescriptorContent( Map<String, String> props, MavenProject aProject,
- String siteDescriptorContent, String inputEncoding,
- String outputEncoding )
+ String siteDescriptorContent )
throws SiteToolException;
/**