Author: brett
Date: Wed Nov 23 17:54:19 2005
New Revision: 348612
URL: http://svn.apache.org/viewcvs?rev=348612&view=rev
Log:
rename packages
PR: DOXIA-32
Added:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/
- copied from r348610,
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/
- copied from r348610,
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/codehaus/plexus/siterenderer/
Removed:
maven/doxia/trunk/doxia-core/src/main/java/org/codehaus/
maven/doxia/trunk/doxia-core/src/test/java/org/codehaus/
maven/doxia/trunk/doxia-sink-api/src/main/java/org/codehaus/
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/codehaus/plexus/siterenderer/
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/RendererException.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.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=348612&r1=348610&r2=348612&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
Wed Nov 23 17:54:19 2005
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.siterenderer;
+package org.apache.maven.doxia.siterenderer;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -20,12 +20,12 @@
import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
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;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.siterenderer.sink.SiteRendererSink;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.StringInputStream;
@@ -56,7 +56,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Vincent Siveton</a>
* @version $Id$
- * @plexus.component role="org.codehaus.plexus.siterenderer.Renderer"
+ * @plexus.component role="org.apache.maven.doxia.siterenderer.Renderer"
*/
public class DefaultSiteRenderer
extends AbstractLogEnabled
@@ -112,7 +112,7 @@
// ----------------------------------------------------------------------
/**
- * @see org.codehaus.plexus.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.File, java.lang.String, java.util.Map)
+ * @see org.apache.maven.doxia.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.File, java.lang.String, java.util.Map)
*/
public void render( File siteDirectory, File outputDirectory, File
siteDescriptor, String templateName,
Map templateProperties )
@@ -122,7 +122,7 @@
}
/**
- * @see org.codehaus.plexus.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.File, java.lang.String, java.util.Map, java.util.Locale)
+ * @see org.apache.maven.doxia.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.File, java.lang.String, java.util.Map, java.util.Locale)
*/
public void render( File siteDirectory, File outputDirectory, File
siteDescriptor, String templateName,
Map templateProperties, Locale locale )
@@ -133,7 +133,7 @@
}
/**
- * @see org.codehaus.plexus.siterenderer.Renderer#render(java.io.File,
java.io.File, java.lang.String, java.lang.String, Map)
+ * @see org.apache.maven.doxia.siterenderer.Renderer#render(java.io.File,
java.io.File, java.lang.String, java.lang.String, Map)
*/
public void render( File siteDirectory, File outputDirectory, String
siteDescriptor, String templateName,
Map templateProperties )
@@ -143,7 +143,7 @@
}
/**
- * @see org.codehaus.plexus.siterenderer.Renderer#render(java.io.File,
java.io.File, java.lang.String, java.lang.String, java.util.Map,
java.util.Locale)
+ * @see org.apache.maven.doxia.siterenderer.Renderer#render(java.io.File,
java.io.File, java.lang.String, java.lang.String, java.util.Map,
java.util.Locale)
*/
public void render( File siteDirectory, File outputDirectory, String
siteDescriptor, String templateName,
Map templateProperties, Locale locale )
@@ -154,7 +154,7 @@
}
/**
- * @see org.codehaus.plexus.siterenderer.Renderer#render(File, File,
InputStream, String, Map)
+ * @see org.apache.maven.doxia.siterenderer.Renderer#render(File, File,
InputStream, String, Map)
*/
public void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
Map templateProperties )
@@ -164,7 +164,7 @@
}
/**
- * @see org.codehaus.plexus.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.InputStream, java.lang.String, java.util.Map,
java.util.Locale)
+ * @see org.apache.maven.doxia.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.InputStream, java.lang.String, java.util.Map,
java.util.Locale)
*/
public void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
Map templateProperties, Locale locale )
@@ -185,7 +185,7 @@
}
/**
- * @see org.codehaus.plexus.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.InputStream, java.lang.String, java.util.Map,
java.util.Locale, java.lang.String)
+ * @see org.apache.maven.doxia.siterenderer.Renderer#render(java.io.File,
java.io.File, java.io.InputStream, java.lang.String, java.util.Map,
java.util.Locale, java.lang.String)
*/
public void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
Map templateProperties, Locale locale, String
outputEncoding )
@@ -318,7 +318,7 @@
}
/**
- * @see
org.codehaus.plexus.siterenderer.Renderer#generateDocument(java.io.Writer,
java.lang.String, java.util.Map,
org.codehaus.plexus.siterenderer.sink.SiteRendererSink)
+ * @see
org.apache.maven.doxia.siterenderer.Renderer#generateDocument(java.io.Writer,
java.lang.String, java.util.Map,
org.apache.maven.doxia.siterenderer.sink.SiteRendererSink)
*/
public void generateDocument( Writer writer, String templateName, Map
templateProperties, SiteRendererSink sink )
throws RendererException
@@ -327,7 +327,7 @@
}
/**
- * @see
org.codehaus.plexus.siterenderer.Renderer#generateDocument(java.io.Writer,
java.lang.String, java.util.Map,
org.codehaus.plexus.siterenderer.sink.SiteRendererSink, java.util.Locale)
+ * @see
org.apache.maven.doxia.siterenderer.Renderer#generateDocument(java.io.Writer,
java.lang.String, java.util.Map,
org.apache.maven.doxia.siterenderer.sink.SiteRendererSink, java.util.Locale)
*/
public void generateDocument( Writer writer, String templateName, Map
templateProperties, SiteRendererSink sink,
Locale locale )
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=348612&r1=348610&r2=348612&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
Wed Nov 23 17:54:19 2005
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.siterenderer;
+package org.apache.maven.doxia.siterenderer;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.codehaus.plexus.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import java.io.File;
import java.io.IOException;
@@ -34,40 +34,42 @@
String ROLE = Renderer.class.getName();
void render( File siteDirectory, File outputDirectory, File
siteDescriptor, String templateName,
- Map templateProperties )
+ Map templateProperties )
throws RendererException, IOException;
void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
- Map templateProperties )
+ Map templateProperties )
throws RendererException, IOException;
void render( File siteDirectory, File outputDirectory, String
siteDescriptor, String templateName,
- Map templateProperties )
+ Map templateProperties )
throws RendererException, IOException;
void render( File siteDirectory, File outputDirectory, File
siteDescriptor, String templateName,
Map templateProperties, Locale locale )
- throws RendererException, IOException;
+ throws RendererException, IOException;
- void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
+ void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
Map templateProperties, Locale locale )
- throws RendererException, IOException;
+ throws RendererException, IOException;
- void render( File siteDirectory, File outputDirectory, String
siteDescriptor, String templateName,
+ void render( File siteDirectory, File outputDirectory, String
siteDescriptor, String templateName,
Map templateProperties, Locale locale )
- throws RendererException, IOException;
+ throws RendererException, IOException;
- void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
+ void render( File siteDirectory, File outputDirectory, InputStream
siteDescriptor, String templateName,
Map templateProperties, Locale locale, String outputEncoding )
- throws RendererException, IOException;
-
- void render( File siteDirectory, File outputDirectory, String module,
String moduleExtension, String moduleParserId,
- String siteDescriptor, String templateName, Map
templateProperties, Locale locale, String outputEncoding )
- throws RendererException, IOException;
-
- void render( File siteDirectory, File outputDirectory, String module,
String moduleExtension, String moduleParserId,
- InputStream siteDescriptor, String templateName, Map
templateProperties, Locale locale, String outputEncoding )
- throws RendererException, IOException;
+ throws RendererException, IOException;
+
+ void render( File siteDirectory, File outputDirectory, String module,
String moduleExtension, String moduleParserId,
+ String siteDescriptor, String templateName, Map
templateProperties, Locale locale,
+ String outputEncoding )
+ throws RendererException, IOException;
+
+ void render( File siteDirectory, File outputDirectory, String module,
String moduleExtension, String moduleParserId,
+ InputStream siteDescriptor, String templateName, Map
templateProperties, Locale locale,
+ String outputEncoding )
+ throws RendererException, IOException;
void generateDocument( Writer writer, String templateName, Map
templateProperties, SiteRendererSink sink )
throws RendererException;
Modified:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RendererException.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RendererException.java?rev=348612&r1=348610&r2=348612&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RendererException.java
(original)
+++
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RendererException.java
Wed Nov 23 17:54:19 2005
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.siterenderer;/*
+package org.apache.maven.doxia.siterenderer;/*
* Copyright 2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Modified:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java?rev=348612&r1=348610&r2=348612&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
(original)
+++
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
Wed Nov 23 17:54:19 2005
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.siterenderer.sink;
+package org.apache.maven.doxia.siterenderer.sink;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified:
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
URL:
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=348612&r1=348610&r2=348612&view=diff
==============================================================================
---
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
(original)
+++
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Wed Nov 23 17:54:19 2005
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.siterenderer;
+package org.apache.maven.doxia.siterenderer;
/*
* Copyright 2004-2005 The Apache Software Foundation.
