svn commit: r1470835 - in /maven/plugins/trunk/maven-pdf-plugin: pom.xml src/main/resources/pdf-plugin_es_ES.properties src/main/resources/pdf-plugin_gl_ES.properties
Author: ltheussl Date: Tue Apr 23 07:21:53 2013 New Revision: 1470835 URL: http://svn.apache.org/r1470835 Log: [MPDF-60] Locale properties for Spanish and Galician Submitted by: Ramon Rial Quintela Added: maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_es_ES.properties (with props) maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_gl_ES.properties (with props) Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1470835r1=1470834r2=1470835view=diff == --- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Tue Apr 23 07:21:53 2013 @@ -43,6 +43,12 @@ under the License. roleTranslator: Portuguese (Brazil)/role /roles /contributor +contributor + nameRamon Rial Quintela/name + roles +roleTranslator: Spanish, Galician/role + /roles +/contributor /contributors prerequisites @@ -418,6 +424,8 @@ under the License. localeen/locale localefr/locale localept_BR/locale +localees_ES/locale +localegl_ES/locale /locales /configuration /plugin Added: maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_es_ES.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_es_ES.properties?rev=1470835view=auto == --- maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_es_ES.properties (added) +++ maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_es_ES.properties Tue Apr 23 07:21:53 2013 @@ -0,0 +1,27 @@ +# 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. + +toc.title = Tabla de contenido +toc.type = Documentaci\u00f3n del proyecto +toc.project-info.item = Informes del proyecto + +report.project-info.column.description = Descripci\u00f3n +report.project-info.column.document= Documento +report.project-info.sectionTitle = Visi\u00f3n general +report.project-info.description1 = Este documento proporciona una visi\u00f3n global de los distintos documentos y enlaces que forman parte de la informaci\u00f3n general del proyecto. Todo este contenido se genera autom\u00e1ticamente +report.project-info.description2 = a partir de la configuraci\u00f3n del proyecto. +report.project-info.title = Informes del proyecto Propchange: maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_es_ES.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_es_ES.properties -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_gl_ES.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_gl_ES.properties?rev=1470835view=auto == --- maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_gl_ES.properties (added) +++ maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_gl_ES.properties Tue Apr 23 07:21:53 2013 @@ -0,0 +1,27 @@ +# 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
svn commit: r1466841 - /maven/doxia/site/trunk/content/apt/issues/index.apt
Author: ltheussl
Date: Thu Apr 11 12:04:28 2013
New Revision: 1466841
URL: http://svn.apache.org/r1466841
Log:
fix link
Modified:
maven/doxia/site/trunk/content/apt/issues/index.apt
Modified: maven/doxia/site/trunk/content/apt/issues/index.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/site/trunk/content/apt/issues/index.apt?rev=1466841r1=1466840r2=1466841view=diff
==
--- maven/doxia/site/trunk/content/apt/issues/index.apt (original)
+++ maven/doxia/site/trunk/content/apt/issues/index.apt Thu Apr 11 12:04:28 2013
@@ -29,7 +29,7 @@
Doxia Issues Gotchas
This document collects some infos about specific issues and 'gotchas' when
working with Doxia.
- Please check also the {{{../faq.apt}Frequently Asked Questions}}.
+ Please check also the {{{../faq.html}Frequently Asked Questions}}.
%{toc|section=1|fromDepth=2|toDepth=2}
svn commit: r1436769 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Author: ltheussl
Date: Tue Jan 22 07:09:15 2013
New Revision: 1436769
URL: http://svn.apache.org/viewvc?rev=1436769view=rev
Log:
[DOXIASITETOOLS-79] better error message in case velocity parsing fails, avoid
NPE
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1436769r1=1436768r2=1436769view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Tue Jan 22 07:09:15 2013
@@ -398,6 +398,11 @@ public class DefaultSiteRenderer
}
}
sink.enableLogging( new PlexusLoggerWrapper( getLogger() ) );
+
+if ( reader == null ) // can happen if velocity throws above
+{
+throw new RendererException( Error getting a parser for ' +
doc );
+}
doxia.parse( reader, renderingContext.getParserId(), sink );
}
catch ( ParserNotFoundException e )
svn commit: r1436778 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: ltheussl Date: Tue Jan 22 07:29:28 2013 New Revision: 1436778 URL: http://svn.apache.org/viewvc?rev=1436778view=rev Log: test current doxia Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1436778r1=1436777r2=1436778view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue Jan 22 07:29:28 2013 @@ -184,8 +184,8 @@ under the License. /issueManagement properties -doxiaVersion1.3/doxiaVersion -doxiaSitetoolsVersion1.3/doxiaSitetoolsVersion +doxiaVersion1.4-SNAPSHOT/doxiaVersion +doxiaSitetoolsVersion1.4-SNAPSHOT/doxiaSitetoolsVersion mavenVersion3.0/mavenVersion prerequisiteMavenVersion2.2.1/prerequisiteMavenVersion wagonVersion1.0/wagonVersion
svn commit: r1429808 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt.vm
Author: ltheussl
Date: Mon Jan 7 14:29:59 2013
New Revision: 1429808
URL: http://svn.apache.org/viewvc?rev=1429808view=rev
Log:
[MSITE-678] fix link
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt.vm
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt.vm?rev=1429808r1=1429807r2=1429808view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt.vm
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt.vm
Mon Jan 7 14:29:59 2013
@@ -29,7 +29,7 @@
Configuring Site Run
- For the {{{./run-mojo.html}site:run}} goal, you can configure which
port to use to start up the site as well as the directory where
+ For the {{{../run-mojo.html}site:run}} goal, you can configure which
port to use to start up the site as well as the directory where
the pages for the site will be rendered.
For example, you can have the following configuration in your POM:
svn commit: r1423355 - in /maven/plugins/trunk/maven-changes-plugin: ./ src/main/java/org/apache/maven/plugin/changes/ src/main/java/org/apache/maven/plugin/issues/ src/main/resources/ src/test/java/o
Author: ltheussl
Date: Tue Dec 18 09:03:16 2012
New Revision: 1423355
URL: http://svn.apache.org/viewvc?rev=1423355view=rev
Log:
[MCHANGES-46] add rss feed generation using rome library
Added:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/FeedGenerator.java
(with props)
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/FeedGeneratorTest.java
(with props)
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_fr.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_pt_BR.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_sv.properties
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=1423355r1=1423354r2=1423355view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Dec 18 09:03:16 2012
@@ -356,6 +356,13 @@ under the License.
version4.1.2/version
/dependency
+!-- for rss feed generation --
+dependency
+ groupIdrome/groupId
+ artifactIdrome/artifactId
+ version1.0/version
+/dependency
+
!-- test dependencies --
dependency
groupIdjunit/groupId
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java?rev=1423355r1=1423354r2=1423355view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
Tue Dec 18 09:03:16 2012
@@ -20,9 +20,14 @@ package org.apache.maven.plugin.changes;
*/
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
+import java.io.Writer;
+
import java.net.URL;
+
import java.text.SimpleDateFormat;
+
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
@@ -42,9 +47,9 @@ import org.apache.maven.reporting.MavenR
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFileFilterRequest;
import org.apache.maven.shared.filtering.MavenFilteringException;
+
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
import org.apache.commons.io.input.XmlStreamReader;
@@ -203,6 +208,22 @@ public class ChangesMojo
private String url;
/**
+ * The type of the feed to generate.
+ *
+ * p
+ * Supported values are:
+ * coderss_0.9, rss_0.91N (RSS 0.91 Netscape), rss_0.91U (RSS 0.91
Userland),
+ * rss_0.92, rss_0.93, rss_0.94, rss_1.0, rss_2.0, atom_0.3,
atom_1.0/code.
+ * /p
+ *
+ * pIf not specified, no feed is generated./p
+ *
+ * @since 2.9
+ */
+@Parameter
+private String feedType;
+
+/**
* The path of the codechanges.xml/code file that will be converted
into an HTML report.
*/
@Parameter( property = changes.xmlPath, defaultValue =
src/changes/changes.xml )
@@ -314,6 +335,15 @@ public class ChangesMojo
getLog().warn( No issue management URL defined in POM. Links to
your issues will not work correctly. );
}
+boolean feedGenerated = false;
+
+if ( StringUtils.isNotEmpty( feedType ) )
+{
+feedGenerated = generateFeed( changesXml, locale );
+}
+
+report.setLinkToFeed( feedGenerated );
+
report.doGenerateReport( getBundle( locale ), getSink() );
// Copy the images
@@ -473,4 +503,48 @@ public class ChangesMojo
}
}
}
+
+private boolean generateFeed( final ChangesXML changesXml, final Locale
locale )
+{
+getLog().debug( Generating + feedType + feed. );
+
+boolean success = true;
+
+final
svn commit: r1422896 - in /maven/plugins/trunk/maven-site-plugin/src/site: apt/examples/multimodule.apt fml/faq.fml
Author: ltheussl
Date: Mon Dec 17 12:22:03 2012
New Revision: 1422896
URL: http://svn.apache.org/viewvc?rev=1422896view=rev
Log:
[MSITE-669] clarify usage of of distMngmnt url for staging and deploying
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt?rev=1422896r1=1422895r2=1422896view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/multimodule.apt
Mon Dec 17 12:22:03 2012
@@ -53,14 +53,30 @@ Building multi-module sites
site:deploy but uses the stagingDirectory parameter as
deployment location.
This can be used to deploy the site to a remote staging area
(site:stage is always local).
- Note: If subprojects inherit the site URL from a parent POM, they will
automatically
+ Notes:
+
+ * If subprojects inherit the (distribution) site URL from a parent POM, they
will automatically
append their artifactId to form their effective deployment location.
This goes for both the project url and the url defined in the
- \distributionManagement\ element of the pom. If your multi-module
tree does not
+ \distributionManagement\ element of the pom.
+
+ * If your multi-module tree does not
follow the maven conventions, or if module directories are named differently
than
module artifacts, you have to specify the url's for each child project.
See also {{{../faq.html#Use_of_url}How does the Site Plugin use the
\url\ element in the POM?}}.
+ * The pom.xml of the topmost project in a multi-module build must define the
distributionManagement URL
+ element (called rootURL hereafter). The rootURL must be the topmost
distributionManagement URL
+ in the multi-module project, implying that any distributionManagement URL
defined within another
+ project in a multimodule build must start with the rootURL and append unique
paths
+ (to be situated below the rootURL).
+
+ * All projects in multi-module builds must define unique
distributionManagement url elements,
+ below/under the root distributionManagement URL in terms of URL path.
+
+ * If the artifactId and module name (i.e. directory name) are not identical
for any project within a
+ multi-module build, the distributionManagement URL element must be defined
in the pom.xml file in the project.
+
* Inheritance
Site descriptors are inherited along the same lines as project descriptors
Modified: maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml?rev=1422896r1=1422895r2=1422896view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml Mon Dec 17
12:22:03 2012
@@ -116,13 +116,17 @@ under the License.
questionHow does the Site Plugin use the lt;urlgt; element in the
POM?/question
answer
p
- The Site Plugin uses the lt;urlgt; element in the POM to create
- relative links for the generated site. If your project has a URL
+ The Site Plugin does not use the lt;urlgt; element in the POM.
+ The project URL is just a piece of information to let your users know
+ where the project lives. Some other plugins (e.g. the
project-info-report-plugin)
+ may be used to present this information. If your project has a URL
where the generated site is deployed, then put that URL into the
lt;urlgt; element. If the project's site is not deployed anywhere,
then remove the lt;urlgt; element from the POM.
/p
p
+ On the other hand, the lt;distributionManagement.urlgt; is used in
a multi-module
+ build to construct relative links between the generated sub-module
sites.
In a multi module build it is important for the parent and child
modules to have strongdifferent/strong URLs. If they have the
same URL, then links within the combined site will not work.
svn commit: r1398031 - in /maven/plugins/trunk/maven-site-plugin/src: it/MSITE-658/ it/MSITE-658/src/ it/MSITE-658/src/site/ main/java/org/apache/maven/plugins/site/
Author: ltheussl Date: Sun Oct 14 08:03:21 2012 New Revision: 1398031 URL: http://svn.apache.org/viewvc?rev=1398031view=rev Log: [MSITE-658] 'relativizeDecorationLinks' not working using multiple 'locales'. Submitted by: Christian Schulte Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/invoker.properties maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site.xml maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site_de.xml maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/verify.bsh Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/invoker.properties?rev=1398031view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/invoker.properties Sun Oct 14 08:03:21 2012 @@ -0,0 +1 @@ +invoker.goals.1 = clean site:site Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml?rev=1398031view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/pom.xml Sun Oct 14 08:03:21 2012 @@ -0,0 +1,50 @@ +?xml version=1.0 encoding=UTF-8? +project xmlns=http://maven.apache.org/POM/4.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + groupIdMSITE-658/groupId + artifactIdMSITE-658/artifactId + version1.0-SNAPSHOT/version + + nameMSITE-658/name + urlhttp://maven.apache.org/sub-directory/url + + properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding +project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding + /properties + + build +pluginManagement + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-site-plugin/artifactId + version@project.version@/version + configuration +localesen,de/locales + /configuration +/plugin + /plugins +/pluginManagement + /build + + reporting +plugins + plugin +artifactIdmaven-project-info-reports-plugin/artifactId +version2.5.1/version +reportSets + reportSet +reports + reportindex/report + reportlicense/report +/reports + /reportSet +/reportSets + /plugin +/plugins + /reporting +/project Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site.xml?rev=1398031view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site.xml Sun Oct 14 08:03:21 2012 @@ -0,0 +1,10 @@ +?xml version=1.0 encoding=UTF-8? +project xmlns=http://maven.apache.org/DECORATION/1.3.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd; + body +menu name=Main inherit=top + item name=Home href=http://maven.apache.org/sub-directory/index.html/ +/menu + /body +/project Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site_de.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site_de.xml?rev=1398031view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site_de.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-658/src/site/site_de.xml Sun Oct 14 08:03:21 2012 @@ -0,0 +1,10 @@ +?xml version=1.0 encoding=UTF-8? +project xmlns=http://maven.apache.org/DECORATION/1.3.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration
svn commit: r1356582 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl
Date: Tue Jul 3 06:56:40 2012
New Revision: 1356582
URL: http://svn.apache.org/viewvc?rev=1356582view=rev
Log:
exclude reports from generated pdf: not necessary and doesn't work with maven 3
Modified:
maven/plugins/trunk/maven-pdf-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1356582r1=1356581r2=1356582view=diff
==
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Tue Jul 3 06:56:40 2012
@@ -322,6 +322,7 @@ under the License.
/goals
configuration
outputDirectory${project.reporting.outputDirectory}/outputDirectory
+ includeReportsfalse/includeReports
/configuration
/execution
/executions
@@ -511,7 +512,7 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
- version3.0-beta-3/version
+ version3.1/version
/plugin
/plugins
/pluginManagement
svn commit: r1351233 - in /maven: doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/ plugins/trunk/maven-site-plugin/ plugins/trunk/maven-site-plugin/src/it/MS
Author: ltheussl
Date: Mon Jun 18 08:30:38 2012
New Revision: 1351233
URL: http://svn.apache.org/viewvc?rev=1351233view=rev
Log:
[MSITE-644] NullPointerException when site URL is not defined in
distributionManagement
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/invoker.properties
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/pom.xml (with
props)
Modified:
maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/plugins/trunk/maven-site-plugin/pom.xml
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=1351233r1=1351232r2=1351233view=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
Mon Jun 18 08:30:38 2012
@@ -1464,6 +1464,11 @@ public class DefaultSiteTool
private static String urlEncode( final String url )
{
+if ( url == null )
+{
+return null;
+}
+
try
{
return new File( url ).toURI().toURL().toExternalForm();
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1351233r1=1351232r2=1351233view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Mon Jun 18 08:30:38 2012
@@ -312,9 +312,9 @@ under the License.
/dependency
dependency
- groupIdorg.apache.maven.shared/groupId
- artifactIdmaven-doxia-tools/artifactId
- version1.4/version
+ groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-integration-tools/artifactId
+ version1.5-SNAPSHOT/version
exclusions
exclusion
groupIdorg.apache.maven/groupId
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/invoker.properties?rev=1351233view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/invoker.properties
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/invoker.properties
Mon Jun 18 08:30:38 2012
@@ -0,0 +1 @@
+invoker.nonRecursive = true
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/invoker.properties
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/pom.xml?rev=1351233view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-644/pom.xml Mon Jun 18
08:30:38 2012
@@ -0,0 +1,57 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+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.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdtest-site/groupId
+ artifactIdno-url/artifactId
+ version1.0-SNAPSHOT/version
+ packagingpom/packaging
+ nameMSITE-644/name
svn commit: r1344160 - in /maven/plugins/trunk/maven-pdf-plugin/src: it/no-site/ it/no-site/pom.xml it/no-site/verify.bsh main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Author: ltheussl
Date: Wed May 30 09:07:35 2012
New Revision: 1344160
URL: http://svn.apache.org/viewvc?rev=1344160view=rev
Log:
[MPDF-56] Pdf generation fails when there is no site
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/
maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/pom.xml (with props)
maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/verify.bsh (with
props)
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Added: maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/pom.xml?rev=1344160view=auto
==
--- maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/pom.xml (added)
+++ maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/pom.xml Wed May 30
09:07:35 2012
@@ -0,0 +1,60 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+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.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.its.pdf/groupId
+ artifactIdtest/artifactId
+ version1.0-SNAPSHOT/version
+ packagingjar/packaging
+
+ namePDF Test :: No Site/name
+ description
+Tests PDF generation without site sources.
+ /description
+
+ organization
+nameThe Apache Software Foundation/name
+urlhttp://www.apache.org//url
+ /organization
+
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-clean-plugin/artifactId
+version2.4.1/version
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-pdf-plugin/artifactId
+version@project.version@/version
+configuration
+ validatetrue/validate
+/configuration
+ /plugin
+/plugins
+ /build
+
+
+
+/project
Propchange: maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/pom.xml
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/pom.xml
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/verify.bsh?rev=1344160view=auto
==
--- maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/verify.bsh (added)
+++ maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/verify.bsh Wed May 30
09:07:35 2012
@@ -0,0 +1,10 @@
+import java.io.*;
+
+File pdfFile = new File( basedir, target/pdf/test.pdf );
+System.out.println( Checking for existence of + pdfFile );
+if ( !pdfFile.isFile() )
+{
+throw new FileNotFoundException( pdfFile + missing );
+}
+
+return true;
Propchange: maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/verify.bsh
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-pdf-plugin/src/it/no-site/verify.bsh
--
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1344160r1=1344159r2=1344160view=diff
==
---
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
(original)
+++
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
Wed May 30 09:07:35 2012
@@ -592,7 +592,11 @@ public class PdfMojo
tmpSiteDir.mkdirs();
// copy site
svn commit: r1338590 - /maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
Author: ltheussl
Date: Tue May 15 08:17:11 2012
New Revision: 1338590
URL: http://svn.apache.org/viewvc?rev=1338590view=rev
Log:
[SUREFIRE-659] Maven PDF plugin: showSuccess=false creates empty table causing
error. Avoid writing tables without rows.
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java?rev=1338590r1=1338589r2=1338590view=diff
==
---
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
(original)
+++
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
Tue May 15 08:17:11 2012
@@ -47,6 +47,8 @@ public class SurefireReportGenerator
private final String xrefLocation;
+private static final int LEFT = Sink.JUSTIFY_LEFT;
+
public SurefireReportGenerator( ListFile reportsDirectories, Locale
locale, boolean showSuccess,
String xrefLocation )
{
@@ -127,6 +129,8 @@ public class SurefireReportGenerator
sink.table();
+sink.tableRows( new int[]{LEFT, LEFT, LEFT, LEFT, LEFT, LEFT}, true );
+
sink.tableRow();
sinkHeader( sink, bundle.getString( report.surefire.label.tests ) );
@@ -159,6 +163,8 @@ public class SurefireReportGenerator
sink.tableRow_();
+sink.tableRows_();
+
sink.table_();
sink.lineBreak();
@@ -189,6 +195,8 @@ public class SurefireReportGenerator
sink.table();
+sink.tableRows( new int[]{LEFT, LEFT, LEFT, LEFT, LEFT, LEFT, LEFT},
true );
+
sink.tableRow();
sinkHeader( sink, bundle.getString( report.surefire.label.package )
);
@@ -236,6 +244,8 @@ public class SurefireReportGenerator
sink.tableRow_();
}
+sink.tableRows_();
+
sink.table_();
sink.lineBreak();
@@ -261,8 +271,28 @@ public class SurefireReportGenerator
sinkAnchor( sink, packageName );
+boolean showTable = false;
+
+while ( suiteIterator.hasNext() )
+{
+ReportTestSuite suite = (ReportTestSuite) suiteIterator.next();
+
+if ( showSuccess || suite.getNumberOfErrors() != 0 ||
suite.getNumberOfFailures() != 0 )
+{
+showTable = true;
+
+break;
+}
+}
+
+suiteIterator = testSuiteList.iterator();
+
+if ( showTable )
+{
sink.table();
+sink.tableRows( new int[]{LEFT, LEFT, LEFT, LEFT, LEFT, LEFT,
LEFT, LEFT}, true );
+
sink.tableRow();
sinkHeader( sink, );
@@ -338,7 +368,10 @@ public class SurefireReportGenerator
}
}
+sink.tableRows_();
+
sink.table_();
+}
sink.section2_();
}
@@ -376,8 +409,28 @@ public class SurefireReportGenerator
sinkAnchor( sink, suite.getPackageName() + suite.getName() );
+boolean showTable = false;
+
+while ( caseIterator.hasNext() )
+{
+ReportTestCase testCase = (ReportTestCase)
caseIterator.next();
+
+if ( testCase.getFailure() != null || showSuccess )
+{
+showTable = true;
+
+break;
+}
+}
+
+caseIterator = testCases.listIterator();
+
+if ( showTable )
+{
sink.table();
+sink.tableRows( new int[]{LEFT, LEFT, LEFT}, true );
+
while ( caseIterator.hasNext() )
{
ReportTestCase testCase = (ReportTestCase)
caseIterator.next();
@@ -492,7 +545,10 @@ public class SurefireReportGenerator
}
}
+sink.tableRows_();
+
sink.table_();
+}
sink.section2_();
}
@@ -528,6 +584,8 @@ public class SurefireReportGenerator
sink.table();
+sink.tableRows( new int[]{LEFT, LEFT}, true );
+
while ( failIter.hasNext() )
{
ReportTestCase tCase = (ReportTestCase) failIter.next();
@@ -618,6 +676,8 @@ public class SurefireReportGenerator
svn commit: r1329564 - in /maven/plugins/trunk/maven-invoker-plugin/src/site/apt: ./ examples/
Author: ltheussl Date: Tue Apr 24 06:15:26 2012 New Revision: 1329564 URL: http://svn.apache.org/viewvc?rev=1329564view=rev Log: box verbatim blocks Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/filtering.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/install-artifacts.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/invoker-properties.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/post-build-script.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-conditions.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/selector-scripts.apt.vm maven/plugins/trunk/maven-invoker-plugin/src/site/apt/usage.apt.vm Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm?rev=1329564r1=1329563r2=1329564view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/clone-projects.apt.vm Tue Apr 24 06:15:26 2012 @@ -34,7 +34,7 @@ Cloning Projects target/it. This will allow mvn clean to remove the output generated by all of the test projects. ++-- project ... build @@ -59,7 +59,7 @@ Cloning Projects /build ... /project ++-- There is another benefit of cloning the projects to a temporary location besides keeping the source tree free of build output. When the projects are not cloned, the plugin must use temporary POMs to perform their filtering. In contrast, Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm?rev=1329564r1=1329563r2=1329564view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/fast-use.apt.vm Tue Apr 24 06:15:26 2012 @@ -40,7 +40,7 @@ Fast Build Configuration To enable this feature, you have to add a settings.xml file in your project (for example in src/it/settings.xml) and modify the plugin configuration as this: ++-- project ... build @@ -59,12 +59,12 @@ Fast Build Configuration /build ... /project ++-- The settings must contain the following content which effectively tells Maven to use the local repository as a remote repository: ++-- ?xml version=1.0? settings profiles @@ -100,7 +100,7 @@ Fast Build Configuration /profile /profiles /settings ++-- The token @localRepositoryUrl@ will be automatically replaced by the Invoker Plugin with the URL to the local repository used for the Maven invocation. Modified: maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/filtering.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/filtering.apt.vm?rev=1329564r1=1329563r2=1329564view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/filtering.apt.vm (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/site/apt/examples/filtering.apt.vm Tue Apr 24 06:15:26 2012 @@ -45,7 +45,7 @@ Filtering Files The following example directory structure highlights the files which are filtered by the Invoker Plugin: ++-- ./ +- pom.xml +- src/ @@ -60,11 +60,11 @@ Filtering Files +- invoker.properties - Filtered +- goals.txt - Filtered +- profiles.txt - Filtered ++-- Below is the corresponding POM snippet for the plugin configuration: ++-- project properties projectPropertyUsedForFilteringanother-value/projectPropertyUsedForFiltering @@ -98,7 +98,7 @@ Filtering Files /plugins /build /project ++-- When filtering the files, the plugin searches various data sources for a token's replacement value in the order indicated below. The search terminates as soon
svn commit: r1329606 - in /maven/plugins/trunk/maven-site-plugin/src/it: MSITE-604/ MSITE-604/goals.txt MSITE-604/invoker.properties MSITE-604/pom.xml MSITE-604/verify.bsh settings.xml
Author: ltheussl
Date: Tue Apr 24 09:33:12 2012
New Revision: 1329606
URL: http://svn.apache.org/viewvc?rev=1329606view=rev
Log:
[MSITE-604] add IT
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/goals.txt (with
props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/invoker.properties
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/pom.xml (with
props)
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/verify.bsh (with
props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/settings.xml
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/goals.txt?rev=1329606view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/goals.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/goals.txt Tue Apr 24
09:33:12 2012
@@ -0,0 +1 @@
+clean site:site site:deploy
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/goals.txt
--
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/goals.txt
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/invoker.properties?rev=1329606view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/invoker.properties
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/invoker.properties
Tue Apr 24 09:33:12 2012
@@ -0,0 +1 @@
+invoker.profiles = msite604
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/invoker.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/invoker.properties
--
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/pom.xml?rev=1329606view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-604/pom.xml Tue Apr 24
09:33:12 2012
@@ -0,0 +1,72 @@
+?xml version=1.0 encoding=UTF-8?
+
+!--
+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.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.site.its/groupId
+ artifactIdMSITE-604/artifactId
+ version1.0-SNAPSHOT/version
+ packagingpom/packaging
+
+ nameoverride settings IT/name
+
+ properties
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+msite604.siteRepositoryIddefaultId/msite604.siteRepositoryId
+
msite604.siteRepositoryUrldefaultRepositoryUrl/msite604.siteRepositoryUrl
+ /properties
+
+ distributionManagement
+site
+ id${msite604.siteRepositoryId}/id
+
urlfile://@project.build.directory@/it/MSITE-604/target/${msite604.siteRepositoryUrl}/url
+/site
+ /distributionManagement
+
+ build
+plugins
+ plugin
+artifactIdmaven-site-plugin/artifactId
+version@project.version@/version
+ /plugin
+/plugins
+ /build
+
+ reporting
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-project-info-reports-plugin/artifactId
+version2.1.2/version
+reportSets
svn commit: r1329143 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl
Date: Mon Apr 23 09:25:58 2012
New Revision: 1329143
URL: http://svn.apache.org/viewvc?rev=1329143view=rev
Log:
remove execution section
Modified:
maven/plugins/trunk/maven-pdf-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1329143r1=1329142r2=1329143view=diff
==
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Mon Apr 23 09:25:58 2012
@@ -445,15 +445,6 @@ under the License.
goal${project.groupId}:${project.artifactId}:${project.version}:pdf/goal
/goals
/configuration
-executions
- execution
-idintegration-test/id
-goals
- goalinstall/goal
- goalrun/goal
-/goals
- /execution
-/executions
/plugin
/plugins
/build
svn commit: r1329203 - /maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml
Author: ltheussl Date: Mon Apr 23 12:20:37 2012 New Revision: 1329203 URL: http://svn.apache.org/viewvc?rev=1329203view=rev Log: filter current version of plugin Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml?rev=1329203r1=1329202r2=1329203view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-325/pom.xml Mon Apr 23 12:20:37 2012 @@ -41,7 +41,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-javadoc-plugin/artifactId - version2.8.1-SNAPSHOT/version + version@pom.version@/version configuration debugtrue/debug links
svn commit: r1328301 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl Date: Fri Apr 20 10:23:39 2012 New Revision: 1328301 URL: http://svn.apache.org/viewvc?rev=1328301view=rev Log: use released Doxia Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1328301r1=1328300r2=1328301view=diff == --- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Fri Apr 20 10:23:39 2012 @@ -83,7 +83,7 @@ under the License. /issueManagement properties -doxiaVersion1.3-SNAPSHOT/doxiaVersion +doxiaVersion1.3/doxiaVersion mavenVersion2.0.9/mavenVersion /properties
svn commit: r1304214 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt
Author: ltheussl Date: Fri Mar 23 07:23:56 2012 New Revision: 1304214 URL: http://svn.apache.org/viewvc?rev=1304214view=rev Log: [MPDF-29] Improve figure scaling Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt?rev=1304214r1=1304213r2=1304214view=diff == --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt Fri Mar 23 07:23:56 2012 @@ -327,10 +327,10 @@ xsl:attribute name=text-aligncenter/xsl:attribute /xsl:attribute-set xsl:attribute-set name=figure.graphics -xsl:attribute name=heightauto/xsl:attribute -xsl:attribute name=widthauto/xsl:attribute -xsl:attribute name=content-heightauto/xsl:attribute -xsl:attribute name=content-widthauto/xsl:attribute +xsl:attribute name=height100%/xsl:attribute +xsl:attribute name=width100%/xsl:attribute +xsl:attribute name=content-heightscale-down-to-fit/xsl:attribute +xsl:attribute name=content-widthscale-down-to-fit/xsl:attribute /xsl:attribute-set xsl:attribute-set name=figure.caption use-attribute-sets=base.body.style xsl:attribute name=keep-with-previousalways/xsl:attribute
svn commit: r1296948 - in /maven/jxr/trunk/maven-jxr/src: main/java/org/apache/maven/jxr/JavaCodeTransform.java test/java/org/apache/maven/jxr/JavaCodeTransformTest.java
Author: ltheussl
Date: Mon Mar 5 07:37:10 2012
New Revision: 1296948
URL: http://svn.apache.org/viewvc?rev=1296948view=rev
Log:
[JXR-96] JXR Comment handling has several shortcomings
Submitted by: Matt Benson
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
maven/jxr/trunk/maven-jxr/src/test/java/org/apache/maven/jxr/JavaCodeTransformTest.java
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java?rev=1296948r1=1296947r2=1296948view=diff
==
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
Mon Mar 5 07:37:10 2012
@@ -69,20 +69,22 @@ import java.util.Vector;
* of filters that deal with specific portions of the java code. The filters
are
* as follows: pre
* htmlFilter
- * |__
- *multiLineCommentFilter - uriFilter
- * |___
- * inlineCommentFilter
- * |___
- *stringFilter
- * |___
- * keywordFilter
- * |___
- *uriFilter
- * |___
- * jxrFilter
- * |___
- *importFilter
+ *|__
+ * ongoingMultiLineCommentFilter - uriFilter
+ *|__
+ * inlineCommentFilter
+ *|__
+ * beginMultiLineCommentFilter - ongoingMultiLineCommentFilter
+ *|__
+ * stringFilter
+ *|__
+ * keywordFilter
+ *|__
+ * uriFilter
+ *|__
+ * jxrFilter
+ *|__
+ * importFilter
* /pre
*/
public class JavaCodeTransform
@@ -708,110 +710,59 @@ public class JavaCodeTransform
line = replace( line, , #92;#92; );
line = replace( line, \\\, \\quot; );
line = replace( line, '\', 'quot;' );
-return multiLineCommentFilter( line );
+return ongoingMultiLineCommentFilter( line );
}
/**
- * Filter out multiLine comments. State is kept with a private boolean
variable.
+ * Handle ongoing multi-line comments, detecting ends if present.
+ * State is maintained in private boolean members,
+ * one each for javadoc and (normal) multiline comments.
*
* @param line String
* @return String
*/
-private final String multiLineCommentFilter( String line )
+private final String ongoingMultiLineCommentFilter( String line )
{
if ( line == null || line.equals( ) )
{
return ;
}
-StringBuffer buf = new StringBuffer();
-int index;
+final String[] tags =
+inJavadocComment
+? new String[] { JAVADOC_COMMENT_START, JAVADOC_COMMENT_END } :
+inMultiLineComment
+? new String[] { COMMENT_START, COMMENT_END } :
+null;
-//First, check for the end of a java comment.
-if ( inJavadocComment ( index = line.indexOf( */ ) ) -1
!isInsideString( line, index ) )
+if ( tags == null )
{
-inJavadocComment = false;
-buf.append( JAVADOC_COMMENT_START );
-buf.append( line.substring( 0, index ) );
-buf.append( */ ).append( JAVADOC_COMMENT_END );
-if ( line.length() index + 2 )
-{
-buf.append( inlineCommentFilter( line.substring( index + 2 ) )
);
-}
-
-return uriFilter( buf.toString() );
+//pass the line down to the next filter for processing.
+return inlineCommentFilter( line );
}
-//Second, check for the end of a multi-line comment.
-if ( inMultiLineComment ( index = line.indexOf( */ ) ) -1
!isInsideString( line, index ) )
+int index = line.indexOf( */ );
+// only filter the portion without the end-of-comment,
+// since * and / seem to be valid URI characters
+String comment = uriFilter( index 0 ? line : line.substring( 0,
index ) );
+if ( index = 0 )
{
+inJavadocComment = false;
inMultiLineComment = false;
-buf.append( COMMENT_START );
-buf.append( line.substring( 0, index ) );
-buf.append( */ ).append( COMMENT_END );
-if ( line.length() index + 2
svn commit: r1294059 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl Date: Mon Feb 27 08:27:51 2012 New Revision: 1294059 URL: http://svn.apache.org/viewvc?rev=1294059view=rev Log: upgrade parent and use current doxia Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1294059r1=1294058r2=1294059view=diff == --- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Mon Feb 27 08:27:51 2012 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version21/version +version22/version relativePath../maven-plugins/pom.xml/relativePath /parent @@ -83,7 +83,7 @@ under the License. /issueManagement properties -doxiaVersion1.2/doxiaVersion +doxiaVersion1.3-SNAPSHOT/doxiaVersion mavenVersion2.0.9/mavenVersion /properties @@ -525,6 +525,6 @@ under the License. /plugins /pluginManagement /build -/profile +/profile /profiles /project
svn commit: r1222187 - in /maven: doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm skins/trunk/maven-stylus-skin/src/mai
Author: ltheussl Date: Thu Dec 22 11:35:15 2011 New Revision: 1222187 URL: http://svn.apache.org/viewvc?rev=1222187view=rev Log: mailto: URI has no slash, see http://maven.apache.org/doxia/doxia/doxia-core/apidocs/org/apache/maven/doxia/util/DoxiaUtils.html#isExternalLink(java.lang.String) Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm?rev=1222187r1=1222186r2=1222187view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm Thu Dec 22 11:35:15 2011 @@ -8,7 +8,7 @@ #set ( $linkTarget = ) #end #if ( $href.toLowerCase().startsWith(http:/) || $href.toLowerCase().startsWith(https:/) || -$href.toLowerCase().startsWith(ftp:/) || $href.toLowerCase().startsWith(mailto:/;) || +$href.toLowerCase().startsWith(ftp:/) || $href.toLowerCase().startsWith(mailto:;) || $href.toLowerCase().startsWith(file:/) || ($href.toLowerCase().indexOf(://) != -1) ) #set ( $linkClass = ' class=externalLink' ) #else @@ -28,7 +28,7 @@ #macro ( image $img $alt $border $width $height ) #if( $img ) #if ( ! ( $img.toLowerCase().startsWith(http:/) || $img.toLowerCase().startsWith(https:/) || -$img.toLowerCase().startsWith(ftp:/) || $img.toLowerCase().startsWith(mailto:/;) || +$img.toLowerCase().startsWith(ftp:/) || $img.toLowerCase().startsWith(mailto:;) || $img.toLowerCase().startsWith(file:/) || ($img.toLowerCase().indexOf(://) != -1) ) ) #set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) ) #set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) ) @@ -64,7 +64,7 @@ #if( $banner.href ) #set ( $hrf = $banner.href ) #if ( ! ( $hrf.toLowerCase().startsWith(http:/) || $hrf.toLowerCase().startsWith(https:/) || -$hrf.toLowerCase().startsWith(ftp:/) || $hrf.toLowerCase().startsWith(mailto:/;) || +$hrf.toLowerCase().startsWith(ftp:/) || $hrf.toLowerCase().startsWith(mailto:;) || $hrf.toLowerCase().startsWith(file:/) || ($hrf.toLowerCase().indexOf(://) != -1) ) ) #set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) ) #set ( $hrf = $hrf.replaceAll( '\\', '/' ) ) @@ -80,7 +80,7 @@ #if( $banner.src ) #set ( $src = $banner.src ) #if ( ! ( $src.toLowerCase().startsWith(http:/) || $src.toLowerCase().startsWith(https:/) || -$src.toLowerCase().startsWith(ftp:/) || $src.toLowerCase().startsWith(mailto:/;) || +$src.toLowerCase().startsWith(ftp:/) || $src.toLowerCase().startsWith(mailto:;) || $src.toLowerCase().startsWith(file:/) || ($src.toLowerCase().indexOf(://) != -1) ) ) #set ( $src = $PathTool.calculateLink( $src, $relativePath ) ) #set ( $src = $src.replaceAll( '\\', '/' ) ) @@ -210,7 +210,7 @@ #end ## #if ( ! ( $menu.img.toLowerCase().startsWith(http:/) || $menu.img.toLowerCase().startsWith(https:/) || -$menu.img.toLowerCase().startsWith(ftp:/) || $menu.img.toLowerCase().startsWith(mailto:/;) || +$menu.img.toLowerCase().startsWith(ftp:/) || $menu.img.toLowerCase().startsWith(mailto:;) || $menu.img.toLowerCase().startsWith(file:/) || ($menu.img.toLowerCase().indexOf(://) != -1) ) ) #set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) ) #set ( $src = $src.replaceAll( '\\', '/' ) ) @@ -398,7 +398,7 @@ #end ## #if ( ! ( $img.toLowerCase().startsWith(http:/) || $img.toLowerCase().startsWith(https:/) || -$img.toLowerCase().startsWith(ftp:/) || $img.toLowerCase().startsWith(mailto:/;) || +$img.toLowerCase().startsWith(ftp:/) || $img.toLowerCase().startsWith(mailto:;) || $img.toLowerCase().startsWith(file:/) || ($img.toLowerCase().indexOf(://) != -1) ) ) #set ( $img = $PathTool.calculateLink( $img, $relativePath ) ) #set ( $img = $img.replaceAll( '\\', '/' ) ) Modified: maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm?rev=1222187r1=1222186r2=1222187view
svn commit: r1222599 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt
Author: ltheussl
Date: Fri Dec 23 07:52:47 2011
New Revision: 1222599
URL: http://svn.apache.org/viewvc?rev=1222599view=rev
Log:
[MSITE-624] Usage page has incorrect information on the id used by
site:stage-deploy
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt?rev=1222599r1=1222598r2=1222599view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt Fri Dec 23
07:52:47 2011
@@ -137,11 +137,15 @@ mvn site:stage -DstagingDirectory=C:\ful
Note: stagingDirectory cannot be dynamic, i.e.
stagingDirectory=$\{basedir\}\fullsite
- To stage a site and to deploy it, just execute the
{{{./stage-deploy-mojo.html}site:stage-deploy}} goal from your project
- with the required parameters. The site:stage-deploy goal will use the
- id stagingSite for deployment. So if you need to add your username or
- password in settings.xml, you should use \id\stagingSite\/id\
- for that \server\ section. See the
+ To stage a site and to deploy it, just execute the
+ {{{./stage-deploy-mojo.html}site:stage-deploy}} goal from your project
+ with the required parameters.
+ The site:stage-deploy goal will use the value of
distributionManagement.site.id as default id
+ to lookup the server section in your settings.xml;
+ unless this is not defined, then the String stagingSite will be used
as id.
+ So if you need to add your username or password separately for stage-deploy
in settings.xml,
+ you should use \id\stagingSite\/id\ for that \server\
section.
+ See the
{{{http://maven.apache.org/guides/mini/guide-deployment-security-settings.html}Guide
to Deployment and Security Settings}}
for more information on this.
svn commit: r1185508 - in /maven/doxia/doxia-sitetools/trunk: doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/ doxia-decoration-model/src/test/java/org/apache/m
Author: ltheussl
Date: Tue Oct 18 06:58:50 2011
New Revision: 1185508
URL: http://svn.apache.org/viewvc?rev=1185508view=rev
Log:
some jdk5 updates
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/AbstractDocumentRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/DocumentRendererContext.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/itext/AbstractITextRender.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo/FoPdfRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/itext/ITextPdfRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/src/test/java/org/apache/maven/doxia/docrenderer/DocumentRendererTest.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java?rev=1185508r1=1185507r2=1185508view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
Tue Oct 18 06:58:50 2011
@@ -233,6 +233,7 @@ public class URIPathDescriptor
*
* @return this URIPathDescriptor as a String.
*/
+@Override
public String toString()
{
return resolveLink().toString();
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java?rev=1185508r1=1185507r2=1185508view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
Tue Oct 18 06:58:50 2011
@@ -50,6 +50,11 @@ public class DecorationModelInheritenceA
private static final String NAME = Name;
+/**
+ *
+ * @throws IOException
+ * @throws XmlPullParserException
+ */
public void testInheritence()
throws IOException, XmlPullParserException
{
@@ -71,6 +76,11 @@ public class DecorationModelInheritenceA
assertEquals( Modified parent!, readModel( parent.xml ),
parentModel );
}
+/**
+ *
+ * @throws IOException
+ * @throws XmlPullParserException
+ */
public void testPathsResolvedWhenEmpty()
throws IOException, XmlPullParserException
{
@@ -93,6 +103,11 @@ public class DecorationModelInheritenceA
assertEquals( Modified parent!, readModel( empty.xml ),
parentModel );
}
+/**
+ *
+ * @throws IOException
+ * @throws XmlPullParserException
+ */
public void testPathsNotResolvedForExternalUrls()
throws IOException, XmlPullParserException
{
@@ -123,21 +138,26 @@ public class DecorationModelInheritenceA
assertEquals( check right banner image,
http://jakarta.apache.org/commons/images/logo.png;,
childModel.getBannerRight().getSrc() );
-Logo poweredBy = (Logo) childModel.getPoweredBy().get( 0 );
+Logo poweredBy = childModel.getPoweredBy().get( 0 );
assertEquals( check powered by logo href,
http://tomcat.apache.org/;, poweredBy.getHref() );
assertEquals( check powered by logo image,
http
svn commit: r1185529 - in /maven/doxia: doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/ doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/ap
Author: ltheussl
Date: Tue Oct 18 08:27:44 2011
New Revision: 1185529
URL: http://svn.apache.org/viewvc?rev=1185529view=rev
Log:
[DOXIA-448] Div class attribute replicated to nested h2 element
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java?rev=1185529r1=1185528r2=1185529view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
Tue Oct 18 08:27:44 2011
@@ -58,7 +58,7 @@ public class SiteRendererSink
private boolean sectionHasID;
-private boolean sectionTitle;
+private boolean isSectionTitle;
private SetString anchorsInSectionTitle;
@@ -92,6 +92,7 @@ public class SiteRendererSink
}
/** {@inheritDoc} */
+@Override
public void title_()
{
if ( getTextBuffer().length() 0 )
@@ -108,6 +109,7 @@ public class SiteRendererSink
* Do nothing.
* @see org.apache.maven.doxia.module.xhtml.XhtmlSink#title()
*/
+@Override
public void title()
{
// nop
@@ -124,6 +126,7 @@ public class SiteRendererSink
}
/** {@inheritDoc} */
+@Override
public void author_()
{
if ( getTextBuffer().length() 0 )
@@ -147,6 +150,7 @@ public class SiteRendererSink
}
/** {@inheritDoc} */
+@Override
public void date_()
{
if ( getTextBuffer().length() 0 )
@@ -173,6 +177,7 @@ public class SiteRendererSink
* Do nothing.
* @see org.apache.maven.doxia.module.xhtml.XhtmlSink#body_()
*/
+@Override
public void body_()
{
// nop
@@ -184,6 +189,7 @@ public class SiteRendererSink
* Do nothing.
* @see org.apache.maven.doxia.module.xhtml.XhtmlSink#body()
*/
+@Override
public void body()
{
// nop
@@ -212,22 +218,25 @@ public class SiteRendererSink
}
/** {@inheritDoc} */
+@Override
public void head_()
{
setHeadFlag( false );
}
/** {@inheritDoc} */
+@Override
public void head()
{
setHeadFlag( true );
}
/** {@inheritDoc} */
+@Override
public void anchor( String name, SinkEventAttributes attributes )
{
super.anchor( name, attributes );
-if ( sectionTitle )
+if ( isSectionTitle )
{
if ( anchorsInSectionTitle == null )
{
@@ -236,18 +245,20 @@ public class SiteRendererSink
anchorsInSectionTitle.add( name );
}
}
-
+
/** {@inheritDoc} */
+@Override
protected void onSectionTitle( int depth, SinkEventAttributes attributes )
{
this.sectionTitleBuffer = new StringBuffer();
sectionHasID = ( attributes != null attributes.isDefined (
Attribute.ID.toString() ) );
-sectionTitle = true;
+isSectionTitle = true;
super.onSectionTitle( depth, attributes );
}
/** {@inheritDoc} */
+@Override
protected void onSectionTitle_( int depth )
{
String sectionTitle = sectionTitleBuffer.toString();
@@ -267,7 +278,7 @@ public class SiteRendererSink
sectionHasID = false;
}
-this.sectionTitle = false;
+this.isSectionTitle = false;
anchorsInSectionTitle = null;
super.onSectionTitle_( depth );
}
@@ -284,6 +295,7 @@ public class SiteRendererSink
}
/** {@inheritDoc} */
+@Override
public void text( String text )
{
if ( sectionTitleBuffer != null )
@@ -296,11 +308,14 @@ public class SiteRendererSink
}
/** {@inheritDoc} */
+@Override
protected void write( String
svn commit: r1185539 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src: main/java/org/apache/maven/doxia/module/markdown/ test/java/org/apache/maven/doxia/module/markdown/
Author: ltheussl
Date: Tue Oct 18 09:04:52 2011
New Revision: 1185539
URL: http://svn.apache.org/viewvc?rev=1185539view=rev
Log:
[DOXIA-451] Tweak Doxia Markdown module HTML to better match
Submitted by: Brian Ferris
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
(with props)
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java?rev=1185539r1=1185538r2=1185539view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
Tue Oct 18 09:04:52 2011
@@ -31,6 +31,7 @@ import org.codehaus.plexus.util.IOUtil;
import org.pegdown.Extensions;
import org.pegdown.PegDownProcessor;
+import org.pegdown.ast.RootNode;
/**
* Implementation of {@link org.apache.maven.doxia.parser.Parser} for Markdown
documents.
@@ -60,12 +61,14 @@ public class MarkdownParser
* {@inheritDoc}
*/
@Override
-public void parse( Reader reader, Sink sink )
+public void parse( Reader source, Sink sink )
throws ParseException
{
try
{
-super.parse( new StringReader( htmlbody +
PEGDOWN_PROCESSOR.markdownToHtml( IOUtil.toString( reader ) ) +
/body/html ), sink );
+RootNode rootNode = PEGDOWN_PROCESSOR.parseMarkdown(
IOUtil.toString( source ).toCharArray() );
+String markdownAsHtml = new
MarkdownToDoxiaHtmlSerializer().toHtml( rootNode );
+super.parse( new StringReader( htmlbody + markdownAsHtml +
/body/html ), sink );
}
catch ( IOException e )
{
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java?rev=1185539view=auto
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
Tue Oct 18 09:04:52 2011
@@ -0,0 +1,46 @@
+package org.apache.maven.doxia.module.markdown;
+
+/*
+ * 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.
+ */
+
+import org.pegdown.ToHtmlSerializer;
+import org.pegdown.ast.VerbatimNode;
+
+/**
+ * Custom Markdown to HTML serialization strategy that better matches the
+ * conventions of existing Doxia modules.
+ *
+ * @author Brian Ferris (bdfer...@google.com)
+ */
+public class MarkdownToDoxiaHtmlSerializer
+extends ToHtmlSerializer
+{
+/**
+ * {@inheritDoc}
+ */
+@Override
+public void visit( VerbatimNode node )
+{
+printer.println().print( div class=\source\pre );
+String text = node.getText();
+text = transformVerbatimText( text );
+printer.printEncoded( text, this );
+printer.print( /pre/div );
+}
+}
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownToDoxiaHtmlSerializer.java
svn commit: r1185112 - in /maven/doxia/doxia/trunk/doxia-core/src: main/java/org/apache/maven/doxia/markup/ main/java/org/apache/maven/doxia/parser/ main/java/org/apache/maven/doxia/sink/ main/java/or
Author: ltheussl
Date: Mon Oct 17 11:33:00 2011
New Revision: 1185112
URL: http://svn.apache.org/viewvc?rev=1185112view=rev
Log:
some java 5 updates
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractTextParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractXmlParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/PipelineSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/XmlValidator.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/WellformednessCheckingSink.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java?rev=1185112r1=1185111r2=1185112view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/HtmlMarkup.java
Mon Oct 17 11:33:00 2011
@@ -73,6 +73,7 @@ public interface HtmlMarkup
Tag ABBR = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return abbr;
@@ -83,6 +84,7 @@ public interface HtmlMarkup
Tag ACRONYM = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return acronym;
@@ -111,6 +113,7 @@ public interface HtmlMarkup
Tag BDO = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return bdo;
@@ -133,6 +136,7 @@ public interface HtmlMarkup
Tag BUTTON = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return button;
@@ -155,6 +159,7 @@ public interface HtmlMarkup
Tag COL = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return col;
@@ -165,6 +170,7 @@ public interface HtmlMarkup
Tag COLGROUP = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return colgroup;
@@ -178,6 +184,7 @@ public interface HtmlMarkup
Tag DEL = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return del;
@@ -206,6 +213,7 @@ public interface HtmlMarkup
Tag FIELDSET = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return fieldset;
@@ -258,6 +266,7 @@ public interface HtmlMarkup
Tag IFRAME = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return iframe;
@@ -274,6 +283,7 @@ public interface HtmlMarkup
Tag INS = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return ins;
@@ -290,6 +300,7 @@ public interface HtmlMarkup
Tag LABEL = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return label;
@@ -300,6 +311,7 @@ public interface HtmlMarkup
Tag LEGEND = new Tag()
{
/** {@inheritDoc} */
+@Override
public String toString()
{
return legend;
@@ -328,6 +340,7 @@ public interface HtmlMarkup
svn commit: r1185118 - /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
Author: ltheussl
Date: Mon Oct 17 12:06:38 2011
New Revision: 1185118
URL: http://svn.apache.org/viewvc?rev=1185118view=rev
Log:
replace constructor not available in java 5
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java?rev=1185118r1=1185117r2=1185118view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/document/DocumentModelTest.java
Mon Oct 17 12:06:38 2011
@@ -359,7 +359,7 @@ public class DocumentModelTest
}
catch ( XmlPullParserException e )
{
-throw new IOException( Error parsing document descriptor, e );
+throw (IOException) new IOException( Error parsing document
descriptor ).initCause( e );
}
finally
{
svn commit: r1184768 - /maven/site/trunk/src/site/site.xml
Author: ltheussl Date: Sun Oct 16 07:08:20 2011 New Revision: 1184768 URL: http://svn.apache.org/viewvc?rev=1184768view=rev Log: remove menu already inherited from parent Modified: maven/site/trunk/src/site/site.xml Modified: maven/site/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?rev=1184768r1=1184767r2=1184768view=diff == --- maven/site/trunk/src/site/site.xml (original) +++ maven/site/trunk/src/site/site.xml Sun Oct 16 07:08:20 2011 @@ -90,11 +90,5 @@ under the License. item name=Source Repository href=/source-repository.html / item name=The Maven Team href=/team-list.html / /menu -menu name=ASF - item name=How Apache Works href=http://www.apache.org/foundation/how-it-works.html/ - item name=Foundation href=http://www.apache.org/foundation// - item name=Sponsoring Apache href=http://www.apache.org/foundation/sponsorship.html/ - item name=Thanks href=http://www.apache.org/foundation/thanks.html/ -/menu /body /project
svn commit: r1182268 - /maven/doxia/doxia-sitetools/trunk/pom.xml
Author: ltheussl
Date: Wed Oct 12 08:55:03 2011
New Revision: 1182268
URL: http://svn.apache.org/viewvc?rev=1182268view=rev
Log:
use current doxia
Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml
Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=1182268r1=1182267r2=1182268view=diff
==
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Wed Oct 12 08:55:03 2011
@@ -185,7 +185,7 @@ under the License.
properties
projectVersion${project.version}/projectVersion
-doxiaVersion1.2/doxiaVersion
+doxiaVersion1.3-SNAPSHOT/doxiaVersion
/properties
dependencyManagement
svn commit: r1182273 - in /maven/doxia: doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/ doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/x
Author: ltheussl
Date: Wed Oct 12 09:02:17 2011
New Revision: 1182273
URL: http://svn.apache.org/viewvc?rev=1182273view=rev
Log:
[DOXIA-446] fix source attributes
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java?rev=1182273r1=1182272r2=1182273view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
Wed Oct 12 09:02:17 2011
@@ -27,6 +27,7 @@ import com.gargoylesoftware.htmlunit.htm
import com.gargoylesoftware.htmlunit.html.HtmlImage;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
+import com.gargoylesoftware.htmlunit.html.HtmlPreformattedText;
import com.gargoylesoftware.htmlunit.html.HtmlTable;
import com.gargoylesoftware.htmlunit.html.HtmlTableDataCell;
import com.gargoylesoftware.htmlunit.html.HtmlTableHeaderCell;
@@ -37,7 +38,7 @@ import java.util.Iterator;
/**
- *
+ *
*
* @author ltheussl
* @version $Id$
@@ -176,6 +177,17 @@ public class AttributesVerifier
assertEquals( /index.html, a.getAttributeValue( href ) );
div = (HtmlDivision) elementIterator.next();
+assertEquals( source, div.getAttributeValue( class ) );
+HtmlPreformattedText pre = (HtmlPreformattedText)
elementIterator.next();
+assertEquals( pretty, pre.getAttributeValue( class ) );
+
+div = (HtmlDivision) elementIterator.next();
+assertEquals( source, div.getAttributeValue( class ) );
+assertEquals( , div.getAttributeValue( id ) );
+pre = (HtmlPreformattedText) elementIterator.next();
+assertEquals( pretty, pre.getAttributeValue( id ) );
+
+div = (HtmlDivision) elementIterator.next();
assertEquals( section, div.getAttributeValue( class ) );
h2 = (HtmlHeader2) elementIterator.next();
assertEquals( Section without id, h2.asText().trim() );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml?rev=1182273r1=1182272r2=1182273view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
Wed Oct 12 09:02:17 2011
@@ -65,6 +65,11 @@
Link to a href=./cdc.txtother document/a.
Link to a href=/index.htmlroot document/a.
/p
+
+ !-- DOXIA-446 --
+ source class=prettysome source/source
+ source id=prettysome source/source
+
/section
!-- DOXIA-245 --
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java?rev=1182273r1=1182272r2=1182273view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/XhtmlBaseSink.java
Wed Oct 12 09:02:17 2011
@@ -1066,26 +1066,16 @@ public class XhtmlBaseSink
boxed.equals( atts.getAttribute(
SinkEventAttributes.DECORATION ).toString() );
}
+SinkEventAttributes divAtts = null;
+
if ( boxed )
{
-atts.addAttribute( Attribute.CLASS, source );
+divAtts = new SinkEventAttributeSet( new String[] {
Attribute.CLASS.toString(), source } );
}
atts.removeAttribute( SinkEventAttributes.DECORATION );
-String width = (String) atts.getAttribute( Attribute.WIDTH.toString()
);
-atts.removeAttribute( Attribute.WIDTH.toString() );
-
-writeStartTag
svn commit: r1176777 - /maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
Author: ltheussl
Date: Wed Sep 28 08:15:06 2011
New Revision: 1176777
URL: http://svn.apache.org/viewvc?rev=1176777view=rev
Log:
add some non-intuitive test results
Modified:
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java?rev=1176777r1=1176776r2=1176777view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/DefaultSiteToolTest.java
Wed Sep 28 08:15:06 2011
@@ -35,14 +35,22 @@ public class DefaultSiteToolTest
{
assertEquals( null, DefaultSiteTool.getNormalizedPath( null ) );
assertEquals( , DefaultSiteTool.getNormalizedPath( ) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( . ) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( ./ ) );
assertEquals( foo, DefaultSiteTool.getNormalizedPath( foo ) );
assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath( foo/bar
) );
assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath( foo\\bar
) );
assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath(
foo/./bar ) );
+assertEquals( foo/bar, DefaultSiteTool.getNormalizedPath( foo//bar
) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( foo/../ ) );
+assertEquals( , DefaultSiteTool.getNormalizedPath( foo/.. ) );
assertEquals( bar, DefaultSiteTool.getNormalizedPath( foo/../bar )
);
assertEquals( foo, DefaultSiteTool.getNormalizedPath( ./foo ) );
assertEquals( ../foo, DefaultSiteTool.getNormalizedPath( ../foo )
);
assertEquals( ../../foo, DefaultSiteTool.getNormalizedPath(
../../foo ) );
assertEquals( index.html, DefaultSiteTool.getNormalizedPath(
./foo/../index.html ) );
+
+// note: space is preserved and double slash is removed!
+assertEquals( file:/Documents and Settings/,
DefaultSiteTool.getNormalizedPath( file://Documents and Settings/ ) );
}
}
svn commit: r1176233 - in /maven/plugins/branches/maven-site-plugin-2.x: ./ src/ src/it/inheritedReports/ src/it/top-parent-different-site/ src/it/top-parent-different-site/module1/ src/it/top-parent-
Author: ltheussl Date: Tue Sep 27 06:55:26 2011 New Revision: 1176233 URL: http://svn.apache.org/viewvc?rev=1176233view=rev Log: [MSITE-600] merge revs 1174605,1174614 from trunk Added: maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/ - copied from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/ maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/invoker.properties - copied unchanged from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/module1/ - copied from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/ maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/module1/pom.xml - copied unchanged from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/pom.xml - copied unchanged from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/root/ - copied from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/ maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/root/pom.xml - copied unchanged from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/pom.xml maven/plugins/branches/maven-site-plugin-2.x/src/it/top-parent-different-site/verify.bsh - copied unchanged from r1174605, maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/verify.bsh Modified: maven/plugins/branches/maven-site-plugin-2.x/ (props changed) maven/plugins/branches/maven-site-plugin-2.x/pom.xml (props changed) maven/plugins/branches/maven-site-plugin-2.x/src/ (props changed) maven/plugins/branches/maven-site-plugin-2.x/src/it/inheritedReports/ (props changed) maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Propchange: maven/plugins/branches/maven-site-plugin-2.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 06:55:26 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:1150948 +/maven/plugins/trunk/maven-site-plugin:1150948,1174605,1174614 Propchange: maven/plugins/branches/maven-site-plugin-2.x/pom.xml -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 06:55:26 2011 @@ -1,2 +1,2 @@ /maven/plugins/branches/maven-site-plugin-3.x/pom.xml:940318,942876,956257,956299,984961,992626,1003823 -/maven/plugins/trunk/maven-site-plugin/pom.xml:1150948 +/maven/plugins/trunk/maven-site-plugin/pom.xml:1150948,1174605,1174614 Propchange: maven/plugins/branches/maven-site-plugin-2.x/src/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 06:55:26 2011 @@ -1,2 +1,2 @@ /maven/plugins/branches/maven-site-plugin-3.x/src:940318,942876,956257,956299,984961,992626,1003823 -/maven/plugins/trunk/maven-site-plugin/src:1150948 +/maven/plugins/trunk/maven-site-plugin/src:1150948,1174605,1174614 Propchange: maven/plugins/branches/maven-site-plugin-2.x/src/it/inheritedReports/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 06:55:26 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin/src/it/inheritedReports:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114,1145947,1147048,1150948 +/maven/plugins/trunk/maven-site-plugin/src/it/inheritedReports:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139
svn commit: r1176241 - in /maven/plugins/branches/maven-site-plugin-2.x: ./ pom.xml src/ src/it/inheritedReports/ src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Author: ltheussl Date: Tue Sep 27 07:16:14 2011 New Revision: 1176241 URL: http://svn.apache.org/viewvc?rev=1176241view=rev Log: [MSITE-600] merge r1175226 from trunk Modified: maven/plugins/branches/maven-site-plugin-2.x/ (props changed) maven/plugins/branches/maven-site-plugin-2.x/pom.xml (props changed) maven/plugins/branches/maven-site-plugin-2.x/src/ (props changed) maven/plugins/branches/maven-site-plugin-2.x/src/it/inheritedReports/ (props changed) maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Propchange: maven/plugins/branches/maven-site-plugin-2.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 07:16:14 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:1150948,1174605,1174614 +/maven/plugins/trunk/maven-site-plugin:1150948,1174605,1174614,1175226 Propchange: maven/plugins/branches/maven-site-plugin-2.x/pom.xml -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 07:16:14 2011 @@ -1,2 +1,2 @@ /maven/plugins/branches/maven-site-plugin-3.x/pom.xml:940318,942876,956257,956299,984961,992626,1003823 -/maven/plugins/trunk/maven-site-plugin/pom.xml:1150948,1174605,1174614 +/maven/plugins/trunk/maven-site-plugin/pom.xml:1150948,1174605,1174614,1175226 Propchange: maven/plugins/branches/maven-site-plugin-2.x/src/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 07:16:14 2011 @@ -1,2 +1,2 @@ /maven/plugins/branches/maven-site-plugin-3.x/src:940318,942876,956257,956299,984961,992626,1003823 -/maven/plugins/trunk/maven-site-plugin/src:1150948,1174605,1174614 +/maven/plugins/trunk/maven-site-plugin/src:1150948,1174605,1174614,1175226 Propchange: maven/plugins/branches/maven-site-plugin-2.x/src/it/inheritedReports/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 27 07:16:14 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin/src/it/inheritedReports:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114,1145947,1147048,1150948,1174605,1174614 +/maven/plugins/trunk/maven-site-plugin/src/it/inheritedReports:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114,1145947,1147048,1150948,1174605,1174614,1175226 Modified: maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1176241r1=1176240r2=1176241view=diff == --- maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java (original) +++ maven/plugins/branches/maven-site-plugin-2.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Tue Sep 27 07:16:14 2011 @@ -677,8 +677,8 @@ public abstract class AbstractDeployMojo } // MSITE-600 -URIPathDescriptor siteURI = new URIPathDescriptor( site.getUrl(), ); -URIPathDescriptor oldSiteURI = new URIPathDescriptor( oldSite.getUrl(), ); +URIPathDescriptor siteURI = new URIPathDescriptor( URIEncoder.encodeURI( site.getUrl() ), ); +URIPathDescriptor oldSiteURI = new URIPathDescriptor
svn commit: r1176251 - in /maven/plugins/trunk/maven-site-plugin/src/site/apt: examples/creating-content.apt.vm examples/sitedescriptor.apt usage.apt
Author: ltheussl
Date: Tue Sep 27 07:47:50 2011
New Revision: 1176251
URL: http://svn.apache.org/viewvc?rev=1176251view=rev
Log:
add TOCs
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm?rev=1176251r1=1176250r2=1176251view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
Tue Sep 27 07:47:50 2011
@@ -32,6 +32,10 @@ Creating Content
Now it's time to create some content for your site. In Maven 2, the site
content is structured by format, as there are several formats supported.
+%{toc|section=1|fromDepth=2|toDepth=3}
+
+* Documentation formats
+
Here's an example of a directory structure for a site:
---
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?rev=1176251r1=1176250r2=1176251view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Tue Sep 27 07:47:50 2011
@@ -51,6 +51,8 @@ Configuring the Site Descriptor
{{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin/src/site/site.xml}site
descriptor for Maven Site Plugin}}
for a real life example.
+%{toc|section=1|fromDepth=2|toDepth=3}
+
* Title
The title of each generated page will be a combination of the site title
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt?rev=1176251r1=1176250r2=1176251view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt Tue Sep 27
07:47:50 2011
@@ -39,6 +39,8 @@ Usage
let Maven generate some {{{./examples/configuring-reports.html}reports}} for
you,
based on the contents of your POM.
+%{toc|section=1|fromDepth=2|toDepth=3}
+
* Generating a Site
To generate the project's site and reports, execute:
svn commit: r1176337 - in /maven/plugins/trunk/maven-site-plugin: ./ src/it/validate/ src/it/validate/src/ src/it/validate/src/site/ src/it/validate/src/site/fml/ src/it/validate/src/site/xdoc/
Author: ltheussl
Date: Tue Sep 27 11:42:55 2011
New Revision: 1176337
URL: http://svn.apache.org/viewvc?rev=1176337view=rev
Log:
[603] ClassNotFoundException on site:site when validating XML input documents
Added:
maven/plugins/trunk/maven-site-plugin/src/it/validate/
maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/fml/
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/fml/faq.fml
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/xdoc/
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/xdoc/xdoc.xml
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1176337r1=1176336r2=1176337view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue Sep 27 11:42:55 2011
@@ -262,12 +262,6 @@ under the License.
groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-core/artifactId
version${doxiaVersion}/version
- exclusions
-exclusion
- groupIdcommons-logging/groupId
- artifactIdcommons-logging/artifactId
-/exclusion
- /exclusions
/dependency
dependency
Added: maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml?rev=1176337view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/validate/pom.xml Tue Sep 27
11:42:55 2011
@@ -0,0 +1,29 @@
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.its.validate/groupId
+ artifactIdtest/artifactId
+ version1.0-SNAPSHOT/version
+ nameXML validation test/name
+
+ urlhttp://example.org//url
+
+ properties
+project.build.sourceEncodingUTF-8/project.build.sourceEncoding
+ /properties
+
+ build
+plugins
+ plugin
+artifactIdmaven-site-plugin/artifactId
+version@project.version@/version
+configuration
+ validatetrue/validate
+ generateReportsfalse/generateReports
+/configuration
+ /plugin
+/plugins
+ /build
+/project
+
Added:
maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/fml/faq.fml?rev=1176337view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/fml/faq.fml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/fml/faq.fml
Tue Sep 27 11:42:55 2011
@@ -0,0 +1,27 @@
+?xml version=1.0?
+faqs xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns=http://maven.apache.org/FML/1.0;
+ xsi:schemaLocation=http://maven.apache.org/FML/1.0
http://maven.apache.org/xsd/fml-1.0.xsd;
+ id=General FAQ
+ part id=General
+faq id=where
+ questionWhere did Maven come from?/question
+ answer
+p
+ Maven was created by a group of software developers who were tired
+ of wasting their time fiddling around with builds and wanted to get
+ down to brass tacks and actually develop software!
+/p
+ /answer
+/faq
+faq id=why
+ questionWhy is Maven so wildly popular?/question
+ answer
+p
+ Maven saves you so much time in your software development efforts
that
+ you will have time to learn a second language, relax ten hours a
+ day, and train for that marathon you've always wanted to run!
+/p
+ /answer
+/faq
+ /part
+/faqs
Added: maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/site.xml?rev=1176337view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/site.xml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/validate/src/site/site.xml Tue
Sep 27 11:42:55 2011
@@ -0,0 +1,27 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+project name=Maven xmlns=http
svn commit: r1175226 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Author: ltheussl
Date: Sat Sep 24 19:16:18 2011
New Revision: 1175226
URL: http://svn.apache.org/viewvc?rev=1175226view=rev
Log:
encode URIs for use with URIPathDescriptor
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1175226r1=1175225r2=1175226view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Sat Sep 24 19:16:18 2011
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.site;
*/
import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.doxia.site.decoration.inheritance.URIPathDescriptor;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.DistributionManagement;
@@ -68,7 +69,6 @@ import java.net.URL;
import java.util.List;
import java.util.Locale;
import java.util.Set;
-import org.apache.maven.doxia.site.decoration.inheritance.URIPathDescriptor;
/**
* Abstract base class for deploy mojos.
@@ -847,8 +847,8 @@ public abstract class AbstractDeployMojo
}
// MSITE-600
-URIPathDescriptor siteURI = new URIPathDescriptor( site.getUrl(),
);
-URIPathDescriptor oldSiteURI = new URIPathDescriptor(
oldSite.getUrl(), );
+URIPathDescriptor siteURI = new URIPathDescriptor(
URIEncoder.encodeURI( site.getUrl() ), );
+URIPathDescriptor oldSiteURI = new URIPathDescriptor(
URIEncoder.encodeURI( oldSite.getUrl() ), );
if ( !siteURI.sameSite( oldSiteURI.getBaseURI() ) )
{
@@ -858,4 +858,32 @@ public abstract class AbstractDeployMojo
return site;
}
+
+private static class URIEncoder
+{
+private static final String mark = -_.!~*'();
+private static final String reserved = ;/?:@=+$,;
+
+public static String encodeURI( final String uriString )
+{
+final char[] chars = uriString.toCharArray();
+final StringBuilder uri = new StringBuilder( chars.length );
+
+for ( int i = 0; i chars.length; i++ )
+{
+final char c = chars[i];
+if ( ( c = '0' c = '9' ) || ( c = 'a' c = 'z' ) || (
c = 'A' c = 'Z' )
+|| mark.indexOf( c ) != -1 || reserved.indexOf( c )
!= -1 )
+{
+uri.append( c );
+}
+else
+{
+uri.append( '%' );
+uri.append( Integer.toHexString( (int) c ) );
+}
+}
+return uri.toString();
+}
+}
}
svn commit: r1174605 - in /maven/plugins/trunk/maven-site-plugin: ./ src/it/top-parent-different-site/ src/it/top-parent-different-site/module1/ src/it/top-parent-different-site/root/
Author: ltheussl
Date: Fri Sep 23 09:21:47 2011
New Revision: 1174605
URL: http://svn.apache.org/viewvc?rev=1174605view=rev
Log:
[MSITE-600] add IT, disabled for now
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/root/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/verify.bsh
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1174605r1=1174604r2=1174605view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Sep 23 09:21:47 2011
@@ -524,6 +524,10 @@ under the License.
pomIncludes
pomInclude*/pom.xml/pomInclude
/pomIncludes
+pomExcludes
+ !-- FIXME! MSITE-600 --
+ pomExcludetop-parent-different-site/pom.xml/pomExclude
+/pomExcludes
postBuildHookScriptverify/postBuildHookScript
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
goals
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties?rev=1174605view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/invoker.properties
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,2 @@
+invoker.goals.1 = clean
+invoker.goals.2 = site:site site:deploy site:stage site:stage-deploy
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml?rev=1174605view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/module1/pom.xml
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,16 @@
+?xml version=1.0 encoding=ISO-8859-1?
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.maven.plugins.its.differentparentsite/groupId
+artifactIdmain/artifactId
+version1.0-SNAPSHOT/version
+ relativePath../pom.xml/relativePath
+ /parent
+
+ artifactIdmodule1/artifactId
+
+ namemodule 1/name
+
+/project
Added:
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml?rev=1174605view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-different-site/pom.xml
Fri Sep 23 09:21:47 2011
@@ -0,0 +1,31 @@
+?xml version=1.0 encoding=ISO-8859-1?
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ parent
+groupIdorg.apache.maven.plugins.its.differentparentsite/groupId
+artifactIdroot/artifactId
+version1.0-SNAPSHOT/version
+ relativePathroot/pom.xml/relativePath
+ /parent
+
+ groupIdorg.apache.maven.plugins.its.differentparentsite/groupId
+ artifactIdmain/artifactId
+ packagingpom/packaging
+ namemain/name
+ version1.0-SNAPSHOT/version
+
+ urlhttp://dummy.com//url
+
+ distributionManagement
+site
+ idwebsite/id
+
urlfile://@project.build.directory@/it/top-parent-different-site/deploy//url
+/site
+ /distributionManagement
+
+ modules
+modulemodule1
svn commit: r1170446 - /maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml
Author: ltheussl Date: Wed Sep 14 06:40:27 2011 New Revision: 1170446 URL: http://svn.apache.org/viewvc?rev=1170446view=rev Log: clarify the use of custom doxia modules Modified: maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml Modified: maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml?rev=1170446r1=1170445r2=1170446view=diff == --- maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml Wed Sep 14 06:40:27 2011 @@ -53,9 +53,12 @@ under the License. questionHow to include a custom Doxia module, like Twiki?/question answer p - The site plugin handles out-of-box apt, xdoc and fml formats. If you - want to use a custom format like Twiki, you need to specify the - Doxia Twiki dependency, i.e.: + The site plugin handles out-of-box apt, xdoc and fml formats. + If you want to use a custom format like Twiki (or any other document format + for which a doxia parser exists, see the list of + a href=http://maven.apache.org/doxia/references/index.html;Doxia Markup Languages/a), + you need to specify the corresponding Doxia dependency, e.g. for Twiki: +/p source ![CDATA[project ... @@ -69,7 +72,7 @@ under the License. dependency groupIdorg.apache.maven.doxia/groupId artifactIddoxia-module-twiki/artifactId -version1.0/version +version!-- adapt to your site plugin version! --/version /dependency /dependencies /plugin @@ -77,6 +80,11 @@ under the License. /build ... /project]]/source +p + strongNote/strong that the doxia version has to be adjusted to the + site-plugin version you are using, see the a href=migrate.htmlMigration Guide/a. + In particular, for site plugin versions codegt;=2.1/code + you need to use doxia codegt;=1.1/code. /p /answer /faq
svn commit: r1170457 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
Author: ltheussl
Date: Wed Sep 14 07:18:26 2011
New Revision: 1170457
URL: http://svn.apache.org/viewvc?rev=1170457view=rev
Log:
more prominent description on using custom doxia modules
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm?rev=1170457r1=1170456r2=1170457view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creating-content.apt.vm
Wed Sep 14 07:18:26 2011
@@ -55,26 +55,34 @@ Creating Content
document formats. Let's take a look at examples of the various document
formats.
+ * APT:
The APT format (Almost Plain Text) is a wiki-like format that allows you to
write simple, structured documents (like this one) very quickly. A full
reference of the
{{{http://maven.apache.org/doxia/references/apt-format.html} APT Format}} is
available.
+ * FML:
The FML format is the FAQ format. This is the same that were used in Maven
1.x.
For more info about the
{{{http://maven.apache.org/doxia/references/fml-format.html}FML Format}}
check the {{{http://maven.apache.org/doxia/}Doxia}} site.
+ * XDoc:
The XDoc format is the same as
{{{http://maven.apache.org/maven-1.x/using/site.html} used in Maven 1.x}}.
A reference for the
{{{http://maven.apache.org/doxia/references/xdoc-format.html} XDoc Format}}
is available.
- Other formats are available, but at this point these 3 are the best tested.
- There are also several possible output formats, but currently only XHTML is
- available.
+ []
+
+ Other formats are available, but the above three are recognized by default
by the site plugin.
+ Any other document format for which a doxia parser exists can be used as
well (see the list of
+ {{{http://maven.apache.org/doxia/references/index.html}Doxia Markup
Languages}}),
+ but in this case you need to add the corresponding Doxia dependency to your
site plugin configuration.
+ Check this
{{{../faq.html\#How_to_include_a_custom_Doxia_module_like_Twiki}FAQ entry}} for
details.
+ Note that Doxia also supports several output formats, the site plugin only
creates XHTML.
Note that all of the above is optional - just one index file is required in
one of the input trees. The paths under each format will be merged together
svn commit: r1159522 - /maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
Author: ltheussl Date: Fri Aug 19 07:40:57 2011 New Revision: 1159522 URL: http://svn.apache.org/viewvc?rev=1159522view=rev Log: [MSHARED-203] add a test case Modified: maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java Modified: maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java?rev=1159522r1=1159521r2=1159522view=diff == --- maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java (original) +++ maven/shared/trunk/maven-doxia-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java Fri Aug 19 07:40:57 2011 @@ -146,6 +146,16 @@ public class SiteToolTest from = http://maven.apache.org/plugins/maven-site-plugin;; assertEquals( tool.getRelativePath( to, from ), .. + File.separator + .. ); +// MSITE-600, MSHARED-203 +to = file:///tmp/bloop; +from = scp://localhost:/tmp/blop; +// FIXME! assertEquals( tool.getRelativePath( to, from ), to ); + +// note: 'tmp' is the host here which is probably not the intention, but at least the result is correct +to = file://tmp/bloop; +from = scp://localhost:/tmp/blop; +assertEquals( tool.getRelativePath( to, from ), to ); + to = http://maven.apache.org/plugins/maven-site-plugin/;; from = http://maven.apache.org;; assertEquals( tool.getRelativePath( to, from ), plugins + File.separator + maven-site-plugin );
svn commit: r1151812 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
Author: ltheussl
Date: Thu Jul 28 12:19:51 2011
New Revision: 1151812
URL: http://svn.apache.org/viewvc?rev=1151812view=rev
Log:
remove duplicate element
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm?rev=1151812r1=1151811r2=1151812view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
Thu Jul 28 12:19:51 2011
@@ -48,7 +48,6 @@ Adding a Protocol to Deploy the Site
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
version${project.version}/version
- dependencies
dependencies
dependency!-- add support for ssh/scp --
groupIdorg.apache.maven.wagon/groupId
@@ -56,7 +55,6 @@ Adding a Protocol to Deploy the Site
version1.0/version
/dependency
/dependencies
- /dependencies
/plugin
/plugins
/pluginManagement
svn commit: r1150994 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Author: ltheussl
Date: Tue Jul 26 06:42:00 2011
New Revision: 1150994
URL: http://svn.apache.org/viewvc?rev=1150994view=rev
Log:
move detailed error message to logger and preserve stacktrace
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1150994r1=1150993r2=1150994view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Tue Jul 26 06:42:00 2011
@@ -343,7 +343,7 @@ public abstract class AbstractDeployMojo
return buildDirectory;
}
-private Wagon getWagon( final Repository repository, final WagonManager
manager, final Log log )
+private static Wagon getWagon( final Repository repository, final
WagonManager manager, final Log log )
throws MojoExecutionException
{
final Wagon wagon;
@@ -354,13 +354,12 @@ public abstract class AbstractDeployMojo
}
catch ( UnsupportedProtocolException e )
{
-log.error( Unavailable protocol for site deployment: ' +
repository.getProtocol() + ' );
+log.error( Unsupported protocol for site deployment: ' +
repository.getProtocol()
++ '. For adding new protocols to the site plugin, see
++
http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-protocol.html;
);
-throw new MojoExecutionException(
- this,
- Unavailable protocol for site
deployment: ' + repository.getProtocol() + ',
- To add a new protocol to site
plugin, see
- +
http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-protocol.html;
);
+throw new MojoExecutionException( Unsupported protocol for site
deployment: '
++ repository.getProtocol() + '., e );
}
catch ( TransferFailedException e )
{
svn commit: r1151002 - /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java
Author: ltheussl Date: Tue Jul 26 07:17:54 2011 New Revision: 1151002 URL: http://svn.apache.org/viewvc?rev=1151002view=rev Log: [DOXIA-437] SwfMacro does not close param tags Submitted by: Andres Gomez Casanova Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java?rev=1151002r1=1151001r2=1151002view=diff == --- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java (original) +++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java Tue Jul 26 07:17:54 2011 @@ -149,12 +149,13 @@ public class SwfMacro .append( codebase=\http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=; ) .append( version ).append( \ width=\ ).append( width ).append( \ height=\ ).append( height ) .append( \ id=\ ).append( id ).append( \ ).append( EOL ); -content.append( param name=\movie\ value=\ ).append( src ).append( \ ).append( EOL ); -content.append( param name=\quality\ value=\ ).append( quality ).append( \ ).append( EOL ); -content.append( param name=\menu\ value=\ ).append( menu ).append( \ ).append( EOL ); -content.append( param name=\loop\ value=\ ).append( loop ).append( \ ).append( EOL ); -content.append( param name=\play\ value=\ ).append( play ).append( \ ).append( EOL ); -content.append( param name=\allowScriptAccess\ value=\ ).append( allowScript ).append( \ ); +content.append( param name=\movie\ value=\ ).append( src ).append( \ / ).append( EOL ); +content.append( param name=\quality\ value=\ ).append( quality ).append( \ / ).append( EOL ); +content.append( param name=\menu\ value=\ ).append( menu ).append( \ / ).append( EOL ); +content.append( param name=\loop\ value=\ ).append( loop ).append( \ / ).append( EOL ); +content.append( param name=\play\ value=\ ).append( play ).append( \ / ).append( EOL ); +content.append( param name=\allowScriptAccess\ value=\ ) +.append( allowScript ).append( \ / ).append( EOL ); content.append( embed src=\ ).append( src ).append( \ width=\ ).append( width ).append( \ height=\ ) .append( height ).append( \ loop=\ ).append( loop ).append( \ play=\ ).append( play ) .append( \ quality=\ ).append( quality ).append( \ allowScriptAccess=\ ).append( allowScript )
svn commit: r1150691 - in /maven/plugins/trunk/maven-site-plugin/src/site/apt: examples/adding-deploy-protocol.apt.vm maven-3.apt.vm
Author: ltheussl
Date: Mon Jul 25 13:18:53 2011
New Revision: 1150691
URL: http://svn.apache.org/viewvc?rev=1150691view=rev
Log:
doc polishing
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm?rev=1150691r1=1150690r2=1150691view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/adding-deploy-protocol.apt.vm
Mon Jul 25 13:18:53 2011
@@ -27,14 +27,16 @@
~~ http://maven.apache.org/doxia/references/apt-format.html
-Adding a Protocol to Deploy the Site
+Adding a Protocol to Deploy the Site
- Maven 3 - then Maven Site Plugin - comes with minimal built-in protocol
support: file, http, https.
- Maven 2 adds scp to this list.
+ Out of the box, Maven 3 only supports file:, http: and
https: as transport protocols.
+ Maven 2 adds scp: to this list.
- To deploy a site with a non-built-in protocol, you'll need to add a new
{{{http://maven.apache.org/wagon}wagon provider}}.
+ To deploy a site with a non-built-in protocol, you need to add the
corresponding
+ {{{http://maven.apache.org/wagon/}wagon provider}}.
- You can add it either as a global extension, or just let it at site plugin
level:
+ You can add it either as a
{{{http://maven.apache.org/guides/mini/guide-using-extensions.html}global
extension}},
+ or declare it at as a dependency of the site plugin:
+-+
project
Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm?rev=1150691r1=1150690r2=1150691view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm (original)
+++ maven/plugins/trunk/maven-site-plugin/src/site/apt/maven-3.apt.vm Mon Jul
25 13:18:53 2011
@@ -35,11 +35,13 @@ Using it with Maven 3
({{{http://jira.codehaus.org/browse/MNG-4162}MNG-4162}}).
As a result, the 2.x versions of the Maven Site Plugin will not work with
Maven 3.
- Using such versions of Maven Site Plugin with Maven 3 won't generate any
reports from reporting plugin,
+ Using such versions of Maven Site Plugin with Maven 3 won't generate any
reports from reporting plugins,
only hand-written Doxia documents (apt, xdoc, ...) will be rendered.
You need to use version 3.x of the Site Plugin, in order for it to work with
Maven 3.
+%{toc|section=1|fromDepth=2|toDepth=3}
+
* Plugins Compatibility Matrix for Maven 3
** Plugins Maintained by the Apache Maven Community
svn commit: r1150986 - /maven/pom/trunk/maven/pom.xml
Author: ltheussl Date: Tue Jul 26 04:55:57 2011 New Revision: 1150986 URL: http://svn.apache.org/viewvc?rev=1150986view=rev Log: does ASF imply you're a member? I'm not. Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1150986r1=1150985r2=1150986view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Tue Jul 26 04:55:57 2011 @@ -382,7 +382,6 @@ under the License. idltheussl/id nameLukas Theussl/name emailltheu...@apache.org/email - organizationASF/organization roles roleCommitter/role /roles
svn commit: r1149489 - in /maven/plugins/branches/maven-site-plugin-3.x/src/site/apt: index.apt maven-3.apt.vm migrate.apt
Author: ltheussl
Date: Fri Jul 22 07:49:25 2011
New Revision: 1149489
URL: http://svn.apache.org/viewvc?rev=1149489view=rev
Log:
doc polishing
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/migrate.apt
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt?rev=1149489r1=1149488r2=1149489view=diff
==
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/index.apt Fri Jul
22 07:49:25 2011
@@ -27,11 +27,13 @@
~~ http://maven.apache.org/doxia/references/apt-format.html
-Maven Site Plugin
+Maven Site Plugin - 3.x
The Site Plugin is used to generate a site for the project. The generated
site also includes the project's reports
that were configured in the POM.
+ This is the site for version 3 of the maven-site-plugin. It requires at
least Maven 2.2.0 to run.
+
Please read the {{{./migrate.html}migration guide}} if you want to upgrade
the Site Plugin.
* Goals Overview
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm?rev=1149489r1=1149488r2=1149489view=diff
==
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm
Fri Jul 22 07:49:25 2011
@@ -29,13 +29,18 @@
Maven Site Plugin with Maven 3.x
- Due to {{{http://jira.codehaus.org/browse/MNG-4162}MNG-4162}}, all reporting
logic has been removed from Maven 3.
- So a branch of the Site Plugin has been created,
-
{{{https://svn.apache.org/repos/asf/maven/plugins/branches/maven-site-plugin-3.x/}/maven/plugins/branches/maven-site-plugin-3.x}}
- in order to get the Site Plugin working with Maven 3.x.
+ A major aim of the refactoring in Maven 3.x was to decouple the Maven core
from Doxia
+ and to allow arbitrary reporting systems to be developed. For this reason,
all reporting
+ related code has been removed from the core of Maven 3
+ ({{{http://jira.codehaus.org/browse/MNG-4162}MNG-4162}}).
+ As a result, the 2.x versions of the Maven Site Plugin will no longer work
with Maven 3.
Using previous versions of maven-site-plugin with Maven 3.x won't generate
reports from any report plugin,
only hand-written Doxia documents (apt, xdoc, ...) will be rendered.
+ Therefore this
+
{{{https://svn.apache.org/repos/asf/maven/plugins/branches/maven-site-plugin-3.x/}3.x
branch}}
+ of the Site Plugin has been created, in order to get the Site Plugin working
with Maven 3.x.
+
* Plugins Compatibility Matrix
** Plugins Maintained by the Apache Maven Community
@@ -43,7 +48,7 @@ Maven Site Plugin with Maven 3.x
Tests have been made on the reporting profile of the Maven parent POM which
enables some reports.
You will need so update some of those plugins for them to work with Maven
3.x. Below you will find the minimum version
required for these plugins to work in Maven 3.
-
+
*---+---+
| Plugin|Version|
*---+---+
@@ -116,8 +121,8 @@ Maven Site Plugin with Maven 3.x
/plugin
/plugins
/reporting
-+-+
-
++-+
+
** New Configuration (Maven 3 only, no reports configuration inheritance)
Reports can be configured in the configuration for maven-site-plugin
too as \reportPlugins\ elements.
@@ -169,15 +174,36 @@ Maven Site Plugin with Maven 3.x
The following order/strategy will be used to find/resolve a version:
* search same groupId/artifactId in the build.plugins section
-
+
* search same groupId/artifactId in the build.pluginManagement.plugins
section
-
+
* resolve with current repositories (can include auto SNAPSHOT resolution)
* Site descriptor attachment
- site:attach-descriptor have been removed from the built-in lifecycle
of Maven 3. Have a look at
-
{{{https://cwiki.apache.org/confluence/display/MAVEN/Maven+3.x+Compatibility+Notes#Maven3.xCompatibilityNotes-SiteandReporting}Maven
3.x Compatibility Notes - Site and Reporting}}.
+ In Maven 3, the default execution of site:attach-descriptor has been
removed from the
+ built-in lifecycle bindings for projects with packaging pom. Users that
actually use those
+ projects to provide a common site descriptor for sub modules will need to
explicitly define
+ the following goal execution to restore the intended behavior
svn commit: r1149565 - /maven/plugins/trunk/pom.xml
Author: ltheussl
Date: Fri Jul 22 10:58:42 2011
New Revision: 1149565
URL: http://svn.apache.org/viewvc?rev=1149565view=rev
Log:
ITs passed for me locally, let's see what Jenkins says
Modified:
maven/plugins/trunk/pom.xml
Modified: maven/plugins/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=1149565r1=1149564r2=1149565view=diff
==
--- maven/plugins/trunk/pom.xml (original)
+++ maven/plugins/trunk/pom.xml Fri Jul 22 10:58:42 2011
@@ -44,7 +44,7 @@ under the License.
!-- HACK: Deliberately put before other plugins that employ
maven-antrun-plugin to workaround MNG-1323 --
modulemaven-eclipse-plugin/module
-!-- Excluded due to ongoing failures
modulemaven-assembly-plugin/module --
+modulemaven-assembly-plugin/module
modulemaven-changelog-plugin/module
modulemaven-changes-plugin/module
modulemaven-checkstyle-plugin/module
@@ -89,11 +89,11 @@ under the License.
profiles
profile
- idmaven-3/id
+ idmaven-3/id
activation
file
- !-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) --
- exists${basedir}/exists
+ !-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) --
+ exists${basedir}/exists
/file
/activation
modules
@@ -101,6 +101,6 @@ under the License.
modulemaven-project-info-reports-plugin/module
modulemaven-remote-resources-plugin/module
/modules
-/profile
+/profile
/profiles
/project
svn commit: r1149122 - /maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties
Author: ltheussl Date: Thu Jul 21 11:16:49 2011 New Revision: 1149122 URL: http://svn.apache.org/viewvc?rev=1149122view=rev Log: skip IT that fails with m3 (as expected) Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties?rev=1149122view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/invoker.properties Thu Jul 21 11:16:49 2011 @@ -0,0 +1,2 @@ +# See MSITE-595 +invoker.maven.version = 3.0-
svn commit: r1148634 - in /maven/plugins/trunk/maven-site-plugin/src/it: emma-plugin-it/invoker.properties empty-report-set/invoker.properties
Author: ltheussl Date: Wed Jul 20 07:30:13 2011 New Revision: 1148634 URL: http://svn.apache.org/viewvc?rev=1148634view=rev Log: remove unnecessary restrictions Removed: maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties Modified: maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties Modified: maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties?rev=1148634r1=1148633r2=1148634view=diff == --- maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties Wed Jul 20 07:30:13 2011 @@ -1,2 +1 @@ invoker.maven.version = 3.0- -invoker.goals=clean site
svn commit: r1147768 - in /maven/jxr/trunk: maven-jxr-plugin/pom.xml maven-jxr/pom.xml pom.xml
Author: ltheussl
Date: Mon Jul 18 07:28:45 2011
New Revision: 1147768
URL: http://svn.apache.org/viewvc?rev=1147768view=rev
Log:
formatting, remove tabs
Modified:
maven/jxr/trunk/maven-jxr-plugin/pom.xml
maven/jxr/trunk/maven-jxr/pom.xml
maven/jxr/trunk/pom.xml
Modified: maven/jxr/trunk/maven-jxr-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/pom.xml?rev=1147768r1=1147767r2=1147768view=diff
==
--- maven/jxr/trunk/maven-jxr-plugin/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr-plugin/pom.xml Mon Jul 18 07:28:45 2011
@@ -65,22 +65,22 @@ under the License.
/distributionManagement
build
- pluginManagement
- plugins
- plugin
-artifactIdmaven-surefire-plugin/artifactId
-configuration
- forkModealways/forkMode
-/configuration
- /plugin
- /plugins
- /pluginManagement
+pluginManagement
+ plugins
+plugin
+ artifactIdmaven-surefire-plugin/artifactId
+ configuration
+forkModealways/forkMode
+ /configuration
+/plugin
+ /plugins
+/pluginManagement
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugin-plugin/artifactId
- version2.8/version
+version2.8/version
executions
execution
idgenerated-helpmojo/id
@@ -102,7 +102,7 @@ under the License.
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-jxr/artifactId
- version2.4-SNAPSHOT/version
+ version${project.version}/version
/dependency
!-- maven --
@@ -146,7 +146,7 @@ under the License.
dependency
groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-sink-api/artifactId
- version1.2/version
+ version${doxiaVersion}/version
/dependency
dependency
groupIdorg.codehaus.plexus/groupId
@@ -182,7 +182,7 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-plugin-plugin/artifactId
- version2.8/version
+version2.8/version
/plugin
/plugins
/reporting
Modified: maven/jxr/trunk/maven-jxr/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/pom.xml?rev=1147768r1=1147767r2=1147768view=diff
==
--- maven/jxr/trunk/maven-jxr/pom.xml (original)
+++ maven/jxr/trunk/maven-jxr/pom.xml Mon Jul 18 07:28:45 2011
@@ -120,14 +120,14 @@ under the License.
version1.5/version
/dependency
dependency
- groupIdcommons-io/groupId
- artifactIdcommons-io/artifactId
- version2.0.1/version
+ groupIdcommons-io/groupId
+ artifactIdcommons-io/artifactId
+ version2.0.1/version
/dependency
dependency
- groupIdcommons-lang/groupId
- artifactIdcommons-lang/artifactId
- version2.6/version
+ groupIdcommons-lang/groupId
+ artifactIdcommons-lang/artifactId
+ version2.6/version
/dependency
/dependencies
/project
Modified: maven/jxr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/pom.xml?rev=1147768r1=1147767r2=1147768view=diff
==
--- maven/jxr/trunk/pom.xml (original)
+++ maven/jxr/trunk/pom.xml Mon Jul 18 07:28:45 2011
@@ -41,10 +41,12 @@ under the License.
developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/jxr/trunk//developerConnection
urlhttp://svn.apache.org/viewvc/maven/jxr/trunk//url
/scm
+
issueManagement
systemjira/system
urlhttp://jira.codehaus.org/browse/JXR/url
/issueManagement
+
ciManagement
systemJenkins/system
urlhttps://builds.apache.org/hudson/job/maven-jxr//url
@@ -58,10 +60,10 @@ under the License.
dependencyManagement
dependencies
dependency
- groupIdjunit/groupId
- artifactIdjunit/artifactId
- scopetest/scope
- version4.8.2/version
+groupIdjunit/groupId
+artifactIdjunit/artifactId
+scopetest/scope
+version4.8.2/version
/dependency
/dependencies
/dependencyManagement
@@ -71,7 +73,7 @@ under the License.
plugins
plugin
artifactIdmaven-site-plugin/artifactId
- version2.3/version
+ version2.3/version
configuration
stagingSiteURLscp://people.apache.org/www/maven.apache.org/jxr/${project.artifactId}-${project.version}/stagingSiteURL
/configuration
svn commit: r1146988 - /maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml
Author: ltheussl Date: Fri Jul 15 07:23:30 2011 New Revision: 1146988 URL: http://svn.apache.org/viewvc?rev=1146988view=rev Log: sync with trunk Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml?rev=1146988r1=1146987r2=1146988view=diff == --- maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml Fri Jul 15 07:23:30 2011 @@ -37,17 +37,6 @@ under the License. enabledtrue/enabled /snapshots /repository -repository - idapache.snapshots/id - nameApache Snapshot Repository/name - urlhttp://repository.apache.org/content/groups/snapshots-group//url - releases -enabledfalse/enabled - /releases - snapshots -enabledtrue/enabled - /snapshots -/repository /repositories pluginRepositories pluginRepository @@ -60,17 +49,6 @@ under the License. enabledtrue/enabled /snapshots /pluginRepository -pluginRepository - idapache.snapshots/id - nameApache Snapshot Repository/name - urlhttp://repository.apache.org/content/groups/snapshots-group//url - releases -enabledfalse/enabled - /releases - snapshots -enabledtrue/enabled - /snapshots -/pluginRepository /pluginRepositories /profile /profiles
svn commit: r1147002 - in /maven/plugins/trunk/maven-site-plugin: pom.xml src/it/empty-report-set/ src/it/empty-report-set/invoker.properties src/it/full-reporting/invoker.properties src/it/full-repor
Author: ltheussl
Date: Fri Jul 15 07:57:49 2011
New Revision: 1147002
URL: http://svn.apache.org/viewvc?rev=1147002view=rev
Log:
sync ITs with m3 branch
Added:
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/
- copied from r1146707,
maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/profiles.txt
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1147002r1=1147001r2=1147002view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Jul 15 07:57:49 2011
@@ -181,6 +181,10 @@ under the License.
doxiaSitetoolsVersion1.2.1-SNAPSHOT/doxiaSitetoolsVersion
mavenVersion2.2.0/mavenVersion
wagonVersion1.0-beta-6/wagonVersion
+!-- for ITs --
+javadocPluginVersion2.6.1/javadocPluginVersion
+projectInfoReportsPluginVersion2.2/projectInfoReportsPluginVersion
+checkstylePluginVersion2.5/checkstylePluginVersion
/properties
dependencies
Added:
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties?rev=1147002view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/empty-report-set/invoker.properties
Fri Jul 15 07:57:49 2011
@@ -0,0 +1 @@
+invoker.maven.version = 3.0+
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties?rev=1147002r1=1147001r2=1147002view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/invoker.properties
Fri Jul 15 07:57:49 2011
@@ -1 +1,2 @@
invoker.maven.version = 3.0-
+invoker.profiles=reporting
\ No newline at end of file
Modified: maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml?rev=1147002r1=1147001r2=1147002view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/pom.xml Fri Jul
15 07:57:49 2011
@@ -4,7 +4,7 @@
parent
groupIdorg.apache.maven/groupId
artifactIdmaven-parent/artifactId
-version11/version
+version15/version
/parent
groupIdorg.apache.maven.plugins.site.its/groupId
@@ -15,6 +15,12 @@
namemaven-site-plugin IT: full reporting/name
urlhttp://maven.apache.org/url
+ properties
+javadocPluginVersion@javadocPluginVersion@/javadocPluginVersion
+
checkstylePluginVersion@checkstylePluginVersion@/checkstylePluginVersion
+
projectInfoReportsPluginVersion@projectInfoReportsPluginVersion@/projectInfoReportsPluginVersion
+ /properties
+
dependencies
dependency
groupIdjunit/groupId
@@ -31,6 +37,21 @@
artifactIdmaven-site-plugin/artifactId
version@project.version@/version
/plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-javadoc-plugin/artifactId
+version${javadocPluginVersion}/version
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-checkstyle-plugin/artifactId
+version${checkstylePluginVersion}/version
+ /plugin
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-project-info-reports-plugin/artifactId
+version@projectInfoReportsPluginVersion@/version
+ /plugin
/plugins
/build
@@ -39,7 +60,7 @@
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-project-info-reports-plugin/artifactId
-version2.2/version
+version@projectInfoReportsPluginVersion@/version
configuration
dependencyDetailsEnabledfalse/dependencyDetailsEnabled
dependencyLocationsEnabledfalse/dependencyLocationsEnabled
@@ -47,13 +68,15 @@
/plugin
svn commit: r1147048 - in /maven/plugins/trunk/maven-site-plugin/src: it/MSITE-550/ it/MSITE-550/src/ it/MSITE-550/src/site/ it/MSITE-550/src/site/apt/ main/java/org/apache/maven/plugins/site/
Author: ltheussl
Date: Fri Jul 15 09:17:26 2011
New Revision: 1147048
URL: http://svn.apache.org/viewvc?rev=1147048view=rev
Log:
[MSITE-550] attributes parameter does not work
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/index.apt
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.vm
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/verify.bsh
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/pom.xml?rev=1147048view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/pom.xml Fri Jul 15
09:17:26 2011
@@ -0,0 +1,30 @@
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdtest/groupId
+ artifactIdMSITE-550/artifactId
+ version1.0-SNAPSHOT/version
+ packagingpom/packaging
+
+ build
+plugins
+ plugin
+artifactIdmaven-site-plugin/artifactId
+version@project.version@/version
+configuration
+ templateFile${basedir}/src/site/site.vm/templateFile
+ generateReportsfalse/generateReports
+ attributes
+ att1val1/att1
+ /attributes
+/configuration
+ /plugin
+/plugins
+ /build
+
+ properties
+dummyvalue/dummy
+ /properties
+
+/project
Added:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/index.apt?rev=1147048view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/index.apt
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/index.apt
Fri Jul 15 09:17:26 2011
@@ -0,0 +1,17 @@
+ -
+ Title Here
+ -
+ Author Here
+ -
+ -
+
+Maven Site for your project
+
+ Congratulations! If you are looking at this page then you have successfully
generated a
+ template site employing the site archetype and you have run:
+
++-+
+
+mvn site
+
++-+
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.vm?rev=1147048view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.vm
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.vm Fri
Jul 15 09:17:26 2011
@@ -0,0 +1,2 @@
+dummy=$dummy
+att1=$att1
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.xml?rev=1147048view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.xml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.xml
Fri Jul 15 09:17:26 2011
@@ -0,0 +1,14 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+project name=Maven xmlns=http://maven.apache.org/DECORATION/1.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd;
+ body
+links
+ item name=Maven href=http://maven.apache.org//
+/links
+
+menu name=Documentation
+ !--item name=Xdoc Example href=xdoc.html/--
+/menu
+ /body
+/project
Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/verify.bsh?rev=1147048view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/verify.bsh (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/verify.bsh Fri Jul
15 09:17:26 2011
@@ -0,0 +1,51 @@
+
+/*
+ * Licensed
svn commit: r1147051 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/MSITE-550/ src/it/MSITE-550/src/ src/it/MSITE-550/src/site/ src/it/MSITE-550/src/site/apt/ src/main/java/org/apache/m
Author: ltheussl
Date: Fri Jul 15 09:21:51 2011
New Revision: 1147051
URL: http://svn.apache.org/viewvc?rev=1147051view=rev
Log:
[MSITE-550] attributes parameter does not work. merge r1147048 from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/
- copied from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/pom.xml
- copied unchanged from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/
- copied from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/
- copied from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/apt/
- copied from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/apt/index.apt
- copied unchanged from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/apt/index.apt
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/site.vm
- copied unchanged from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.vm
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/src/site/site.xml
- copied unchanged from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/src/site/site.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-550/verify.bsh
- copied unchanged from r1147048,
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-550/verify.bsh
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 15 09:21:51 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114,1145947
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114,1145947,1147048
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1147051r1=1147050r2=1147051view=diff
==
---
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Fri Jul 15 09:21:51 2011
@@ -130,7 +130,7 @@ public abstract class AbstractSiteRender
/**
* The template properties for rendering the site.
*
- * @parameter expression=${attributes}
+ * @parameter
*/
private MapString, Object attributes;
svn commit: r1146587 - in /maven/plugins/trunk/maven-site-plugin/src/it: MSITE-159/ MSITE-265/ MSITE-304/ MSITE-312/ MSITE-322/ MSITE-354/ MSITE-456/ MSITE-458/ MSITE-537/ MSITE-548/ MSITE-566/ full-r
Author: ltheussl
Date: Thu Jul 14 07:58:39 2011
New Revision: 1146587
URL: http://svn.apache.org/viewvc?rev=1146587view=rev
Log:
formatting to sync with m3 branch
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-354/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-456/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-537/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-548/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-566/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/full-reporting/verify.groovy
maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/site-inheritance/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/site-jar/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/site-stage-deploy/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/it/surefire-report/verify.groovy
maven/plugins/trunk/maven-site-plugin/src/it/top-parent-no-site/verify.bsh
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/verify.bsh?rev=1146587r1=1146586r2=1146587view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-159/verify.bsh Thu Jul
14 07:58:39 2011
@@ -50,7 +50,7 @@ try
result = false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh?rev=1146587r1=1146586r2=1146587view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/verify.bsh Thu Jul
14 07:58:39 2011
@@ -89,7 +89,7 @@ try
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=1146587r1=1146586r2=1146587view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Thu Jul
14 07:58:39 2011
@@ -68,7 +68,7 @@ try
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh?rev=1146587r1=1146586r2=1146587view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-312/verify.bsh Thu Jul
14 07:58:39 2011
@@ -85,7 +85,7 @@ try
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/verify.bsh?rev=1146587r1=1146586r2=1146587view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-322/verify.bsh Thu Jul
14 07:58:39 2011
@@ -116,7 +116,7 @@ try
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-354/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-354/verify.bsh?rev=1146587r1=1146586r2=1146587view=diff
svn commit: r1146704 - in /maven/plugins/trunk/maven-site-plugin/src/it: MSITE-497/ MSITE-504/ MSITE-506/ MSITE-507/ MSITE-512/ emma-plugin-it/ inheritedMenus-m3/ it-plugin-test/ no-version/ report-ch
Author: ltheussl Date: Thu Jul 14 13:38:47 2011 New Revision: 1146704 URL: http://svn.apache.org/viewvc?rev=1146704view=rev Log: copy ITs that also pass on trunk from m3 branch Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-497/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-504/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-504/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-506/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-506/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-507/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-507/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-512/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/invoker.properties maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus-m3/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus-m3/invoker.properties maven/plugins/trunk/maven-site-plugin/src/it/it-plugin-test/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/it-plugin-test/ maven/plugins/trunk/maven-site-plugin/src/it/no-version/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/ maven/plugins/trunk/maven-site-plugin/src/it/no-version/invoker.properties maven/plugins/trunk/maven-site-plugin/src/it/report-changes-generation/ - copied from r1146635, maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/ maven/plugins/trunk/maven-site-plugin/src/it/report-changes-generation/invoker.properties Modified: maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/invoker.properties?rev=1146704view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/invoker.properties Thu Jul 14 13:38:47 2011 @@ -0,0 +1 @@ +invoker.maven.version = 3.0- Modified: maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties?rev=1146704r1=1146635r2=1146704view=diff == --- maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/emma-plugin-it/invoker.properties Thu Jul 14 13:38:47 2011 @@ -1 +1,2 @@ -invoker.goals=clean site \ No newline at end of file +invoker.maven.version = 3.0- +invoker.goals=clean site Added: maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus-m3/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus-m3/invoker.properties?rev=1146704view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus-m3/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/inheritedMenus-m3/invoker.properties Thu Jul 14 13:38:47 2011 @@ -0,0 +1 @@ +invoker.maven.version = 3.0- Added: maven/plugins/trunk/maven-site-plugin/src/it/no-version/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/no-version/invoker.properties?rev=1146704view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/no-version/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/no-version/invoker.properties Thu Jul 14 13:38:47 2011 @@ -0,0 +1 @@ +invoker.maven.version = 3.0- Added: maven/plugins/trunk/maven-site-plugin/src/it/report-changes-generation/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/report-changes-generation/invoker.properties?rev=1146704view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/report-changes-generation/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/report-changes
svn commit: r1145947 - in /maven/plugins/trunk/maven-site-plugin/src: it/site-skip/ it/site-skip/site/ it/site-skip/skip-site-deploy/ it/site-skip/skip-site/ main/java/org/apache/maven/plugins/site/
Author: ltheussl Date: Wed Jul 13 10:17:35 2011 New Revision: 1145947 URL: http://svn.apache.org/viewvc?rev=1145947view=rev Log: [MSITE-367] [MSITE-541] add skip and skipDeploy options Added: maven/plugins/trunk/maven-site-plugin/src/it/site-skip/ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/invoker.properties maven/plugins/trunk/maven-site-plugin/src/it/site-skip/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Added: maven/plugins/trunk/maven-site-plugin/src/it/site-skip/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/invoker.properties?rev=1145947view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/site-skip/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/invoker.properties Wed Jul 13 10:17:35 2011 @@ -0,0 +1,2 @@ +invoker.goals.1 = clean +invoker.goals.2 = site:site site:deploy site:stage site:stage-deploy Added: maven/plugins/trunk/maven-site-plugin/src/it/site-skip/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/pom.xml?rev=1145947view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/site-skip/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/pom.xml Wed Jul 13 10:17:35 2011 @@ -0,0 +1,38 @@ +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + groupIdtest-site-skip/groupId + artifactIdtop/artifactId + version1.0-SNAPSHOT/version + packagingpom/packaging + nameTop/name + + distributionManagement +site + idsite/id + urlfile:///@project.build.directory@/it/site-skip/deployed//url +/site + /distributionManagement + + build +pluginManagement + plugins +plugin + artifactIdmaven-site-plugin/artifactId + version@project.version@/version + configuration +generateReportsfalse/generateReports + /configuration +/plugin + /plugins +/pluginManagement + /build + + modules +modulesite/module +moduleskip-site/module +moduleskip-site-deploy/module + /modules + +/project Added: maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/pom.xml?rev=1145947view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/pom.xml Wed Jul 13 10:17:35 2011 @@ -0,0 +1,15 @@ +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + parent +groupIdtest-site-skip/groupId +artifactIdtop/artifactId +version1.0-SNAPSHOT/version + /parent + + artifactIdsite/artifactId + packagingpom/packaging + nameSite/name + +/project Added: maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml?rev=1145947view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml Wed Jul 13 10:17:35 2011 @@ -0,0 +1,27 @@ +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + modelVersion4.0.0/modelVersion + + parent +groupIdtest-site-skip/groupId +artifactIdtop/artifactId +version1.0-SNAPSHOT/version + /parent
svn commit: r1145949 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/site-skip/ src/it/site-skip/site/ src/it/site-skip/skip-site-deploy/ src/it/site-skip/skip-site/ src/main/java/org/ap
Author: ltheussl Date: Wed Jul 13 10:26:49 2011 New Revision: 1145949 URL: http://svn.apache.org/viewvc?rev=1145949view=rev Log: [MSITE-367] [MSITE-541] add skip and skipDeploy options. Merge r1145947 from trunk. Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/ - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/invoker.properties - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/invoker.properties maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/pom.xml - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/site/ - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/site/pom.xml - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/site/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site/ - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site-deploy/ - copied from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site-deploy/pom.xml - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/skip-site/pom.xml - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/site-skip/verify.bsh - copied unchanged from r1145947, maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh Modified: maven/plugins/branches/maven-site-plugin-3.x/ (props changed) maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Propchange: maven/plugins/branches/maven-site-plugin-3.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 13 10:26:49 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114 +/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114,1145947 Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1145949r1=1145948r2=1145949view=diff == --- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Wed Jul 13 10:26:49 2011 @@ -115,6 +115,14 @@ public abstract class AbstractDeployMojo private String chmodOptions; /** + * Set this to 'true' to skip site deployment
svn commit: r1145543 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml
Author: ltheussl Date: Tue Jul 12 11:05:09 2011 New Revision: 1145543 URL: http://svn.apache.org/viewvc?rev=1145543view=rev Log: fix skin version Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml?rev=1145543r1=1145542r2=1145543view=diff == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/src/site/site.xml Tue Jul 12 11:05:09 2011 @@ -27,6 +27,7 @@ under the License. skin groupIdorg.apache.maven.skins/groupId artifactIdmaven-stylus-skin/artifactId +version1.3/version /skin body breadcrumbs
svn commit: r1145544 - /maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml
Author: ltheussl Date: Tue Jul 12 11:05:26 2011 New Revision: 1145544 URL: http://svn.apache.org/viewvc?rev=1145544view=rev Log: fix skin version Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml?rev=1145544r1=1145543r2=1145544view=diff == --- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/src/site/site.xml Tue Jul 12 11:05:26 2011 @@ -27,6 +27,7 @@ under the License. skin groupIdorg.apache.maven.skins/groupId artifactIdmaven-stylus-skin/artifactId +version1.3/version /skin body breadcrumbs
svn commit: r1145546 - in /maven/plugins/trunk/maven-site-plugin: ./ src/it/interpolation/ src/it/interpolation/parent/ src/main/java/org/apache/maven/plugins/site/
Author: ltheussl
Date: Tue Jul 12 11:08:29 2011
New Revision: 1145546
URL: http://svn.apache.org/viewvc?rev=1145546view=rev
Log:
[MSITE-585] empty deploy protocol when properties are used
Added:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
Removed:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1145546r1=1145545r2=1145546view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue Jul 12 11:08:29 2011
@@ -402,10 +402,6 @@ under the License.
pomIncludes
pomInclude*/pom.xml/pomInclude
/pomIncludes
- !-- FIXME: remove! --
- pomExcludes
-pomIncludeinterpolation/pom.xml/pomInclude
- /pomExcludes
postBuildHookScriptverify/postBuildHookScript
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
goals
Added:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties?rev=1145546view=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
Tue Jul 12 11:08:29 2011
@@ -0,0 +1,2 @@
+invoker.goals.1 = clean
+invoker.goals.2 = site-deploy
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml?rev=1145546r1=1145545r2=1145546view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
Tue Jul 12 11:08:29 2011
@@ -31,6 +31,8 @@ under the License.
properties
interpolatedinterpolation/interpolated
+site.serversite-deploy/site.server
+
site.repositoryfile://@project.build.directory@/it/${interpolated}/target/site-deployed/parent//site.repository
/properties
distributionManagement
Modified: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml?rev=1145546r1=1145545r2=1145546view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml Tue Jul
12 11:08:29 2011
@@ -39,16 +39,6 @@ under the License.
site.repositoryfile://@project.build.directory@/it/${interpolated}/target/site-deployed//site.repository
/properties
-!-- FIXME: moving the distMngmnt section from parent to here makes it work!?
--
-!--
- distributionManagement
-site
- id${site.server}/id
- url${site.repository}/url
-/site
- /distributionManagement
---
-
build
plugins
plugin
Modified: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh?rev=1145546r1=1145545r2=1145546view=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh Tue
Jul 12 11:08:29 2011
@@ -29,10 +29,11 @@ try
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( target file is missing or not a directory. );
+System.err.println( target.getAbsolutePath() );
result = false;
}
-File siteDirectory = new File( target, site-deployed );
+File siteDirectory = new File( target, site-deployed/interpolation );
if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
{
System.err.println( site file is missing or not a directory. );
@@ -44,6 +45,7 @@ try
if ( !index.exists
svn commit: r1145547 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/interpolation/ src/it/interpolation/parent/ src/main/java/org/apache/maven/plugins/site/
Author: ltheussl
Date: Tue Jul 12 11:12:11 2011
New Revision: 1145547
URL: http://svn.apache.org/viewvc?rev=1145547view=rev
Log:
[MSITE-585] merge r1145546 from trunk
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/invoker.properties
- copied unchanged from r1145546,
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/invoker.properties
Removed:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/goals.txt
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 12 11:12:11 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=1145547r1=1145546r2=1145547view=diff
==
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Jul 12 11:12:11
2011
@@ -602,10 +602,6 @@ under the License.
pomIncludes
pomInclude*/pom.xml/pomInclude
/pomIncludes
- !-- FIXME: remove! --
- pomExcludes
-pomIncludeinterpolation/pom.xml/pomInclude
- /pomExcludes
postBuildHookScriptverify/postBuildHookScript
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
goals
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml?rev=1145547r1=1145546r2=1145547view=diff
==
---
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
(original)
+++
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml
Tue Jul 12 11:12:11 2011
@@ -31,6 +31,8 @@ under the License.
properties
interpolatedinterpolation/interpolated
+site.serversite-deploy/site.server
+
site.repositoryfile://@project.build.directory@/it/${interpolated}/target/site-deployed/parent//site.repository
/properties
distributionManagement
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml?rev=1145547r1=1145546r2=1145547view=diff
==
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml
Tue Jul 12 11:12:11 2011
@@ -39,16 +39,6 @@ under
svn commit: r1145555 - /maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_fr.properties
Author: ltheussl Date: Tue Jul 12 11:44:30 2011 New Revision: 114 URL: http://svn.apache.org/viewvc?rev=114view=rev Log: [MSITE-593] Correction in the french localization Submitted by: Guillaume Husta Modified: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_fr.properties Modified: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_fr.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_fr.properties?rev=114r1=1145554r2=114view=diff == --- maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_fr.properties (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_fr.properties Tue Jul 12 11:44:30 2011 @@ -18,9 +18,9 @@ report.category.column.description = Description report.category.column.document= Document report.category.sectionTitle = Vue d'ensemble -report.information.description1= Ce document fournit une vue d'ensemble des divers documents et liens qui font partis des informations g\u00e9n\u00e9rales du projet. Tous ces contenus sont g\u00e9n\u00e9r\u00e9s automatiquement par -report.information.description2= le projet lui-m\u00eame. +report.information.description1= Ce document fournit une vue d'ensemble des divers documents et liens qui font partie des informations g\u00e9n\u00e9rales du projet. Tous ces contenus sont g\u00e9n\u00e9r\u00e9s automatiquement par +report.information.description2= pour le compte du projet. report.information.title = Information g\u00e9n\u00e9rale du projet report.project.description1= Ce document fournit une vue d'ensemble des divers rapports g\u00e9n\u00e9r\u00e9s automatiquement par report.project.description2= . Chaque rapport est d\u00e9crit bri\u00e8vement ci-dessous. -report.project.title = Rapport g\u00e9n\u00e9r\u00e9s par Maven +report.project.title = Rapports g\u00e9n\u00e9r\u00e9s par Maven
svn commit: r1145556 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/main/resources/site-plugin_fr.properties
Author: ltheussl Date: Tue Jul 12 11:47:03 2011 New Revision: 1145556 URL: http://svn.apache.org/viewvc?rev=1145556view=rev Log: [MSITE-593] merge r114 from trunk Modified: maven/plugins/branches/maven-site-plugin-3.x/ (props changed) maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_fr.properties Propchange: maven/plugins/branches/maven-site-plugin-3.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jul 12 11:47:03 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546 +/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936,1145546,114 Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_fr.properties URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_fr.properties?rev=1145556r1=114r2=1145556view=diff == --- maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_fr.properties (original) +++ maven/plugins/branches/maven-site-plugin-3.x/src/main/resources/site-plugin_fr.properties Tue Jul 12 11:47:03 2011 @@ -18,9 +18,9 @@ report.category.column.description = Description report.category.column.document= Document report.category.sectionTitle = Vue d'ensemble -report.information.description1= Ce document fournit une vue d'ensemble des divers documents et liens qui font partis des informations g\u00e9n\u00e9rales du projet. Tous ces contenus sont g\u00e9n\u00e9r\u00e9s automatiquement par -report.information.description2= le projet lui-m\u00eame. +report.information.description1= Ce document fournit une vue d'ensemble des divers documents et liens qui font partie des informations g\u00e9n\u00e9rales du projet. Tous ces contenus sont g\u00e9n\u00e9r\u00e9s automatiquement par +report.information.description2= pour le compte du projet. report.information.title = Information g\u00e9n\u00e9rale du projet report.project.description1= Ce document fournit une vue d'ensemble des divers rapports g\u00e9n\u00e9r\u00e9s automatiquement par report.project.description2= . Chaque rapport est d\u00e9crit bri\u00e8vement ci-dessous. -report.project.title = Rapport g\u00e9n\u00e9r\u00e9s par Maven +report.project.title = Rapports g\u00e9n\u00e9r\u00e9s par Maven
svn commit: r1143762 - /maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml
Author: ltheussl Date: Thu Jul 7 11:11:41 2011 New Revision: 1143762 URL: http://svn.apache.org/viewvc?rev=1143762view=rev Log: [DOXIA-426] upgrade pegdown, this should be java 5 compatible Modified: maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml Modified: maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml?rev=1143762r1=1143761r2=1143762view=diff == --- maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml (original) +++ maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml Thu Jul 7 11:11:41 2011 @@ -51,7 +51,7 @@ under the License. dependency groupIdorg.pegdown/groupId artifactIdpegdown/artifactId -version1.0.1/version +version1.0.2/version /dependency dependency groupIdorg.apache.maven.doxia/groupId
svn commit: r1143770 - in /maven: doxia/doxia/trunk/doxia-modules/doxia-module-markdown/ doxia/doxia/trunk/doxia-modules/doxia-module-markdown/pom.xml doxia/doxia/trunk/doxia-modules/pom.xml sandbox/t
Author: ltheussl Date: Thu Jul 7 11:39:16 2011 New Revision: 1143770 URL: http://svn.apache.org/viewvc?rev=1143770view=rev Log: [DOXIA-426] Markdown module Submitted by: Julien Nicoulaud Added: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/ - copied from r1143731, maven/sandbox/trunk/doxia/doxia-module-markdown/ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/pom.xml - copied unchanged from r1143762, maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml Removed: maven/sandbox/trunk/doxia/doxia-module-markdown/ Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/pom.xml?rev=1143770r1=1143769r2=1143770view=diff == --- maven/doxia/doxia/trunk/doxia-modules/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-modules/pom.xml Thu Jul 7 11:39:16 2011 @@ -46,6 +46,8 @@ under the License. moduledoxia-module-twiki/module moduledoxia-module-xdoc/module moduledoxia-module-xhtml/module +!-- this has a dep on xhtml module, so needs to be built last! -- +moduledoxia-module-markdown/module /modules dependencies
svn commit: r1143281 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: ltheussl Date: Wed Jul 6 07:56:32 2011 New Revision: 1143281 URL: http://svn.apache.org/viewvc?rev=1143281view=rev Log: use latest parent Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1143281r1=1143280r2=1143281view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Wed Jul 6 07:56:32 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version20/version +version21/version relativePath../maven-plugins/pom.xml/relativePath /parent
svn commit: r1143282 - /maven/plugins/branches/maven-site-plugin-3.x/pom.xml
Author: ltheussl
Date: Wed Jul 6 07:58:20 2011
New Revision: 1143282
URL: http://svn.apache.org/viewvc?rev=1143282view=rev
Log:
order imports the same as trunk
Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=1143282r1=1143281r2=1143282view=diff
==
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Wed Jul 6 07:58:20
2011
@@ -263,11 +263,6 @@ under the License.
!-- Doxia --
dependency
groupIdorg.apache.maven.doxia/groupId
- artifactIddoxia-module-xhtml/artifactId
- version${doxiaVersion}/version
-/dependency
-dependency
- groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-sink-api/artifactId
version${doxiaVersion}/version
/dependency
@@ -291,6 +286,11 @@ under the License.
dependency
groupIdorg.apache.maven.doxia/groupId
+ artifactIddoxia-module-xhtml/artifactId
+ version${doxiaVersion}/version
+/dependency
+dependency
+ groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-module-apt/artifactId
version${doxiaVersion}/version
scoperuntime/scope
svn commit: r1143284 - /maven/plugins/branches/maven-site-plugin-3.x/pom.xml
Author: ltheussl Date: Wed Jul 6 08:01:56 2011 New Revision: 1143284 URL: http://svn.apache.org/viewvc?rev=1143284view=rev Log: use latest parent Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=1143284r1=1143283r2=1143284view=diff == --- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original) +++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Wed Jul 6 08:01:56 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version19/version +version21/version /parent artifactIdmaven-site-plugin/artifactId
svn commit: r1140068 - in /maven/site/trunk/src/site/apt/developers/release: maven-core-release.apt maven-shared-release.apt
Author: ltheussl Date: Mon Jun 27 09:27:03 2011 New Revision: 1140068 URL: http://svn.apache.org/viewvc?rev=1140068view=rev Log: Document to run site lifecycle phase before staging. site:stage does not execute any phase, so it does not necessarily generate the whole site. Additionally, since site-plugin-2.3 and 3.0-beta-4, the site has to be generated before (stage-)deploy. Modified: maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt Modified: maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt?rev=1140068r1=1140067r2=1140068view=diff == --- maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt (original) +++ maven/site/trunk/src/site/apt/developers/release/maven-core-release.apt Mon Jun 27 09:27:03 2011 @@ -91,7 +91,7 @@ Releasing Maven [[1]] From the site checkout, stage the site (replacing $USER and $VERSION): +--+ -mvn -Preporting site:stage-deploy -DstagingSiteURL=scp://people.apache.org/home/$USER/public_html/staged-sites/maven-$VERSION +mvn -Preporting site site:stage-deploy -DstagingSiteURL=scp://people.apache.org/home/$USER/public_html/staged-sites/maven-$VERSION +--+ Note: It requires Maven 2.1.0 or higher to successfully deploy to people.apache.org via SSH. Older Maven @@ -106,7 +106,7 @@ http://people.apache.org/~USER/staged-si upload it manually: +--+ -mvn -Preporting site:stage +mvn -Preporting site site:stage scp -r target/staging/people.apache.org/home/$USER/public_html/staged-sites/maven-$VERSION u...@people.apache.org:/home/$USER/public_html/staged-sites/maven-$VERSION +--+ Modified: maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt?rev=1140068r1=1140067r2=1140068view=diff == --- maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt (original) +++ maven/site/trunk/src/site/apt/developers/release/maven-shared-release.apt Mon Jun 27 09:27:03 2011 @@ -46,7 +46,7 @@ Releasing A Maven Shared Component +--+ cd target/checkout -mvn site:stage-deploy -Preporting +mvn site site:stage-deploy -Preporting +--+ Note: It requires Maven 2.1.0 or higher to successfully deploy to people.apache.org via SSH. Older Maven @@ -65,7 +65,7 @@ http://maven.apache.org/shared/maven-XXX upload it manually: +--+ -mvn site:stage -Preporting +mvn site site:stage -Preporting scp -r target/staging/people.apache.org/www/maven.apache.org/shared/maven-XXX your_apache_usern...@people.apache.org:/www/maven.apache.org/shared/maven-XXX-Y.Z +--+
svn commit: r1137879 - in /maven/doxia/doxia/trunk: doxia-core/src/test/java/org/apache/maven/doxia/sink/ doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/ doxia-modules/
Author: ltheussl
Date: Tue Jun 21 06:48:28 2011
New Revision: 1137879
URL: http://svn.apache.org/viewvc?rev=1137879view=rev
Log:
[DOXIA-433] Regression: Unicode characters not rendered in table cells
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java?rev=1137879r1=1137878r2=1137879view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
Tue Jun 21 06:48:28 2011
@@ -948,4 +948,32 @@ public class XhtmlBaseSinkTest
assertEquals( a text '#x1d7ed;', writer.toString() );
}
+
+/**
+ * Test unicode chracters in tables. DOXIA-433.
+ */
+public void testSpecialCharacters()
+{
+try
+{
+sink = new XhtmlBaseSink( writer );
+sink.table( null );
+sink.tableRows( null, true );
+sink.tableRow( null );
+sink.tableCell();
+sink.text( \u2713, null );
+sink.tableCell_();
+sink.tableRow_();
+sink.tableRows_();
+sink.table_();
+}
+finally
+{
+sink.close();
+}
+
+final String result = writer.toString();
+
+assertTrue( result.indexOf( #x2713; ) != -1 );
+}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=1137879r1=1137878r2=1137879view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Tue Jun 21 06:48:28 2011
@@ -2482,6 +2482,7 @@ public class AptParser
cellLine = replaceAll( cellLine, \\u00A0, \\ );
cellLine = replaceAll( cellLine, \\u00A0{, \\{ );
cellLine = replaceAll( cellLine, \\u00A0}, \\} );
+cellLine = replaceAll( cellLine, \\u00A0u, \\u );
cellLine = replaceAll( cellLine, \\u00A0\\u00A0,
);
cellLine = cellLine.trim();
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java?rev=1137879r1=1137878r2=1137879view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptParserTest.java
Tue Jun 21 06:48:28 2011
@@ -569,12 +569,12 @@ public class AptParserTest
public void testSpecialCharactersInTables()
throws Exception
{
-// DOXIA-323
+// DOXIA-323, DOXIA-433
String text =
- \\~ \\= \\- \\+ \\* \\[ \\] \\ \\ \\{ \\} + EOL
+ \\~ \\= \\- \\+ \\* \\[ \\] \\ \\ \\{ \\} \\u2713 +
EOL
+ EOL
+
*--+---+ + EOL
-+ | \\~ \\= \\- \\+ \\* \\[ \\] \\ \\ \\{ \\} |
special chars | + EOL
++ | \\~ \\= \\- \\+ \\* \\[ \\] \\ \\ \\{ \\} \\u2713
| special chars | + EOL
+
*--+---+;
SinkEventTestingSink sink = new SinkEventTestingSink();
@@ -589,7 +589,7 @@ public class AptParserTest
assertEquals( paragraph, ( it.next() ).getName() );
SinkEventElement event = it.next();
assertEquals( text, event.getName() );
-assertEquals( ~ = - + * [ ] { } \\, event.getArgs()[0] );
+assertEquals
svn commit: r1137885 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl Date: Tue Jun 21 07:03:29 2011 New Revision: 1137885 URL: http://svn.apache.org/viewvc?rev=1137885view=rev Log: upgrade parent Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1137885r1=1137884r2=1137885view=diff == --- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Tue Jun 21 07:03:29 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version20/version +version21/version relativePath../maven-plugins/pom.xml/relativePath /parent
svn commit: r1137895 - in /maven/plugins/trunk/maven-pdf-plugin: pom.xml src/main/resources/pdf-plugin_pt_BR.properties
Author: ltheussl
Date: Tue Jun 21 07:46:54 2011
New Revision: 1137895
URL: http://svn.apache.org/viewvc?rev=1137895view=rev
Log:
[MPDF-53] Add pt_BR localization
Submitted by: Taciano Tres
Added:
maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_pt_BR.properties
Modified:
maven/plugins/trunk/maven-pdf-plugin/pom.xml
Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1137895r1=1137894r2=1137895view=diff
==
--- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Tue Jun 21 07:46:54 2011
@@ -59,6 +59,15 @@ under the License.
/developer
/developers
+ contributors
+contributor
+ nameTaciano Tres/name
+ roles
+roleTranslator: Portuguese (Brazil)/role
+ /roles
+/contributor
+ /contributors
+
prerequisites
maven${mavenVersion}/maven
/prerequisites
@@ -396,6 +405,7 @@ under the License.
localede/locale
localeen/locale
localefr/locale
+localept_BR/locale
/locales
/configuration
/plugin
Added:
maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_pt_BR.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_pt_BR.properties?rev=1137895view=auto
==
---
maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_pt_BR.properties
(added)
+++
maven/plugins/trunk/maven-pdf-plugin/src/main/resources/pdf-plugin_pt_BR.properties
Tue Jun 21 07:46:54 2011
@@ -0,0 +1,27 @@
+# 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.
+
+toc.title = Lista de Conte\u00fados
+toc.type = Documenta\u00e7\u00e3o do Projeto
+toc.project-info.item = Relat\u00f3rios do Projeto
+
+report.project-info.description1 = Este documento prov\u00ea uma
vis\u00e3o geral dos v\u00e1rios documentos e links que fazem parte das
informa\u00e7\u00f5es gerais deste projeto. Todo este conte\u00fado \u00e9
gerado automaticamente pelo
+report.project-info.description2 = baseado nas informa\u00e7\u00f5es do
projeto.
+report.project-info.title = Informa\u00e7\u00f5es do Projeto
+report.project-info.sectionTitle = Vis\u00e3o Geral
+report.project-info.column.description = Descri\u00e7\u00e3o
+report.project-info.column.document= Documento
svn commit: r1133256 - /maven/site/trunk/pom.xml
Author: ltheussl Date: Wed Jun 8 06:22:29 2011 New Revision: 1133256 URL: http://svn.apache.org/viewvc?rev=1133256view=rev Log: remove dead mailing lists Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1133256r1=1133255r2=1133256view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Wed Jun 8 06:22:29 2011 @@ -84,145 +84,6 @@ /otherArchives /mailingList -!-- duplication from doxia - temporary until they inherit properly -- -mailingList - nameDoxia Developer List/name - postdoxia-...@maven.apache.org/post - subscribedoxia-dev-subscr...@maven.apache.org/subscribe - unsubscribedoxia-dev-unsubscr...@maven.apache.org/unsubscribe - archivehttp://mail-archives.apache.org/mod_mbox/maven-doxia-dev//archive - otherArchives - otherArchivehttp://www.mail-archive.com/doxia-dev@maven.apache.org/otherArchive - otherArchivehttp://old.nabble.com/Doxia---dev-f11816.html/otherArchive - otherArchivehttp://markmail.org/list/org.apache.maven.doxia-dev/otherArchive - /otherArchives -/mailingList -mailingList - nameDoxia User List/name - postdoxia-us...@maven.apache.org/post - subscribedoxia-users-subscr...@maven.apache.org/subscribe - unsubscribedoxia-users-unsubscr...@maven.apache.org/unsubscribe - archivehttp://mail-archives.apache.org/mod_mbox/maven-doxia-users//archive - otherArchives - otherArchivehttp://www.mail-archive.com/doxia-users@maven.apache.org/otherArchive - otherArchivehttp://old.nabble.com/Doxia---Users-f14483.html/otherArchive - otherArchivehttp://markmail.org/list/org.apache.maven.doxia-users/otherArchive - /otherArchives -/mailingList -mailingList - nameDoxia Commits List/name - subscribedoxia-commits-subscr...@maven.apache.org/subscribe - unsubscribedoxia-commits-unsubscr...@maven.apache.org/unsubscribe - archivehttp://mail-archives.apache.org/mod_mbox/maven-doxia-commits//archive - otherArchives - otherArchivehttp://www.mail-archive.com/doxia-commits@maven.apache.org/otherArchive - otherArchivehttp://markmail.org/list/org.apache.maven.doxia-commits/otherArchive - /otherArchives -/mailingList - -!-- duplication from scm - temporary until they inherit properly -- -mailingList - nameSCM Developer List/name - subscribescm-dev-subscr...@maven.apache.org/subscribe - unsubscribescm-dev-unsubscr...@maven.apache.org/unsubscribe - postscm-...@maven.apache.org/post - archivehttp://mail-archives.apache.org/mod_mbox/maven-scm-dev/archive - otherArchives - otherArchivehttp://www.mail-archive.com/scm-dev@maven.apache.org/otherArchive - otherArchivehttp://markmail.org/list/org.apache.maven.scm-dev/otherArchive - /otherArchives -/mailingList -mailingList - nameSCM User List/name - subscribescm-users-subscr...@maven.apache.org/subscribe - unsubscribescm-users-unsubscr...@maven.apache.org/unsubscribe - postscm-us...@maven.apache.org/post - archivehttp://mail-archives.apache.org/mod_mbox/maven-scm-users/archive - otherArchives - otherArchivehttp://www.mail-archive.com/scm-users@maven.apache.org/otherArchive - otherArchivehttp://markmail.org/list/org.apache.maven.scm-users/otherArchive - /otherArchives -/mailingList -mailingList - nameSCM Commits List/name - subscribescm-commits-subscr...@maven.apache.org/subscribe - unsubscribescm-commits-unsubscr...@maven.apache.org/unsubscribe - archivehttp://mail-archives.apache.org/mod_mbox/maven-scm-commits/archive - otherArchives - otherArchivehttp://www.mail-archive.com/scm-commits@maven.apache.org/otherArchive - otherArchivehttp://markmail.org/list/org.apache.maven.scm-commits/otherArchive - /otherArchives -/mailingList - -!-- duplication from surefire - temporary until they inherit properly -- -mailingList - nameSurefire User List/name - postsurefire-us...@maven.apache.org/post - subscribesurefire-users-subscr...@maven.apache.org/subscribe - unsubscribesurefire-users-unsubscr...@maven.apache.org/unsubscribe - archivehttp://mail-archives.apache.org/mod_mbox/maven-surefire-users//archive - otherArchives - otherArchivehttp://www.mail-archive.com/surefire-users@maven.apache.org/otherArchive - otherArchivehttp://markmail.org/list/org.apache.maven.surefire-users/otherArchive - /otherArchives -/mailingList -mailingList - nameSurefire Developer List/name - postsurefire-...@maven.apache.org/post - subscribesurefire-dev-subscr...@maven.apache.org/subscribe - unsubscribesurfire-dev-unsubscr...@maven.apache.org/unsubscribe
svn commit: r1133257 - /maven/site/trunk/pom.xml
Author: ltheussl Date: Wed Jun 8 06:23:56 2011 New Revision: 1133257 URL: http://svn.apache.org/viewvc?rev=1133257view=rev Log: get latest changes from parent Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=1133257r1=1133256r2=1133257view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Wed Jun 8 06:23:56 2011 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version19/version +version20-SNAPSHOT/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r1132879 - /maven/plugins/trunk/maven-pdf-plugin/src/site/apt/examples/filtering.apt
Author: ltheussl
Date: Tue Jun 7 06:42:36 2011
New Revision: 1132879
URL: http://svn.apache.org/viewvc?rev=1132879view=rev
Log:
[MPDF-52] documentation issue
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/site/apt/examples/filtering.apt
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/site/apt/examples/filtering.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/site/apt/examples/filtering.apt?rev=1132879r1=1132878r2=1132879view=diff
==
--- maven/plugins/trunk/maven-pdf-plugin/src/site/apt/examples/filtering.apt
(original)
+++ maven/plugins/trunk/maven-pdf-plugin/src/site/apt/examples/filtering.apt
Tue Jun 7 06:42:36 2011
@@ -36,9 +36,9 @@ Filtering Document Descriptor
*--+--+
| $\{JAVA_HOME\} | The JAVA_HOME environment value.
*--+--+
-| $\{project.name\}| The project name defined in \name/\ tag
in the pom.xml.
+| $\{project.name\}| The project name as defined by the
\name/\ tag in pom.xml.
*--+--+
-| $\{project.developers[0].email\} | The email of the first developed defined
in \developers/\ tag in the pom.xml.
+| $\{project.developers[0].email\} | The email of the first developer as
defined by the \developers/\ tag in the pom.xml.
*--+--+
| $\{date} | The current date displayed in ISO-8601
format (i.e. -MM-dd), for instance 2009-06-22.
*--+--+
@@ -48,7 +48,7 @@ Filtering Document Descriptor
*--+--+
| $\{year} $\{month\} $\{day\} | The single date informations.
*--+--+
-| $\{hour} $\{minutes\} $\{second\}| The single time informations.
+| $\{hour} $\{minute\} $\{second\} | The single time informations.
*--+--+
Example
svn commit: r1132880 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl Date: Tue Jun 7 06:44:32 2011 New Revision: 1132880 URL: http://svn.apache.org/viewvc?rev=1132880view=rev Log: upgrade site and pir plugins, remove unnecessary reports Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1132880r1=1132879r2=1132880view=diff == --- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Tue Jun 7 06:44:32 2011 @@ -284,7 +284,7 @@ under the License. /plugin plugin artifactIdmaven-site-plugin/artifactId - version2.2/version + version2.3/version /plugin plugin groupIdorg.apache.maven.plugins/groupId @@ -359,7 +359,20 @@ under the License. plugins plugin artifactIdmaven-project-info-reports-plugin/artifactId -version2.3.1/version +version2.4/version +reportSets + reportSet +reports + reportcim/report + reportissue-tracking/report + reportlicense/report + reportmailing-list/report + reportproject-team/report + reportscm/report + reportsummary/report +/reports + /reportSet +/reportSets /plugin plugin groupIdorg.apache.maven.plugins/groupId @@ -445,28 +458,15 @@ under the License. reporting plugins plugin -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-plugin-plugin/artifactId -version2.7/version - /plugin - plugin artifactIdmaven-project-info-reports-plugin/artifactId -version2.3.1/version +version2.4/version reportSets reportSet reports reportcim/report - !-- too long - reportdependencies/report too long -- - reportdependency-convergence/report - reportdependency-management/report - !-- not needed - reportindex/report not needed -- reportissue-tracking/report reportlicense/report reportmailing-list/report - reportplugin-management/report - reportplugins/report reportproject-team/report reportscm/report reportsummary/report @@ -510,7 +510,7 @@ under the License. plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-site-plugin/artifactId - version3.0-beta-2/version + version3.0-beta-3/version /plugin /plugins /pluginManagement
svn commit: r1132936 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt: ./ index.apt
Author: ltheussl Date: Tue Jun 7 10:03:28 2011 New Revision: 1132936 URL: http://svn.apache.org/viewvc?rev=1132936view=rev Log: add a bogus index file to sync with the m3 version of the IT Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt?rev=1132936view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt Tue Jun 7 10:03:28 2011 @@ -0,0 +1,32 @@ + -- + Title + -- + Author + -- + Date + -- + + ~~ 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. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/doxia/references/apt-format.html + + +MSITE-458 + + This is a test.
svn commit: r1132939 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/MSITE-458/src/site/apt/ src/it/MSITE-458/src/site/apt/index.apt
Author: ltheussl Date: Tue Jun 7 10:06:41 2011 New Revision: 1132939 URL: http://svn.apache.org/viewvc?rev=1132939view=rev Log: merge r1132936 from trunk: add an index file which is not generated by pir in m3 Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/apt/ - copied from r1132936, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/apt/index.apt - copied unchanged from r1132936, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/apt/index.apt Modified: maven/plugins/branches/maven-site-plugin-3.x/ (props changed) Propchange: maven/plugins/branches/maven-site-plugin-3.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 7 10:06:41 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945 +/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079474,1079529,1079698,1080781,1081676,1081837,1081887,1082091,1082242,1082274,1082877,1083147,1083251,1083473,1084564,1086313,1086338-1086339,1086533,1087455,1088584,1089802,1089852,1091331,1098168,1098170,1099591,1126420,1126918-1126945,1132936
svn commit: r1133006 - in /maven/site/trunk/src/site/apt/guides: introduction/introduction-to-plugin-prefix-mapping.apt plugin/guide-java-plugin-development.apt
Author: ltheussl
Date: Tue Jun 7 13:33:00 2011
New Revision: 1133006
URL: http://svn.apache.org/viewvc?rev=1133006view=rev
Log:
escape special characters
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt?rev=1133006r1=1133005r2=1133006view=diff
==
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt
Tue Jun 7 13:33:00 2011
@@ -55,9 +55,9 @@ Introduction to Plugin Prefix Resolution
maven or plugin surrounded by dashes in the plugin's artifact ID. The
conventional artifact ID formats to use are:
-* maven-${prefix}-plugin - for plugins from the Apache Maven project
+* maven-$\{prefix\}-plugin - for plugins from the Apache Maven
project
-* ${prefix}-maven-plugin - for plugins from other sources
+* $\{prefix\}-maven-plugin - for plugins from other sources
If your plugin's artifactId fits this pattern, Maven will automatically map
your plugin to the correct prefix in the metadata stored within your plugin's
Modified:
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt?rev=1133006r1=1133005r2=1133006view=diff
==
---
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/plugin/guide-java-plugin-development.apt
Tue Jun 7 13:33:00 2011
@@ -208,7 +208,7 @@ mvn groupID:artifactID:version:goal
* You can assign a shortened prefix to your plugin, such as mvn
hello:sayhi.
This is done automatically if you follow the convention of using
-${prefix}-maven-plugin (or maven-${prefix}-plugin if the
plugin is
+$\{prefix\}-maven-plugin (or maven-$\{prefix\}-plugin if the
plugin is
part of the Apache Maven project). You may also assign one through
additional
configuration - for more information see
{{{../introduction/introduction-to-plugin-prefix-mapping.html}
Introduction to Plugin Prefix Mapping}}.
svn commit: r1133015 - /maven/site/trunk/src/site/resources/pdf-config.xml
Author: ltheussl Date: Tue Jun 7 14:00:17 2011 New Revision: 1133015 URL: http://svn.apache.org/viewvc?rev=1133015view=rev Log: tweak some properties for pdf Added: maven/site/trunk/src/site/resources/pdf-config.xml Added: maven/site/trunk/src/site/resources/pdf-config.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/pdf-config.xml?rev=1133015view=auto == --- maven/site/trunk/src/site/resources/pdf-config.xml (added) +++ maven/site/trunk/src/site/resources/pdf-config.xml Tue Jun 7 14:00:17 2011 @@ -0,0 +1,24 @@ +xsl:stylesheet + version=1.0 + xmlns:xsl=http://www.w3.org/1999/XSL/Transform; + xmlns:fo=http://www.w3.org/1999/XSL/Format; + +xsl:attribute-set name=figure.graphics +xsl:attribute name=content-widthscale-down-to-fit/xsl:attribute +xsl:attribute name=content-heightscale-down-to-fit/xsl:attribute +xsl:attribute name=width100%/xsl:attribute +xsl:attribute name=height100%/xsl:attribute +/xsl:attribute-set + +xsl:attribute-set name=base.pre.style +xsl:attribute name=font-familymonospace/xsl:attribute +xsl:attribute name=wrap-optionno-wrap/xsl:attribute +xsl:attribute name=keep-togetherauto/xsl:attribute +xsl:attribute name=white-space-collapsefalse/xsl:attribute +/xsl:attribute-set + +xsl:attribute-set name=body.pre use-attribute-sets=base.pre.style +xsl:attribute name=font-size9pt/xsl:attribute +/xsl:attribute-set + +/xsl:stylesheet
svn commit: r1130981 - in /maven: doxia/doxia/trunk/doxia-modules/ doxia/doxia/trunk/doxia-modules/doxia-module-markdown/ sandbox/trunk/doxia/doxia-module-markdown/ sandbox/trunk/doxia/doxia-module-ma
Author: ltheussl Date: Fri Jun 3 10:59:01 2011 New Revision: 1130981 URL: http://svn.apache.org/viewvc?rev=1130981view=rev Log: revert r1129048 until it builds with java 5 Added: maven/sandbox/trunk/doxia/doxia-module-markdown/ (props changed) - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/ maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml - copied unchanged from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml maven/sandbox/trunk/doxia/doxia-module-markdown/src/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java - copied unchanged from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java - copied unchanged from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt - copied unchanged from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/site.xml - copied unchanged from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/site.xml maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/ maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/ - copied from r1129047, maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/ maven/sandbox/trunk/doxia/doxia-module
svn commit: r1131001 - /maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm
Author: ltheussl Date: Fri Jun 3 11:48:26 2011 New Revision: 1131001 URL: http://svn.apache.org/viewvc?rev=1131001view=rev Log: fix copy/paste error introduced in r984016 Modified: maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm Modified: maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm?rev=1131001r1=1131000r2=1131001view=diff == --- maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm (original) +++ maven/skins/trunk/maven-stylus-skin/src/main/resources/META-INF/maven/site.vm Fri Jun 3 11:48:26 2011 @@ -398,7 +398,7 @@ $img.toLowerCase().startsWith(ftp:/) || $img.toLowerCase().startsWith(mailto:/;) || $img.toLowerCase().startsWith(file:/) || ($img.toLowerCase().indexOf(://) != -1) ) ) #set ( $img = $PathTool.calculateLink( $img, $relativePath ) ) -#set ( $img = $src.replaceAll( '\\', '/' ) ) +#set ( $img = $img.replaceAll( '\\', '/' ) ) #end ## #if( $item.alt )
svn commit: r1129037 - /maven/doxia/site/pom.xml
Author: ltheussl Date: Mon May 30 08:04:33 2011 New Revision: 1129037 URL: http://svn.apache.org/viewvc?rev=1129037view=rev Log: use latest doxia-maven-plugin Modified: maven/doxia/site/pom.xml Modified: maven/doxia/site/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=1129037r1=1129036r2=1129037view=diff == --- maven/doxia/site/pom.xml (original) +++ maven/doxia/site/pom.xml Mon May 30 08:04:33 2011 @@ -210,7 +210,7 @@ under the License. plugin groupIdorg.apache.maven.doxia/groupId artifactIddoxia-maven-plugin/artifactId -version1.1.4/version +version1.3-SNAPSHOT/version executions execution phasepre-site/phase
svn commit: r1129048 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-markdown/ pom.xml
Author: ltheussl Date: Mon May 30 08:23:22 2011 New Revision: 1129048 URL: http://svn.apache.org/viewvc?rev=1129048view=rev Log: [DOXIA-426] Markdown module Submitted by: Julien Nicoulaud Added: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/ - copied from r1129030, maven/sandbox/trunk/doxia/doxia-module-markdown/ Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/pom.xml?rev=1129048r1=1129047r2=1129048view=diff == --- maven/doxia/doxia/trunk/doxia-modules/pom.xml (original) +++ maven/doxia/doxia/trunk/doxia-modules/pom.xml Mon May 30 08:23:22 2011 @@ -46,6 +46,8 @@ under the License. moduledoxia-module-twiki/module moduledoxia-module-xdoc/module moduledoxia-module-xhtml/module +!-- this has a dep on xhtml module, so needs to be built last! -- +moduledoxia-module-markdown/module /modules dependencies
svn commit: r1128707 - in /maven/doxia/site: pom.xml src/site/apt/index.apt.vm src/site/apt/upgrading.apt.vm src/site/apt/whatsnew-1.1.apt src/site/site.xml
Author: ltheussl
Date: Sat May 28 17:04:33 2011
New Revision: 1128707
URL: http://svn.apache.org/viewvc?rev=1128707view=rev
Log:
site updates
Added:
maven/doxia/site/src/site/apt/upgrading.apt.vm
Modified:
maven/doxia/site/pom.xml
maven/doxia/site/src/site/apt/index.apt.vm
maven/doxia/site/src/site/apt/whatsnew-1.1.apt
maven/doxia/site/src/site/site.xml
Modified: maven/doxia/site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/site/pom.xml?rev=1128707r1=1128706r2=1128707view=diff
==
--- maven/doxia/site/pom.xml (original)
+++ maven/doxia/site/pom.xml Sat May 28 17:04:33 2011
@@ -123,8 +123,8 @@ under the License.
/issueManagement
ciManagement
-systemHudson/system
-urlhttps://hudson.apache.org/hudson//url
+systemJenkins/system
+urlhttps://builds.apache.org/job/maven-doxia-trunks//url
/ciManagement
distributionManagement
@@ -157,7 +157,7 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-site-plugin/artifactId
- version2.3-SNAPSHOT/version
+ version2.3/version
/plugin
plugin
groupIdorg.apache.maven.plugins/groupId
@@ -172,7 +172,7 @@ under the License.
plugin
groupIdorg.apache.maven.doxia/groupId
artifactIddoxia-maven-plugin/artifactId
-version${doxiaVersion}/version
+version1.1.4/version
executions
execution
phasepre-site/phase
@@ -258,7 +258,7 @@ under the License.
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-project-info-reports-plugin/artifactId
-version2.3.1/version
+version2.4/version
reportSets
reportSet
reports
@@ -282,7 +282,7 @@ under the License.
resolutionIdsClosed/resolutionIds
sortColumnNamesFix Version DESC/sortColumnNames
maxEntries1000/maxEntries
- fixVersionIds13617,15073,15517,15924,16702/fixVersionIds !--
1.1.x --
+ fixVersionIds14082/fixVersionIds !-- 1.2.x --
/configuration
reportSets
reportSet
Modified: maven/doxia/site/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/index.apt.vm?rev=1128707r1=1128706r2=1128707view=diff
==
--- maven/doxia/site/src/site/apt/index.apt.vm (original)
+++ maven/doxia/site/src/site/apt/index.apt.vm Sat May 28 17:04:33 2011
@@ -48,7 +48,7 @@ Maven Doxia
* {{{./jira-report.html}Release Notes for ${doxiaVersion}}}
- * {{{./whatsnew-1.1.html}What's new in 1.1}}
+ * {{{./upgrading.html}Upgrading from earlier versions}}
[]
Added: maven/doxia/site/src/site/apt/upgrading.apt.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/upgrading.apt.vm?rev=1128707view=auto
==
--- maven/doxia/site/src/site/apt/upgrading.apt.vm (added)
+++ maven/doxia/site/src/site/apt/upgrading.apt.vm Sat May 28 17:04:33 2011
@@ -0,0 +1,45 @@
+ -
+ Upgrading from old versions
+ -
+ Lukas Theussl
+ --
+ 2011-05-28
+ --
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+
+Latest release
+
+ The current version of Doxia is ${doxiaVersion}. Read the latest
{{{./jira-report.html}Release Notes}}.
+
+
+Upgrading from v. 1.0.x to 1.1.x
+
+ See {{{./whatsnew-1.1.html}What's new in 1.1}}.
+
+Upgrading from v. 1.1.x to 1.2.x
+
+ The only major change in version 1.2 is the upgrade to java 5.
+ Functionally v. 1.2 is equivalent and fully compatible with v. 1.1.
+
+ The full list of changes is available in the release notes:
+
{{{http://jira.codehaus.org/secure/ReleaseNote.jspa?version=14082styleName=TextprojectId=10780}1.2}}
Modified: maven/doxia/site/src/site/apt/whatsnew-1.1.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/whatsnew-1.1.apt?rev=1128707r1=1128706r2=1128707view=diff
svn commit: r1128829 [1/2] - in /maven/sandbox/trunk/doxia/doxia-module-markdown/src: site/apt/ site/apt/index.apt test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java test/resourc
Author: ltheussl
Date: Sun May 29 05:45:24 2011
New Revision: 1128829
URL: http://svn.apache.org/viewvc?rev=1128829view=rev
Log:
[DOXIA-426] Markdown module: apply doxia-module-markdown-3.patch
Submitted by: Julien Nicoulaud
Added:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/
maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt
Modified:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/test.md
Added: maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt?rev=1128829view=auto
==
--- maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt
(added)
+++ maven/sandbox/trunk/doxia/doxia-module-markdown/src/site/apt/index.apt Sun
May 29 05:45:24 2011
@@ -0,0 +1,40 @@
+ -
+ doxia-module-markdown
+ -
+ Julien Nicoulaud julien.nicoul...@gmail.com
+ --
+ 2011-05-28
+ --
+
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
+doxia-module-markdown
+
+ Markdown is a popular lightweight markup language, easy to read and easy to
write.
+ It is supported by a large panel of websites, text editors/IDEs and
converter tools.
+
+ References
+
+ * {{{http://daringfireball.net/projects/markdown}Markdown project website}}
+
+ * {{{http://en.wikipedia.org/wiki/Markdown}Markdown Wikipedia page}}
+
+ * {{{http://xbeta.org/wiki/show/Markdown}Markdown wiki}}
Modified:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java?rev=1128829r1=1128828r2=1128829view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
Sun May 29 05:45:24 2011
@@ -83,11 +83,11 @@ public class MarkdownParserTest
{
IteratorSinkEventElement it = parseFileToEventTestingSink(
paragraph ).getEventList().iterator();
-assertEquals( body, ( it.next() ).getName() );
-assertEquals( paragraph, ( it.next() ).getName() );
-assertEquals( text, ( it.next() ).getName() );
-assertEquals( paragraph_, ( it.next() ).getName() );
-assertEquals( body_, ( it.next() ).getName() );
+assertEquals( body, it.next().getName() );
+assertEquals( paragraph, it.next().getName() );
+assertEquals( text, it.next().getName() );
+assertEquals( paragraph_, it.next().getName() );
+assertEquals( body_, it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -101,13 +101,13 @@ public class MarkdownParserTest
{
IteratorSinkEventElement it = parseFileToEventTestingSink( bold
).getEventList().iterator();
-assertEquals( body, ( it.next() ).getName() );
-assertEquals( paragraph, ( it.next() ).getName() );
-assertEquals( bold, ( it.next() ).getName() );
-assertEquals( text, ( it.next() ).getName() );
-assertEquals( bold_, ( it.next() ).getName() );
-assertEquals( paragraph_, ( it.next() ).getName() );
-assertEquals( body_, ( it.next() ).getName() );
+assertEquals( body, it.next().getName() );
+assertEquals( paragraph, it.next().getName() );
+assertEquals( bold, it.next().getName() );
+assertEquals( text, it.next().getName() );
+assertEquals( bold_, it.next().getName() );
+assertEquals( paragraph_, it.next().getName() );
+assertEquals( body_, it.next
svn commit: r1128181 - in /maven/sandbox/trunk/doxia/doxia-module-markdown: ./ src/main/java/org/apache/maven/doxia/module/markdown/ src/test/java/org/apache/maven/doxia/module/markdown/ src/test/reso
Author: ltheussl
Date: Fri May 27 07:22:11 2011
New Revision: 1128181
URL: http://svn.apache.org/viewvc?rev=1128181view=rev
Log:
[DOXIA-426] Markdown module: apply doxia-module-markdown-2.patch with some
modifications
Submitted by: Julien Nicoulaud
Added:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/bold.md
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/code.md
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/image.md
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/italic.md
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/link.md
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/list.md
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/numbered-list.md
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/resources/paragraph.md
Removed:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParseException.java
maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSinkFactory.java
Modified:
maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml
maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
Modified: maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml?rev=1128181r1=1128180r2=1128181view=diff
==
--- maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml (original)
+++ maven/sandbox/trunk/doxia/doxia-module-markdown/pom.xml Fri May 27 07:22:11
2011
@@ -52,7 +52,11 @@ under the License.
dependency
groupIdorg.pegdown/groupId
artifactIdpegdown/artifactId
-version0.9.2/version
+version1.0.1/version
+/dependency
+dependency
+groupIdorg.apache.maven.doxia/groupId
+artifactIddoxia-module-xhtml/artifactId
/dependency
/dependencies
Modified:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java?rev=1128181r1=1128180r2=1128181view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
(original)
+++
maven/sandbox/trunk/doxia/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
Fri May 27 07:22:11 2011
@@ -21,8 +21,10 @@ package org.apache.maven.doxia.module.ma
import java.io.IOException;
import java.io.Reader;
+import java.io.StringReader;
-import org.apache.maven.doxia.parser.AbstractTextParser;
+import org.apache.maven.doxia.module.xhtml.XhtmlParser;
+import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.sink.Sink;
import org.codehaus.plexus.util.IOUtil;
@@ -40,7 +42,7 @@ import org.pegdown.PegDownProcessor;
* @since 1.3
*/
public class MarkdownParser
-extends AbstractTextParser
+extends XhtmlParser
{
/**
@@ -57,16 +59,17 @@ public class MarkdownParser
/**
* {@inheritDoc}
*/
+@Override
public void parse( Reader reader, Sink sink )
-throws MarkdownParseException
+throws ParseException
{
try
{
-sink.rawText( PEGDOWN_PROCESSOR.markdownToHtml( IOUtil.toString(
reader ) ) );
+super.parse( new StringReader( htmlbody +
PEGDOWN_PROCESSOR.markdownToHtml( IOUtil.toString( reader ) ) +
/body/html ), sink );
}
catch ( IOException e )
{
-throw new MarkdownParseException( Failed reading Markdown source
document, e );
+throw new ParseException( Failed reading Markdown source
document, e );
}
}
}
Modified:
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java?rev=1128181r1=1128180r2=1128181view=diff
==
---
maven/sandbox/trunk/doxia/doxia-module-markdown/src/test/java/org/apache/maven/doxia
svn commit: r1127801 - /maven/plugins/trunk/maven-acr-plugin/pom.xml
Author: ltheussl Date: Thu May 26 06:51:00 2011 New Revision: 1127801 URL: http://svn.apache.org/viewvc?rev=1127801view=rev Log: fix relativePath Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1127801r1=1127800r2=1127801view=diff == --- maven/plugins/trunk/maven-acr-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-acr-plugin/pom.xml Thu May 26 06:51:00 2011 @@ -26,6 +26,7 @@ under the License. groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId version19/version +relativePath../maven-plugins/pom.xml/relativePath /parent artifactIdmaven-acr-plugin/artifactId
svn commit: r1127813 - /maven/plugins/trunk/maven-pdf-plugin/pom.xml
Author: ltheussl Date: Thu May 26 07:49:26 2011 New Revision: 1127813 URL: http://svn.apache.org/viewvc?rev=1127813view=rev Log: upgrade parent and doxia-tools Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml Modified: maven/plugins/trunk/maven-pdf-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/pom.xml?rev=1127813r1=1127812r2=1127813view=diff == --- maven/plugins/trunk/maven-pdf-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-pdf-plugin/pom.xml Thu May 26 07:49:26 2011 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-plugins/artifactId -version19/version +version20/version relativePath../maven-plugins/pom.xml/relativePath /parent @@ -139,7 +139,7 @@ under the License. dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-doxia-tools/artifactId - version1.3/version + version1.4/version exclusions exclusion groupIdorg.apache.maven.doxia/groupId
svn commit: r1127453 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/it/MSITE-458/ src/it/MSITE-458/first/ src/it/MSITE-458/second/ src/it/MSITE-458/src/ src/it/MSITE-458/src/site/ src/it/i
Author: ltheussl Date: Wed May 25 09:33:20 2011 New Revision: 1127453 URL: http://svn.apache.org/viewvc?rev=1127453view=rev Log: merge changes from trunk Added: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/ - copied from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/first/ - copied from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/first/pom.xml - copied unchanged from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/invoker.properties - copied unchanged from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/pom.xml - copied unchanged from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/second/ - copied from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/second/pom.xml - copied unchanged from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/ - copied from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/ - copied from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/src/site/site.xml - copied unchanged from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/site.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/verify.bsh - copied unchanged from r1126945, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/verify.bsh maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/ - copied from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/goals.txt - copied unchanged from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/ - copied from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/parent/pom.xml - copied unchanged from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/pom.xml - copied unchanged from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/ - copied from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/ - copied from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/site.xml - copied unchanged from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/site.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/xdoc/ - copied from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/xdoc/ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/src/site/xdoc/index.xml - copied unchanged from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/xdoc/index.xml maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh - copied unchanged from r1126420, maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh Modified: maven/plugins/branches/maven-site-plugin-3.x/ (props changed) maven/plugins/branches/maven-site-plugin-3.x/pom.xml Propchange: maven/plugins/branches/maven-site-plugin-3.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 25 09:33:20 2011 @@ -1 +1 @@ -/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079
svn commit: r1126925 - in /maven/doxia/doxia-sitetools/trunk: doxia-decoration-model/pom.xml doxia-doc-renderer/pom.xml doxia-site-renderer/pom.xml pom.xml
Author: ltheussl Date: Tue May 24 08:32:29 2011 New Revision: 1126925 URL: http://svn.apache.org/viewvc?rev=1126925view=rev Log: insert minor bug-fix release Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml maven/doxia/doxia-sitetools/trunk/pom.xml Modified: maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml?rev=1126925r1=1126924r2=1126925view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/pom.xml Tue May 24 08:32:29 2011 @@ -25,7 +25,7 @@ under the License. parent artifactIddoxia-sitetools/artifactId groupIdorg.apache.maven.doxia/groupId -version1.3-SNAPSHOT/version +version1.2.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml?rev=1126925r1=1126924r2=1126925view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml Tue May 24 08:32:29 2011 @@ -25,7 +25,7 @@ under the License. parent artifactIddoxia-sitetools/artifactId groupIdorg.apache.maven.doxia/groupId -version1.3-SNAPSHOT/version +version1.2.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=1126925r1=1126924r2=1126925view=diff == --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Tue May 24 08:32:29 2011 @@ -25,7 +25,7 @@ under the License. parent artifactIddoxia-sitetools/artifactId groupIdorg.apache.maven.doxia/groupId -version1.3-SNAPSHOT/version +version1.2.1-SNAPSHOT/version relativePath../pom.xml/relativePath /parent Modified: maven/doxia/doxia-sitetools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=1126925r1=1126924r2=1126925view=diff == --- maven/doxia/doxia-sitetools/trunk/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/pom.xml Tue May 24 08:32:29 2011 @@ -31,7 +31,7 @@ under the License. groupIdorg.apache.maven.doxia/groupId artifactIddoxia-sitetools/artifactId - version1.3-SNAPSHOT/version + version1.2.1-SNAPSHOT/version packagingpom/packaging nameDoxia Sitetools/name
svn commit: r1126918 - in /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458: ./ first/ first/pom.xml pom.xml second/ second/pom.xml src/ src/site/ src/site/site.xml verify.bsh
Author: ltheussl Date: Tue May 24 08:12:30 2011 New Revision: 1126918 URL: http://svn.apache.org/viewvc?rev=1126918view=rev Log: add an IT to check the order of items in modules menu (MSITE-458) Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/pom.xml maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/site.xml maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/verify.bsh Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/pom.xml?rev=1126918view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/first/pom.xml Tue May 24 08:12:30 2011 @@ -0,0 +1,22 @@ +?xml version=1.0? +project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns=http://maven.apache.org/POM/4.0.0; +xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + modelVersion4.0.0/modelVersion + parent +artifactIdaggregator/artifactId +groupIdorg.example/groupId +version0.0.1-SNAPSHOT/version + /parent + artifactIdfirst/artifactId + version0.0.1-SNAPSHOT/version + nameShould be first in Modules list/name + +dependencies +dependency + groupIdorg.example/groupId + artifactIdsecond/artifactId + version0.0.1-SNAPSHOT/version +/dependency + /dependencies + +/project Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml?rev=1126918view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/pom.xml Tue May 24 08:12:30 2011 @@ -0,0 +1,47 @@ +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; + + modelVersion4.0.0/modelVersion + groupIdorg.example/groupId + artifactIdaggregator/artifactId + version0.0.1-SNAPSHOT/version + packagingpom/packaging + nameHas modules list/name + + properties +project.build.sourceEncodingUTF-8/project.build.sourceEncoding + /properties + + modules +modulefirst/module +modulesecond/module + /modules + + build +pluginManagement + plugins +plugin + artifactIdmaven-site-plugin/artifactId + version@project.version@/version +/plugin + /plugins +/pluginManagement + /build + + reporting +plugins + plugin +artifactIdmaven-project-info-reports-plugin/artifactId +version2.4/version +reportSets + reportSet +reports + reportindex/report +/reports + /reportSet +/reportSets + /plugin +/plugins + /reporting + +/project Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/pom.xml?rev=1126918view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/pom.xml (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/second/pom.xml Tue May 24 08:12:30 2011 @@ -0,0 +1,13 @@ +?xml version=1.0? +project xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns=http://maven.apache.org/POM/4.0.0; +xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + modelVersion4.0.0/modelVersion + parent +artifactIdaggregator/artifactId +groupIdorg.example/groupId +version0.0.1-SNAPSHOT/version + /parent + artifactIdsecond/artifactId + version0.0.1-SNAPSHOT/version + nameShould be second in Modules list/name +/project Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site/site.xml?rev=1126918view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/src/site
svn commit: r1126930 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: ltheussl Date: Tue May 24 08:38:35 2011 New Revision: 1126930 URL: http://svn.apache.org/viewvc?rev=1126930view=rev Log: use current doxia-sitetools Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1126930r1=1126929r2=1126930view=diff == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue May 24 08:38:35 2011 @@ -178,7 +178,7 @@ under the License. properties doxiaVersion1.2/doxiaVersion -doxiaSitetoolsVersion1.2/doxiaSitetoolsVersion +doxiaSitetoolsVersion1.2.1-SNAPSHOT/doxiaSitetoolsVersion mavenVersion2.2.0/mavenVersion wagonVersion1.0-beta-6/wagonVersion /properties
svn commit: r1126945 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties
Author: ltheussl Date: Tue May 24 09:17:55 2011 New Revision: 1126945 URL: http://svn.apache.org/viewvc?rev=1126945view=rev Log: add missing invoker properties Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties Added: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties?rev=1126945view=auto == --- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties (added) +++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-458/invoker.properties Tue May 24 09:17:55 2011 @@ -0,0 +1,3 @@ +invoker.goals.1 = clean +invoker.goals.2 = install +invoker.goals.3 = site
svn commit: r1127047 - /maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
Author: ltheussl Date: Tue May 24 13:42:13 2011 New Revision: 1127047 URL: http://svn.apache.org/viewvc?rev=1127047view=rev Log: use site-plugin-2.3, its maven-doxia-tools transitive dep gets used for the test (the test still fails though, see MPIR-182) Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1127047r1=1127046r2=1127047view=diff == --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Tue May 24 13:42:13 2011 @@ -88,7 +88,7 @@ under the License. mavenVersion2.2.0/mavenVersion wagonVersion1.0-beta-7/wagonVersion scmVersion1.4/scmVersion -sitePluginVersion2.2/sitePluginVersion +sitePluginVersion2.3/sitePluginVersion /properties dependencies
svn commit: r1126622 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Author: ltheussl
Date: Mon May 23 18:05:49 2011
New Revision: 1126622
URL: http://svn.apache.org/viewvc?rev=1126622view=rev
Log:
[DOXIASITETOOLS-60] Useless error message error in opening zip file in
DefaultSiteRenderer.createContextForSkin()
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1126622r1=1126621r2=1126622view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Mon May 23 18:05:49 2011
@@ -52,6 +52,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import org.apache.maven.doxia.Doxia;
@@ -574,8 +575,8 @@ public class DefaultSiteRenderer
{
SiteRenderingContext context = new SiteRenderingContext();
-// TODO: plexus-archiver, if it could do the excludes
-ZipFile zipFile = new ZipFile( skinFile );
+ZipFile zipFile = getZipFile( skinFile );
+
try
{
if ( zipFile.getEntry( SKIN_TEMPLATE_LOCATION ) != null )
@@ -604,6 +605,25 @@ public class DefaultSiteRenderer
return context;
}
+private static ZipFile getZipFile( File file )
+throws IOException
+{
+if ( file == null )
+{
+throw new IOException( Error opening ZipFile: null );
+}
+
+try
+{
+// TODO: plexus-archiver, if it could do the excludes
+return new ZipFile( file );
+}
+catch ( ZipException ex )
+{
+throw new IOException( Error opening ZipFile: +
file.getAbsolutePath(), ex );
+}
+}
+
/** {@inheritDoc} */
public SiteRenderingContext createContextForTemplate( File templateFile,
File skinFile, MapString, ? attributes,
DecorationModel
decoration, String defaultWindowTitle,
@@ -624,7 +644,7 @@ public class DefaultSiteRenderer
return context;
}
-private void closeZipFile( ZipFile zipFile )
+private static void closeZipFile( ZipFile zipFile )
{
// TODO: move to plexus utils
try
@@ -643,8 +663,8 @@ public class DefaultSiteRenderer
{
if ( siteRenderingContext.getSkinJarFile() != null )
{
-// TODO: plexus-archiver, if it could do the excludes
-ZipFile file = new ZipFile( siteRenderingContext.getSkinJarFile()
);
+ZipFile file = getZipFile( siteRenderingContext.getSkinJarFile() );
+
try
{
for ( Enumeration? extends ZipEntry e = file.entries();
e.hasMoreElements(); )
@@ -669,7 +689,7 @@ public class DefaultSiteRenderer
}
finally
{
-file.close();
+closeZipFile( file );
}
}
@@ -767,7 +787,7 @@ public class DefaultSiteRenderer
}
}
-private void copyFileFromZip( ZipFile file, ZipEntry entry, File destFile )
+private static void copyFileFromZip( ZipFile file, ZipEntry entry, File
destFile )
throws IOException
{
FileOutputStream fos = new FileOutputStream( destFile );
svn commit: r1126420 - in /maven/plugins/trunk/maven-site-plugin: ./ src/it/interpolation/ src/it/interpolation/parent/ src/it/interpolation/src/ src/it/interpolation/src/site/ src/it/interpolation/sr
Author: ltheussl
Date: Mon May 23 10:33:15 2011
New Revision: 1126420
URL: http://svn.apache.org/viewvc?rev=1126420view=rev
Log:
adding an IT for an issue reported on the dev list
Added:
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/site.xml
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/xdoc/
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/src/site/xdoc/index.xml
maven/plugins/trunk/maven-site-plugin/src/it/interpolation/verify.bsh
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1126420r1=1126419r2=1126420view=diff
==
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Mon May 23 10:33:15 2011
@@ -402,6 +402,10 @@ under the License.
pomIncludes
pomInclude*/pom.xml/pomInclude
/pomIncludes
+ !-- FIXME: remove! --
+ pomExcludes
+pomIncludeinterpolation/pom.xml/pomInclude
+ /pomExcludes
postBuildHookScriptverify/postBuildHookScript
localRepositoryPath${project.build.directory}/local-repo/localRepositoryPath
goals
Added: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt?rev=1126420view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/goals.txt Mon
May 23 10:33:15 2011
@@ -0,0 +1 @@
+clean site-deploy
\ No newline at end of file
Added: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml?rev=1126420view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
(added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/parent/pom.xml
Mon May 23 10:33:15 2011
@@ -0,0 +1,43 @@
+!--
+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.
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;
+ modelVersion4.0.0/modelVersion
+
+ groupIdorg.apache.maven.plugins.site.its/groupId
+ artifactIdinterpolation-parent/artifactId
+ version1.0-SNAPSHOT/version
+ packagingpom/packaging
+
+ namesite-interpolation IT - parent/name
+
+ properties
+interpolatedinterpolation/interpolated
+ /properties
+
+ distributionManagement
+site
+ id${site.server}/id
+ url${site.repository}/url
+/site
+ /distributionManagement
+
+/project
Added: maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml?rev=1126420view=auto
==
--- maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/interpolation/pom.xml Mon May
23 10:33:15 2011
@@ -0,0 +1,77 @@
+!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
svn commit: r1125966 - /maven/pom/trunk/maven/pom.xml
Author: ltheussl Date: Sun May 22 13:55:54 2011 New Revision: 1125966 URL: http://svn.apache.org/viewvc?rev=1125966view=rev Log: update my role Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1125966r1=1125965r2=1125966view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Sun May 22 13:55:54 2011 @@ -165,16 +165,6 @@ under the License. timezone+1/timezone /developer developer - idltheussl/id - nameLukas Theussl/name - emailltheu...@apache.org/email - organizationASF/organization - roles -rolePMC Member/role - /roles - timezone+1/timezone -/developer -developer idmkleint/id nameMilos Kleint/name roles @@ -378,6 +368,16 @@ under the License. /roles /developer developer + idltheussl/id + nameLukas Theussl/name + emailltheu...@apache.org/email + organizationASF/organization + roles +roleCommitter/role + /roles + timezone+1/timezone +/developer +developer idrafale/id nameRaphaël Piéroni/name emailraf...@apache.org/email
svn commit: r1125256 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt
Author: ltheussl Date: Fri May 20 06:49:32 2011 New Revision: 1125256 URL: http://svn.apache.org/viewvc?rev=1125256view=rev Log: [DOXIA-430] add linefeed-treatment=preserve to preserve empty lines Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt?rev=1125256r1=1125255r2=1125256view=diff == --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/resources/fo-styles.xslt Fri May 20 06:49:32 2011 @@ -86,6 +86,10 @@ /xsl:attribute-set xsl:attribute-set name=base.pre.style xsl:attribute name=font-familymonospace/xsl:attribute +xsl:attribute name=linefeed-treatmentpreserve/xsl:attribute +xsl:attribute name=wrap-optionno-wrap/xsl:attribute +xsl:attribute name=keep-togetheralways/xsl:attribute +xsl:attribute name=white-space-collapsefalse/xsl:attribute /xsl:attribute-set xsl:attribute-set name=italic @@ -113,9 +117,6 @@ xsl:attribute name=end-indentinherited-property-value(end-indent) + 1em/xsl:attribute /xsl:attribute-set xsl:attribute-set name=body.source use-attribute-sets=body.pre -xsl:attribute name=wrap-optionno-wrap/xsl:attribute -xsl:attribute name=keep-togetheralways/xsl:attribute -xsl:attribute name=white-space-collapsefalse/xsl:attribute xsl:attribute name=colorblack/xsl:attribute xsl:attribute name=border-stylesolid/xsl:attribute xsl:attribute name=border-width0.5pt/xsl:attribute
