svn commit: r348605 [9/9] - in /maven/doxia/trunk: ./ doxia-core/ doxia-core/src/main/java/org/apache/ doxia-core/src/main/java/org/apache/maven/ doxia-core/src/main/java/org/apache/maven/doxia/ doxia

2005-11-23 Thread brett
Modified: 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/RendererException.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/RendererException.java?rev=348605&r1=348604&r2=348605&view=diff
==
--- 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/RendererException.java
 (original)
+++ 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/RendererException.java
 Wed Nov 23 17:02:44 2005
@@ -1,11 +1,21 @@
-/**
- * 
+package org.codehaus.plexus.siterenderer;/*
+ * Copyright 2004-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.
  */
-package org.codehaus.plexus.siterenderer;
 
 /**
  * @author Emmanuel Venisse
- *
  */
 public class RendererException
 extends Exception

Modified: 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/sink/SiteRendererSink.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/sink/SiteRendererSink.java?rev=348605&r1=348604&r2=348605&view=diff
==
--- 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/sink/SiteRendererSink.java
 (original)
+++ 
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/sink/SiteRendererSink.java
 Wed Nov 23 17:02:44 2005
@@ -1,12 +1,5 @@
 package org.codehaus.plexus.siterenderer.sink;
 
-import org.codehaus.doxia.module.xhtml.XhtmlSink;
-import org.codehaus.doxia.module.xhtml.decoration.render.RenderingContext;
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *
@@ -23,6 +16,13 @@
  * limitations under the License.
  */
 
+import org.apache.maven.doxia.module.xhtml.XhtmlSink;
+import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author mailto:[EMAIL PROTECTED]>Emmanuel Venisse
  * @version $Id$
@@ -46,7 +46,7 @@
 }
 
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#title_()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#title_()
  */
 public void title_()
 {
@@ -59,7 +59,7 @@
 }
 
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#title()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#title()
  */
 public void title()
 {
@@ -71,7 +71,7 @@
 }
 
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#author_()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#author_()
  */
 public void author_()
 {
@@ -89,7 +89,7 @@
 }
 
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#date_()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#date_()
  */
 public void date_()
 {
@@ -107,14 +107,14 @@
 }
 
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#body_()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#body_()
  */
 public void body_()
 {
 }
 
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#body()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#body()
  */
 public void body()
 {
@@ -124,8 +124,9 @@
 {
 return writer.toString();
 }
+
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#head_()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#head_()
  */
 public void head_()
 {
@@ -133,7 +134,7 @@
 }
 
 /**
- * @see org.codehaus.doxia.module.xhtml.XhtmlSink#head()
+ * @see org.apache.maven.doxia.module.xhtml.XhtmlSink#head()
  */
 public void head()
 {

Modified: 
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/codehaus/plexus/siterenderer/DefaultSiteRendererTest.java
URL: 
http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-site-renderer/src/test/java/org/codehaus/plexus/siterenderer/DefaultSiteRendererTest.java?rev=348605&r1=348604&r2=348605&view=diff
==
--- 
maven/doxia/trunk/doxia-site-renderer/src/t

svn commit: r348612 - in /maven/doxia/trunk: doxia-core/src/main/java/org/codehaus/ doxia-core/src/test/java/org/codehaus/ doxia-sink-api/src/main/java/org/codehaus/ doxia-site-renderer/src/main/java/

2005-11-23 Thread brett
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 mailto:[EMAIL PROTECTED]">Emmanuel Venisse
  * @author mailto:[EMAIL PROTECTED]">Vincent Siveton
  * @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 

svn commit: r348613 - in /maven/doxia/trunk/doxia-site-renderer/src: main/java/org/codehaus/ test/java/org/codehaus/

2005-11-23 Thread brett
Author: brett
Date: Wed Nov 23 18:06:27 2005
New Revision: 348613

URL: http://svn.apache.org/viewcvs?rev=348613&view=rev
Log:
remove old directories

Removed:
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/codehaus/



svn commit: r348619 - in /maven/doxia/trunk/doxia-core/src/site/resources: ./ css/ css/maven-theme.css images/

2005-11-23 Thread brett
Author: brett
Date: Wed Nov 23 18:34:15 2005
New Revision: 348619

URL: http://svn.apache.org/viewcvs?rev=348619&view=rev
Log:
add css

Added:
maven/doxia/trunk/doxia-core/src/site/resources/
maven/doxia/trunk/doxia-core/src/site/resources/css/
maven/doxia/trunk/doxia-core/src/site/resources/css/maven-theme.css
  - copied unchanged from r348596, 
maven/site/trunk/src/site/resources/css/maven-theme.css
maven/doxia/trunk/doxia-core/src/site/resources/images/
  - copied from r348596, 
maven/scm/trunk/maven-scm-site/src/site/resources/images/



svn commit: r348671 - in /maven/doxia/trunk: doxia-core/src/site/ src/ src/site/ src/site/apt/ src/site/resources/ src/site/site.xml

2005-11-23 Thread brett
Author: brett
Date: Wed Nov 23 21:58:12 2005
New Revision: 348671

URL: http://svn.apache.org/viewcvs?rev=348671&view=rev
Log:
move site to top level

Added:
maven/doxia/trunk/src/
maven/doxia/trunk/src/site/
  - copied from r348612, maven/doxia/trunk/doxia-core/src/site/
maven/doxia/trunk/src/site/apt/
  - copied from r348670, maven/doxia/trunk/doxia-core/src/site/apt/
maven/doxia/trunk/src/site/resources/
  - copied from r348670, maven/doxia/trunk/doxia-core/src/site/resources/
maven/doxia/trunk/src/site/site.xml
  - copied unchanged from r348670, 
maven/doxia/trunk/doxia-core/src/site/site.xml
Removed:
maven/doxia/trunk/doxia-core/src/site/