Author: apetrelli
Date: Mon Jul 19 20:09:41 2010
New Revision: 965612
URL: http://svn.apache.org/viewvc?rev=965612&view=rev
Log:
VELOCITYSB-6
Now Anakia is a pure Maven project.
Added:
velocity/sandbox/maven-reorg/anakia/trunk/src/main/
velocity/sandbox/maven-reorg/anakia/trunk/src/main/java/
- copied from r964798, velocity/sandbox/maven-reorg/anakia/trunk/src/java/
velocity/sandbox/maven-reorg/anakia/trunk/src/site/resources/images/pbv90x30.png
- copied unchanged from r964798,
velocity/sandbox/maven-reorg/anakia/trunk/xdocs/images/pbv90x30.png
velocity/sandbox/maven-reorg/anakia/trunk/src/site/resources/images/powered-by-logo.gif
- copied unchanged from r964798,
velocity/sandbox/maven-reorg/anakia/trunk/xdocs/images/powered-by-logo.gif
velocity/sandbox/maven-reorg/anakia/trunk/src/site/resources/images/powered-by-logo.psd
- copied unchanged from r964798,
velocity/sandbox/maven-reorg/anakia/trunk/xdocs/images/powered-by-logo.psd
velocity/sandbox/maven-reorg/anakia/trunk/src/site/resources/images/velocity_project_wide.png
- copied unchanged from r964798,
velocity/sandbox/maven-reorg/anakia/trunk/xdocs/images/velocity_project_wide.png
velocity/sandbox/maven-reorg/anakia/trunk/src/site/resources/images/velocity_project_wide.xcf
- copied unchanged from r964798,
velocity/sandbox/maven-reorg/anakia/trunk/xdocs/images/velocity_project_wide.xcf
velocity/sandbox/maven-reorg/anakia/trunk/src/site/xdoc/
- copied from r964798, velocity/sandbox/maven-reorg/anakia/trunk/xdocs/
velocity/sandbox/maven-reorg/anakia/trunk/src/site/xdoc/index.xml
- copied unchanged from r964798,
velocity/sandbox/maven-reorg/anakia/trunk/xdocs/docs/index.xml
velocity/sandbox/maven-reorg/anakia/trunk/src/test/java/
velocity/sandbox/maven-reorg/anakia/trunk/src/test/java/org/
- copied from r964798,
velocity/sandbox/maven-reorg/anakia/trunk/src/test/org/
velocity/sandbox/maven-reorg/anakia/trunk/src/test/resources/
- copied from r964798, velocity/sandbox/maven-reorg/anakia/trunk/test/
Removed:
velocity/sandbox/maven-reorg/anakia/trunk/build/
velocity/sandbox/maven-reorg/anakia/trunk/src/java/
velocity/sandbox/maven-reorg/anakia/trunk/src/site/xdoc/docs/index.xml
velocity/sandbox/maven-reorg/anakia/trunk/src/site/xdoc/images/
velocity/sandbox/maven-reorg/anakia/trunk/src/test/org/
velocity/sandbox/maven-reorg/anakia/trunk/test/
velocity/sandbox/maven-reorg/anakia/trunk/xdocs/
Modified:
velocity/sandbox/maven-reorg/anakia/trunk/pom.xml
velocity/sandbox/maven-reorg/anakia/trunk/src/site/site.xml
velocity/sandbox/maven-reorg/anakia/trunk/src/test/java/org/apache/anakia/AnakiaTestCase.java
Modified: velocity/sandbox/maven-reorg/anakia/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/anakia/trunk/pom.xml?rev=965612&r1=965611&r2=965612&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/anakia/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/anakia/trunk/pom.xml Mon Jul 19 20:09:41 2010
@@ -1,274 +1,201 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
-
-<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>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>4</version>
- </parent>
-
- <groupId>org.apache.anakia</groupId>
- <artifactId>anakia</artifactId>
- <version>1.1-SNAPSHOT</version>
-
- <name>Anakia</name>
- <url>http://velocity.apache.org/anakia/devel/</url>
- <description>Anakia uses Apache Velocity to generate documents based on XML
source files.</description>
- <inceptionYear>2007</inceptionYear>
- <packaging>jar</packaging>
-
- <build>
- <defaultGoal>post-site</defaultGoal>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <inputEncoding>UTF-8</inputEncoding>
- <outputEncoding>UTF-8</outputEncoding>
- <xdocDirectory>${basedir}/xdocs/docs</xdocDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <site>
- <id>velocity.apache.org</id>
-
<url>scpexe://people.apache.org/www/velocity.apache.org/anakia/devel/</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>Will Glass-Husain</name>
- <id>wglass</id>
- <email>[email protected]</email>
- <organization>Forio Business Simulations</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Geir Magnusson Jr.</name>
- <id>geirm</id>
- <email>[email protected]</email>
- <organization>Independent</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Daniel Rall</name>
- <id>dlr</id>
- <email>[email protected]</email>
- <organization>CollabNet, Inc.</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- <developer>
- <name>Henning P. Schmiedehausen</name>
- <id>henning</id>
- <email>[email protected]</email>
- <organization>INTERMETA - Gesellschaft für Mehrwertdienste
mbH</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>2</timezone>
- </developer>
-
- <developer>
- <name>Nathan Bubna</name>
- <id>nbubna</id>
- <email>[email protected]</email>
- <organization>ESHA Research</organization>
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
-
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.5</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>werken-xpath</groupId>
- <artifactId>werken-xpath</artifactId>
- <version>0.9.4</version>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>test.compare.dir</name>
- <value>${basedir}/test</value>
- <name>test.results.dir</name>
- <value>${basedir}/target/test</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>summary</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <!-- no FixFor yet. -->
- <filter>sorter/field=issuekey&sorter/order=ASC</filter>
- <maxEntries>100</maxEntries>
- <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <configuration>
- <tag>TODO</tag>
- <tag>FIXME</tag>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
- <link>http://jakarta.apache.org/commons/lang/api-release</link>
-
<link>http://jakarta.apache.org/commons/collections/api-release</link>
- <link>http://www.jdom.org/docs/apidocs</link>
- <link>http://logging.apache.org/log4j/docs/api</link>
- <link>http://excalibur.apache.org/apidocs</link>
-
<link>http://velocity.apache.org/engine/releases/velocity-1.5/apidocs</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/anakia/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/anakia/trunk</developerConnection>
- <tag>HEAD</tag>
- <url>http://svn.apache.org/viewvc/velocity/anakia/trunk</url>
- </scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/ANAKIA</url>
- </issueManagement>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you 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. -->
+
+<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>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-master</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-anakia</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+
+ <name>Anakia</name>
+ <url>http://velocity.apache.org/anakia/devel/</url>
+ <description>Anakia uses Apache Velocity to generate documents based on
XML source files.</description>
+ <inceptionYear>2007</inceptionYear>
+ <packaging>jar</packaging>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>test.compare.dir</name>
+ <value>${project.build.testOutputDirectory}</value>
+ </property>
+ <property>
+ <name>test.results.dir</name>
+ <value>${project.build.directory}/results</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <inputEncoding>UTF-8</inputEncoding>
+ <outputEncoding>UTF-8</outputEncoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <site>
+ <id>velocity.apache.org</id>
+
<url>scpexe://people.apache.org/www/velocity.apache.org/anakia/devel/</url>
+ </site>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>werken-xpath</groupId>
+ <artifactId>werken-xpath</artifactId>
+ <version>0.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ <!-- <report>jira-report</report> -->
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <!-- no FixFor yet. -->
+ <filter>sorter/field=issuekey&sorter/order=ASC</filter>
+ <maxEntries>100</maxEntries>
+
<teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <configuration>
+ <tag>TODO</tag>
+ <tag>FIXME</tag>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
+ <link>http://jakarta.apache.org/oro/api</link>
+ <link>http://commons.apache.org/lang/api-release/
+ </link>
+
<link>http://commons.apache.org/collections/api-release/
+ </link>
+ <link>http://logging.apache.org/log4j/1.2/apidocs/
+ </link>
+ <link>http://excalibur.apache.org/apidocs</link>
+
<link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/
+ </link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/anakia/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/anakia/trunk</developerConnection>
+ <tag>HEAD</tag>
+
<url>http://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/anakia/trunk</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/ANAKIA</url>
+ </issueManagement>
</project>
Modified: velocity/sandbox/maven-reorg/anakia/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/anakia/trunk/src/site/site.xml?rev=965612&r1=965611&r2=965612&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/anakia/trunk/src/site/site.xml (original)
+++ velocity/sandbox/maven-reorg/anakia/trunk/src/site/site.xml Mon Jul 19
20:09:41 2010
@@ -15,7 +15,7 @@
"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 name="Apache Anakia">
@@ -31,10 +31,10 @@
</bannerRight>
<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>
@@ -42,7 +42,7 @@
<skin>
<groupId>org.apache.velocity.site</groupId>
<artifactId>velocity-site-skin</artifactId>
- <version>1.2.0</version>
+ <version>1.2.3</version>
</skin>
<body>
Modified:
velocity/sandbox/maven-reorg/anakia/trunk/src/test/java/org/apache/anakia/AnakiaTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/anakia/trunk/src/test/java/org/apache/anakia/AnakiaTestCase.java?rev=965612&r1=964798&r2=965612&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/anakia/trunk/src/test/java/org/apache/anakia/AnakiaTestCase.java
(original)
+++
velocity/sandbox/maven-reorg/anakia/trunk/src/test/java/org/apache/anakia/AnakiaTestCase.java
Mon Jul 19 20:09:41 2010
@@ -68,8 +68,8 @@ public class AnakiaTestCase extends Test
*/
public void setUp()
{
- resultsDir = new File(System.getProperty(RESULTS_DIR_KEY, "bin/test"),
"anakia");
- testDir = new File(System.getProperty(TEST_DIR_KEY, "test"));
+ resultsDir = new File(System.getProperty(RESULTS_DIR_KEY), "anakia");
+ testDir = new File(System.getProperty(TEST_DIR_KEY));
compareDir = new File (testDir, "anakia/compare");
}
