Author: hboutemy
Date: Fri Aug 21 22:39:07 2015
New Revision: 1697063
URL: http://svn.apache.org/r1697063
Log:
[MPDF-73] check which Doxia Markups are included in pdf or not
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/apt/apt.apt
(with props)
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/fml.fml
(with props)
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/markdown/
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/markdown/markdown.md
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml
(with props)
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xhtml/
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xhtml/xhtml.xhtml
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/site.xml
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/verify.bsh
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/apt/apt.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/apt/apt.apt?rev=1697063&view=auto
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/apt/apt.apt
(added)
+++
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/apt/apt.apt
Fri Aug 21 22:39:07 2015
@@ -0,0 +1,31 @@
+ ------
+ APT Doxia Markup
+ ------
+ Hervé Boutemy
+ ------
+ 2015-08-21
+ ------
+
+~~ 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
+
+APT Doxia Markup
+
+ This file was written in APT Doxia Markup.
Propchange:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/apt/apt.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/apt/apt.apt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/fml.fml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/fml.fml?rev=1697063&view=auto
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/fml.fml
(added)
+++
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/fml.fml
Fri Aug 21 22:39:07 2015
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<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";
+ title="FML Doxia Markup">
+ <part id="FML">
+ <faq id="FML">
+ <question>Is FML Doxia Markup Content Merged into PDF?</question>
+ <answer>
+ <p>This file was written in FML Doxia Markup. We'll see...</p>
+ </answer>
+ </faq>
+ </part>
+</faqs>
+
Propchange:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/fml.fml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/fml/fml.fml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/markdown/markdown.md
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/markdown/markdown.md?rev=1697063&view=auto
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/markdown/markdown.md
(added)
+++
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/markdown/markdown.md
Fri Aug 21 22:39:07 2015
@@ -0,0 +1,27 @@
+# Markdown Doxia Markup
+
+<!--
+ 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
+-->
+
+## Markdown Doxia Markup
+
+This file was written in Markdown Doxia Markup.
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/site.xml?rev=1697063&r1=1697062&r2=1697063&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/site.xml
(original)
+++
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/site.xml
Fri Aug 21 22:39:07 2015
@@ -25,5 +25,12 @@ under the License.
<item name="Introduction" href="index.html"/>
<item name="Usage" href="usage.html"/>
</menu>
+ <menu name="Doxia Markups">
+ <item name="APT" href="apt.html"/>
+ <item name="FML" href="fml.html"/>
+ <item name="Markdown" href="markdown.html"/>
+ <item name="Xdoc" href="xdoc.html"/>
+ <item name="XHTML" href="xhtml.html"/>
+ </menu>
</body>
</project>
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml?rev=1697063&view=auto
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml
(added)
+++
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml
Fri Aug 21 22:39:07 2015
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+ <properties>
+ <title>Xdoc Doxia Markup</title>
+ <author>Hervé Boutemy</author>
+ </properties>
+ <body>
+ <section name="Xdoc Doxia Markup">
+ <p>This file was written in Xdoc Doxia Markup.</p>
+ </section>
+ </body>
+</document>
Propchange:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xdoc/xdoc.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xhtml/xhtml.xhtml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xhtml/xhtml.xhtml?rev=1697063&view=auto
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xhtml/xhtml.xhtml
(added)
+++
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/src/site/xhtml/xhtml.xhtml
Fri Aug 21 22:39:07 2015
@@ -0,0 +1,29 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml";>
+<!-- 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. -->
+ <head>
+ <title>XHTML Doxia Markup</title>
+ <meta name="author" content="Hervé Boutemy" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ </head>
+ <body>
+ <h1>XHTML Doxia Markup</h1>
+ <p>This file was written in XHTML Doxia Markup.</p>
+ </body>
+</html>
Modified:
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/verify.bsh?rev=1697063&r1=1697062&r2=1697063&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/verify.bsh
(original)
+++
maven/plugins/trunk/maven-pdf-plugin/src/it/pdf-with-reporting-section/verify.bsh
Fri Aug 21 22:39:07 2015
@@ -33,10 +33,40 @@ in.close();
String content = new String( bytes, "ISO-8859-1" );
-if ( content.indexOf( "/Title (Continuous Integration)" ) < 0 )
+if ( !content.contains( "/Title (Continuous Integration)" ) )
{
System.err.println( "MPIR CIM report not included in pdf." );
- // return false; MPDF-48: known issue...
+ // return false; MPDF-48: known issue with Maven 3...
+}
+
+if ( !content.contains( "/Title (APT)" ) )
+{
+ System.err.println( "APT Doxia Markup not included in pdf." );
+ return false;
+}
+
+if ( !content.contains( "/Title (FML)" ) )
+{
+ System.err.println( "FML Doxia Markup not included in pdf." );
+ return false;
+}
+
+if ( !content.contains( "/Title (Xdoc)" ) )
+{
+ System.err.println( "Xdoc Doxia Markup not included in pdf." );
+ return false;
+}
+
+if ( !content.contains( "/Title (XHTML)" ) )
+{
+ System.err.println( "XHTML Doxia Markup not included in pdf." );
+ return false;
+}
+
+if ( !content.contains( "/Title (Markdown)" ) )
+{
+ System.err.println( "Markdown Doxia Markup not included in pdf." );
+ //return false;
}
return true;
