Author: apetrelli
Date: Mon Jul 14 08:16:06 2008
New Revision: 676621
URL: http://svn.apache.org/viewvc?rev=676621&view=rev
Log:
TILES-282
Merge from trunk to TILES_2_0_X branch.
Fixed NOTICE file and license of Retrotranslator
Added:
tiles/framework/branches/TILES_2_0_X/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
(with props)
Modified:
tiles/framework/branches/TILES_2_0_X/NOTICE.txt
tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml
Modified: tiles/framework/branches/TILES_2_0_X/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/NOTICE.txt?rev=676621&r1=676620&r2=676621&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/NOTICE.txt (original)
+++ tiles/framework/branches/TILES_2_0_X/NOTICE.txt Mon Jul 14 08:16:06 2008
@@ -3,4 +3,6 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
+
+ The Java 1.4-compatible distribution contains software developed by:
+ Retrotranslator (http://retrotranslator.sourceforge.net/).
Modified:
tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml?rev=676621&r1=676620&r2=676621&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml
(original)
+++ tiles/framework/branches/TILES_2_0_X/assembly/src/main/assembly/bin-j4.xml
Mon Jul 14 08:16:06 2008
@@ -51,5 +51,12 @@
<include>NOTICE.txt</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>RETROTRANSLATOR-LICENSE.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Added:
tiles/framework/branches/TILES_2_0_X/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt?rev=676621&view=auto
==============================================================================
---
tiles/framework/branches/TILES_2_0_X/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
(added)
+++
tiles/framework/branches/TILES_2_0_X/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
Mon Jul 14 08:16:06 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/branches/TILES_2_0_X/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/branches/TILES_2_0_X/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
