Author: dkulp Date: Fri Jun 7 20:57:27 2013 New Revision: 1490822 URL: http://svn.apache.org/r1490822 Log: Merged revisions 1490817 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1490817 | dkulp | 2013-06-07 16:52:30 -0400 (Fri, 07 Jun 2013) | 11 lines Merged revisions 1485223 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1485223 | dkulp | 2013-05-22 10:26:53 -0400 (Wed, 22 May 2013) | 3 lines Move BUILDING.txt and README to root (so appears in a useful place for folks checking out from SVN) Also ignore the .gitignore file for the src distribution ........ ........ Added: cxf/branches/2.6.x-fixes/BUILDING.txt - copied, changed from r1490636, cxf/branches/2.6.x-fixes/distribution/src/main/release/BUILDING.txt cxf/branches/2.6.x-fixes/README - copied, changed from r1490636, cxf/branches/2.6.x-fixes/distribution/src/main/release/README Removed: cxf/branches/2.6.x-fixes/distribution/src/main/release/BUILDING.txt cxf/branches/2.6.x-fixes/distribution/src/main/release/README Modified: cxf/branches/2.6.x-fixes/distribution/src/main/assembly/bin.xml cxf/branches/2.6.x-fixes/distribution/src/main/assembly/src.xml Copied: cxf/branches/2.6.x-fixes/BUILDING.txt (from r1490636, cxf/branches/2.6.x-fixes/distribution/src/main/release/BUILDING.txt) URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/BUILDING.txt?p2=cxf/branches/2.6.x-fixes/BUILDING.txt&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/BUILDING.txt&r1=1490636&r2=1490822&rev=1490822&view=diff ============================================================================== (empty) Copied: cxf/branches/2.6.x-fixes/README (from r1490636, cxf/branches/2.6.x-fixes/distribution/src/main/release/README) URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/README?p2=cxf/branches/2.6.x-fixes/README&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/README&r1=1490636&r2=1490822&rev=1490822&view=diff ============================================================================== (empty) Modified: cxf/branches/2.6.x-fixes/distribution/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/assembly/bin.xml?rev=1490822&r1=1490821&r2=1490822&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/assembly/bin.xml (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/assembly/bin.xml Fri Jun 7 20:57:27 2013 @@ -35,6 +35,12 @@ <include>licenses/*.*</include> <include>lib/*</include> <include>release_notes.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>..</directory> + <outputDirectory>apache-cxf-${cxf.version}</outputDirectory> + <includes> <include>README</include> </includes> </fileSet> Modified: cxf/branches/2.6.x-fixes/distribution/src/main/assembly/src.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/assembly/src.xml?rev=1490822&r1=1490821&r2=1490822&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/distribution/src/main/assembly/src.xml (original) +++ cxf/branches/2.6.x-fixes/distribution/src/main/assembly/src.xml Fri Jun 7 20:57:27 2013 @@ -32,8 +32,6 @@ <outputDirectory>apache-cxf-${cxf.version}-src</outputDirectory> <includes> <include>licenses/*.*</include> - <include>README</include> - <include>BUILDING.txt</include> </includes> </fileSet> <fileSet> @@ -69,6 +67,7 @@ <exclude>**/pmd-eclipse.log</exclude> <exclude>**/.classpath</exclude> <exclude>**/.project</exclude> + <exclude>**/.gitignore</exclude> <exclude>**/.wtpmodules</exclude> <exclude>**/surefire*</exclude> <exclude>**/cobertura.ser</exclude>
