You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by ap...@apache.org on 2010/06/20 21:40:54 UTC
svn commit: r956393 - in /velocity/sandbox/maven-reorg: maven/trunk/pom/
site/site/ site/site/src/site/ site/site/src/site/apt/
site/site/src/site/velocity/ site/site/src/site/xdoc/ site/tools/
site/tools/src/site/apt/
Author: apetrelli
Date: Sun Jun 20 19:40:53 2010
New Revision: 956393
URL: http://svn.apache.org/viewvc?rev=956393&view=rev
Log:
VELOCITYSB-3
Fixed links, updated plugins, removed useless pages, generated project infos.
Removed:
velocity/sandbox/maven-reorg/site/site/src/site/velocity/
Modified:
velocity/sandbox/maven-reorg/maven/trunk/pom/ (props changed)
velocity/sandbox/maven-reorg/maven/trunk/pom/pom.xml
velocity/sandbox/maven-reorg/site/site/doap_anakia.rdf
velocity/sandbox/maven-reorg/site/site/doap_dvsl.rdf
velocity/sandbox/maven-reorg/site/site/doap_engine.rdf
velocity/sandbox/maven-reorg/site/site/doap_texen.rdf
velocity/sandbox/maven-reorg/site/site/doap_tools.rdf
velocity/sandbox/maven-reorg/site/site/pom.xml
velocity/sandbox/maven-reorg/site/site/src/site/apt/board-reports.apt
velocity/sandbox/maven-reorg/site/site/src/site/apt/get-involved.apt
velocity/sandbox/maven-reorg/site/site/src/site/apt/how-it-works.apt
velocity/sandbox/maven-reorg/site/site/src/site/apt/site-building.apt
velocity/sandbox/maven-reorg/site/site/src/site/site.xml
velocity/sandbox/maven-reorg/site/site/src/site/xdoc/index.xml
velocity/sandbox/maven-reorg/site/tools/pom.xml
velocity/sandbox/maven-reorg/site/tools/src/site/apt/index.apt
Propchange: velocity/sandbox/maven-reorg/maven/trunk/pom/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jun 20 19:40:53 2010
@@ -1 +1,2 @@
.*
+target
Modified: velocity/sandbox/maven-reorg/maven/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/maven/trunk/pom/pom.xml?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/maven/trunk/pom/pom.xml (original)
+++ velocity/sandbox/maven-reorg/maven/trunk/pom/pom.xml Sun Jun 20 19:40:53 2010
@@ -32,7 +32,7 @@
<description>Master POM for Velocity</description>
<issueManagement>
<system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/VELOCITYSB</url>
+ <url>https://issues.apache.org/jira/browse/VELOCITY</url>
</issueManagement>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/maven/trunk/pom</connection>
@@ -212,7 +212,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: velocity/sandbox/maven-reorg/site/site/doap_anakia.rdf
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/doap_anakia.rdf?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/doap_anakia.rdf (original)
+++ velocity/sandbox/maven-reorg/site/site/doap_anakia.rdf Sun Jun 20 19:40:53 2010
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
=======================================================================
- Copyright (c) 2006 The Apache Software Foundation.
+ Copyright (c) 2006 The Apache Software Foundation.
All rights reserved.
=======================================================================
@@ -22,7 +22,7 @@
<shortdesc>Anakia uses Apache Velocity to generate documents based on XML source files.</shortdesc>
<description>Anakia is an XML transformation tool that uses JDOM and Velocity to transform XML documents into the format of your choice. It provides an alternative to using Ant's <style> task and XSL to process XML files.</description>
<bug-database rdf:resource="http://issues.apache.org/jira/browse/ANAKIA" />
- <mailing-list rdf:resource="http://velocity.apache.org/contact.html" />
+ <mailing-list rdf:resource="http://velocity.apache.org/mail-lists.html" />
<download-page rdf:resource="http://velocity.apache.org/download.cgi" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/library"/>
Modified: velocity/sandbox/maven-reorg/site/site/doap_dvsl.rdf
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/doap_dvsl.rdf?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/doap_dvsl.rdf (original)
+++ velocity/sandbox/maven-reorg/site/site/doap_dvsl.rdf Sun Jun 20 19:40:53 2010
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
=======================================================================
- Copyright (c) 2006 The Apache Software Foundation.
+ Copyright (c) 2006 The Apache Software Foundation.
All rights reserved.
=======================================================================
@@ -22,7 +22,7 @@
<shortdesc>A tool modeled after XSLT and intended for general XML transformations using the Velocity Template Language.</shortdesc>
<description>DVSL (Declarative Velocity Style Language) is a tool modeled after XSLT and is intended for general XML transformations using the Velocity Template Language as the templating language for the transformations. The key differences are that it incorporates easy access to Java objects and allows you to use the Velocity template language and it's features for expressing the transformation templates.</description>
<bug-database rdf:resource="http://issues.apache.org/jira/browse/VELOCITY" />
- <mailing-list rdf:resource="http://velocity.apache.org/contact.html" />
+ <mailing-list rdf:resource="http://velocity.apache.org/mail-lists.html" />
<download-page rdf:resource="http://velocity.apache.org/download.cgi" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/library"/>
Modified: velocity/sandbox/maven-reorg/site/site/doap_engine.rdf
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/doap_engine.rdf?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/doap_engine.rdf (original)
+++ velocity/sandbox/maven-reorg/site/site/doap_engine.rdf Sun Jun 20 19:40:53 2010
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
=======================================================================
- Copyright (c) 2010 The Apache Software Foundation.
+ Copyright (c) 2010 The Apache Software Foundation.
All rights reserved.
=======================================================================
@@ -24,7 +24,7 @@
When Velocity is used for web development, Web designers can work in parallel with Java programmers to develop web sites according to the Model-View-Controller (MVC) model, meaning that web page designers can focus solely on creating a site that looks good, and programmers can focus solely on writing top-notch code. Velocity separates Java code from the web pages, making the web site more maintainable over its lifespan and providing a viable alternative to Java Server Pages (JSPs) or PHP. </description>
<bug-database rdf:resource="http://issues.apache.org/jira/browse/VELOCITY" />
- <mailing-list rdf:resource="http://velocity.apache.org/contact.html" />
+ <mailing-list rdf:resource="http://velocity.apache.org/mail-lists.html" />
<download-page rdf:resource="http://velocity.apache.org/download.cgi" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/library"/>
Modified: velocity/sandbox/maven-reorg/site/site/doap_texen.rdf
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/doap_texen.rdf?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/doap_texen.rdf (original)
+++ velocity/sandbox/maven-reorg/site/site/doap_texen.rdf Sun Jun 20 19:40:53 2010
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
=======================================================================
- Copyright (c) 2006 The Apache Software Foundation.
+ Copyright (c) 2006 The Apache Software Foundation.
All rights reserved.
=======================================================================
@@ -22,7 +22,7 @@
<shortdesc>Texen is a general purpose text generating utility based on Apache Velocity and Apache Ant.</shortdesc>
<description>Texen is a general purpose text generating utility. It is capable of producing almost any sort of text output. Driven by Ant, essentially an Ant Task, Texen uses a control template, an optional set of worker templates, and control context to govern the generated output. Although TexenTask can be used directly, it is usually subclassed to initialize your control context before generating any output.</description>
<bug-database rdf:resource="http://issues.apache.org/jira/browse/TEXEN" />
- <mailing-list rdf:resource="http://velocity.apache.org/contact.html" />
+ <mailing-list rdf:resource="http://velocity.apache.org/mail-lists.html" />
<download-page rdf:resource="http://velocity.apache.org/download.cgi" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/library"/>
Modified: velocity/sandbox/maven-reorg/site/site/doap_tools.rdf
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/doap_tools.rdf?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/doap_tools.rdf (original)
+++ velocity/sandbox/maven-reorg/site/site/doap_tools.rdf Sun Jun 20 19:40:53 2010
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns="http://usefulinc.com/ns/doap#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:asfext="http://projects.apache.org/ns/asfext#"
xmlns:foaf="http://xmlns.com/foaf/0.1/">
<!--
=======================================================================
- Copyright (c) 2010 The Apache Software Foundation.
+ Copyright (c) 2010 The Apache Software Foundation.
All rights reserved.
=======================================================================
@@ -22,7 +22,7 @@
<shortdesc>Tools and infrastructure for the template engine</shortdesc>
<description>VelocityTools is a collection of Velocity subprojects with a common goal of creating tools and infrastructure for building both web and non-web applications using the Velocity template engine.</description>
<bug-database rdf:resource="http://issues.apache.org/jira/browse/VELTOOLS" />
- <mailing-list rdf:resource="http://velocity.apache.org/contact.html" />
+ <mailing-list rdf:resource="http://velocity.apache.org/mail-lists.html" />
<download-page rdf:resource="http://velocity.apache.org/download.cgi" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/library"/>
Modified: velocity/sandbox/maven-reorg/site/site/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/pom.xml?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/pom.xml (original)
+++ velocity/sandbox/maven-reorg/site/site/pom.xml Sun Jun 20 19:40:53 2010
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>velocity-master</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site</artifactId>
<version>1.0.0</version>
@@ -22,172 +27,6 @@
</site>
</distributionManagement>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>The Apache Software License 2.0</comments>
- </license>
- </licenses>
-
- <prerequisites>
- <maven>2.0.5</maven>
- </prerequisites>
-
- <developers>
-
- <developer>
- <name>Claude Brisson</name>
- <id>cbrisson</id>
- <roles>
- <role>Java developer</role>
- <role>PMC Member</role>
- </roles>
- </developer>
-
- <developer>
- <name>Nathan Bubna</name>
- <id>nbubna</id>
- <email>nathan@esha.com</email>
- <organization>ESHA Research</organization>
- <roles>
- <role>Java developer</role>
- <role>PMC Member</role>
- </roles>
- </developer>
-
- <developer>
- <name>Will Glass-Husain</name>
- <id>wglass</id>
- <email>wglass@forio.com</email>
- <organization>Forio Business Simulations</organization>
- <roles>
- <role>Java developer</role>
- <role>PMC Chair</role>
- </roles>
- </developer>
-
- <developer>
- <name>Marinó A. Jónsson</name>
- <id>marino</id>
- <email>marinoj@centrum.is</email>
- <roles>
- <role>Java developer</role>
- <role>PMC Member</role>
- </roles>
- </developer>
-
- <developer>
- <name>Geir Magnusson Jr.</name>
- <id>geirm</id>
- <email>geirm@optonline.net</email>
- <organization>Independent (DVSL Maven)</organization>
- <roles>
- <role>Java developer</role>
- <role>PMC Member</role>
- </roles>
- </developer>
-
- <developer>
- <name>Daniel Rall</name>
- <id>dlr</id>
- <email>dlr@finemaltcoding.com</email>
- <organization>CollabNet, Inc.</organization>
- <roles>
- <role>Java developer</role>
- <role>PMC Member</role>
- </roles>
- </developer>
-
- <developer>
- <name>Henning P. Schmiedehausen</name>
- <id>henning</id>
- <organization>The Henning Schmiedehausen Organization</organization>
- <roles>
- <role>Java developer</role>
- <role>PMC Member</role>
- </roles>
- <timezone>-7</timezone>
- </developer>
-
- <developer>
- <name>Jon S. Stevens</name>
- <id>jons</id>
- <roles>
- <role>Emeritus</role>
- </roles>
- </developer>
-
- <developer>
- <name>Jason van Zyl</name>
- <id>jvanzyl</id>
- <roles>
- <role>Emeritus</role>
- </roles>
- </developer>
-
- <developer>
- <name>Christopher Schultz</name>
- <id>schultz</id>
- <roles>
- <role>Java developer</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
-
- <developer>
- <name>Antonio Petrelli</name>
- <id>apetrelli</id>
- <roles>
- <role>Java developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
-
- </developers>
-
- <mailingLists>
- <mailingList>
- <name>general</name>
- <subscribe>general-subscribe@velocity.apache.org</subscribe>
- <unsubscribe>general-unsubscribe@velocity.apache.org</unsubscribe>
- <post>general@velocity.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/velocity-general/</archive>
- </mailingList>
-
- <mailingList>
- <name>user</name>
- <subscribe>user-subscribe@velocity.apache.org</subscribe>
- <unsubscribe>user-unsubscribe@velocity.apache.org</unsubscribe>
- <post>user@velocity.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/velocity-user/</archive>
- <otherArchives>
- <otherArchive>http://www.nabble.com/Velocity---User-f347.html</otherArchive>
- <otherArchive>http://www.mail-archive.com/user@velocity.apache.org/</otherArchive>
- </otherArchives>
- </mailingList>
-
- <mailingList>
- <name>dev</name>
- <subscribe>dev-subscribe@velocity.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@velocity.apache.org</unsubscribe>
- <post>dev@velocity.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/velocity-dev/</archive>
- <otherArchives>
- <otherArchive>http://www.nabble.com/Velocity---Dev-f346.html</otherArchive>
- <otherArchive>http://www.mail-archive.com/dev@velocity.apache.org/</otherArchive>
- </otherArchives>
- </mailingList>
-
- <mailingList>
- <name>commits</name>
- <subscribe>commits-subscribe@velocity.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@velocity.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/velocity-commits/</archive>
- </mailingList>
- </mailingLists>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/site/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/site/trunk/</developerConnection>
@@ -200,16 +39,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet/>
- </reportSets>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-news-plugin</artifactId>
- <configuration>
- <baseUrl>http://velocity.apache.org/</baseUrl>
- </configuration>
+ <version>1.2.0-SNAPSHOT</version>
+ <reportSets>
+ <reportSet>
+ <configuration>
+ <baseUrl>http://velocity.apache.org/</baseUrl>
+ </configuration>
+ <id>news-set</id>
+ <reports>
+ <report>news</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</plugins>
</reporting>
@@ -219,18 +65,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>2.1.1</version>
<dependencies>
<dependency>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-news-plugin</artifactId>
<version>1.2.0-SNAPSHOT</version>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-doxia-renderer</artifactId>
<version>1.2.0-SNAPSHOT</version>
- </dependency>
+ </dependency> -->
</dependencies>
</plugin>
@@ -263,7 +109,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+<!-- <plugin>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-doxia-renderer</artifactId>
<configuration>
@@ -277,16 +123,26 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-news-plugin</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
<executions>
<execution>
+ <id>pre-site-news</id>
+ <phase>pre-site</phase>
<goals>
<goal>pre-site</goal>
</goals>
</execution>
+<!-- <execution>
+ <id>in-site-news</id>
+ <phase>site</phase>
+ <goals>
+ <goal>news</goal>
+ </goals>
+ </execution> -->
</executions>
</plugin>
</plugins>
Modified: velocity/sandbox/maven-reorg/site/site/src/site/apt/board-reports.apt
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/src/site/apt/board-reports.apt?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/src/site/apt/board-reports.apt (original)
+++ velocity/sandbox/maven-reorg/site/site/src/site/apt/board-reports.apt Sun Jun 20 19:40:53 2010
@@ -8,19 +8,19 @@ Reports to the Board of the Apache Softw
As part of the {{{http://www.apache.org/}Apache Software Foundation}}
we must report to the board about our activity. These reports are
- quarterly due and public.
+ quarterly due and public.
- * {{{reports/report-2007-11.html}November 2007 Report}}
+ * {{{./reports/report-2007-11.html}November 2007 Report}}
- * {{{reports/report-2007-08.html}August 2007 Report}}
+ * {{{./reports/report-2007-08.html}August 2007 Report}}
- * {{{reports/report-2007-05.html}May 2007 Report}}
+ * {{{./reports/report-2007-05.html}May 2007 Report}}
- * {{{reports/report-2007-02.html}February 2007 Report}}
+ * {{{./reports/report-2007-02.html}February 2007 Report}}
- * {{{reports/report-2007-01.html}January 2007 Report}}
+ * {{{./reports/report-2007-01.html}January 2007 Report}}
- * {{{reports/report-2006-12.html}December 2006 Report}}
+ * {{{./reports/report-2006-12.html}December 2006 Report}}
- * {{{reports/report-2006-11.html}November 2006 Report}}
+ * {{{./reports/report-2006-11.html}November 2006 Report}}
Modified: velocity/sandbox/maven-reorg/site/site/src/site/apt/get-involved.apt
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/src/site/apt/get-involved.apt?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/src/site/apt/get-involved.apt (original)
+++ velocity/sandbox/maven-reorg/site/site/src/site/apt/get-involved.apt Sun Jun 20 19:40:53 2010
@@ -20,11 +20,11 @@ Getting involved with the Apache Velocit
cetera, is by far the most important role. Your feedback allows the
technology to evolve.
- * {{{contact.html#Mailing lists}Join Mailing Lists}}
+ * {{{./mail-lists.html}Join Mailing Lists}}
- * {{{download.cgi#Production releases}Download Binary Builds}}
+ * {{{./download.cgi#Production_releases}Download Binary Builds}}
- * {{{contact.html#Issue Tracking}Report bugs/Request additional features}}
+ * {{{./issue-tracking.html}Report bugs/Request additional features}}
* Contribute Code or Documentation Patches
@@ -32,13 +32,13 @@ Getting involved with the Apache Velocit
code. If this is the type of role you'd like to play, here are some
steps (in addition to the ones above) to get you started:
- * {{{how-it-works.html}Read Guidelines}}
+ * {{{./how-it-works.html}Read Guidelines}}
- * {{{reference-library.html}Review Reference Library}}
+ * {{{./reference-library.html}Review Reference Library}}
- * {{{download.cgi}Download the Source Code}}
+ * {{{./download.cgi}Download the Source Code}}
- * {{{download.cgi#Source code repository}Access the Source Code Repository}}
+ * {{{./download.cgi#Source_code_repository}Access the Source Code Repository}}
* Contribute Patches
Modified: velocity/sandbox/maven-reorg/site/site/src/site/apt/how-it-works.apt
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/src/site/apt/how-it-works.apt?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/src/site/apt/how-it-works.apt (original)
+++ velocity/sandbox/maven-reorg/site/site/src/site/apt/how-it-works.apt Sun Jun 20 19:40:53 2010
@@ -11,7 +11,7 @@ How the Apache Velocity project works
project and are grateful for the guidance that we got from the Jakarta people.
This is an evolving document and we expect it to branch away from the Jakarta
- rules in the future. For the moment, we will reference the Jakarta project
+ rules in the future. For the moment, we will reference the Jakarta project
guidelines here and apply these as good as possible to the Apache Velocity
Project.
@@ -46,4 +46,4 @@ How the Apache Velocity project works
{{{http://jakarta.apache.org/site/guidelines.html}The Jakarta Site}},
this is a living document. Changes can be made by the Project
Management Committee. Suggestions for changes should be discussed on
- the {{{contact.html#general}Velocity general}} mailing list.
+ the {{{./mail-lists.html}Velocity general}} mailing list.
Modified: velocity/sandbox/maven-reorg/site/site/src/site/apt/site-building.apt
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/src/site/apt/site-building.apt?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/src/site/apt/site-building.apt (original)
+++ velocity/sandbox/maven-reorg/site/site/src/site/apt/site-building.apt Sun Jun 20 19:40:53 2010
@@ -21,7 +21,7 @@ The Apache Velocity Site
[[a]] want to re-create the Apache Velocity site on your local computer or intranet.
- [[b]] are an {{{who-we-are.html#apache_velocity_committers}Apache Velocity committer}} and want to update the site.
+ [[b]] are an {{{./team-list.html}Apache Velocity committer}} and want to update the site.
* Building the Site
@@ -47,7 +47,7 @@ The Apache Velocity Site
* {Create the Apache Velocity Site Helper modules}
- To build the site, you need the helper modules installed locally.
+ To build the site, you need the helper modules installed locally.
The helper modules have been organized as a Maven reactor build. You
can install them by running <<<mvn>>> from the directory where you found
@@ -64,7 +64,7 @@ The Apache Velocity Site
installs a few extra files (e.g. the <<<download.cgi>>> script for
automatic mirror selection).
- If you want to re-create the site locally, you can now enter
+ If you want to re-create the site locally, you can now enter
<<<mvn site:run>>> and point a web browser at {{{http://localhost:8080/}your local web server}}.
* Deploy the Apache Velocity Site
@@ -75,7 +75,7 @@ The Apache Velocity Site
Maven Doxia and the site and changes plugins.
It is therefore recommended that you do not deploy the site from
- your local computer but log onto <velocity.zones.apache.org> (as a
+ your local computer but log onto <velocity.zones.apache.org> (as a
committer, you can get an account here by just asking on the PMC
list) and run the following commands:
@@ -153,8 +153,7 @@ Missing:
2) org.apache.velocity:doxia-velocity-renderer:jar:0.0.1
+--
- Both messages mean that you neglected to {{{#Create the Apache
- Velocity Site Helper modules}install the helper modules}}. Please go
+ Both messages mean that you neglected to {{{./site-building.html#Create_the_Apache_Velocity_Site_Helper_modules}install the helper modules}}. Please go
to the directory where you found this README file and run
<<<mvn>>>. Afterwards the site should build fine.
@@ -169,7 +168,7 @@ Missing:
+--
means that you are probably using Apache Maven 2.0.4 and either
- forgot to add the {{{#WORKAROUND for Maven 2.0.4}workaround described
+ forgot to add the {{{./site-building.html#WORKAROUND_for_Maven_2.0.4}workaround described
above}} when trying to build the site or forgot to remove the
extensions as described above when trying to execute <<<site:run>>>
or <<<site:deploy>>>.
@@ -179,5 +178,5 @@ Missing:
If you have questions about the Apache Velocity Site building
process, please ask the Velocity developers on the
- {{{contact.html#dev}Velocity Developers mailing list}}.
+ {{{./mail-lists.html}Velocity Developers mailing list}}.
Modified: velocity/sandbox/maven-reorg/site/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/src/site/site.xml?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/src/site/site.xml (original)
+++ velocity/sandbox/maven-reorg/site/site/src/site/site.xml Sun Jun 20 19:40:53 2010
@@ -8,10 +8,10 @@
</bannerLeft>
<poweredBy>
- <logo name="Apache Velocity"
+ <logo name="Apache Velocity"
href="http://velocity.apache.org"
img="/images/pbv90x30.png" />
- <logo name="Velocity News Feed"
+ <logo name="Velocity News Feed"
href="http://velocity.apache.org/rss/news.rss"
img="/images/feed-icon-24x24.jpg" />
</poweredBy>
@@ -41,7 +41,7 @@
<item name="Welcome" href="index.html"/>
<item name="News" href="news.html"/>
<item name="Downloads" href="download.cgi"/>
- </menu>
+ </menu>
<menu name="Releases">
<item name="Engine 1.6.4" href="engine/releases/velocity-1.6.4/"/>
@@ -62,13 +62,13 @@
</menu>
<menu name="Community">
- <item name="Who we are" href="who-we-are.html"/>
- <item name="Contact us" href="contact.html"/>
+ <item name="Who we are" href="team-list.html"/>
+ <item name="Contact us" href="mail-lists.html"/>
<item name="Get involved" href="get-involved.html"/>
<item name="Wiki" href="http://wiki.apache.org/velocity/FrontPage"/>
<item name="How it works" href="how-it-works.html"/>
<item name="Board reports" href="board-reports.html"/>
- </menu>
+ </menu>
<menu name="Developer Resources">
<item name="Coding Standards" href="http://wiki.apache.org/velocity/CodeStandards"/>
@@ -86,6 +86,8 @@
<item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"/>
<item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
</menu>
+ <menu ref="modules" />
+ <menu ref="reports" />
</body>
</project>
Modified: velocity/sandbox/maven-reorg/site/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/site/src/site/xdoc/index.xml?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/site/src/site/xdoc/index.xml (original)
+++ velocity/sandbox/maven-reorg/site/site/src/site/xdoc/index.xml Sun Jun 20 19:40:53 2010
@@ -70,17 +70,17 @@
<dt><a href="texen/">Velocity Texen</a></dt>
<dd>
- Texen is a general purpose text generating utility.
- It is capable of producing almost any sort of text output.
- Usually used as an Ant Task, Texen uses a control template,
- an optional set of worker templates, and control context to
+ Texen is a general purpose text generating utility.
+ It is capable of producing almost any sort of text output.
+ Usually used as an Ant Task, Texen uses a control template,
+ an optional set of worker templates, and control context to
govern the generated output.
</dd>
<dt><a href="anakia/">Velocity Anakia</a></dt>
<dd>
Essentially an XML transformation tool, Anakia uses JDOM and
- Velocity Engine to transform XML documents into the format of your
+ Velocity Engine to transform XML documents into the format of your
choice. It provides an alternative to using Ant's <style> task
and XSL to process XML files.
</dd>
@@ -169,14 +169,14 @@
<a href="how-it-works.html">How the Apache Velocity project works</a>
</li>
<li>
- <a href="who-we-are.html">Who are the people behind the Apache Velocity project</a>
+ <a href="team-list.html">Who are the people behind the Apache Velocity project</a>
</li>
<li>
<a href="get-involved.html">Find out how to get involved with the Apache Velocity
project</a>
</li>
<li>
- <a href="contact.html">Contact the Apache Velocity project</a>
+ <a href="mail-lists.html">Contact the Apache Velocity project</a>
</li>
</ul>
Modified: velocity/sandbox/maven-reorg/site/tools/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/tools/pom.xml?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/tools/pom.xml (original)
+++ velocity/sandbox/maven-reorg/site/tools/pom.xml Sun Jun 20 19:40:53 2010
@@ -16,14 +16,19 @@
"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.
+ under the License.
-->
<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>velocity-master</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-tools</artifactId>
@@ -40,10 +45,6 @@
<module>velocity-site-skin</module>
</modules>
- <prerequisites>
- <maven>2.0.5</maven>
- </prerequisites>
-
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
@@ -53,56 +54,13 @@
<defaultGoal>install</defaultGoal>
</build>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<distributionManagement>
<site>
<id>velocity.apache.org</id>
<url>scpexe://people.apache.org/www/velocity.apache.org/site/tools</url>
</site>
- <repository>
- <id>apache.releases</id>
- <name>Apache Release Distribution Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
- <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
</distributionManagement>
- <developers>
- <developer>
- <name>Henning P. Schmiedehausen</name>
- <id>henning</id>
- <email>henning@apache.org</email>
- <url>http://henning.schmiedehausen.org/</url>
- <organization>The Apache Software Foundation</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>1</timezone>
- </developer>
- </developers>
-
<reporting>
<plugins>
<plugin>
@@ -161,9 +119,4 @@
<tag>HEAD</tag>
<url>http://svn.apache.org/viewvc/velocity/site/tools</url>
</scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/VELOCITY</url>
- </issueManagement>
</project>
Modified: velocity/sandbox/maven-reorg/site/tools/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/site/tools/src/site/apt/index.apt?rev=956393&r1=956392&r2=956393&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/site/tools/src/site/apt/index.apt (original)
+++ velocity/sandbox/maven-reorg/site/tools/src/site/apt/index.apt Sun Jun 20 19:40:53 2010
@@ -13,15 +13,15 @@ Velocity Site Tools
from static APT or Xdoc files but from Velocity templates.
Most prominently, the
- {{{http://velocity.apache.org/who-we-are.html}Who we are}} and
- {{{http://velocity.apache.org/contact.html}Contact Us}} pages benefit
+ {{{http://velocity.apache.org/team-list.html}Who we are}} and
+ {{{http://velocity.apache.org/mail-lists.html}Contact Us}} pages benefit
from this as their information can be kept at a central place (the
{{{http://svn.apache.org/repos/asf/velocity/site/site/pom.xml}Site
POM}}) and gets read and parsed from there.
* Velocity Site News Plugin
- This is a Maven plugin that allows you to keep news items in a
+ This is a Maven plugin that allows you to keep news items in a
XML file and displayed at various parts of your site.
It also registers a Doxia macro with the Renderer which is