On Thu, Jan 28, 2010 at 12:14 AM, ant elder <[email protected]> wrote: > On Wed, Jan 27, 2010 at 9:15 PM, Luciano Resende <[email protected]> wrote: >> On Wed, Jan 27, 2010 at 3:03 AM, ant elder <[email protected]> wrote: >>> >>> To help try to get this out quickly I've had a look right away. >>> There's one issue which i think does need to be fixed which is several >>> copies of Dojo have got included in the src distribution so the src >>> distro LICENSE is out of date. It looks like including Dojo is an >>> accident, probably as the build is putting it in src/main/resources >>> instead of target/ and that means when the src distro is built it got >>> included. >>> >> >> AFAIK, we are only shipping dojo in web-javascript-dojo, which has >> proper LICENSE and NOTICE pieces from Dojo... and all other samples >> download dojo from ant script... having said that, if you know a >> particular place where this is happening, please let me know. >> > > The whole of Dojo gets included in: > > /demos/alert-aggregator-webapp/src/main/resources/dojo > /demos/bigbank/src/main/resources/dojo > /samples/helloworld-dojo-webapp/src/main/resources/dojo > /samples/simple-bigbank-spring/src/main/resources/dojo > > thats actually the binary distribution not the src distribution. The > build scripts download it again anyway regardless that its already in > the folder. I guess the easiest fix might be to just exclude those not > include those folders in the distribution by added them to the > excludes in distribution\src\main\assembly\bin.xml. > > ...ant >
Ok, I have made the following changes to bin.xml (similar to what we already have in src.xml) + <exclude>**/resources/dojo</exclude> + <exclude>**/resources/dojo/**/*</exclude> + <exclude>**/webapp/dojo</exclude> + <exclude>**/webapp/dojo/**/*</exclude> -- Luciano Resende http://people.apache.org/~lresende http://lresende.blogspot.com/
