Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPXDOC-132 : A link starting with https wasn't considered as an external link.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@153863 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2005-02-14 22:07:14 +00:00
parent 632a860139
commit e57ab85705
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xdoc/project.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
/* /*
* Copyright 2001-2004 The Apache Software Foundation. * Copyright 2001-2004 The Apache Software Foundation.
@ -17,7 +16,6 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<project> <project>
<extend>../plugin-parent/project.xml</extend> <extend>../plugin-parent/project.xml</extend>
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
@ -143,7 +141,7 @@
<role>Developer</role> <role>Developer</role>
</roles> </roles>
<timezone>-3</timezone> <timezone>-3</timezone>
</developer> </developer>
</developers> </developers>
<dependencies> <dependencies>
<dependency> <dependency>
@ -164,7 +162,7 @@
<dependency> <dependency>
<groupId>commons-jelly</groupId> <groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId> <artifactId>commons-jelly-tags-jsl</artifactId>
<version>1.1-SNAPSHOT</version> <version>1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-jelly</groupId> <groupId>commons-jelly</groupId>

2
xdoc/src/plugin-resources/site.jsl
View File

@ -305,7 +305,7 @@
<doc:escapeNameToken value="${href}"/> <doc:escapeNameToken value="${href}"/>
</x:attribute> </x:attribute>
</j:when> </j:when>
<j:when test="${href.startsWith('http://')}"> <j:when test="${href.startsWith('http://') or href.startsWith('https://')}">
<x:attribute name="href">${href}</x:attribute> <x:attribute name="href">${href}</x:attribute>
<x:attribute name="class">externalLink</x:attribute> <x:attribute name="class">externalLink</x:attribute>
<x:attribute name="title">External Link</x:attribute> <x:attribute name="title">External Link</x:attribute>

16
xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml
View File

@ -16,20 +16,18 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<document> <document>
<properties> <properties>
<title>Xdoc test Document</title> <title>Xdoc test Document</title>
</properties> </properties>
<body> <body>
<section name="test jslToSite tag"> <section name="test jslToSite tag">
<p>empty document</p> <p>This document is generated separately from other xdoc documents but should retain the site stylesheet and navigation.<br/>
<p> <ul>
This document is generated separately from other xdoc documents <li><a href="http://myAddress">HTTP External link 1</a></li>
but should retain the site stylesheet and navigation. <li><a href="https://myAddress">HTTPS External link 2</a></li>
</p> </ul>
</p>
</section> </section>
</body> </body>
</document> </document>

10
xdoc/xdocs/changes.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
/* /*
* Copyright 2001-2004 The Apache Software Foundation. * Copyright 2001-2004 The Apache Software Foundation.
@ -17,7 +16,6 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<document> <document>
<properties> <properties>
<title>Changes</title> <title>Changes</title>
@ -27,16 +25,18 @@
</properties> </properties>
<body> <body>
<release version="1.9-SNAPSHOT" date="in CVS"> <release version="1.9-SNAPSHOT" date="in CVS">
<action dev="aheritier" type="fix" issue="MPXDOC-132" due-to="Ignacio G. Mac Dowell">A link starting with https wasn't considered as an external link.</action>
<action dev="felipeal" type="add" issue="MPXDOC-129" due-to="Miguel Griffa">Add a <code>comment</code> property for dependencies</action> <action dev="felipeal" type="add" issue="MPXDOC-129" due-to="Miguel Griffa">Add a <code>comment</code> property for dependencies</action>
<action dev="brett" type="add">Added maven.xdoc.copy.excludes property which lists the files to exclude from the resources copy. This defaults to any images currently unused by Maven. Additionally, if you are not using the classic theme, maven.xdoc.copy.excludes.classic is used to eliminate images only for the classic theme</action> <action dev="brett" type="add">Added maven.xdoc.copy.excludes property which lists the files to exclude from the resources copy. This defaults to any images currently unused by Maven. Additionally, if you are not using the classic theme, maven.xdoc.copy.excludes.classic is used to eliminate images only for the classic theme</action>
<action dev="felipeal" type="add" issue="MPXDOC-118">Added new tag <code>&lt;escapeXml&gt;</code>.</action> <action dev="felipeal" type="add" issue="MPXDOC-118">Added new tag <code>&lt;escapeXml&gt;</code>.</action>
<action dev="epugh" type="add" issue="MPXDOC-124" due-to="Shinobu Kawai">Maven xdoc plugin clean up generated velocity log as part of calling clean.</action> <action dev="epugh" type="add" issue="MPXDOC-124" due-to="Shinobu Kawai">Maven xdoc plugin clean up generated velocity log as part of calling clean.</action>
<action dev="aheritier" type="add" issue="MPXDOC-123">New property (maven.xdoc.xml.copy) to copy only and not transform some xml files provided in the ${maven.docs.src} directory.</action> <action dev="aheritier" type="add" issue="MPXDOC-123">New property (maven.xdoc.xml.copy) to copy only and not transform some xml files provided in the ${maven.docs.src} directory.</action>
<action dev="brett" type="update">Make compatible with Maven 1.1</action> <action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="aheritier" type="fix" issue="MPXDOC-117" due-to="Dennis Lundberg">Show version if maven.xdoc.date=right</action> <action dev="aheritier" type="fix" issue="MPXDOC-117" due-to="Dennis Lundberg">Show version if maven.xdoc.date=right</action>
<action dev="aheritier" type="fix" issue="MPXDOC-115" due-to="Brent Worden">Allow header images and links to use relative paths</action> <action dev="aheritier" type="fix" issue="MPXDOC-115" due-to="Brent Worden">Allow header images and links to use relative paths</action>
<action dev="carlos" type="add" issue="MPFAQ-11">Added dt css style</action> <action dev="carlos" type="add" issue="MPFAQ-11">Added dt css style</action>
<action dev="brett" type="add">Add a legend for the symbols in the xdoc, disabled by setting <code>maven.xdoc.legend=false</code></action> <action dev="brett" type="add">Add a legend for the symbols in the xdoc, disabled by setting <code>maven.xdoc.legend=false</code>
</action>
</release> </release>
<release version="1.8" date="2004-07-10"> <release version="1.8" date="2004-07-10">
<action dev="brett" type="add">Add an externalLink attribute to a report to use if link is not present</action> <action dev="brett" type="add">Add an externalLink attribute to a report to use if link is not present</action>