Author: apetrelli
Date: Mon Jul 14 07:01:58 2008
New Revision: 676593
URL: http://svn.apache.org/viewvc?rev=676593&view=rev
Log:
TILES-281
Fixed libraries that are included in assemblies.
TILES-282
Fixed NOTICE file and license of Retrotranslator
Modified:
tiles/framework/trunk/NOTICE.txt
tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml
tiles/framework/trunk/assembly/src/main/assembly/bin.xml
Modified: tiles/framework/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/NOTICE.txt?rev=676593&r1=676592&r2=676593&view=diff
==============================================================================
--- tiles/framework/trunk/NOTICE.txt (original)
+++ tiles/framework/trunk/NOTICE.txt Mon Jul 14 07:01:58 2008
@@ -6,4 +6,6 @@
The binary distribution contains software developed by:
SpringSource: http://www.springsource.com/
+
+ The Java 1.4-compatible distribution contains software developed by:
Retrotranslator (http://retrotranslator.sourceforge.net/).
\ No newline at end of file
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=676593&r1=676592&r2=676593&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin-j4.xml Mon Jul 14
07:01:58 2008
@@ -52,5 +52,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>
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=676593&r1=676592&r2=676593&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Mon Jul 14
07:01:58 2008
@@ -40,6 +40,7 @@
<exclude>org.apache.tiles:tiles-portlet</exclude>
<exclude>org.apache.tiles:tiles-compat</exclude>
<exclude>org.apache.tiles:tiles-test</exclude>
+ <exclude>commons-logging:commons-logging</exclude>
<exclude>commons-logging:commons-logging-api</exclude>
<exclude>commons-beanutils:commons-beanutils</exclude>
<exclude>commons-digester:commons-digester</exclude>
