Author: apetrelli
Date: Thu Jul 1 19:39:08 2010
New Revision: 959758
URL: http://svn.apache.org/viewvc?rev=959758&view=rev
Log:
VELOCITYSB-4
Moved code to velocity-engine-servlet.
Prepared for aggregated javadocs and packaging assembly.
Modified:
velocity/sandbox/maven-reorg/engine/trunk/pom.xml
Modified: velocity/sandbox/maven-reorg/engine/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/pom.xml?rev=959758&r1=959757&r2=959758&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/pom.xml Thu Jul 1 19:39:08 2010
@@ -1,165 +1,183 @@
<?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>
- <artifactId>velocity-master</artifactId>
- <groupId>org.apache.velocity</groupId>
- <version>1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
-
- <name>Apache Velocity</name>
- <url>http://velocity.apache.org/engine/devel/</url>
- <description>Apache Velocity is a general purpose template
engine.</description>
- <inceptionYear>2000</inceptionYear>
- <packaging>pom</packaging>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <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.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <site>
- <id>velocity.apache.org</id>
-
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/</url>
- </site>
- </distributionManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.0</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
- <!-- Apache JIRA, Component Engine -->
- <component>12311337</component>
- <!-- FixFor 1.6 -->
-
<filter>fixfor=12310290&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>
- <version>2.2</version>
- <configuration>
- <tag>TODO</tag>
- <tag>FIXME</tag>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
- <link>http://jakarta.apache.org/oro/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://tomcat.apache.org/tomcat-4.1-doc/servletapi</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- </plugins>
- </reporting>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk</developerConnection>
- <tag>HEAD</tag>
-
<url>http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk</url>
- </scm>
+ <!--
+ 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>
+ <artifactId>velocity-master</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+
+ <name>Apache Velocity</name>
+ <url>http://velocity.apache.org/engine/devel/</url>
+ <description>Apache Velocity is a general purpose template
engine.</description>
+ <inceptionYear>2000</inceptionYear>
+ <packaging>pom</packaging>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <goals>deploy site-deploy</goals>
+ <arguments>-Papache-release</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <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.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <site>
+ <id>velocity.apache.org</id>
+
<url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/</url>
+ </site>
+ </distributionManagement>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+
<issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
+ <!-- Apache JIRA, Component Engine -->
+ <component>12311337</component>
+ <!-- FixFor 1.6 -->
+
<filter>fixfor=12310290&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>
+ <version>2.2</version>
+ <configuration>
+ <tag>TODO</tag>
+ <tag>FIXME</tag>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregated</id>
+ <configuration>
+ <links>
+
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://jakarta.apache.org/oro/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://tomcat.apache.org/tomcat-4.1-doc/servletapi</link>
+ </links>
+ </configuration>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk</developerConnection>
+ <tag>HEAD</tag>
+
<url>http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk</url>
+ </scm>
<properties>
<jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url>
</properties>
- <issueManagement>
- <system>JIRA</system>
- <url>${jira.browse.url}/VELOCITY</url>
- </issueManagement>
- <modules>
- <module>velocity-engine-core</module>
- <module>velocity-engine-log4j</module>
- <module>velocity-engine-commons-logging</module>
- <module>velocity-engine-servlet</module>
- <module>velocity-engine-examples</module>
- <module>velocity-engine-assembly</module>
- </modules>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>${jira.browse.url}/VELOCITY</url>
+ </issueManagement>
+ <modules>
+ <module>velocity-engine-core</module>
+ <module>velocity-engine-log4j</module>
+ <module>velocity-engine-commons-logging</module>
+ <module>velocity-engine-servlet</module>
+ <module>velocity-engine-examples</module>
+ <module>velocity-engine-assembly</module>
+ </modules>
</project>
