You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/02/06 13:34:36 UTC
svn commit: r504109 - in /myfaces/shared/trunk: core/src/main/resources/
core/src/main/resources/META-INF/ shared-impl/ shared-tomahawk/
Author: manolito
Date: Tue Feb 6 04:34:35 2007
New Revision: 504109
URL: http://svn.apache.org/viewvc?view=rev&rev=504109
Log:
merged from "shared" branch 2.0.5 down to trunk
[Moved LICENSE.txt and NOTICE.txt to META-INF sub-dir and modified refactoring process so that they get included in the refactored JARs]
Added:
myfaces/shared/trunk/core/src/main/resources/META-INF/
- copied from r504105, myfaces/shared/branches/2_0_5/core/src/main/resources/META-INF/
myfaces/shared/trunk/core/src/main/resources/META-INF/LICENSE.txt
- copied unchanged from r504105, myfaces/shared/branches/2_0_5/core/src/main/resources/META-INF/LICENSE.txt
myfaces/shared/trunk/core/src/main/resources/META-INF/NOTICE.txt
- copied unchanged from r504105, myfaces/shared/branches/2_0_5/core/src/main/resources/META-INF/NOTICE.txt
Removed:
myfaces/shared/trunk/core/src/main/resources/LICENSE.txt
myfaces/shared/trunk/core/src/main/resources/NOTICE.txt
Modified:
myfaces/shared/trunk/shared-impl/build.xml
myfaces/shared/trunk/shared-tomahawk/build.xml
Modified: myfaces/shared/trunk/shared-impl/build.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-impl/build.xml?view=diff&rev=504109&r1=504108&r2=504109
==============================================================================
--- myfaces/shared/trunk/shared-impl/build.xml (original)
+++ myfaces/shared/trunk/shared-impl/build.xml Tue Feb 6 04:34:35 2007
@@ -35,6 +35,13 @@
<include name="**/*.properties"/>
<include name="**/*.xml"/>
</replace>
+ <!-- 4. Move LICENSE.txt and NOTICE.txt -->
+ <move todir="${refactor.output.dir}/META-INF">
+ <fileset dir="${refactor.src.dir}/META-INF">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+ </move>
</target>
</project>
Modified: myfaces/shared/trunk/shared-tomahawk/build.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-tomahawk/build.xml?view=diff&rev=504109&r1=504108&r2=504109
==============================================================================
--- myfaces/shared/trunk/shared-tomahawk/build.xml (original)
+++ myfaces/shared/trunk/shared-tomahawk/build.xml Tue Feb 6 04:34:35 2007
@@ -35,6 +35,13 @@
<include name="**/*.properties"/>
<include name="**/*.xml"/>
</replace>
+ <!-- 4. Move LICENSE.txt and NOTICE.txt -->
+ <move todir="${refactor.output.dir}/META-INF">
+ <fileset dir="${refactor.src.dir}/META-INF">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+ </move>
</target>
</project>