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/07/13 20:42:24 UTC
svn commit: r963812 - in /velocity/sandbox/maven-reorg/tools/trunk:
velocity-tools-assembly/ velocity-tools-assembly/src/main/
velocity-tools-assembly/src/main/assembly/
velocity-tools-examples/velocity-tools-examples-showcase/
velocity-tools-generic/s...
Author: apetrelli
Date: Tue Jul 13 18:42:23 2010
New Revision: 963812
URL: http://svn.apache.org/viewvc?rev=963812&view=rev
Log:
VELOCITYSB-5
Almost finished assembly module. I have to check sites.
Added:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/bin.xml (with props)
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/resources/org/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/times.properties
- copied unchanged from r963405, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/times.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/tools.xml
- copied unchanged from r963405, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/tools.xml
Removed:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/times.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/tools.xml
Modified:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/pom.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-uberjar/pom.xml
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/pom.xml?rev=963812&r1=963811&r2=963812&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/pom.xml Tue Jul 13 18:42:23 2010
@@ -1,14 +1,184 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>velocity-tools-parent</artifactId>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>velocity-tools-parent</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-assembly</artifactId>
<version>2.1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-assembly</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache Velocity Tools - Assembly</name>
- <description>Assembly building for Velocity Tools.</description>
+ <packaging>pom</packaging>
+ <name>Apache Velocity Tools - Assembly</name>
+ <description>Assembly building for Velocity Tools.</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <finalName>velocity-tools-${version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-uberjar</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view-jsp</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view-engine2</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-xml</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-struts</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-examples-simple</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>war</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-examples-showcase</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>war</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-examples-struts</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <type>war</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <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/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </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}-bin.zip*" />
+ <include
+ name="${project.artifactId}-${project.version}-bin.tar.gz*" />
+ </fileset>
+ <mapper type="glob"
+ from="${project.artifactId}-*"
+ to="velocity-tools-*" />
+ </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</url>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Added: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/bin.xml?rev=963812&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/bin.xml (added)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/bin.xml Tue Jul 13 18:42:23 2010
@@ -0,0 +1,230 @@
+<?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.
+ -->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <excludes>
+ <exclude>org.apache.velocity:*</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.velocity:velocity-tools*</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.velocity:velocity-tools-uberjar</exclude>
+ <exclude>org.apache.velocity:velocity-tools-examples*</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>velocity-tools-${artifact.version}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.apache.velocity:velocity-tools-uberjar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/examples</outputDirectory>
+ <includes>
+ <include>org.apache.velocity:velocity-tools-examples-*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*LICENSE*</include>
+ <include>NOTICE</include>
+ <include>README.txt</include>
+ <include>STATUS</include>
+ <include>CONTRIBUTORS</include>
+ <include>WHY_THREE_JARS.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>src/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-generic</directory>
+ <outputDirectory>src/velocity-tools-generic</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-xml</directory>
+ <outputDirectory>src/velocity-tools-xml</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-view</directory>
+ <outputDirectory>src/velocity-tools-view</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-view-engine2</directory>
+ <outputDirectory>src/velocity-tools-view-engine2</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-view-jsp</directory>
+ <outputDirectory>src/velocity-tools-view-jsp</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-struts</directory>
+ <outputDirectory>src/velocity-tools-struts</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-uberjar</directory>
+ <outputDirectory>src/velocity-tools-uberjar</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-assembly</directory>
+ <outputDirectory>src/velocity-tools-assembly</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples</directory>
+ <outputDirectory>src/velocity-tools-examples</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples/velocity-tools-examples-simple</directory>
+ <outputDirectory>src/velocity-tools-examples/velocity-tools-examples-simple</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples/velocity-tools-examples-showcase</directory>
+ <outputDirectory>src/velocity-tools-examples/velocity-tools-examples-showcase</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples/velocity-tools-examples-struts</directory>
+ <outputDirectory>src/velocity-tools-examples/velocity-tools-examples-struts</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../target/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-generic/target/site</directory>
+ <outputDirectory>docs/velocity-tools-generic</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-xml/target/site</directory>
+ <outputDirectory>docs/velocity-tools-xml</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-view/target/site</directory>
+ <outputDirectory>docs/velocity-tools-view</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-view-jsp/target/site</directory>
+ <outputDirectory>docs/velocity-tools-view-jsp</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-view-engine2/target/site</directory>
+ <outputDirectory>docs/velocity-tools-view-engine2</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-struts/target/site</directory>
+ <outputDirectory>docs/velocity-tools-struts</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-generic/target/site</directory>
+ <outputDirectory>docs/velocity-tools-generic</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-uberjar/target/site</directory>
+ <outputDirectory>docs/velocity-tools-uberjar</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-assembly/target/site</directory>
+ <outputDirectory>docs/velocity-tools-assembly</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples/target/site</directory>
+ <outputDirectory>docs/velocity-tools-examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples/velocity-tools-examples-simple/target/site</directory>
+ <outputDirectory>docs/velocity-tools-examples/velocity-tools-examples-simple</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples/velocity-tools-examples-showcase/target/site</directory>
+ <outputDirectory>docs/velocity-tools-examples/velocity-tools-examples-showcase</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../velocity-tools-examples/velocity-tools-examples-showcase/target/site</directory>
+ <outputDirectory>docs/velocity-tools-examples/velocity-tools-examples-showcase</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-assembly/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=963812&r1=963811&r2=963812&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml Tue Jul 13 18:42:23 2010
@@ -64,7 +64,6 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools-view</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml?rev=963812&r1=963811&r2=963812&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-struts/pom.xml Tue Jul 13 18:42:23 2010
@@ -47,7 +47,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts-tiles</artifactId>
<version>1.3.8</version>
- <scope>runtime</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-uberjar/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-uberjar/pom.xml?rev=963812&r1=963811&r2=963812&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-uberjar/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-uberjar/pom.xml Tue Jul 13 18:42:23 2010
@@ -27,6 +27,7 @@
<artifactSet>
<includes>
<include>org.apache.velocity:velocity-tools-generic</include>
+ <include>org.apache.velocity:velocity-tools-xml</include>
<include>org.apache.velocity:velocity-tools-view</include>
<include>org.apache.velocity:velocity-tools-view-jsp</include>
<include>org.apache.velocity:velocity-tools-struts</include>
@@ -49,5 +50,10 @@
<artifactId>velocity-tools-struts</artifactId>
<version>2.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-xml</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file