Author: brett
Date: Tue Dec 20 17:33:45 2005
New Revision: 358171

URL: http://svn.apache.org/viewcvs?rev=358171&view=rev
Log:
remove unused themes from inside doxia to make way for skinning

Removed:
    maven/doxia/trunk/doxia-core/src/main/resources/codehaus/
    maven/doxia/trunk/doxia-core/src/main/resources/maven/
Modified:
    
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/SinkDescriptorReader.java
    
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

Modified: 
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/SinkDescriptorReader.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/SinkDescriptorReader.java?rev=358171&r1=358170&r2=358171&view=diff
==============================================================================
--- 
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/SinkDescriptorReader.java
 (original)
+++ 
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/SinkDescriptorReader.java
 Tue Dec 20 17:33:45 2005
@@ -17,6 +17,7 @@
  */
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.Reader;
 import java.util.HashMap;
 import java.util.Map;
@@ -28,7 +29,7 @@
 public class SinkDescriptorReader
 {
     public Map read( Reader reader )
-        throws Exception
+        throws IOException
     {
         Map directives = new HashMap();
 

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=358171&r1=358170&r2=358171&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
 Tue Dec 20 17:33:45 2005
@@ -22,6 +22,8 @@
 import org.apache.maven.doxia.module.xhtml.decoration.model.DecorationModel;
 import 
org.apache.maven.doxia.module.xhtml.decoration.model.DecorationModelReader;
 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.module.SiteModule;
 import org.apache.maven.doxia.site.module.manager.SiteModuleManager;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -48,7 +50,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.LineNumberReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.StringWriter;
@@ -216,50 +217,51 @@
 
             File moduleBasedir = new File( siteDirectory, 
module.getSourceDirectory() );
 
-            if ( !moduleBasedir.exists() )
+            if ( moduleBasedir.exists() )
             {
-                continue;
-            }
+                List docs = FileUtils.getFileNames( moduleBasedir, "**/*." + 
module.getExtension(), null, false );
 
-            List docs = FileUtils.getFileNames( moduleBasedir, "**/*." + 
module.getExtension(), null, false );
+                for ( Iterator j = docs.iterator(); j.hasNext(); )
+                {
+                    String doc = (String) j.next();
 
-            for ( Iterator j = docs.iterator(); j.hasNext(); )
-            {
-                String doc = (String) j.next();
+                    String outputName = doc.substring( 0, doc.indexOf( "." ) + 
1 ) + "html";
 
-                String outputName = doc.substring( 0, doc.indexOf( "." ) + 1 ) 
+ "html";
+                    String fullPathDoc = new File( moduleBasedir, doc 
).getPath();
 
-                String fullPathDoc = new File( moduleBasedir, doc ).getPath();
+                    SiteRendererSink sink = createSink( moduleBasedir, 
outputName );
 
-                SiteRendererSink sink = createSink( moduleBasedir, outputName 
);
+                    try
+                    {
+                        FileReader reader = new FileReader( fullPathDoc );
 
-                try
-                {
-                    FileReader reader = new FileReader( fullPathDoc );
+                        doxia.parse( reader, module.getParserId(), sink );
 
-                    doxia.parse( reader, module.getParserId(), sink );
+                        File outputFile = new File( outputDirectory, 
outputName );
 
-                    File outputFile = new File( outputDirectory, outputName );
+                        if ( !outputFile.getParentFile().exists() )
+                        {
+                            outputFile.getParentFile().mkdirs();
+                        }
 
-                    if ( !outputFile.getParentFile().exists() )
+                        generateDocument( new OutputStreamWriter( new 
FileOutputStream( outputFile ), outputEncoding ),
+                                          templateName, templateProperties, 
sink, locale );
+                    }
+                    catch ( ParserNotFoundException e )
                     {
-                        outputFile.getParentFile().mkdirs();
+                        throw new RendererException(
+                            "Error getting a parser for " + fullPathDoc + ": " 
+ e.getMessage() );
                     }
+                    catch ( ParseException e )
+                    {
+                        getLogger().error( "Error parsing " + fullPathDoc + ": 
" + e.getMessage(), e );
+                    }
+                    finally
+                    {
+                        sink.flush();
 
-                    generateDocument( new OutputStreamWriter( new 
FileOutputStream( outputFile ), outputEncoding ),
-                                      templateName, templateProperties, sink, 
locale );
-                }
-                catch ( Exception e )
-                {
-                    e.printStackTrace();
-
-                    getLogger().error( "Error rendering " + fullPathDoc + ": " 
+ e.getMessage(), e );
-                }
-                finally
-                {
-                    sink.flush();
-
-                    sink.close();
+                        sink.close();
+                    }
                 }
             }
         }
@@ -281,9 +283,8 @@
         {
             throw new RendererException( "Can't read site descriptor.", e );
         }
-        File moduleBasedir = siteDirectory;
 
-        List docs = FileUtils.getFileNames( moduleBasedir, "**/*." + 
moduleExtension, null, false );
+        List docs = FileUtils.getFileNames( siteDirectory, "**/*." + 
moduleExtension, null, false );
 
         for ( Iterator j = docs.iterator(); j.hasNext(); )
         {
@@ -291,9 +292,9 @@
 
             String outputName = doc.substring( 0, doc.indexOf( "." ) + 1 ) + 
"html";
 
-            String fullPathDoc = new File( moduleBasedir, doc ).getPath();
+            String fullPathDoc = new File( siteDirectory, doc ).getPath();
 
-            SiteRendererSink sink = createSink( moduleBasedir, outputName );
+            SiteRendererSink sink = createSink( siteDirectory, outputName );
 
             try
             {
@@ -310,11 +311,13 @@
                 generateDocument( new OutputStreamWriter( new 
FileOutputStream( outputFile ), outputEncoding ),
                                   templateName, templateProperties, sink, 
locale );
             }
-            catch ( Exception e )
+            catch ( ParserNotFoundException e )
             {
-                e.printStackTrace();
-
-                getLogger().error( "Error rendering " + fullPathDoc + ": " + 
e.getMessage(), e );
+                throw new RendererException( "Error getting a parser for " + 
fullPathDoc + ": " + e.getMessage() );
+            }
+            catch ( ParseException e )
+            {
+                getLogger().error( "Error parsing " + fullPathDoc + ": " + 
e.getMessage(), e );
             }
             finally
             {
@@ -398,11 +401,9 @@
         writeTemplate( templateName, writer, context );
     }
 
-    protected void writeTemplate( String templateName, Writer writer, Context 
context )
+    private void writeTemplate( String templateName, Writer writer, Context 
context )
         throws RendererException
     {
-        Template template = null;
-
         ClassLoader old = null;
 
         if ( templateClassLoader != null )
@@ -418,29 +419,12 @@
 
         try
         {
-            try
-            {
-                template = velocity.getEngine().getTemplate( templateName );
-            }
-            catch ( Exception e )
-            {
-                throw new RendererException( "Could not find the template '" + 
templateName + "' in " +
-                    Thread.currentThread().getContextClassLoader() );
-            }
-
-            try
-            {
-                template.merge( context, writer );
-
-                writer.close();
-            }
-            catch ( Exception e )
-            {
-                throw new RendererException( "Error while generating code.", e 
);
-            }
+            processTemplate( templateName, context, writer );
         }
         finally
         {
+            IOUtil.close( writer );
+
             if ( old != null )
             {
                 Thread.currentThread().setContextClassLoader( old );
@@ -448,6 +432,33 @@
         }
     }
 
+    /**
+     * @noinspection OverlyBroadCatchBlock,UnusedCatchParameter
+     */
+    private void processTemplate( String templateName, Context context, Writer 
writer )
+        throws RendererException
+    {
+        Template template;
+
+        try
+        {
+            template = velocity.getEngine().getTemplate( templateName );
+        }
+        catch ( Exception e )
+        {
+            throw new RendererException( "Could not find the template '" + 
templateName );
+        }
+
+        try
+        {
+            template.merge( context, writer );
+        }
+        catch ( Exception e )
+        {
+            throw new RendererException( "Error while generating code.", e );
+        }
+    }
+
     public SiteRendererSink createSink( File moduleBaseDir, String document, 
File siteDescriptor )
         throws RendererException, IOException
     {
@@ -488,7 +499,7 @@
 
     public XhtmlSink createSink( File moduleBasedir, String doc, String 
outputDirectory, InputStream siteDescriptor,
                                  String flavour )
-        throws Exception
+        throws IOException, XmlPullParserException
     {
         DecorationModelReader decorationModelReader = new 
DecorationModelReader();
 
@@ -515,50 +526,6 @@
         RenderingContext renderingContext = new RenderingContext( 
moduleBasedir, doc, decorationModel );
 
         return new XhtmlSink( new FileWriter( outputFile ), renderingContext, 
directives );
-    }
-
-    public void copyResources( String outputDirectory, String flavour )
-        throws Exception
-    {
-        InputStream resourceList = getStream( flavour + "/resources.txt" );
-
-        if ( resourceList != null )
-        {
-            LineNumberReader reader = new LineNumberReader( new 
InputStreamReader( resourceList ) );
-
-            String line;
-
-            while ( ( line = reader.readLine() ) != null )
-            {
-                InputStream is = getStream( flavour + "/" + line );
-
-                if ( is == null )
-                {
-                    throw new IOException( "The resource " + line + " doesn't 
exists in " + flavour + " flavour." );
-                }
-
-                File outputFile = new File( outputDirectory, line );
-
-                if ( !outputFile.getParentFile().exists() )
-                {
-                    outputFile.getParentFile().mkdirs();
-                }
-
-                FileOutputStream w = new FileOutputStream( outputFile );
-
-                IOUtil.copy( is, w );
-
-                IOUtil.close( is );
-
-                IOUtil.close( w );
-            }
-        }
-    }
-
-    private InputStream getStream( String name )
-        throws Exception
-    {
-        return DefaultSiteRenderer.class.getClassLoader().getResourceAsStream( 
name );
     }
 
 }

Modified: 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java?rev=358171&r1=358170&r2=358171&view=diff
==============================================================================
--- 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
 (original)
+++ 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
 Tue Dec 20 17:33:45 2005
@@ -89,6 +89,4 @@
 
     void setTemplateClassLoader( ClassLoader templateClassLoader );
 
-    void copyResources( String outputDirectory, String flavour )
-        throws Exception;
 }


Reply via email to