svn commit: r385395 - /maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/cdc.apt
Author: brett Date: Sun Mar 12 16:19:59 2006 New Revision: 385395 URL: http://svn.apache.org/viewcvs?rev=385395&view=rev Log: remove TODOs from test data to reduce noise in reports Modified: maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/cdc.apt Modified: maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/cdc.apt URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/cdc.apt?rev=385395&r1=385394&r2=385395&view=diff == --- maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/cdc.apt (original) +++ maven/doxia/trunk/doxia-site-renderer/src/test/site/apt/cdc.apt Sun Mar 12 16:19:59 2006 @@ -26,13 +26,9 @@ | @plexus.version | n | The component version. | *---*---** | @plexus.lifecycle-handler | n | The lifecycle handler of the component. | -| | || *---*---** | @plexus.instatiation-strategy | n | The instantiation strategy of the component. | -| | | | *---*---** -~~ TODO: This line will be incorrectly render the *name* of the table as well as the caption -~~ [plexus-component-tags] Plexus Component Tags +---+ /** @@ -48,8 +44,7 @@ * Requirement Tags - These tags are used on fields to state requirements. TODO: it should be - possible to override the role for a normal field. + These tags are used on fields to state requirements. *---**---* | <> | <> | <> |
svn commit: r385397 - in /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia: macro/ macro/snippet/ module/apt/ parser/
Author: brett
Date: Sun Mar 12 16:52:22 2006
New Revision: 385397
URL: http://svn.apache.org/viewcvs?rev=385397&view=rev
Log:
[DOXIA-56] clean up macro exception handling
Added:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
(with props)
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParseException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java?rev=385397&r1=385396&r2=385397&view=diff
==
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
Sun Mar 12 16:52:22 2006
@@ -28,7 +28,6 @@
extends AbstractMacro
{
public void execute( Sink sink, MacroRequest request )
-throws Exception
{
sink.verbatim( true );
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java?rev=385397&r1=385396&r2=385397&view=diff
==
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
Sun Mar 12 16:52:22 2006
@@ -27,6 +27,6 @@
String ROLE = Macro.class.getName();
void execute( Sink sink, MacroRequest request )
-throws Exception;
+throws MacroExecutionException;
}
Added:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java?rev=385397&view=auto
==
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
(added)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
Sun Mar 12 16:52:22 2006
@@ -0,0 +1,31 @@
+package org.apache.maven.doxia.macro;
+
+/*
+ * Copyright 2001-2005 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.
+ */
+
+/**
+ * Warp an exception that occurs during the execution of a Doxia macro.
+ *
+ * @author mailto:[EMAIL PROTECTED]">Brett Porter
+ */
+public class MacroExecutionException
+extends Exception
+{
+public MacroExecutionException( String message, Throwable cause )
+{
+super( message, cause );
+}
+}
Propchange:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
--
svn:eol-style = native
Propchange:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
--
svn:keywords = Author Date Id Revision
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=385397&r1=385396&r2=385397&view=diff
==
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/s
svn commit: r385427 - in /maven/doxia/trunk/doxia-site-renderer/src: main/java/org/apache/maven/doxia/siterenderer/ test/java/org/apache/maven/doxia/siterenderer/
Author: brett
Date: Sun Mar 12 21:16:54 2006
New Revision: 385427
URL: http://svn.apache.org/viewcvs?rev=385427&view=rev
Log:
[MSITE-80] clean up site and push features into Doxia site renderer
Modified:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Modified:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=385427&r1=385426&r2=385427&view=diff
==
---
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Sun Mar 12 21:16:54 2006
@@ -20,6 +20,7 @@
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
+import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.site.module.SiteModule;
import org.apache.maven.doxia.site.module.manager.SiteModuleManager;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -28,6 +29,7 @@
import org.apache.velocity.context.Context;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.PathTool;
@@ -38,13 +40,24 @@
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.text.SimpleDateFormat;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.text.DateFormat;
+import java.util.Arrays;
import java.util.Date;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
/**
* @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse
@@ -82,6 +95,12 @@
*/
private I18N i18n;
+private static final String RESOURCE_DIR = "org/apache/maven/plugins/site";
+
+private static final String DEFAULT_TEMPLATE = RESOURCE_DIR +
"/default-site.vm";
+
+private static final String SKIN_TEMPLATE_LOCATION =
"META-INF/maven/site.vm";
+
// --
// Renderer implementation
// --
@@ -103,60 +122,19 @@
if ( moduleBasedir.exists() )
{
-List docs = FileUtils.getFileNames( moduleBasedir, "**/*." +
module.getExtension(), null, false );
-
-for ( Iterator j = docs.iterator(); j.hasNext(); )
-{
-String doc = (String) j.next();
-
-String outputName = doc.substring( 0, doc.indexOf( "." ) +
1 ) + "html";
-
-String fullPathDoc = new File( moduleBasedir, doc
).getPath();
-
-SiteRendererSink sink = createSink( moduleBasedir,
outputName );
-
-try
-{
-FileReader reader = new FileReader( fullPathDoc );
-
-doxia.parse( reader, module.getParserId(), sink );
-
-File outputFile = new File( outputDirectory,
outputName );
-
-if ( !outputFile.getParentFile().exists() )
-{
-outputFile.getParentFile().mkdirs();
-}
-
-generateDocument( new OutputStreamWriter( new
FileOutputStream( outputFile ), outputEncoding ),
- sink, context );
-}
-catch ( ParserNotFoundException e )
-{
-throw new RendererException(
-"Error getting a parser for " + fullPathDoc + ": "
+ e.getMessage() );
-}
-catch ( ParseExcepti
svn commit: r385433 - /maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Author: brett
Date: Sun Mar 12 21:44:35 2006
New Revision: 385433
URL: http://svn.apache.org/viewcvs?rev=385433&view=rev
Log:
[MSITE-80] move resources to correct location
Modified:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Modified:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=385433&r1=385432&r2=385433&view=diff
==
---
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Sun Mar 12 21:44:35 2006
@@ -95,7 +95,7 @@
*/
private I18N i18n;
-private static final String RESOURCE_DIR = "org/apache/maven/plugins/site";
+private static final String RESOURCE_DIR =
"org/apache/maven/doxia/siterenderer/resources";
private static final String DEFAULT_TEMPLATE = RESOURCE_DIR +
"/default-site.vm";
@@ -411,42 +411,45 @@
public void copyResources( File outputDir, SiteRenderingContext
siteContext )
throws IOException
{
-// TODO: plexus-archiver, if it could do the excludes
-ZipFile file = new ZipFile( siteContext.getSkinJarFile() );
-try
+if ( siteContext.getSkinJarFile() != null )
{
-for ( Enumeration e = file.entries(); e.hasMoreElements(); )
+// TODO: plexus-archiver, if it could do the excludes
+ZipFile file = new ZipFile( siteContext.getSkinJarFile() );
+try
{
-ZipEntry entry = (ZipEntry) e.nextElement();
-
-if ( !entry.getName().startsWith( "META-INF/" ) )
+for ( Enumeration e = file.entries(); e.hasMoreElements(); )
{
-File destFile = new File( outputDir, entry.getName() );
-if ( !entry.isDirectory() )
+ZipEntry entry = (ZipEntry) e.nextElement();
+
+if ( !entry.getName().startsWith( "META-INF/" ) )
{
-destFile.getParentFile().mkdirs();
+File destFile = new File( outputDir, entry.getName() );
+if ( !entry.isDirectory() )
+{
+destFile.getParentFile().mkdirs();
-FileOutputStream fos = new FileOutputStream( destFile
);
+FileOutputStream fos = new FileOutputStream(
destFile );
-try
-{
-IOUtil.copy( file.getInputStream( entry ), fos );
+try
+{
+IOUtil.copy( file.getInputStream( entry ), fos
);
+}
+finally
+{
+IOUtil.close( fos );
+}
}
-finally
+else
{
-IOUtil.close( fos );
+destFile.mkdirs();
}
}
-else
-{
-destFile.mkdirs();
-}
}
}
-}
-finally
-{
-file.close();
+finally
+{
+file.close();
+}
}
if ( siteContext.isUsingDefaultTemplate() )
svn commit: r385434 - in /maven/doxia/trunk/doxia-site-renderer/src/main/resources: ./ org/ org/apache/ org/apache/maven/ org/apache/maven/doxia/ org/apache/maven/doxia/siterenderer/ org/apache/maven/
Author: brett
Date: Sun Mar 12 21:49:09 2006
New Revision: 385434
URL: http://svn.apache.org/viewcvs?rev=385434&view=rev
Log:
[MSITE-80] add the resources
Added:
maven/doxia/trunk/doxia-site-renderer/src/main/resources/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/print.css
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/collapsed.gif
(with props)
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/expanded.gif
(with props)
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/images/logos/maven-feather.png
(with props)
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/resources.txt
(with props)
Added:
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css?rev=385434&view=auto
==
---
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
(added)
+++
maven/doxia/trunk/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css
Sun Mar 12 21:49:09 2006
@@ -0,0 +1,148 @@
+body {
+ margin: 0px;
+ padding: 0px;
+}
+img {
+ border:none;
+}
+table {
+ padding:0px;
+ width: 100%;
+ margin-left: -2px;
+ margin-right: -2px;
+}
+acronym {
+ cursor: help;
+ border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+ padding: 2px 4px 2px 4px;
+ vertical-align: top;
+}
+div.clear{
+ clear:both;
+ visibility: hidden;
+}
+div.clear hr{
+ display: none;
+}
+#bannerLeft, #bannerRight {
+ font-size: xx-large;
+ font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+ margin: 0px;
+}
+.xleft, #bannerLeft img {
+ float:left;
+ text-shadow: #7CFC00;
+}
+.xright, #bannerRight img {
+ float:right;
+ text-shadow: #7CFC00;
+}
+#banner {
+ padding: 0px;
+}
+#banner img {
+ border: none;
+}
+#breadcrumbs {
+ padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+ margin-right: 1.5em;
+ margin-left: 197px;
+}
+#legend {
+ padding: 8px 0 8px 0;
+}
+#navcolumn {
+ padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+ margin: 0;
+ padding: 0;
+ font-size: small;
+}
+#navcolumn ul {
+ margin: 0;
+ padding: 0;
+ font-size: small;
+}
+#navcolumn li {
+ list-style-type: none;
+ background-image: none;
+ background-repeat: no-repeat;
+ background-position: 0 0.4em;
+ padding-left: 16px;
+ list-style-position: outside;
+ line-height: 1.2em;
+ font-size: smaller;
+}
+#navcolumn li.expanded {
+ background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+ background-image: url(../images/collapsed.gif);
+}
+#poweredBy {
+ text-align: center;
+}
+#navcolumn img {
+ margin-top: 10px;
+ margin-bottom: 3px;
+}
+#poweredBy img {
+ display:block;
+ margin: 20px 0 20px 17px;
+ border: 1px solid black;
+ width: 90px;
+ height: 30px;
+}
+#search img {
+margin: 0px;
+display: block;
+}
+#search #q, #search #btnG {
+border: 1px solid #999;
+margin-bottom:10px;
+}
+#search form {
+margin: 0px;
+}
+#lastPublished {
+ font-size: x-small;
+}
+.navSection {
+ margin-bottom: 2px;
+ padding: 8px;
+}
+.navSectionHead {
+ font-weight: bold;
+ font-size: x-small;
+}
+.section {
+ padding: 4px;
+}
+#footer {
+ padding: 3px 10px 3px 10px;
+ font-size: x-small;
+}
+#breadcrumbs {
svn commit: r385438 - /maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
Author: brett
Date: Sun Mar 12 22:39:23 2006
New Revision: 385438
URL: http://svn.apache.org/viewcvs?rev=385438&view=rev
Log:
[MSITE-80] enable menu refs instead of the now deprecated ${reports}, ${modules}
Modified:
maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
Modified: maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=385438&r1=385437&r2=385438&view=diff
==
--- maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
(original)
+++ maven/doxia/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo Sun
Mar 12 22:39:23 2006
@@ -94,6 +94,45 @@
true
+
+
+ 1.0.0
+
+
+
+
+
Banner
@@ -267,6 +306,14 @@
String
true
+
+ ref
+
+ 1.0.0
+ String
+ true
+
items
Menu item.
@@ -339,10 +386,10 @@
public static Skin getDefaultSkin()
{
-Skin skin = new Skin();
-skin.setGroupId( "org.apache.maven.skins" );
-skin.setArtifactId( "maven-default-skin" );
-return skin;
+Skin skin = new Skin();
+skin.setGroupId( "org.apache.maven.skins" );
+skin.setArtifactId( "maven-default-skin" );
+return skin;
}
