aheritier 2004/09/22 17:42:24
Modified: pdf/src/plugin-test maven.xml project.xml
pdf/src/plugin-test/xdocs navigation.xml
pdf/xdocs changes.xml
Added: pdf/src/plugin-test project.properties
pdf/src/plugin-test/test01 .cvsignore maven.xml project.xml
pdf/src/plugin-test/test01/xdocs navigation.xml test.xml
pdf/src/plugin-test/test01/xdocs/images
asf_logo_wide_clear.gif maven.gif
pdf/src/plugin-test/test02 .cvsignore maven.xml project.xml
pdf/src/plugin-test/test02/xdocs navigation.xml test.xml
pdf/src/plugin-test/test02/xdocs/images
asf_logo_wide_clear.gif maven.gif
Removed: pdf/src/plugin-test/xdocs test.xml
Log:
pdf plugin tests with multiproject
Revision Changes Path
1.2 +16 -8 maven-plugins/pdf/src/plugin-test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven-plugins/pdf/src/plugin-test/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 21 Sep 2004 22:14:25 -0000 1.1
+++ maven.xml 23 Sep 2004 00:42:23 -0000 1.2
@@ -15,16 +15,24 @@
* limitations under the License.
*/
-->
-<project xmlns:util="jelly:util"
- xmlns:assert="assert"
- xmlns:j="jelly:core">
-
- <goal name="testPlugin" prereqs="clean,test-pdf">
+<project xmlns:util="jelly:util" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:assert="assert" xmlns:ant="jelly:ant">
+ <goal name="testPlugin" prereqs="test-pdf">
</goal>
-
<goal name="test-pdf">
- <attainGoal name="site"/>
+ <attainGoal name="multiproject:clean"/>
+ <!-- Multiproject : site -->
+ <attainGoal name="multiproject:site"/>
+ <maven:reactor basedir="${basedir}" postProcessing="true"
includes="test*/project.xml" collectOnly="true" ignoreFailures="false"
collectionVar="multiprojects"/>
+ <!-- We copy the generated files to us them in the pdf -->
+ <j:forEach var="reactorProject" items="${multiprojects}">
+ <j:set var="fromDir"
value="${reactorProject.context.getVariable('maven.gen.docs')}"/>
+ <ant:copy
todir="${maven.build.dir}/pdf/${maven.multiproject.aggregateDir}${reactorProject.artifactId}">
+ <ant:fileset dir="${fromDir}" force="true">
+ <ant:include name="**/*.*"/>
+ </ant:fileset>
+ </ant:copy>
+ </j:forEach>
<attainGoal name="pdf"/>
<assert:assertFileExists file="${maven.docs.dest}/${pom.artifactId}.pdf"/>
</goal>
-</project>
\ No newline at end of file
+</project>
1.2 +4 -16 maven-plugins/pdf/src/plugin-test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/pdf/src/plugin-test/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 21 Sep 2004 22:14:25 -0000 1.1
+++ project.xml 23 Sep 2004 00:42:23 -0000 1.2
@@ -16,23 +16,11 @@
* limitations under the License.
*/
-->
-
-
<project>
- <extend>${basedir}/../../../plugin-parent/project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<pomVersion>3</pomVersion>
<id>test-maven-pdf-plugin</id>
- <name>Test project for Maven PDF Plugin</name>
- <groupId>maven</groupId>
- <currentVersion>1.0</currentVersion>
- <inceptionYear>2001</inceptionYear>
- <package>org.apache.maven</package>
- <description>Test for Maven PDF plugin</description>
- <shortDescription>Test for Maven PDF plugin</shortDescription>
- <url>http://maven.apache.org/reference/plugins/pdf/</url>
- <siteDirectory>/www/maven.apache.org/reference/plugins/pdf/</siteDirectory>
- <repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:maven-plugins/pdf/</connection>
- <url>http://cvs.apache.org/viewcvs/maven-plugins/pdf/</url>
- </repository>
+ <name>Maven PDF Plugin Tests</name>
+ <description>Maven PDF Plugin Tests</description>
+ <shortDescription>Maven PDF Plugin Tests</shortDescription>
</project>
1.1 maven-plugins/pdf/src/plugin-test/project.properties
Index: project.properties
===================================================================
# -------------------------------------------------------------------
# Copyright 2001-2004 The Apache Software Foundation.
#
# Licensed 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.
# -------------------------------------------------------------------
# Multiproject plugin settings
maven.multiproject.navigation=aggregate
maven.multiproject.overviewPage.title=Maven PDF tests
maven.multiproject.overviewPage.text=The following Maven pdf tests are available:
# PDF plugin properties
maven.pdf.navigationFilePath=${maven.gen.docs}
1.1 maven-plugins/pdf/src/plugin-test/test01/.cvsignore
Index: .cvsignore
===================================================================
gump.xml
target
*.log
1.1 maven-plugins/pdf/src/plugin-test/test01/maven.xml
Index: maven.xml
===================================================================
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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:util="jelly:util"
xmlns:assert="assert"
xmlns:j="jelly:core">
<goal name="testPlugin" prereqs="clean,test-pdf">
</goal>
<goal name="test-pdf">
<attainGoal name="site"/>
<attainGoal name="pdf"/>
<assert:assertFileExists file="${maven.docs.dest}/${pom.artifactId}.pdf"/>
</goal>
</project>
1.1 maven-plugins/pdf/src/plugin-test/test01/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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>
<extend>${basedir}/../../../../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion>
<id>test-maven-pdf-plugin-01</id>
<name>Maven PDF Plugin Test 01</name>
<description>Maven PDF Plugin Test 01</description>
<shortDescription>Maven PDF Plugin Test 01</shortDescription>
</project>
1.1 maven-plugins/pdf/src/plugin-test/test01/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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 name="Maven PDF Plugin">
<title>Maven PDF Plugin</title>
<body>
<links>
<item name="Maven" href="http://maven.apache.org/"/>
<item name="FOP" href="http://xml.apache.org/fop/"/>
<item name="PDF Documentation" href="/maven-pdf-plugin.pdf"
img="/images/pdf.gif" target="_blank"/>
</links>
<menu name="Overview">
<item name="Test" href="/test.html"/>
</menu>
</body>
</project>
1.1 maven-plugins/pdf/src/plugin-test/test01/xdocs/test.xml
Index: test.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<document>
<properties>
<author email="nospam.AT.foo.DOT.com">Jon S. Stevens</author>
<author email="mrsmith.AT.foo.DOT.com">Mr. Smith</author>
<title/>
</properties>
<meta name="keyword" content="jakarta, java"/>
<body>
<section name="Section 1">
<p>This is section 1.</p>
<table>
<tr>
<td>This is a table</td>
</tr>
</table>
<ul>
<li>This is an unordered list.</li>
</ul>
</section>
<section name="Section 2">
<p>This is section 2.</p>
<ol>
<li>This is an ordered list.</li>
</ol>
</section>
<section name="Section 3">
<p>This is section 3.</p>
<source><![CDATA[
Anything within this tag is rendered as a "box"
with blue lines and <pre/> tags around it.
]]></source>
<pre><![CDATA[
Anything within this tag is rendered as a "box"
with blue lines and <pre/> tags around it.
]]></pre>
<subsection name="Subsection of Section 3">
<p>
This is the subsection 3.
</p>
</subsection>
</section>
</body>
</document>
1.1
maven-plugins/pdf/src/plugin-test/test01/xdocs/images/asf_logo_wide_clear.gif
<<Binary file>>
1.1 maven-plugins/pdf/src/plugin-test/test01/xdocs/images/maven.gif
<<Binary file>>
1.1 maven-plugins/pdf/src/plugin-test/test02/.cvsignore
Index: .cvsignore
===================================================================
gump.xml
target
*.log
1.1 maven-plugins/pdf/src/plugin-test/test02/maven.xml
Index: maven.xml
===================================================================
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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:util="jelly:util"
xmlns:assert="assert"
xmlns:j="jelly:core">
<goal name="testPlugin" prereqs="clean,test-pdf">
</goal>
<goal name="test-pdf">
<attainGoal name="site"/>
<attainGoal name="pdf"/>
<assert:assertFileExists file="${maven.docs.dest}/${pom.artifactId}.pdf"/>
</goal>
</project>
1.1 maven-plugins/pdf/src/plugin-test/test02/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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>
<extend>${basedir}/../../../../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion>
<id>test-maven-pdf-plugin-02</id>
<name>Maven PDF Plugin Test 02</name>
<description>Maven PDF Plugin Test 02</description>
<shortDescription>Maven PDF Plugin Test 02</shortDescription>
</project>
1.1 maven-plugins/pdf/src/plugin-test/test02/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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 name="Maven PDF Plugin">
<title>Maven PDF Plugin</title>
<body>
<links>
<item name="Maven" href="http://maven.apache.org/"/>
<item name="FOP" href="http://xml.apache.org/fop/"/>
<item name="PDF Documentation" href="/maven-pdf-plugin.pdf"
img="/images/pdf.gif" target="_blank"/>
</links>
<menu name="Overview">
<item name="Test" href="/test.html"/>
</menu>
</body>
</project>
1.1 maven-plugins/pdf/src/plugin-test/test02/xdocs/test.xml
Index: test.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
-->
<document>
<properties>
<author email="nospam.AT.foo.DOT.com">Jon S. Stevens</author>
<author email="mrsmith.AT.foo.DOT.com">Mr. Smith</author>
<title/>
</properties>
<meta name="keyword" content="jakarta, java"/>
<body>
<section name="Section 1">
<p>This is section 1.</p>
<table>
<tr>
<td>This is a table</td>
</tr>
</table>
<ul>
<li>This is an unordered list.</li>
</ul>
</section>
<section name="Section 2">
<p>This is section 2.</p>
<ol>
<li>This is an ordered list.</li>
</ol>
</section>
<section name="Section 3">
<p>This is section 3.</p>
<source><![CDATA[
Anything within this tag is rendered as a "box"
with blue lines and <pre/> tags around it.
]]></source>
<pre><![CDATA[
Anything within this tag is rendered as a "box"
with blue lines and <pre/> tags around it.
]]></pre>
<subsection name="Subsection of Section 3">
<p>
This is the subsection 3.
</p>
</subsection>
</section>
</body>
</document>
1.1
maven-plugins/pdf/src/plugin-test/test02/xdocs/images/asf_logo_wide_clear.gif
<<Binary file>>
1.1 maven-plugins/pdf/src/plugin-test/test02/xdocs/images/maven.gif
<<Binary file>>
1.2 +11 -8 maven-plugins/pdf/src/plugin-test/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/maven-plugins/pdf/src/plugin-test/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 21 Sep 2004 22:14:25 -0000 1.1
+++ navigation.xml 23 Sep 2004 00:42:23 -0000 1.2
@@ -16,16 +16,19 @@
* limitations under the License.
*/
-->
-<project name="Maven PDF Plugin">
- <title>Maven PDF Plugin</title>
+<project name="$pom.name">
<body>
- <links>
- <item name="Maven" href="http://maven.apache.org/"/>
- <item name="FOP" href="http://xml.apache.org/fop/"/>
- <item name="PDF Documentation" href="/maven-pdf-plugin.pdf"
img="/images/pdf.gif" target="_blank"/>
- </links>
+ <links/>
<menu name="Overview">
- <item name="Test" href="/test.html"/>
+ #if ($overviewPageCreate == "true" )
+ <item name="${overviewPageLinkTitle}"
href="${overviewPageLink}.html"/>
+ #end
</menu>
+ <menu name="Sub-Projects">
+ #foreach ($reactorProject in $multiprojects)
+ <item name="$reactorProject.name"
href="/${aggregateDir}${reactorProject.artifactId}/index.html"/>
+ <item name="$reactorProject.name test"
href="/${aggregateDir}${reactorProject.artifactId}/test.html"/>
+ #end
+ </menu>
</body>
</project>
1.21 +1 -1 maven-plugins/pdf/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/pdf/xdocs/changes.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- changes.xml 22 Sep 2004 21:39:30 -0000 1.20
+++ changes.xml 23 Sep 2004 00:42:23 -0000 1.21
@@ -25,7 +25,7 @@
<release version="2.2-SNAPSHOT" date="In CVS">
<action dev="aheritier" type="fix" issue="MPPDF-14">PRE tag support
added.</action>
<action dev="carlos" type="fix">Show "v." in cover only when version is not
empty.</action>
- <action dev="aheritier" type="add" issue="MPPDF-11">The new property
"maven.pdf.navigationFilePath" allows you to define a different directory from
${maven.xdoc.src} for the navigation file (If this file is generated for
example).</action>
+ <action dev="aheritier" type="fix" issue="MPPDF-12">The new property
"maven.pdf.navigationFilePath" allows you to define a different directory from
${maven.xdoc.src} for the navigation file. From now, the PDF plugin can be used in a
multiproject environment with a navigation file dynamically generated.</action>
<action dev="aheritier" type="add" issue="MPPDF-10" due-to="M. Sean
Gilligan">Add USLetter (8.5"x11") as a paper type.</action>
</release>
<release version="2.1" date="2004-05-15">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
