svn commit: r421602 - in /maven/doxia/trunk: ./ doxia-core/src/main/java/org/apache/maven/doxia/macro/ doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/ doxia-core/src/main/java/org/apach
Author: trygvis
Date: Thu Jul 13 05:32:43 2006
New Revision: 421602
URL: http://svn.apache.org/viewvc?rev=421602&view=rev
Log:
o Adding a version to make sure a working Plexus plugin is used.
o Adding the ability to give a file= argument to the Snippet macro. Useful to
include files that's in the same checkout.
Adding a basedir parameter to the MacroRequest. This parameter is currently
set to File( "" ) which is not correct in all cases.
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.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/AptParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
maven/doxia/trunk/pom.xml
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java?rev=421602&r1=421601&r2=421602&view=diff
==
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroExecutionException.java
Thu Jul 13 05:32:43 2006
@@ -24,6 +24,11 @@
public class MacroExecutionException
extends Exception
{
+public MacroExecutionException( String message )
+{
+super( message );
+}
+
public MacroExecutionException( String message, Throwable cause )
{
super( message, cause );
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java?rev=421602&r1=421601&r2=421602&view=diff
==
---
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
(original)
+++
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
Thu Jul 13 05:32:43 2006
@@ -17,6 +17,7 @@
*/
import java.util.Map;
+import java.io.File;
/**
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
@@ -24,16 +25,29 @@
*/
public class MacroRequest
{
+private File basedir;
+
private Map parameters;
-public Map getParameters()
+public MacroRequest( Map parameters, File basedir )
{
-return parameters;
+this.parameters = parameters;
+this.basedir = basedir;
}
-public MacroRequest( Map parameters )
+public File getBasedir()
{
-this.parameters = parameters;
+return basedir;
+}
+
+public void setBasedir( File basedir )
+{
+this.basedir = basedir;
+}
+
+public Map getParameters()
+{
+return parameters;
}
public Object getParameter( String key )
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=421602&r1=421601&r2=421602&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/snippet/SnippetMacro.java
Thu Jul 13 05:32:43 2006
@@ -20,8 +20,12 @@
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.macro.MacroRequest;
import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.FileUtils;
import java.io.IOException;
+import java.io.File;
+import java.io.FileNotFoundException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
@@ -53,29 +57,50 @@
String urlParam = (String) request.getParameter( "url" );
-required( urlParam, "url" );
+String fileParam = (String) request.getParameter( "file" );
-URL url;
+StringBuffer snippet;
-try
+if ( !StringUtils.isEmpty( urlParam ) )
{
-url = new URL( urlParam );
+try
+{
+snippet = getSnippet( new URL( urlParam ), id );
+}
+catch ( MalformedURLException e )
+{
+
svn commit: r421614 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
Author: trygvis Date: Thu Jul 13 06:11:57 2006 New Revision: 421614 URL: http://svn.apache.org/viewvc?rev=421614&view=rev Log: o Removing debugging output. Modified: 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/parser/AbstractParser.java URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java?rev=421614&r1=421613&r2=421614&view=diff == --- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java (original) +++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java Thu Jul 13 06:11:57 2006 @@ -60,9 +60,6 @@ return new File( basedir ); } -System.out.println( -"new File( new File( \"\" ).getAbsolutePath() ) = " + new File( new File( "" ).getAbsolutePath() ) ); - return new File( new File( "" ).getAbsolutePath() ); } }
svn commit: r421641 - /maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
Author: trygvis
Date: Thu Jul 13 07:33:10 2006
New Revision: 421641
URL: http://svn.apache.org/viewvc?rev=421641&view=rev
Log:
o Making sure file= snippets work correctly.
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
Modified:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=421641&r1=421640&r2=421641&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/snippet/SnippetMacro.java
Thu Jul 13 07:33:10 2006
@@ -59,22 +59,18 @@
String fileParam = (String) request.getParameter( "file" );
-StringBuffer snippet;
+URL url;
if ( !StringUtils.isEmpty( urlParam ) )
{
try
{
-snippet = getSnippet( new URL( urlParam ), id );
+url = new URL( urlParam );
}
catch ( MalformedURLException e )
{
throw new IllegalArgumentException( urlParam + " is a
malformed URL" );
}
-catch ( IOException e )
-{
-throw new MacroExecutionException( "Error reading snippet", e
);
-}
}
else if ( !StringUtils.isEmpty( fileParam ) )
{
@@ -87,20 +83,27 @@
try
{
-snippet = new StringBuffer( FileUtils.fileRead( f ) );
+url = f.toURL();
}
-catch ( FileNotFoundException e )
-{
-throw new MacroExecutionException( "No such file: '" +
f.getAbsolutePath() + "'." );
-}
-catch ( IOException e )
+catch ( MalformedURLException e )
{
-throw new MacroExecutionException( "Error while readin file:
'" + f.getAbsolutePath() + "'.", e );
+throw new IllegalArgumentException( urlParam + " is a
malformed URL" );
}
}
else
{
throw new IllegalArgumentException( "Either the 'url' or the
'file' param has to be given." );
+}
+
+StringBuffer snippet;
+
+try
+{
+snippet = getSnippet( url, id );
+}
+catch ( IOException e )
+{
+throw new MacroExecutionException( "Error reading snippet", e );
}
sink.verbatim( true );
svn commit: r421642 - in /maven/doxia/trunk/doxia-sandbox: doxia-book/ doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/ doxia-book/src/main/java/org/apache/maven/doxia/book/servi
Author: trygvis
Date: Thu Jul 13 07:35:35 2006
New Revision: 421642
URL: http://svn.apache.org/viewvc?rev=421642&view=rev
Log:
o Improving Xdoc XML output. Switched to using content() so the text would be
properly escaped.
o Fixing a bug in the mojo.
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/pom.xml
maven/doxia/trunk/doxia-sandbox/doxia-maven-plugin/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java
Modified: maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml?rev=421642&r1=421641&r2=421642&view=diff
==
--- maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml (original)
+++ maven/doxia/trunk/doxia-sandbox/doxia-book/pom.xml Thu Jul 13 07:35:35 2006
@@ -3,7 +3,7 @@
org.apache.maven.doxia
doxia
- 1.0-alpha-8-SNAPSHOT
+1.0-alpha-9-SNAPSHOT
doxia-book
1.0-alpha-1-SNAPSHOT
@@ -41,20 +41,17 @@
+site-docs
+pre-site
- java
- xpp3-reader
+ xdoc
+ xsd
-
-
-
-org.codehaus.plexus
-plexus-maven-plugin
-
- descriptor
+ java
+ xpp3-reader
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java?rev=421642&r1=421641&r2=421642&view=diff
==
---
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
(original)
+++
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/indexer/BookIndexingSink.java
Thu Jul 13 07:35:35 2006
@@ -137,7 +137,11 @@
// Sanitize the id. The most important step is to remove any
blanks
//
---
-String id = text.toLowerCase().replace( ' ', '_' );
+String id = text;
+id = id.toLowerCase();
+id = id.replace( '\'', '_' );
+id = id.replace( '\"', '_' );
+id = id.replace( ' ', '_' );
//
---
//
Modified:
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java?rev=421642&r1=421641&r2=421642&view=diff
==
---
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
(original)
+++
maven/doxia/trunk/doxia-sandbox/doxia-book/src/main/java/org/apache/maven/doxia/book/services/renderer/xdoc/XdocBookSink.java
Thu Jul 13 07:35:35 2006
@@ -80,11 +80,13 @@
IndexEntry prevEntry = indexEntry.getPrevEntry();
-String string;
+markup( "" );
if ( prevEntry != null )
{
-string = "Previous: " +
prevEntry.getTitle() + "";
+markup( "Previous: " );
+content( prevEntry.getTitle() );
+markup( "" );
}
else
{
@@ -92,16 +94,19 @@
if ( prevChapter == null )
{
-string = "Start of book";
+markup( "Start of book" );
}
else
{
IndexEntry lastEntry = prevChapter.getLastEntry();
-string = "Previous: "
+ lastEntry.getTitle() + "";
+
+markup( "Previous: "
);
+content( lastEntry.getTitle() );
+markup( "" );
}
}
-markup( "" + string + "" + EOL );
+markup( "" + EOL );
//
---
// Parent
@@ -115,9 +120,13 @@
IndexEntry nextEntry = indexEntry.getNextEntry();
+markup( "" );
+
svn commit: r421643 - in /maven/doxia/trunk/doxia-site: ./ src/books/ src/books/example-book/ src/site/apt/ src/site/apt/book/
Author: trygvis Date: Thu Jul 13 07:36:41 2006 New Revision: 421643 URL: http://svn.apache.org/viewvc?rev=421643&view=rev Log: o Starting some documentation on the Doxia book core. Adding an example book ripped from the XFire User's Guide. Added: maven/doxia/trunk/doxia-site/src/books/ maven/doxia/trunk/doxia-site/src/books/example-book/ maven/doxia/trunk/doxia-site/src/books/example-book.xml maven/doxia/trunk/doxia-site/src/books/example-book/aegis-binding.apt maven/doxia/trunk/doxia-site/src/books/example-book/bindings.apt maven/doxia/trunk/doxia-site/src/books/example-book/castor.apt maven/doxia/trunk/doxia-site/src/books/example-book/http-transport.apt maven/doxia/trunk/doxia-site/src/books/example-book/jms-transport.apt maven/doxia/trunk/doxia-site/src/books/example-book/local-transport.apt maven/doxia/trunk/doxia-site/src/books/example-book/transport-and-channel-api.apt maven/doxia/trunk/doxia-site/src/site/apt/book/ maven/doxia/trunk/doxia-site/src/site/apt/book/index.apt Modified: maven/doxia/trunk/doxia-site/ (props changed) maven/doxia/trunk/doxia-site/pom.xml maven/doxia/trunk/doxia-site/src/site/apt/index.apt Propchange: maven/doxia/trunk/doxia-site/ -- --- svn:ignore (added) +++ svn:ignore Thu Jul 13 07:36:41 2006 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Modified: maven/doxia/trunk/doxia-site/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-site/pom.xml?rev=421643&r1=421642&r2=421643&view=diff == --- maven/doxia/trunk/doxia-site/pom.xml (original) +++ maven/doxia/trunk/doxia-site/pom.xml Thu Jul 13 07:36:41 2006 @@ -1,4 +1,7 @@ -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 doxia @@ -7,4 +10,43 @@ doxia-site Doxia Site + + + +maven-site-plugin +2.0-SNAPSHOT + + + +org.apache.maven.doxia +doxia-maven-plugin +1.0-SNAPSHOT + + +pre-site + + render-books + + + + + + + src/books/example-book + src/books/example-book.xml + + + latex + + + xdoc + + + + + + + + + Added: maven/doxia/trunk/doxia-site/src/books/example-book.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-site/src/books/example-book.xml?rev=421643&view=auto == --- maven/doxia/trunk/doxia-site/src/books/example-book.xml (added) +++ maven/doxia/trunk/doxia-site/src/books/example-book.xml Thu Jul 13 07:36:41 2006 @@ -0,0 +1,41 @@ + + + doxia-example-book + XFire User Manual + + + bindings + Bindings + + + bindings + + + aegis-binding + + + castor + + + + + transports + Transports + + + transport-and-channel-api + + + http-transport + + + jms-transport + + + local-transport + + + + + + Added: maven/doxia/trunk/doxia-site/src/books/example-book/aegis-binding.apt URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-site/src/books/example-book/aegis-binding.apt?rev=421643&view=auto == --- maven/doxia/trunk/doxia-site/src/books/example-book/aegis-binding.apt (added) +++ maven/doxia/trunk/doxia-site/src/books/example-book/aegis-binding.apt Thu Jul 13 07:36:41 2006 @@ -0,0 +1,217 @@ + - + Aegis Binding + - + XFire User's Guide + - + +Aegis Binding + + Aegis is the default XFire binding which maps XML to POJOs. It supports code first development only at this point - + i.e. you write your service in POJOs and it will generate the XML schema/wsdl for you. + +XML and Annotation Mapping Overview + + Aegis has a flexible mapping system so you can control how your beans are controlled. By default your POJOs are + serialized based on their name and namespaces. If you have a class in the "org.codehaus.xfire" package named + "Employee" it would be serialized in namespace "http://xfire.codehaus.org"; with the local name "Your
