Sylvain,
I hadn't realized that but this breaks a different aspect of the
build. The release target doesn't have any sandbox stuff which is why
I changed this in the first place. I take it this is a problem with
the nightly builds only right?
The TCK crew is retesting with the official 1.1 build but I don't
believe that will be an issue b/c it doesn't need (nor should it have)
the sandbox stuff. As long as the build is good we can leave you
changes and worry about this the next time we need to release.
sean
On 9/13/05, Sylvain Vieujot <[EMAIL PROTECTED]> wrote:
> Hello Sean,
>
> I just re-fixed the path because with this commit, the files go in
> subdirectories of META-INF.
> For example,
> <zipfileset dir="${dist.dir}" prefix="META-INF/"> <include
> name="temp/myfaces_all.tld" unless="skip.sandbox"/>
> </zipfileset>
>
> Should be :
> <zipfileset dir="${dist.dir}/temp" prefix="META-INF/"> <include
> name="myfaces_all.tld" unless="skip.sandbox"/>
> </zipfileset>
>
>
> Thanks,
>
> Sylvain.
>
>
> On Tue, 2005-09-13 at 22:06 +0000, [EMAIL PROTECTED] wrote:
> Author: schof
> Date: Tue Sep 13 15:06:25 2005
> New Revision: 280686
>
> URL: http://svn.apache.org/viewcvs?rev=280686&view=rev
> Log:
> changed sylvain's myfaces-all stuff to be optional when skipping sandbox
> (ie. releasing)
>
> Modified:
> myfaces/build/trunk/build.xml
>
> Modified: myfaces/build/trunk/build.xml
> URL:
> http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=280686&r1=280685&r2=280686&view=diff
> ==============================================================================
> --- myfaces/build/trunk/build.xml (original)
> +++ myfaces/build/trunk/build.xml Tue Sep 13 15:06:25 2005
> @@ -729,13 +729,13 @@
> <zipfileset dir="../" prefix="META-INF">
> <include name="sandbox/build/temp/tlds/**"
> unless="skip.sandbox"/>
> </zipfileset>
> - <zipfileset dir="${dist.dir}/temp" prefix="META-INF/">
> - <include name="myfaces_all.tld" unless="skip.sandbox"/>
> + <zipfileset dir="${dist.dir}" prefix="META-INF/">
> + <include name="temp/myfaces_all.tld" unless="skip.sandbox"/>
> </zipfileset>
>
> <!-- additional resources -->
> <zipfileset dir="${dist.dir}" prefix="META-INF/">
> - <include name="/temp/faces-config.xml" unless="skip.sandbox"/>
> + <include name="temp/faces-config.xml" unless="skip.sandbox"/>
> </zipfileset>
> <fileset dir="../impl/src/java" excludes="**/*.java **/package.html"/>
> <fileset dir="../tomahawk/src/java" excludes="**/*.java **/*.properties"/>
>
>
>
>
