Author: apetrelli
Date: Mon Jul 26 08:22:14 2010
New Revision: 979191
URL: http://svn.apache.org/viewvc?rev=979191&view=rev
Log:
VELOCITYSB-7
Reorganized structure of Texen.
Added:
velocity/sandbox/maven-reorg/texen/trunk/src/main/
velocity/sandbox/maven-reorg/texen/trunk/src/main/java/
- copied from r979041, velocity/sandbox/maven-reorg/texen/trunk/src/java/
velocity/sandbox/maven-reorg/texen/trunk/src/main/resources/
velocity/sandbox/maven-reorg/texen/trunk/src/main/resources/org/
velocity/sandbox/maven-reorg/texen/trunk/src/main/resources/org/apache/
velocity/sandbox/maven-reorg/texen/trunk/src/main/resources/org/apache/texen/
velocity/sandbox/maven-reorg/texen/trunk/src/main/resources/org/apache/texen/defaults/
- copied from r979041,
velocity/sandbox/maven-reorg/texen/trunk/src/java/org/apache/texen/defaults/
velocity/sandbox/maven-reorg/texen/trunk/src/site/resources/images/Thumbs.db
- copied unchanged from r979041,
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/Thumbs.db
velocity/sandbox/maven-reorg/texen/trunk/src/site/resources/images/pbv90x30.png
- copied unchanged from r979041,
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/pbv90x30.png
velocity/sandbox/maven-reorg/texen/trunk/src/site/resources/images/powered-by-logo.gif
- copied unchanged from r979041,
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/powered-by-logo.gif
velocity/sandbox/maven-reorg/texen/trunk/src/site/resources/images/powered-by-logo.psd
- copied unchanged from r979041,
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/powered-by-logo.psd
velocity/sandbox/maven-reorg/texen/trunk/src/site/resources/images/velocity_project_wide.png
- copied unchanged from r979041,
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/velocity_project_wide.png
velocity/sandbox/maven-reorg/texen/trunk/src/site/resources/images/velocity_project_wide.xcf
- copied unchanged from r979041,
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/velocity_project_wide.xcf
velocity/sandbox/maven-reorg/texen/trunk/src/site/xdoc/
- copied from r979041,
velocity/sandbox/maven-reorg/texen/trunk/xdocs/docs/
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/
- copied from r979041,
velocity/sandbox/maven-reorg/texen/trunk/src/test/org/
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/
- copied from r979041, velocity/sandbox/maven-reorg/texen/trunk/test/
Removed:
velocity/sandbox/maven-reorg/texen/trunk/src/java/
velocity/sandbox/maven-reorg/texen/trunk/src/main/java/org/apache/texen/defaults/
velocity/sandbox/maven-reorg/texen/trunk/src/test/org/
velocity/sandbox/maven-reorg/texen/trunk/test/
velocity/sandbox/maven-reorg/texen/trunk/xdocs/docs/
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/Thumbs.db
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/pbv90x30.png
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/powered-by-logo.gif
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/powered-by-logo.psd
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/velocity-logo.png
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/velocity_project_wide.png
velocity/sandbox/maven-reorg/texen/trunk/xdocs/images/velocity_project_wide.xcf
Modified:
velocity/sandbox/maven-reorg/texen/trunk/pom.xml
velocity/sandbox/maven-reorg/texen/trunk/src/site/site.xml
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/ExtendedTexenTestCase.java
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/TexenTestCase.java
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/manyfiles/Control.vm
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/service.props
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/templates/Control.vm
Modified: velocity/sandbox/maven-reorg/texen/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk/pom.xml?rev=979191&r1=979190&r2=979191&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/texen/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/texen/trunk/pom.xml Mon Jul 26 08:22:14 2010
@@ -1,254 +1,305 @@
<?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>
-
- <groupId>org.apache.texen</groupId>
- <artifactId>texen</artifactId>
- <version>1.1-SNAPSHOT</version>
-
- <name>Texen</name>
- <url>http://velocity.apache.org/texen/devel/</url>
- <description>Texen is a general purpose text generating utility based on
Apache Velocity and Apache Ant.</description>
- <inceptionYear>2007</inceptionYear>
- <packaging>pom</packaging>
-
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
-
- <build>
- <defaultGoal>install</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>
-
- <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/texen/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>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>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
- </dependencies>
-
- <reporting>
- <plugins>
- <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/texen/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/texen/trunk</developerConnection>
- <tag>HEAD</tag>
- <url>http://svn.apache.org/viewvc/velocity/texen/trunk</url>
- </scm>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TEXEN</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";>
+
+ <parent>
+ <artifactId>velocity-master</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-texen</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+
+ <name>Velocity Texen</name>
+ <url>http://velocity.apache.org/texen/devel/</url>
+ <description>Texen is a general purpose text generating utility based on
Apache Velocity and Apache Ant.</description>
+ <inceptionYear>2007</inceptionYear>
+ <packaging>jar</packaging>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>site deploy site-deploy</goals>
+ <arguments>-Papache-release</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <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>
+ <version>2.1.1</version>
+ <configuration>
+ <inputEncoding>UTF-8</inputEncoding>
+ <outputEncoding>UTF-8</outputEncoding>
+ </configuration>
+ <!-- Need to exclude commons-logging due to bug. See:
http://jira.codehaus.org/browse/MSITE-459 -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
+ <version>1.1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/all.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <site>
+ <id>velocity.apache.org</id>
+
<url>scpexe://people.apache.org/www/velocity.apache.org/texen/devel/</url>
+ </site>
+ </distributionManagement>
+
+ <dependencies>
+ <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>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6</version>
+ <scope>provided</scope>
+ </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/texen/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/texen/trunk</developerConnection>
+ <tag>HEAD</tag>
+
<url>http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk</url>
+ </scm>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/TEXEN</url>
+ </issueManagement>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/all.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir
+
dir="${project.build.directory}/assemblies" />
+ <copy
+
todir="${project.build.directory}/assemblies">
+ <fileset
+
dir="${settings.localRepository}/org/apache/velocity/${project.artifactId}/${project.version}">
+ <include
+
name="${project.artifactId}-${project.version}-all.zip*" />
+ <include
+
name="${project.artifactId}-${project.version}-all.tar.gz*" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>upload</goal>
+ </goals>
+ <configuration>
+
<fromDir>${project.build.directory}/assemblies</fromDir>
+ <includes>**</includes>
+ <toDir>${pom.version}</toDir>
+ <serverId>apache.build</serverId>
+
<url>scp://people.apache.org/www/people.apache.org/builds/velocity/texen</url>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: velocity/sandbox/maven-reorg/texen/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk/src/site/site.xml?rev=979191&r1=979190&r2=979191&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/texen/trunk/src/site/site.xml (original)
+++ velocity/sandbox/maven-reorg/texen/trunk/src/site/site.xml Mon Jul 26
08:22:14 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 Texen">
@@ -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/texen/trunk/src/test/java/org/apache/texen/ExtendedTexenTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/ExtendedTexenTestCase.java?rev=979191&r1=979041&r2=979191&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/ExtendedTexenTestCase.java
(original)
+++
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/ExtendedTexenTestCase.java
Mon Jul 26 08:22:14 2010
@@ -94,47 +94,47 @@ public class ExtendedTexenTestCase exten
{
try
{
-
+
File compareDir = new File (testDir, "texen/compare");
File resultsDir = new File(System.getProperty(RESULTS_DIR_KEY,
"bin/test"), "texen-generator");
-
+
TestUtil.assureResultsDirectoryExists(resultsDir);
-
+
Texen texen = new Texen();
-
+
ExtendedProperties properties = new ExtendedProperties();
-
+
TestUtil.loadProperties(new File(testDir, "texen/service.props"),
properties);
TestUtil.loadProperties(new File(testDir,
"texen/additional.props"), properties);
-
- texen.setControlTemplate("Control.vm");
+
+ texen.setControlTemplate("texen/templates/Control.vm");
texen.setOutputDirectory(resultsDir);
- texen.setTemplatePath(new File(testDir,
"texen/templates").getCanonicalPath());
+ texen.setTemplatePath(testDir.getCanonicalPath());
texen.setOutputFileName("report");
texen.setOutputEncoding("ISO-8859-1");
texen.setInputEncoding("ISO-8859-1");
texen.setUseClasspath(false);
-
+
texen.addContributors(Collections.singleton(new
ExtendedPropertiesContributor(properties, new TexenFileResolver() {
public File resolveFile(final String fileName) {
- return new File(fileName);
+ return new File(testDir, fileName);
}
})));
-
+
texen.setUseResourceLoaderCache(false);
texen.setLog(new Log());
texen.execute();
-
+
if (!compareTexenResults(compareDir, resultsDir))
{
fail("Texen results are incorrect.");
}
- }
+ }
catch (Error e)
{
e.printStackTrace();
throw e;
- }
+ }
catch (Exception e)
{
e.printStackTrace();
@@ -148,43 +148,43 @@ public class ExtendedTexenTestCase exten
{
File compareDir = new File (testDir, "texen/compare");
File resultsDir = new File(System.getProperty(RESULTS_DIR_KEY,
"bin/test"), "texen-generator-classpath");
-
+
TestUtil.assureResultsDirectoryExists(resultsDir);
-
+
Texen texen = new Texen();
-
+
ExtendedProperties properties = new ExtendedProperties();
-
- TestUtil.loadProperties("service.props", properties);
- TestUtil.loadProperties("additional.props", properties);
-
- texen.setControlTemplate("Control.vm");
+
+ TestUtil.loadProperties("texen/service.props", properties);
+ TestUtil.loadProperties("texen/additional.props", properties);
+
+ texen.setControlTemplate("texen/templates/Control.vm");
texen.setOutputDirectory(resultsDir);
texen.setOutputFileName("report");
texen.setOutputEncoding("ISO-8859-1");
texen.setInputEncoding("ISO-8859-1");
texen.setUseResourceLoaderCache(false);
-
+
texen.addContributors(Collections.singleton(new
ExtendedPropertiesContributor(properties, new TexenFileResolver() {
public File resolveFile(final String fileName) {
- return new File(fileName);
+ return new File(testDir, fileName);
}
})));
-
+
texen.setUseClasspath(true);
texen.setLog(new Log());
texen.execute();
-
+
if (!compareTexenResults(compareDir, resultsDir))
{
fail("Texen classpath results are incorrect.");
}
- }
+ }
catch (Error e)
{
e.printStackTrace();
throw e;
- }
+ }
catch (Exception e)
{
e.printStackTrace();
Modified:
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/TexenTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/TexenTestCase.java?rev=979191&r1=979041&r2=979191&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/TexenTestCase.java
(original)
+++
velocity/sandbox/maven-reorg/texen/trunk/src/test/java/org/apache/texen/TexenTestCase.java
Mon Jul 26 08:22:14 2010
@@ -104,9 +104,9 @@ public class TexenTestCase extends TestC
TestUtil.loadProperties(new File(testDir, "texen/service.props"),
properties);
TestUtil.loadProperties(new File(testDir, "texen/additional.props"),
properties);
- texen.setControlTemplate("Control.vm");
+ texen.setControlTemplate("texen/templates/Control.vm");
texen.setOutputDirectory(resultsDir);
- texen.setTemplatePath(new File(testDir,
"texen/templates").getCanonicalPath());
+ texen.setTemplatePath(testDir.getCanonicalPath());
texen.setOutputFileName("report");
texen.setOutputEncoding("ISO-8859-1");
texen.setInputEncoding("ISO-8859-1");
@@ -114,7 +114,7 @@ public class TexenTestCase extends TestC
texen.addContributors(Collections.singleton(new
ExtendedPropertiesContributor(properties, new TexenFileResolver() {
public File resolveFile(final String fileName) {
- return new File(fileName);
+ return new File(testDir, fileName);
}
})));
@@ -139,10 +139,10 @@ public class TexenTestCase extends TestC
ExtendedProperties properties = new ExtendedProperties();
- TestUtil.loadProperties("service.props", properties);
- TestUtil.loadProperties("additional.props", properties);
+ TestUtil.loadProperties("texen/service.props", properties);
+ TestUtil.loadProperties("texen/additional.props", properties);
- texen.setControlTemplate("Control.vm");
+ texen.setControlTemplate("texen/templates/Control.vm");
texen.setOutputDirectory(resultsDir);
texen.setOutputFileName("report");
texen.setOutputEncoding("ISO-8859-1");
@@ -151,7 +151,7 @@ public class TexenTestCase extends TestC
texen.addContributors(Collections.singleton(new
ExtendedPropertiesContributor(properties, new TexenFileResolver() {
public File resolveFile(final String fileName) {
- return new File(fileName);
+ return new File(testDir, fileName);
}
})));
Modified:
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/manyfiles/Control.vm
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/manyfiles/Control.vm?rev=979191&r1=979041&r2=979191&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/manyfiles/Control.vm
(original)
+++
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/manyfiles/Control.vm
Mon Jul 26 08:22:14 2010
@@ -1,4 +1,4 @@
#foreach ($num in [1..2000])
#set ( $fname = $strings.concat(["Funfacts_", $num, ".txt"]) )
- $generator.parse("NumFacts.vm", $fname, "num", $num)
+ $generator.parse("manyfiles/NumFacts.vm", $fname, "num", $num)
#end
\ No newline at end of file
Modified:
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/service.props
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/service.props?rev=979191&r1=979041&r2=979191&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/service.props
(original)
+++
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/service.props
Mon Jul 26 08:22:14 2010
@@ -18,9 +18,9 @@ [email protected]
# "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.
-license.file.contents = test/texen/license.txt
+license.file.contents = texen/license.txt
# Test some properties that have be give some boolean
# values.
Modified:
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/templates/Control.vm
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/templates/Control.vm?rev=979191&r1=979041&r2=979191&view=diff
==============================================================================
---
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/templates/Control.vm
(original)
+++
velocity/sandbox/maven-reorg/texen/trunk/src/test/resources/texen/templates/Control.vm
Mon Jul 26 08:22:14 2010
@@ -1,16 +1,16 @@
#set ( $sourceFile = "Turbine${baseName}Service.java" )
-$generator.parse("ServiceImplementation.vm",$sourceFile)
+$generator.parse("texen/templates/ServiceImplementation.vm",$sourceFile)
#set ( $sourceFile = "${baseName}Service.java" )
-$generator.parse("ServiceInterface.vm",$sourceFile)
+$generator.parse("texen/templates/ServiceInterface.vm",$sourceFile)
#set ( $sourceFile = "Turbine${baseName}.java" )
-$generator.parse("ServiceStaticHelper.vm",$sourceFile)
+$generator.parse("texen/templates/ServiceStaticHelper.vm",$sourceFile)
#set ( $sourceFile = "Test.txt" )
-$generator.parse("Test.vm",$sourceFile)
+$generator.parse("texen/templates/Test.vm",$sourceFile)
-#set ( $props = $properties.load("test.props") )
+#set ( $props = $properties.load("texen/templates/test.props") )
## This is to test a properties file that was once taken from
## the file system but is now taken from a JAR. We have to
@@ -19,7 +19,7 @@ $generator.parse("Test.vm",$sourceFile)
## system. I have a hack in PropsUtil right now to deal
## with it.
-#set ( $props2 = $properties.load("$generator.TemplatePath/test.props") )
+#set ( $props2 =
$properties.load("$generator.TemplatePath/texen/templates/test.props") )
$generator.TemplatePath/test.props
#set ( $sourceFile = "book.txt" )
-$generator.parse("book.vm",$sourceFile)
+$generator.parse("texen/templates/book.vm",$sourceFile)
