Jonathan Gibbons wrote:
Kelly O'Hair wrote:Jonathan Gibbons wrote:Kelly O'Hair wrote:Andrew, Sorry I'm so slow on this, ... I'm looking at updating the jaxp bundle. The webrev is:http://cr.openjdk.java.net/~ohair/openjdk7/jdk7-tl-jaxp-6861589/webrev/Updated jaxp source bundle, and complete removal of anything that would use the original source. The final changeset will also delete the jaxp/src directory so we never accidently use it. It also adds a md5 checksum check on the bundle in the ant script, a property value contains the expected checksum. I'm not done, so I could add more if you want me to add the changes mentioned here... The merge should be trivial. One snag is that I plan on pushing this to the TL forest so that the TL integrator (Tim Bell) can get the appropriate tests done on the jaxp changes. In the future jaxp changes will probably be going through the TL area. ... a few more comments below... Andrew John Hughes wrote:2009/10/12 Kelly O'Hair <kelly.oh...@sun.com>:I saw the webrev for a while, and now I can't :^(, but I saw enough...Andrew John Hughes wrote:2009/10/7 Andrew John Hughes <gnu_and...@member.fsf.org>:...[snip]...I found a number of issues with the current version:* The drop zips are expected to be in a share/jdk7-drops subdirectoryof the devtools directory. This doesn't really work outside Sun'sinternal setup. I've added support for ALT_DROP_DIR which can be usedto specify an exact path to the zips. If this is not set, the old devtools behaviour is used.I'm concerned about the name dropdir (your master copy location) vs. drop.dir (destination for the exploded contents) in the property names. Seems confusing.I hesitate to go on a name hunt, but what about ALT_DROP_BUNDLE_DIR anddrop.bundle.dir?Yes, I noticed drop.dir after posting the webrev and agree it's confusing. Would just making them ALT_DROPS_DIR and drops.dir not be sufficient? drop.bundle seems a little verbose and both mean the same thing to me at least.I'm ok with ALT_DROPS_DIR and drops.dir.* The zips are being downloaded and extracted in the source directory, which could be read only. I've changed this so they are written tothe build directory like everything else.It turns out that we need this drop.dir to be in the source area if we want the openjdk source zip bundles, created by RE, to include the drop sources. These source bundles are created by bundling up everything in the forest, prior to building, so the drop.dir needs to be in the forest somehow. Otherwise, the bundling logic has to merge two separate source trees, or different roots.I was given a requirement that the openjdk source bundles include thesedrop sources, easiest answer was drop.dir in the repo. Not an unsurmountable problem, I avoided the more complicated path. I know that becomes an issue if the repository or source is in aread-only area, but that's not the only situation in the openjdk I suspect.I assumed someone building from a read-only area could set drop.dir to some other location.Would it not make more sense for RE to set the drop.dir property into the source directory, given it's that build that's abnormal (needing to distribute a post build tree in effect)?I will look into that. You have convinced me. ;^)Not sure what to say. How important is it for the community that the openjdk source bundles include these drop sources? e.g. ones at http://download.java.net/openjdk/jdk7/ If they are not included, when the openjdk source bundles are built,they will need to download the jaxp and jaxws drop bundles at build time.I obviously can't speak for everyone, but for IcedTea7 we don't even use the download bundles any more. We grab from the IcedTea forest instead, which allows patches which didn't make a bxx release to be applied there once and used in releases. We did this for the security fixes with Milestone 4/1.11. I've already added downloading of the jaxp, jaxws and jaf bundles to the IcedTea build; it's this process that resulted in this webrev. This has two advantages; we check all the zips/tarballs at the same point in the build (the JAXP and JAXWS builds are then pointed at the directory IcedTea uses for them) and we check the MD5 sums of the downloads or pre-existing zips. I don't know if the latter could be incorporated into the OpenJDK build somehow. At present, there's no guarantee that these zips are valid. The rules look like this: stamps/download-jaxp-drop.stamp: mkdir -p drops if USE_ALT_JAXP_DROP_ZIP ln -sf $(ALT_JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP) endif if ! echo "$(JAXP_DROP_MD5SUM) drops/$(JAXP_DROP_ZIP)" \ | $(MD5SUM) --check ; \ then \ if [ -f drops/$(JAXP_DROP_ZIP) ] ; \ then \ mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \ fi ; \ $(WGET) $(DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \ fi ; mkdir -p stamps touch stamps/download-jaxp-drop.stamp ALT_JAXP_DROP_ZIP gets set if the user specifies --with-jaxp-drop-zip=<path> to configure. WGET and MD5SUM are the respective binaries as located by configure and DROP_URL is the kenai.com URL as in the jaxws.properties and jaxp.properties files: DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip JAXWS_DROP_MD5SUM = debb949440c5a15ce999cfefbbc56526 JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip JAF_DROP_MD5SUM = eb8cb7a4a7f14e211fbe2354878a2472 JAXP_DROP_ZIP = jdk7-jaxp-2009_09_28.zip JAXP_DROP_MD5SUM = 8800970d03bab1fff188dcfafc346f5dAh... so my checksum logic in the ant script will serve as a double check. Unless you are changing the bundles and rebundling them... nobody does that, ... do they??? Ah, if they do, they would need to change the property value holding the checksum. -kto-ktoThe webrev for these changes is here: http://cr.openjdk.java.net/~andrew/drops/webrev.01/I've committed this to IcedTea already. Does this look ok for buildalso?Kelly,Does all this mean we can somewhat simplify the list of forests on hg.o.j.n, by removing jdk7/{corba,jaxp,jaxws} and the corresponding -gate forests?-- JonNo. Not yet. In theory, what little logic is left in jaxp and jaxws (corba has not changed), could be folded up into the top repo or the jdk repo, and you could empty out jaxp and jaxws repos entirely. But I had no plans to do so. What this does is leave a small set of ant scripts and a Makefile over it, in these repos. The build logic is about all that is there, and it will get the jaxp or jaxws source bundle drops, and build them. This change will delete the original sources from the repo, to guarantee they are no longer used. The detailed management of those sources is completely under the control of the jaxp and jaxws teams/projects. The selection of which drop bundles the jdk7 project uses is defined in the jaxp/jaxp.properties and jaxws/jaxws.properties files. -ktoKelly,I was not referring to the jaxp/jaxws/corba repositories in each forest. It seemed like we had (mostly unused) forests for integrating jaxp,jaxws,corba stuff. Specifically:*jdk7/jaxp* <http://hg.openjdk.java.net/jdk7/jaxp/> jaxp build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp/archive/tip.tar.bz2> *jdk7/jaxp-gate* <http://hg.openjdk.java.net/jdk7/jaxp-gate/> jaxp (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp-gate/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp-gate/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp-gate/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp-gate/archive/tip.tar.bz2> *jdk7/jaxp-gate/corba* <http://hg.openjdk.java.net/jdk7/jaxp-gate/corba/> jaxp (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp-gate/corba/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp-gate/corba/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp-gate/corba/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp-gate/corba/archive/tip.tar.bz2> *jdk7/jaxp-gate/hotspot* <http://hg.openjdk.java.net/jdk7/jaxp-gate/hotspot/> jaxp (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp-gate/hotspot/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp-gate/hotspot/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp-gate/hotspot/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp-gate/hotspot/archive/tip.tar.bz2> *jdk7/jaxp-gate/jaxp* <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxp/> jaxp (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxp/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxp/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxp/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxp/archive/tip.tar.bz2> *jdk7/jaxp-gate/jaxws* <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxws/> jaxp (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxws/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxws/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxws/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp-gate/jaxws/archive/tip.tar.bz2> *jdk7/jaxp-gate/jdk* <http://hg.openjdk.java.net/jdk7/jaxp-gate/jdk/> jaxp (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp-gate/jdk/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp-gate/jdk/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp-gate/jdk/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp-gate/jdk/archive/tip.tar.bz2> *jdk7/jaxp-gate/langtools* <http://hg.openjdk.java.net/jdk7/jaxp-gate/langtools/> jaxp (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp-gate/langtools/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp-gate/langtools/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp-gate/langtools/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp-gate/langtools/archive/tip.tar.bz2> *jdk7/jaxp/corba* <http://hg.openjdk.java.net/jdk7/jaxp/corba/> jaxp build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp/corba/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp/corba/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp/corba/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp/corba/archive/tip.tar.bz2> *jdk7/jaxp/hotspot* <http://hg.openjdk.java.net/jdk7/jaxp/hotspot/> jaxp build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp/hotspot/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp/hotspot/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp/hotspot/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp/hotspot/archive/tip.tar.bz2> *jdk7/jaxp/jaxp* <http://hg.openjdk.java.net/jdk7/jaxp/jaxp/> jaxp build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp/jaxp/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp/jaxp/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp/jaxp/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp/jaxp/archive/tip.tar.bz2> *jdk7/jaxp/jaxws* <http://hg.openjdk.java.net/jdk7/jaxp/jaxws/> jaxp build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp/jaxws/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp/jaxws/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp/jaxws/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp/jaxws/archive/tip.tar.bz2> *jdk7/jaxp/jdk* <http://hg.openjdk.java.net/jdk7/jaxp/jdk/> jaxp build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp/jdk/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp/jdk/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp/jdk/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp/jdk/archive/tip.tar.bz2> *jdk7/jaxp/langtools* <http://hg.openjdk.java.net/jdk7/jaxp/langtools/> jaxp build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxp/langtools/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxp/langtools/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxp/langtools/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxp/langtools/archive/tip.tar.bz2> *jdk7/jaxws* <http://hg.openjdk.java.net/jdk7/jaxws/> jaxws build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws/archive/tip.tar.bz2> *jdk7/jaxws-gate* <http://hg.openjdk.java.net/jdk7/jaxws-gate/> jaxws (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws-gate/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws-gate/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws-gate/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws-gate/archive/tip.tar.bz2> *jdk7/jaxws-gate/corba* <http://hg.openjdk.java.net/jdk7/jaxws-gate/corba/> jaxws (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws-gate/corba/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws-gate/corba/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws-gate/corba/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws-gate/corba/archive/tip.tar.bz2> *jdk7/jaxws-gate/hotspot* <http://hg.openjdk.java.net/jdk7/jaxws-gate/hotspot/> jaxws (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws-gate/hotspot/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws-gate/hotspot/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws-gate/hotspot/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws-gate/hotspot/archive/tip.tar.bz2> *jdk7/jaxws-gate/jaxp* <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxp/> jaxws (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxp/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxp/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxp/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxp/archive/tip.tar.bz2> *jdk7/jaxws-gate/jaxws* <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxws/> jaxws (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxws/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxws/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxws/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws-gate/jaxws/archive/tip.tar.bz2> *jdk7/jaxws-gate/jdk* <http://hg.openjdk.java.net/jdk7/jaxws-gate/jdk/> jaxws (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws-gate/jdk/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws-gate/jdk/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws-gate/jdk/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws-gate/jdk/archive/tip.tar.bz2> *jdk7/jaxws-gate/langtools* <http://hg.openjdk.java.net/jdk7/jaxws-gate/langtools/> jaxws (gate) build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws-gate/langtools/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws-gate/langtools/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws-gate/langtools/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws-gate/langtools/archive/tip.tar.bz2> *jdk7/jaxws/corba* <http://hg.openjdk.java.net/jdk7/jaxws/corba/> jaxws build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws/corba/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws/corba/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws/corba/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws/corba/archive/tip.tar.bz2> *jdk7/jaxws/hotspot* <http://hg.openjdk.java.net/jdk7/jaxws/hotspot/> jaxws build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws/hotspot/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws/hotspot/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws/hotspot/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws/hotspot/archive/tip.tar.bz2> *jdk7/jaxws/jaxp* <http://hg.openjdk.java.net/jdk7/jaxws/jaxp/> jaxws build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws/jaxp/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws/jaxp/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws/jaxp/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws/jaxp/archive/tip.tar.bz2> *jdk7/jaxws/jaxws* <http://hg.openjdk.java.net/jdk7/jaxws/jaxws/> jaxws build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws/jaxws/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws/jaxws/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws/jaxws/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws/jaxws/archive/tip.tar.bz2> *jdk7/jaxws/jdk* <http://hg.openjdk.java.net/jdk7/jaxws/jdk/> jaxws build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws/jdk/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws/jdk/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws/jdk/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws/jdk/archive/tip.tar.bz2> *jdk7/jaxws/langtools* <http://hg.openjdk.java.net/jdk7/jaxws/langtools/> jaxws build-dev@openjdk.java.net 20 months ago RSS <http://hg.openjdk.java.net/jdk7/jaxws/langtools/rss-log> | zip <http://hg.openjdk.java.net/jdk7/jaxws/langtools/archive/tip.zip> | gz <http://hg.openjdk.java.net/jdk7/jaxws/langtools/archive/tip.tar.gz> | bz2 <http://hg.openjdk.java.net/jdk7/jaxws/langtools/archive/tip.tar.bz2>
DOH! Sorry... Yes, these jaxp and jaxws forests can probably go away, we won't be using them. The current plan is that jaxp/jaxws changes (new bundles) will go through the TL forest. -kto