Andrew John Hughes wrote:
2009/10/23 Kelly O'Hair <kelly.oh...@sun.com>:
Sigh... if I'm changing jaxp, might as well change jaxws too....
keep them in sync.
I effectively included the drop.dir change you wanted with these
webrevs:
http://cr.openjdk.java.net/~ohair/openjdk7/jdk7-tl-jaxp/webrev/
http://cr.openjdk.java.net/~ohair/openjdk7/jdk7-tl-jaxws/webrev/
In both cases, any use of the original source is being removed, and
the changeset I create will probably just delete the "src/" directory.
Good, makes things clearer.
I'm using a different directory name when the dropped sources are
baked in by our RE people, "drop_included" (should have called these
batteries so I could use "batteries_included". ;^)
Ok, I think it makes the build.xml more complicated than necessary,
given you could just set drop.dir for builds which include the source,
but I'm happy enough with it.
There are problems with building from the source bundles that included
the drop sources. I need to protect the drop_included sources from being
deleted with an 'ant clobber' or 'make clobber'. Putting them in separately
named directory was obvious, but what wasn't obvious was how to make that a
permanent and protected source area when building with a source bundle.
Baking in the idea of a drop_included directory was the only way to
protect drop_included from being deleted accidently, and also make it
the higher priority source location, when it exists, the drop bundles
and drop area should not be needed.
So there are two properties drop.expanded.dir and drop.included.dir,
and the drop.dir property is conditional set in the ant script.
But I did not add the ALT_DROPS_DIR change.
Do you want me to include that, or do you want to make that change
separately?
There's already three changes in this one changeset:
* Removing the original source option
* Adding drop.expanded (which seems similar to the original source
option except you can specify the directory)
* Checksumming
so I'd rather we had the ALT_DROPS_DIR in a separate one, but I don't
mind who commits it.
OK. I'll hold off on the ALT_DROPS_DIR.
I also notice the URL changes -- why?
The jaxp source bundle is being updated.
The kenai.com urls were mine, and somewhat temporary.
The jaxp/jaxws teams get to pick where these bundles will live.
With java.net, I think adding a new file creates a new url. :^(
So I suspect, every bundle update may create a new url, but I just
use what they give me.
I'll try and separate these changes into different changesets, but
will need to file separate bugs.
-kto
-kto
Thanks,
