Author: jvanzyl
Date: Sun Mar 18 18:43:05 2007
New Revision: 519787
URL: http://svn.apache.org/viewvc?view=rev&rev=519787
Log:
o first pass at getting this all working
o depMan needs work to have all deps in the top-level
Modified:
maven/doxia/doxia-site/trunk/doxia-decoration-model/pom.xml
maven/doxia/doxia-site/trunk/doxia-doc-renderer/pom.xml
maven/doxia/doxia-site/trunk/doxia-site-renderer/pom.xml
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
Modified: maven/doxia/doxia-site/trunk/doxia-decoration-model/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-decoration-model/pom.xml?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
--- maven/doxia/doxia-site/trunk/doxia-decoration-model/pom.xml (original)
+++ maven/doxia/doxia-site/trunk/doxia-decoration-model/pom.xml Sun Mar 18
18:43:05 2007
@@ -22,9 +22,9 @@
<project xmlns="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";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>doxia</artifactId>
+ <artifactId>doxia-site</artifactId>
<groupId>org.apache.maven.doxia</groupId>
- <version>1.0-alpha-9-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<artifactId>doxia-decoration-model</artifactId>
<name>Doxia Decoration Model</name>
Modified: maven/doxia/doxia-site/trunk/doxia-doc-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-doc-renderer/pom.xml?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
--- maven/doxia/doxia-site/trunk/doxia-doc-renderer/pom.xml (original)
+++ maven/doxia/doxia-site/trunk/doxia-doc-renderer/pom.xml Sun Mar 18 18:43:05
2007
@@ -22,9 +22,9 @@
<project xmlns="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";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>doxia</artifactId>
+ <artifactId>doxia-site</artifactId>
<groupId>org.apache.maven.doxia</groupId>
- <version>1.0-alpha-9-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<artifactId>doxia-doc-renderer</artifactId>
<name>Doxia Document Renderer Component</name>
@@ -65,6 +65,15 @@
</developers>
<dependencies>
<dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-i18n</artifactId>
<version>1.0-beta-6</version>
@@ -72,7 +81,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-itext</artifactId>
- <version>${projectVersion}</version>
+ <version>${doxiaVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/doxia/doxia-site/trunk/doxia-site-renderer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-site-renderer/pom.xml?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
--- maven/doxia/doxia-site/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-site/trunk/doxia-site-renderer/pom.xml Sun Mar 18
18:43:05 2007
@@ -22,9 +22,9 @@
<project xmlns="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";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>doxia</artifactId>
+ <artifactId>doxia-site</artifactId>
<groupId>org.apache.maven.doxia</groupId>
- <version>1.0-alpha-9-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<artifactId>doxia-site-renderer</artifactId>
<name>Doxia Site Renderer Component</name>
@@ -73,22 +73,19 @@
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- <version>${projectVersion}</version>
- </dependency>
<!-- The modules are not in doxia core anymore so you have to state a
dependency so that
the component descriptor gets picked up. -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-apt</artifactId>
- <version>${projectVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-xdoc</artifactId>
- <version>${projectVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
---
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Sun Mar 18 18:43:05 2007
@@ -20,7 +20,7 @@
*/
import org.apache.maven.doxia.Doxia;
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.module.xhtml.RenderingContext;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
import org.apache.maven.doxia.site.decoration.DecorationModel;
Modified:
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
---
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
(original)
+++
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
Sun Mar 18 18:43:05 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.module.xhtml.RenderingContext;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
Modified:
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
---
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
(original)
+++
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
Sun Mar 18 18:43:05 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.module.xhtml.RenderingContext;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
Modified:
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
---
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
(original)
+++
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
Sun Mar 18 18:43:05 2007
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
+import org.apache.maven.doxia.module.xhtml.RenderingContext;
import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
Modified:
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java?view=diff&rev=519787&r1=519786&r2=519787
==============================================================================
---
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
(original)
+++
maven/doxia/doxia-site/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
Sun Mar 18 18:43:05 2007
@@ -20,8 +20,7 @@
*/
import org.apache.maven.doxia.module.xhtml.XhtmlSink;
-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
-import org.apache.velocity.io.VelocityWriter;
+import org.apache.maven.doxia.module.xhtml.RenderingContext;
import java.io.StringWriter;
import java.io.Writer;
