Author: rahul
Date: Thu Dec 28 22:54:32 2006
New Revision: 490929
URL: http://svn.apache.org/viewvc?view=rev&rev=490929
Log:
* Sample app war files did not contain LICENSE and NOTICE files in their
META-INF directory. Move location to src/main/webapp/META-INF, rather than
src/main/resources/META-INF so they are placed in the correct place in the war
files.
* Sample app assemblies did not contain LICENSE and NOTICE files in the root
directory. Modify assembly descriptors to pick up these files (from above
location).
SHALE-380
Added:
shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/META-INF/
- copied from r490872,
shale/framework/trunk/shale-apps/shale-blank/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/META-INF/LICENSE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-blank/src/main/resources/META-INF/LICENSE.txt
shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/META-INF/NOTICE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-blank/src/main/resources/META-INF/NOTICE.txt
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/META-INF/
- copied from r490872,
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/META-INF/LICENSE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/META-INF/LICENSE.txt
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/META-INF/NOTICE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/META-INF/NOTICE.txt
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/LICENSE.txt
- copied unchanged from r490904,
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/META-INF/LICENSE.txt
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/NOTICE.txt
- copied unchanged from r490905,
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/META-INF/NOTICE.txt
shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/META-INF/
- copied from r490872,
shale/framework/trunk/shale-apps/shale-mailreader/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/META-INF/LICENSE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-mailreader/src/main/resources/META-INF/LICENSE.txt
shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/META-INF/NOTICE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-mailreader/src/main/resources/META-INF/NOTICE.txt
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/META-INF/
- copied from r490872,
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/META-INF/LICENSE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/resources/META-INF/LICENSE.txt
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/META-INF/NOTICE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/resources/META-INF/NOTICE.txt
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/META-INF/
- copied from r490872,
shale/framework/trunk/shale-apps/shale-usecases/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/META-INF/LICENSE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-usecases/src/main/resources/META-INF/LICENSE.txt
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/META-INF/NOTICE.txt
- copied unchanged from r490928,
shale/framework/trunk/shale-apps/shale-usecases/src/main/resources/META-INF/NOTICE.txt
Removed:
shale/framework/trunk/shale-apps/shale-blank/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-mailreader/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/resources/META-INF/
shale/framework/trunk/shale-apps/shale-usecases/src/main/resources/META-INF/
Modified:
shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml
shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml
shale/framework/trunk/shale-apps/shale-usecases/src/main/assembly/dep.xml
Modified: shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml?view=diff&rev=490929&r1=490928&r2=490929
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml
(original)
+++ shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml Thu
Dec 28 22:54:32 2006
@@ -39,6 +39,16 @@
</includes>
</fileSet>
+ <!-- Include LICENSE.txt and NOTICE.txt -->
+ <fileSet>
+ <directory>./src/main/webapp/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
<!-- Include the source code in the assembly -->
<fileSet>
<directory>./src</directory>
Modified:
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml?view=diff&rev=490929&r1=490928&r2=490929
==============================================================================
---
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml
(original)
+++
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml
Thu Dec 28 22:54:32 2006
@@ -39,6 +39,16 @@
</includes>
</fileSet>
+ <!-- Include LICENSE.txt and NOTICE.txt -->
+ <fileSet>
+ <directory>./src/main/webapp/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
<!-- Include the source code in the assembly -->
<fileSet>
<directory>./src</directory>
Modified:
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml?view=diff&rev=490929&r1=490928&r2=490929
==============================================================================
---
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml
(original)
+++
shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml
Thu Dec 28 22:54:32 2006
@@ -37,6 +37,16 @@
</includes>
</fileSet>
+ <!-- Include LICENSE.txt and NOTICE.txt -->
+ <fileSet>
+ <directory>./src/main/webapp/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
<!-- Include the source code in the assembly -->
<fileSet>
<directory>./src</directory>
Modified:
shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml?view=diff&rev=490929&r1=490928&r2=490929
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml
(original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml
Thu Dec 28 22:54:32 2006
@@ -39,6 +39,16 @@
</includes>
</fileSet>
+ <!-- Include LICENSE.txt and NOTICE.txt -->
+ <fileSet>
+ <directory>./src/main/webapp/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
<!-- Include the source code in the assembly -->
<fileSet>
<directory>./src</directory>
Modified:
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml?view=diff&rev=490929&r1=490928&r2=490929
==============================================================================
---
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml
(original)
+++
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml
Thu Dec 28 22:54:32 2006
@@ -39,6 +39,16 @@
</includes>
</fileSet>
+ <!-- Include LICENSE.txt and NOTICE.txt -->
+ <fileSet>
+ <directory>./src/main/webapp/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
<!-- Include the source code in the assembly -->
<fileSet>
<directory>./src</directory>
Modified:
shale/framework/trunk/shale-apps/shale-usecases/src/main/assembly/dep.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/src/main/assembly/dep.xml?view=diff&rev=490929&r1=490928&r2=490929
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/src/main/assembly/dep.xml
(original)
+++ shale/framework/trunk/shale-apps/shale-usecases/src/main/assembly/dep.xml
Thu Dec 28 22:54:32 2006
@@ -39,6 +39,16 @@
</includes>
</fileSet>
+ <!-- Include LICENSE.txt and NOTICE.txt -->
+ <fileSet>
+ <directory>./src/main/webapp/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </fileSet>
+
<!-- Include the source code in the assembly -->
<fileSet>
<directory>./src</directory>
