Author: vsiveton
Date: Fri Feb 15 15:23:08 2008
New Revision: 628202
URL: http://svn.apache.org/viewvc?rev=628202&view=rev
Log:
o fixed code due to r628201
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=628202&r1=628201&r2=628202&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Fri Feb 15 15:23:08 2008
@@ -20,14 +20,10 @@
*/
import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.StringTokenizer;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.site.decoration.DecorationModel;
@@ -39,7 +35,6 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.StringUtils;
/**
* Base class for site mojos.
@@ -50,17 +45,12 @@
extends AbstractMojo
{
/**
- * The locale by default for all default bundles
- */
- private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
-
- /**
* A comma separated list of locales supported by Maven. The first valid
token will be the default Locale
* for this instance of the Java Virtual Machine.
*
* @parameter expression="${locales}"
*/
- private String locales;
+ protected String locales;
/**
* SiteTool.
@@ -129,120 +119,6 @@
* @parameter expression="${outputEncoding}" default-value="ISO-8859-1"
*/
protected String outputEncoding;
-
- /**
- * Init the <code>localesList</code> variable.
- * <p>If <code>locales</code> variable is available, the first valid token
will be the <code>defaultLocale</code>
- * for this instance of the Java Virtual Machine.</p>
- *
- * @return a list of <code>Locale</code>
- */
- protected List getAvailableLocales()
- {
- List localesList = new ArrayList();
- if ( locales != null )
- {
- String[] localesArray = StringUtils.split( locales, "," );
-
- for ( int i = 0; i < localesArray.length; i++ )
- {
- Locale locale = codeToLocale( localesArray[i] );
-
- if ( locale != null )
- {
- if ( !Arrays.asList( Locale.getAvailableLocales()
).contains( locale ) )
- {
- getLog().warn( "The locale parsed defined by '" +
locale
- + "' is not available in this Java Virtual Machine
(" + System.getProperty( "java.version" )
- + " from " + System.getProperty( "java.vendor" ) +
") - IGNORING" );
- continue;
- }
-
- // Default bundles are in English
- if ( !locale.getLanguage().equals(
DEFAULT_LOCALE.getLanguage() ) )
- {
- if ( !i18n.getBundle( "site-plugin", locale
).getLocale().getLanguage().equals(
- locale.getLanguage() ) )
- {
- StringBuffer sb = new StringBuffer();
-
- sb.append( "The locale '" ).append( locale
).append( "' (" );
- sb.append( locale.getDisplayName( Locale.ENGLISH )
);
- sb.append( ") is not currently support by Maven -
IGNORING. " );
- sb.append( "\n" );
- sb.append( "Contribution are welcome and greatly
appreciated! " );
- sb.append( "\n" );
- sb.append( "If you want to contribute a new
translation, please visit " );
- sb.append(
"http://maven.apache.org/plugins/maven-site-plugin/i18n.html " );
- sb.append( "for detailed instructions." );
-
- getLog().warn( sb.toString() );
-
- continue;
- }
- }
-
- localesList.add( locale );
- }
- }
- }
-
- if ( localesList.isEmpty() )
- {
- localesList = Collections.singletonList( DEFAULT_LOCALE );
- }
-
- return localesList;
- }
-
- /**
- * Converts a locale code like "en", "en_US" or "en_US_win" to a
<code>java.util.Locale</code>
- * object.
- * <p>If localeCode = <code>default</code>, return the current value of
the default locale for this instance
- * of the Java Virtual Machine.</p>
- *
- * @param localeCode the locale code string.
- * @return a java.util.Locale object instancied or null if errors occurred
- * @see <a
href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Locale.html";>java.util.Locale#getDefault()</a>
- */
- private Locale codeToLocale( String localeCode )
- {
- if ( localeCode == null )
- {
- return null;
- }
-
- if ( "default".equalsIgnoreCase( localeCode ) )
- {
- return Locale.getDefault();
- }
-
- String language = "";
- String country = "";
- String variant = "";
-
- StringTokenizer tokenizer = new StringTokenizer( localeCode, "_" );
- if ( tokenizer.countTokens() > 3 )
- {
- getLog().warn( "Invalid java.util.Locale format for '" +
localeCode + "' entry - IGNORING" );
- return null;
- }
-
- if ( tokenizer.hasMoreTokens() )
- {
- language = tokenizer.nextToken();
- if ( tokenizer.hasMoreTokens() )
- {
- country = tokenizer.nextToken();
- if ( tokenizer.hasMoreTokens() )
- {
- variant = tokenizer.nextToken();
- }
- }
- }
-
- return new Locale( language, country, variant );
- }
protected void populateReportItems( DecorationModel decorationModel,
Locale locale, Map reportsByOutputName )
{
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java?rev=628202&r1=628201&r2=628202&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
Fri Feb 15 15:23:08 2008
@@ -65,7 +65,7 @@
public void execute()
throws MojoExecutionException
{
- List localesList = getAvailableLocales();
+ List localesList = siteTool.getAvailableLocales( locales );
for ( Iterator iterator = localesList.iterator(); iterator.hasNext(); )
{
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=628202&r1=628201&r2=628202&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Fri Feb 15 15:23:08 2008
@@ -83,7 +83,7 @@
try
{
- List localesList = getAvailableLocales();
+ List localesList = siteTool.getAvailableLocales( locales );
// Default is first in the list
Locale defaultLocale = (Locale) localesList.get( 0 );
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java?rev=628202&r1=628201&r2=628202&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
Fri Feb 15 15:23:08 2008
@@ -158,7 +158,7 @@
List filteredReports = filterReports( reports );
- List localesList = getAvailableLocales();
+ List localesList = siteTool.getAvailableLocales( locales );
webapp.setAttribute( DoxiaFilter.LOCALES_LIST_KEY, localesList );
// Default is first in the list
