svn commit: r354925 - /maven/doxia/tags/doxia-module-twiki-1.5-syntax/
Author: jdcasey Date: Wed Dec 7 16:56:52 2005 New Revision: 354925 URL: http://svn.apache.org/viewcvs?rev=354925&view=rev Log: Tagging 1.5 syntax, before I convert it to 1.4 syntax. Added: maven/doxia/tags/doxia-module-twiki-1.5-syntax/ - copied from r354924, maven/doxia/trunk/doxia-module-twiki/
svn commit: r355685 - in /maven/doxia/trunk: doxia-core/pom.xml doxia-sink-api/pom.xml doxia-site-renderer/pom.xml pom.xml
Author: jdcasey Date: Fri Dec 9 17:37:08 2005 New Revision: 355685 URL: http://svn.apache.org/viewcvs?rev=355685&view=rev Log: (empty) Modified: maven/doxia/trunk/doxia-core/pom.xml maven/doxia/trunk/doxia-sink-api/pom.xml maven/doxia/trunk/doxia-site-renderer/pom.xml maven/doxia/trunk/pom.xml Modified: maven/doxia/trunk/doxia-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=355685&r1=355684&r2=355685&view=diff == --- maven/doxia/trunk/doxia-core/pom.xml (original) +++ maven/doxia/trunk/doxia-core/pom.xml Fri Dec 9 17:37:08 2005 @@ -2,11 +2,23 @@ doxia org.apache.maven.doxia -1.0-alpha-6-SNAPSHOT +1.0-alpha-6 4.0.0 doxia-core Doxia Core + 1.0-alpha-6 + + + +maven-compiler-plugin + + 1.4 + 1.4 + + + + oro @@ -14,32 +26,20 @@ 2.0.7 + org.apache.maven.doxia + doxia-sink-api + 1.0-alpha-6 + + org.codehaus.plexus plexus-utils 1.0.4 - org.apache.maven.doxia - doxia-sink-api - 1.0-alpha-6-SNAPSHOT - - org.codehaus.plexus plexus-container-default 1.0-alpha-8 test - - - -org.apache.maven.plugins -maven-compiler-plugin - - 1.4 - 1.4 - - - - - + \ No newline at end of file Modified: maven/doxia/trunk/doxia-sink-api/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-sink-api/pom.xml?rev=355685&r1=355684&r2=355685&view=diff == --- maven/doxia/trunk/doxia-sink-api/pom.xml (original) +++ maven/doxia/trunk/doxia-sink-api/pom.xml Fri Dec 9 17:37:08 2005 @@ -2,9 +2,10 @@ doxia org.apache.maven.doxia -1.0-alpha-6-SNAPSHOT +1.0-alpha-6 4.0.0 doxia-sink-api Doxia Sink API + 1.0-alpha-6 Modified: maven/doxia/trunk/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/pom.xml?rev=355685&r1=355684&r2=355685&view=diff == --- maven/doxia/trunk/doxia-site-renderer/pom.xml (original) +++ maven/doxia/trunk/doxia-site-renderer/pom.xml Fri Dec 9 17:37:08 2005 @@ -2,13 +2,30 @@ doxia org.apache.maven.doxia -1.0-alpha-6-SNAPSHOT +1.0-alpha-6 4.0.0 doxia-site-renderer Doxia Site Renderer Component + 1.0-alpha-6 + + + Vincent Siveton + [EMAIL PROTECTED] + Apache Software Foundation + +Java Developer + + -5 + + + org.apache.maven.doxia + doxia-core + 1.0-alpha-6 + + org.codehaus.plexus plexus-i18n 1.0-beta-6 @@ -18,21 +35,5 @@ plexus-velocity 1.1.2 - - org.apache.maven.doxia - doxia-core - 1.0-alpha-6-SNAPSHOT - - - - Vincent Siveton - [EMAIL PROTECTED] - Apache Software Foundation - -Java Developer - - -5 - - Modified: maven/doxia/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/pom.xml?rev=355685&r1=355684&r2=355685&view=diff == --- maven/doxia/trunk/pom.xml (original) +++ maven/doxia/trunk/pom.xml Fri Dec 9 17:37:08 2005 @@ -1,10 +1,11 @@ 4.0.0 + org.apache.maven.doxia doxia - Doxia - 1.0-alpha-6-SNAPSHOT pom + Doxia + 1.0-alpha-6 http://maven.apache.org/doxia jira @@ -65,9 +66,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/trunk -http://svn.apache.org/viewcvs.cgi/maven/doxia/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 + http://svn.apache.org/viewcvs.cgi/maven/doxia/tags/doxia-1.0-alpha-6 @@ -84,6 +85,11 @@ + +doxia-core +doxia-sink-api +doxia-site-renderer + repo1 @@ -100,9 +106,4 @@ scp://minotaur.apache.org/www/maven.apache.org/doxia/ - -doxia-core -doxia-sink-api -doxia-site-renderer -
svn commit: r355686 - in /maven/doxia/trunk: doxia-core/pom.xml doxia-sink-api/pom.xml doxia-site-renderer/pom.xml pom.xml
Author: jdcasey Date: Fri Dec 9 17:41:22 2005 New Revision: 355686 URL: http://svn.apache.org/viewcvs?rev=355686&view=rev Log: Rolling back failed release commit. Modified: maven/doxia/trunk/doxia-core/pom.xml maven/doxia/trunk/doxia-sink-api/pom.xml maven/doxia/trunk/doxia-site-renderer/pom.xml maven/doxia/trunk/pom.xml Modified: maven/doxia/trunk/doxia-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=355686&r1=355685&r2=355686&view=diff == --- maven/doxia/trunk/doxia-core/pom.xml (original) +++ maven/doxia/trunk/doxia-core/pom.xml Fri Dec 9 17:41:22 2005 @@ -2,23 +2,11 @@ doxia org.apache.maven.doxia -1.0-alpha-6 +1.0-alpha-6-SNAPSHOT 4.0.0 doxia-core Doxia Core - 1.0-alpha-6 - - - -maven-compiler-plugin - - 1.4 - 1.4 - - - - oro @@ -26,20 +14,32 @@ 2.0.7 - org.apache.maven.doxia - doxia-sink-api - 1.0-alpha-6 - - org.codehaus.plexus plexus-utils 1.0.4 + org.apache.maven.doxia + doxia-sink-api + 1.0-alpha-6-SNAPSHOT + + org.codehaus.plexus plexus-container-default 1.0-alpha-8 test - \ No newline at end of file + + + +org.apache.maven.plugins +maven-compiler-plugin + + 1.4 + 1.4 + + + + + Modified: maven/doxia/trunk/doxia-sink-api/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-sink-api/pom.xml?rev=355686&r1=355685&r2=355686&view=diff == --- maven/doxia/trunk/doxia-sink-api/pom.xml (original) +++ maven/doxia/trunk/doxia-sink-api/pom.xml Fri Dec 9 17:41:22 2005 @@ -2,10 +2,9 @@ doxia org.apache.maven.doxia -1.0-alpha-6 +1.0-alpha-6-SNAPSHOT 4.0.0 doxia-sink-api Doxia Sink API - 1.0-alpha-6 Modified: maven/doxia/trunk/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/pom.xml?rev=355686&r1=355685&r2=355686&view=diff == --- maven/doxia/trunk/doxia-site-renderer/pom.xml (original) +++ maven/doxia/trunk/doxia-site-renderer/pom.xml Fri Dec 9 17:41:22 2005 @@ -2,30 +2,13 @@ doxia org.apache.maven.doxia -1.0-alpha-6 +1.0-alpha-6-SNAPSHOT 4.0.0 doxia-site-renderer Doxia Site Renderer Component - 1.0-alpha-6 - - - Vincent Siveton - [EMAIL PROTECTED] - Apache Software Foundation - -Java Developer - - -5 - - - org.apache.maven.doxia - doxia-core - 1.0-alpha-6 - - org.codehaus.plexus plexus-i18n 1.0-beta-6 @@ -35,5 +18,21 @@ plexus-velocity 1.1.2 + + org.apache.maven.doxia + doxia-core + 1.0-alpha-6-SNAPSHOT + + + + Vincent Siveton + [EMAIL PROTECTED] + Apache Software Foundation + +Java Developer + + -5 + + Modified: maven/doxia/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/pom.xml?rev=355686&r1=355685&r2=355686&view=diff == --- maven/doxia/trunk/pom.xml (original) +++ maven/doxia/trunk/pom.xml Fri Dec 9 17:41:22 2005 @@ -1,11 +1,10 @@ 4.0.0 - org.apache.maven.doxia doxia - pom Doxia - 1.0-alpha-6 + 1.0-alpha-6-SNAPSHOT + pom http://maven.apache.org/doxia jira @@ -66,9 +65,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 - http://svn.apache.org/viewcvs.cgi/maven/doxia/tags/doxia-1.0-alpha-6 + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/trunk +http://svn.apache.org/viewcvs.cgi/maven/doxia/trunk @@ -85,11 +84,6 @@ - -doxia-core -doxia-sink-api -doxia-site-renderer - repo1 @@ -106,4 +100,9 @@ scp://minotaur.apache.org/www/maven.apache.org/doxia/ + +doxia-core +doxia-sink-api +doxia-site-renderer +
svn commit: r355844 - in /maven/doxia/trunk: doxia-core/pom.xml doxia-sink-api/pom.xml doxia-site-renderer/pom.xml pom.xml
Author: jdcasey Date: Sat Dec 10 17:02:23 2005 New Revision: 355844 URL: http://svn.apache.org/viewcvs?rev=355844&view=rev Log: [maven-release-plugin] prepare release doxia-1.0-alpha-6 Modified: maven/doxia/trunk/doxia-core/pom.xml maven/doxia/trunk/doxia-sink-api/pom.xml maven/doxia/trunk/doxia-site-renderer/pom.xml maven/doxia/trunk/pom.xml Modified: maven/doxia/trunk/doxia-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=355844&r1=355843&r2=355844&view=diff == --- maven/doxia/trunk/doxia-core/pom.xml (original) +++ maven/doxia/trunk/doxia-core/pom.xml Sat Dec 10 17:02:23 2005 @@ -2,11 +2,23 @@ doxia org.apache.maven.doxia -1.0-alpha-6-SNAPSHOT +1.0-alpha-6 4.0.0 doxia-core Doxia Core + 1.0-alpha-6 + + + +maven-compiler-plugin + + 1.4 + 1.4 + + + + oro @@ -14,32 +26,20 @@ 2.0.7 + org.apache.maven.doxia + doxia-sink-api + 1.0-alpha-6 + + org.codehaus.plexus plexus-utils 1.0.4 - org.apache.maven.doxia - doxia-sink-api - 1.0-alpha-6-SNAPSHOT - - org.codehaus.plexus plexus-container-default 1.0-alpha-8 test - - - -org.apache.maven.plugins -maven-compiler-plugin - - 1.4 - 1.4 - - - - - + \ No newline at end of file Modified: maven/doxia/trunk/doxia-sink-api/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-sink-api/pom.xml?rev=355844&r1=355843&r2=355844&view=diff == --- maven/doxia/trunk/doxia-sink-api/pom.xml (original) +++ maven/doxia/trunk/doxia-sink-api/pom.xml Sat Dec 10 17:02:23 2005 @@ -2,9 +2,10 @@ doxia org.apache.maven.doxia -1.0-alpha-6-SNAPSHOT +1.0-alpha-6 4.0.0 doxia-sink-api Doxia Sink API + 1.0-alpha-6 Modified: maven/doxia/trunk/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/pom.xml?rev=355844&r1=355843&r2=355844&view=diff == --- maven/doxia/trunk/doxia-site-renderer/pom.xml (original) +++ maven/doxia/trunk/doxia-site-renderer/pom.xml Sat Dec 10 17:02:23 2005 @@ -2,13 +2,30 @@ doxia org.apache.maven.doxia -1.0-alpha-6-SNAPSHOT +1.0-alpha-6 4.0.0 doxia-site-renderer Doxia Site Renderer Component + 1.0-alpha-6 + + + Vincent Siveton + [EMAIL PROTECTED] + Apache Software Foundation + +Java Developer + + -5 + + + org.apache.maven.doxia + doxia-core + 1.0-alpha-6 + + org.codehaus.plexus plexus-i18n 1.0-beta-6 @@ -18,21 +35,5 @@ plexus-velocity 1.1.2 - - org.apache.maven.doxia - doxia-core - 1.0-alpha-6-SNAPSHOT - - - - Vincent Siveton - [EMAIL PROTECTED] - Apache Software Foundation - -Java Developer - - -5 - - Modified: maven/doxia/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/pom.xml?rev=355844&r1=355843&r2=355844&view=diff == --- maven/doxia/trunk/pom.xml (original) +++ maven/doxia/trunk/pom.xml Sat Dec 10 17:02:23 2005 @@ -2,9 +2,9 @@ 4.0.0 org.apache.maven.doxia doxia - Doxia - 1.0-alpha-6-SNAPSHOT pom + Doxia + 1.0-alpha-6 http://maven.apache.org/doxia jira @@ -65,9 +65,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/trunk -http://svn.apache.org/viewcvs.cgi/maven/doxia/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 + http://svn.apache.org/viewcvs.cgi/maven/doxia/tags/doxia-1.0-alpha-6 @@ -84,6 +84,11 @@ + +doxia-core +doxia-sink-api +doxia-site-renderer + repo1 @@ -100,9 +105,4 @@ scp://minotaur.apache.org/www/maven.apache.org/doxia/ - -doxia-core -doxia-sink-api -doxia-site-renderer - - + \ No newline at end of file
svn commit: r355845 - in /maven/doxia/tags/doxia-1.0-alpha-6: ./ doxia-core/pom.xml doxia-sink-api/pom.xml doxia-site-renderer/pom.xml pom.xml
Author: jdcasey Date: Sat Dec 10 17:02:29 2005 New Revision: 355845 URL: http://svn.apache.org/viewcvs?rev=355845&view=rev Log: [maven-scm] copy for tag doxia-1.0-alpha-6 Added: maven/doxia/tags/doxia-1.0-alpha-6/ - copied from r355773, maven/doxia/trunk/ maven/doxia/tags/doxia-1.0-alpha-6/doxia-core/pom.xml - copied unchanged from r355844, maven/doxia/trunk/doxia-core/pom.xml maven/doxia/tags/doxia-1.0-alpha-6/doxia-sink-api/pom.xml - copied unchanged from r355844, maven/doxia/trunk/doxia-sink-api/pom.xml maven/doxia/tags/doxia-1.0-alpha-6/doxia-site-renderer/pom.xml - copied unchanged from r355844, maven/doxia/trunk/doxia-site-renderer/pom.xml maven/doxia/tags/doxia-1.0-alpha-6/pom.xml - copied unchanged from r355844, maven/doxia/trunk/pom.xml
svn commit: r355846 - in /maven/doxia/trunk: doxia-core/pom.xml doxia-sink-api/pom.xml doxia-site-renderer/pom.xml pom.xml
Author: jdcasey Date: Sat Dec 10 17:02:39 2005 New Revision: 355846 URL: http://svn.apache.org/viewcvs?rev=355846&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/doxia/trunk/doxia-core/pom.xml maven/doxia/trunk/doxia-sink-api/pom.xml maven/doxia/trunk/doxia-site-renderer/pom.xml maven/doxia/trunk/pom.xml Modified: maven/doxia/trunk/doxia-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=355846&r1=355845&r2=355846&view=diff == --- maven/doxia/trunk/doxia-core/pom.xml (original) +++ maven/doxia/trunk/doxia-core/pom.xml Sat Dec 10 17:02:39 2005 @@ -2,12 +2,12 @@ doxia org.apache.maven.doxia -1.0-alpha-6 +1.0-alpha-7-SNAPSHOT 4.0.0 doxia-core Doxia Core - 1.0-alpha-6 + 1.0-alpha-7-SNAPSHOT @@ -28,7 +28,7 @@ org.apache.maven.doxia doxia-sink-api - 1.0-alpha-6 + 1.0-alpha-7-SNAPSHOT org.codehaus.plexus Modified: maven/doxia/trunk/doxia-sink-api/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-sink-api/pom.xml?rev=355846&r1=355845&r2=355846&view=diff == --- maven/doxia/trunk/doxia-sink-api/pom.xml (original) +++ maven/doxia/trunk/doxia-sink-api/pom.xml Sat Dec 10 17:02:39 2005 @@ -2,10 +2,10 @@ doxia org.apache.maven.doxia -1.0-alpha-6 +1.0-alpha-7-SNAPSHOT 4.0.0 doxia-sink-api Doxia Sink API - 1.0-alpha-6 + 1.0-alpha-7-SNAPSHOT Modified: maven/doxia/trunk/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/pom.xml?rev=355846&r1=355845&r2=355846&view=diff == --- maven/doxia/trunk/doxia-site-renderer/pom.xml (original) +++ maven/doxia/trunk/doxia-site-renderer/pom.xml Sat Dec 10 17:02:39 2005 @@ -2,12 +2,12 @@ doxia org.apache.maven.doxia -1.0-alpha-6 +1.0-alpha-7-SNAPSHOT 4.0.0 doxia-site-renderer Doxia Site Renderer Component - 1.0-alpha-6 + 1.0-alpha-7-SNAPSHOT Vincent Siveton @@ -23,7 +23,7 @@ org.apache.maven.doxia doxia-core - 1.0-alpha-6 + 1.0-alpha-7-SNAPSHOT org.codehaus.plexus Modified: maven/doxia/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/pom.xml?rev=355846&r1=355845&r2=355846&view=diff == --- maven/doxia/trunk/pom.xml (original) +++ maven/doxia/trunk/pom.xml Sat Dec 10 17:02:39 2005 @@ -4,7 +4,7 @@ doxia pom Doxia - 1.0-alpha-6 + 1.0-alpha-7-SNAPSHOT http://maven.apache.org/doxia jira @@ -65,9 +65,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/tags/doxia-1.0-alpha-6 - http://svn.apache.org/viewcvs.cgi/maven/doxia/tags/doxia-1.0-alpha-6 + scm:svn:http://svn.apache.org/repos/asf/maven/doxia/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/trunk +http://svn.apache.org/viewcvs.cgi/maven/doxia/trunk
svn commit: r355867 - /maven/doxia/tags/doxia-1.0-alpha-6/pom.xml
Author: jdcasey Date: Sat Dec 10 18:01:09 2005 New Revision: 355867 URL: http://svn.apache.org/viewcvs?rev=355867&view=rev Log: switching to scpexe deployment. Modified: maven/doxia/tags/doxia-1.0-alpha-6/pom.xml Modified: maven/doxia/tags/doxia-1.0-alpha-6/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/tags/doxia-1.0-alpha-6/pom.xml?rev=355867&r1=355866&r2=355867&view=diff == --- maven/doxia/tags/doxia-1.0-alpha-6/pom.xml (original) +++ maven/doxia/tags/doxia-1.0-alpha-6/pom.xml Sat Dec 10 18:01:09 2005 @@ -70,6 +70,13 @@ http://svn.apache.org/viewcvs.cgi/maven/doxia/tags/doxia-1.0-alpha-6 + + +org.apache.maven.wagon +wagon-ssh-external +RELEASE + + org.codehaus.plexus @@ -93,16 +100,16 @@ repo1 Maven Central Repository - scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 + scpexe://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2 snapshots Maven Central Development Repository - scp://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2 + scpexe://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2 website - scp://minotaur.apache.org/www/maven.apache.org/doxia/ + scpexe://minotaur.apache.org/www/maven.apache.org/doxia/ - \ No newline at end of file +
svn commit: r355870 - /maven/doxia/tags/doxia-1.0-alpha-6/doxia-core/pom.xml
Author: jdcasey Date: Sat Dec 10 18:08:12 2005 New Revision: 355870 URL: http://svn.apache.org/viewcvs?rev=355870&view=rev Log: Fixing source/target in the javadoc plugin. Modified: maven/doxia/tags/doxia-1.0-alpha-6/doxia-core/pom.xml Modified: maven/doxia/tags/doxia-1.0-alpha-6/doxia-core/pom.xml URL: http://svn.apache.org/viewcvs/maven/doxia/tags/doxia-1.0-alpha-6/doxia-core/pom.xml?rev=355870&r1=355869&r2=355870&view=diff == --- maven/doxia/tags/doxia-1.0-alpha-6/doxia-core/pom.xml (original) +++ maven/doxia/tags/doxia-1.0-alpha-6/doxia-core/pom.xml Sat Dec 10 18:08:12 2005 @@ -17,6 +17,13 @@ 1.4 + +maven-javadoc-plugin + + 1.4 + 1.4 + + @@ -42,4 +49,4 @@ test - \ No newline at end of file +
svn commit: r530611 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Author: jdcasey
Date: Thu Apr 19 19:08:52 2007
New Revision: 530611
URL: http://svn.apache.org/viewvc?view=rev&rev=530611
Log:
Adding escape sequence for pipe and equals sign using backslash character, so
we can embed more advanced macro parameter values, like scripting lines.
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
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?view=diff&rev=530611&r1=530610&r2=530611
==
---
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
Thu Apr 19 19:08:52 2007
@@ -2192,6 +2192,8 @@
String s = text;
s = s.substring( 2, s.length() - 1 );
+
+s = escapeForMacro( s );
String[] params = StringUtils.split( s, "|" );
@@ -2203,7 +2205,10 @@
{
String[] param = StringUtils.split( params[i], "=" );
-parameters.put( param[0], param[1] );
+String key = unescapeForMacro( param[0] );
+String value = unescapeForMacro( param[1] );
+
+parameters.put( key, value );
}
parameters.put( "sourceContent", sourceContent );
@@ -2225,6 +2230,38 @@
{
throw new AptParseException( "Unable to find macro used in the
APT document", e );
}
+}
+
+private String escapeForMacro( String s )
+{
+if ( s == null || s.length() < 1 )
+{
+return s;
+}
+
+String result = s;
+
+// use some outrageously out-of-place chars for text
+// (these are device control one/two in unicode)
+result = StringUtils.replace( result, "\\=", "\u0011" );
+result = StringUtils.replace( result, "\\|", "\u0012" );
+
+return result;
+}
+
+private String unescapeForMacro( String s )
+{
+if ( s == null || s.length() < 1 )
+{
+return s;
+}
+
+String result = s;
+
+result = StringUtils.replace( result, "\u0011", "=" );
+result = StringUtils.replace( result, "\u0012", "|" );
+
+return result;
}
}
svn commit: r568690 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src: main/java/org/apache/maven/doxia/module/docbook/ test/java/org/apache/maven/doxia/module/docbook/ test/
Author: jdcasey
Date: Wed Aug 22 09:30:06 2007
New Revision: 568690
URL: http://svn.apache.org/viewvc?rev=568690&view=rev
Log:
[DOXIA-116] Adding support for book-style rendering (see the sandbox code for
the actual book stuff).
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookBookSinkTest.java
(with props)
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/resources/book.xml
(with props)
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java?rev=568690&r1=568689&r2=568690&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
Wed Aug 22 09:30:06 2007
@@ -128,8 +128,22 @@
/** tableHasGrid. */
private boolean tableHasGrid;
+// books have chapters and no headers
+private boolean isBook;
+
+private boolean skip;
+
+private boolean outputBookHead;
+
// ---
+public DocBookSink( Writer out, boolean isBook )
+{
+this( out );
+this.isBook = isBook;
+this.outputBookHead = true;
+}
+
/**
* @param writer the default writer.
*/
@@ -512,6 +526,8 @@
{
resetState();
+skip = isBook && !outputBookHead;
+
if ( xmlMode )
{
markup( "http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java?rev=568690&r1=568689&r2=568690&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java
Wed Aug 22 09:30:06 2007
@@ -56,7 +56,7 @@
return "article";
}
};
-
+
/** Docbook tag for articleinfo */
Tag ARTICLEINFO_TAG = new Tag()
{
@@ -64,6 +64,36 @@
public String toString()
{
return "articleinfo";
+}
+};
+
+/** Docbook tag for book */
+Tag BOOK_TAG = new Tag()
+{
+/** [EMAIL PROTECTED] */
+public String toString()
+{
+return "book";
+}
+};
+
+/** Docbook tag for bookinfo */
+Tag BOOKINFO_TAG = new Tag()
+{
+/** [EMAIL PROTECTED] */
+public String toString()
+{
+return "bookinfo";
+}
+};
+
+/** Docbook tag for chapter */
+Tag CHAPTER_TAG = new Tag()
+{
+/** [EMAIL PROTECTED] */
+public String toString()
+{
+return "chapter";
}
};
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookBookSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookBookSinkTest.java?rev=568690&view=auto
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookBookSinkTest.java
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookBookSinkTest.java
Wed Aug 22 09:30:06 2007
@@ -0,0 +1,40 @@
+package org.apache.maven.doxia.module.docbook;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import org.apache.maven.doxia.parser.Parser;
+import org.apache.maven.doxia.sink.AbstractSinkTestCase;
+import org.apache.maven.doxia.sink.Sink;
+
+/**
+ * Test the book path of the DockBook sink
+ * @author eredmond
+ */
+public
svn commit: r676983 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src: main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java test/java/org/apache/maven/doxia/module/xdoc/XdocPar
Author: jdcasey
Date: Tue Jul 15 10:19:51 2008
New Revision: 676983
URL: http://svn.apache.org/viewvc?rev=676983&view=rev
Log:
[DOXIA-245] Use 'id' of xdoc section to generate an html anchor.
Modified:
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/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?rev=676983&r1=676982&r2=676983&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Tue Jul 15 10:19:51 2008
@@ -141,6 +141,13 @@
{
closeOpenSections( Sink.SECTION_LEVEL_1, sink );
+Object id = attribs.getAttribute( Attribute.ID.toString() );
+if ( id != null )
+{
+sink.anchor( id.toString() );
+sink.anchor_();
+}
+
sink.section( Sink.SECTION_LEVEL_1, attribs );
sink.sectionTitle( Sink.SECTION_LEVEL_1, attribs );
@@ -153,6 +160,13 @@
{
closeOpenSections( Sink.SECTION_LEVEL_2, sink );
+Object id = attribs.getAttribute( Attribute.ID.toString() );
+if ( id != null )
+{
+sink.anchor( id.toString() );
+sink.anchor_();
+}
+
sink.section( Sink.SECTION_LEVEL_2, attribs );
sink.sectionTitle( Sink.SECTION_LEVEL_2, attribs );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java?rev=676983&r1=676982&r2=676983&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
Tue Jul 15 10:19:51 2008
@@ -24,6 +24,7 @@
import java.io.Reader;
import java.io.Writer;
+import java.util.Arrays;
import java.util.Iterator;
import org.apache.maven.doxia.parser.AbstractParserTest;
@@ -237,4 +238,31 @@
{
return text.replaceAll( EOL, "" );
}
+
+public void testSectionIdAnchor()
+throws Exception
+{
+String text = "This is a
test.";
+
+SinkEventTestingSink sink = new SinkEventTestingSink();
+
+parser.parse( text, sink );
+
+Iterator it = sink.getEventList().iterator();
+
+SinkEventElement anchorEvt = (SinkEventElement) it.next();
+
+assertEquals( "anchor", anchorEvt.getName() );
+assertEquals( "test-id", anchorEvt.getArgs()[0] );
+
+assertEquals( "anchor_", ( (SinkEventElement) it.next() ).getName() );
+assertEquals( "section1", ( (SinkEventElement) it.next() ).getName() );
+assertEquals( "sectionTitle1", ( (SinkEventElement) it.next()
).getName() );
+assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+assertEquals( "sectionTitle1_", ( (SinkEventElement) it.next()
).getName() );
+assertEquals( "text", ( (SinkEventElement) it.next() ).getName() );
+assertEquals( "section1_", ( (SinkEventElement) it.next() ).getName()
);
+assertFalse( it.hasNext() );
+}
+
}
