Author: apetrelli
Date: Sun Jul 13 10:10:16 2008
New Revision: 676367
URL: http://svn.apache.org/viewvc?rev=676367&view=rev
Log:
TILES-281
Added new modules to assembly.
Fixed copyright year.
Added Retrotranslator license and lines in NOTICE file.
Added:
tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
(with props)
Modified:
tiles/framework/trunk/NOTICE.txt
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml
tiles/framework/trunk/assembly/src/main/assembly/bin.xml
tiles/framework/trunk/assembly/src/main/assembly/src.xml
tiles/framework/trunk/assembly/src/main/resources/NOTICE.txt
tiles/framework/trunk/tiles-api/src/main/resources/NOTICE.txt
tiles/framework/trunk/tiles-compat/src/main/resources/NOTICE.txt
tiles/framework/trunk/tiles-core/src/main/resources/NOTICE.txt
tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt
tiles/framework/trunk/tiles-servlet/src/main/resources/NOTICE.txt
tiles/framework/trunk/tiles-test/src/main/resources/NOTICE.txt
Modified: tiles/framework/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/NOTICE.txt (original)
+++ tiles/framework/trunk/NOTICE.txt Sun Jul 13 10:10:16 2008
@@ -1,6 +1,9 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+ The binary distribution contains software developed by:
+ SpringSource: http://www.springsource.com/
+ Retrotranslator (http://retrotranslator.sourceforge.net/).
\ No newline at end of file
Modified: tiles/framework/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Sun Jul 13 10:10:16 2008
@@ -111,6 +111,30 @@
<dependency>
<groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-servlet</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-portlet</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>${pom.version}</version>
<exclusions>
@@ -122,6 +146,22 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-servlet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-compat</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -147,6 +187,32 @@
<dependency>
<groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-servlet</artifactId>
+ <version>${pom.version}</version>
+ <classifier>j4</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-portlet</artifactId>
+ <version>${pom.version}</version>
+ <classifier>j4</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>${pom.version}</version>
<classifier>j4</classifier>
@@ -159,6 +225,23 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-servlet</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-compat</artifactId>
+ <version>${pom.version}</version>
+ <classifier>j4</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -201,6 +284,40 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
+ <version>6.0.16</version>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>2.5.5</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc-portlet</artifactId>
+ <version>2.5.5</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</project>
Modified: tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml Sun Jul 13
10:10:16 2008
@@ -24,12 +24,10 @@
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <excludes>
- <exclude>org.apache.tiles:tiles-api</exclude>
- <exclude>org.apache.tiles:tiles-core</exclude>
- <exclude>org.apache.tiles:tiles-jsp</exclude>
- <exclude>org.apache.tiles:tiles-test</exclude>
- </excludes>
+ <includes>
+
<include>net.sf.retrotranslator:retrotranslator-runtime</include>
+
<include>backport-util-concurrent:backport-util-concurrent</include>
+ </includes>
</dependencySet>
<dependencySet>
<outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping>
@@ -37,7 +35,10 @@
<includes>
<include>org.apache.tiles:tiles-api:jar:j4</include>
<include>org.apache.tiles:tiles-core:jar:j4</include>
+ <include>org.apache.tiles:tiles-servlet:jar:j4</include>
<include>org.apache.tiles:tiles-jsp:jar:j4</include>
+ <include>org.apache.tiles:tiles-portlet:jar:j4</include>
+ <include>org.apache.tiles:tiles-compat:jar:j4</include>
</includes>
</dependencySet>
</dependencySets>
Modified: tiles/framework/trunk/assembly/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin.xml?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Sun Jul 13
10:10:16 2008
@@ -24,13 +24,27 @@
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>commons-logging:commons-logging-api</include>
+ <include>commons-beanutils:commons-beanutils</include>
+ <include>commons-digester:commons-digester</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib/optional</outputDirectory>
<excludes>
<exclude>org.apache.tiles:tiles-api</exclude>
<exclude>org.apache.tiles:tiles-core</exclude>
+ <exclude>org.apache.tiles:tiles-servlet</exclude>
<exclude>org.apache.tiles:tiles-jsp</exclude>
+ <exclude>org.apache.tiles:tiles-portlet</exclude>
+ <exclude>org.apache.tiles:tiles-compat</exclude>
<exclude>org.apache.tiles:tiles-test</exclude>
-
<exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
-
<exclude>backport-util-concurrent:backport-util-concurrent</exclude>
+ <exclude>commons-logging:commons-logging-api</exclude>
+ <exclude>commons-beanutils:commons-beanutils</exclude>
+ <exclude>commons-digester:commons-digester</exclude>
+
<exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
+
<exclude>backport-util-concurrent:backport-util-concurrent</exclude>
</excludes>
</dependencySet>
<dependencySet>
@@ -38,7 +52,10 @@
<includes>
<include>org.apache.tiles:tiles-api</include>
<include>org.apache.tiles:tiles-core</include>
+ <include>org.apache.tiles:tiles-servlet</include>
<include>org.apache.tiles:tiles-jsp</include>
+ <include>org.apache.tiles:tiles-portlet</include>
+ <include>org.apache.tiles:tiles-compat</include>
</includes>
<excludes>
<exclude>*:j4</exclude>
Modified: tiles/framework/trunk/assembly/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/src.xml?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/src.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/src.xml Sun Jul 13
10:10:16 2008
@@ -54,6 +54,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-servlet</directory>
+ <outputDirectory>src/tiles-servlet</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../tiles-jsp</directory>
<outputDirectory>src/tiles-jsp</outputDirectory>
<includes>
@@ -62,6 +70,22 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-portlet</directory>
+ <outputDirectory>src/tiles-portlet</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../tiles-compat</directory>
+ <outputDirectory>src/tiles-compat</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../tiles-test</directory>
<outputDirectory>src/tiles-test</outputDirectory>
<includes>
Modified: tiles/framework/trunk/assembly/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/resources/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ tiles/framework/trunk/assembly/src/main/resources/NOTICE.txt Sun Jul 13
10:10:16 2008
@@ -1,5 +1,5 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Added:
tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt?rev=676367&view=auto
==============================================================================
---
tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
(added)
+++
tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
Sun Jul 13 10:10:16 2008
@@ -0,0 +1,29 @@
+ Retrotranslator: a Java bytecode transformer that translates Java classes
+ compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+
+ Copyright (c) 2005, 2006 Taras Puchko
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
Propchange:
tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-api/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/resources/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/resources/NOTICE.txt (original)
+++ tiles/framework/trunk/tiles-api/src/main/resources/NOTICE.txt Sun Jul 13
10:10:16 2008
@@ -1,5 +1,5 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tiles/framework/trunk/tiles-compat/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/resources/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/main/resources/NOTICE.txt (original)
+++ tiles/framework/trunk/tiles-compat/src/main/resources/NOTICE.txt Sun Jul 13
10:10:16 2008
@@ -1,5 +1,5 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tiles/framework/trunk/tiles-core/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/resources/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/resources/NOTICE.txt (original)
+++ tiles/framework/trunk/tiles-core/src/main/resources/NOTICE.txt Sun Jul 13
10:10:16 2008
@@ -1,5 +1,5 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt Sun Jul 13
10:10:16 2008
@@ -1,5 +1,5 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tiles/framework/trunk/tiles-servlet/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/resources/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/resources/NOTICE.txt (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/resources/NOTICE.txt Sun Jul
13 10:10:16 2008
@@ -1,5 +1,5 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tiles/framework/trunk/tiles-test/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/resources/NOTICE.txt?rev=676367&r1=676366&r2=676367&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/resources/NOTICE.txt (original)
+++ tiles/framework/trunk/tiles-test/src/main/resources/NOTICE.txt Sun Jul 13
10:10:16 2008
@@ -1,5 +1,5 @@
Apache Tiles
- Copyright 1999-2007 The Apache Software Foundation
+ Copyright 1999-2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
