stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2010-07-14 09:12:46 -07:00
commit 6f5c11015d
345 changed files with 3130 additions and 1138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -73,3 +73,4 @@ b5dab6a313fdff4c043250e4d9c8f66fd624d27e jdk7-b93
d260f892491e040ae385a8e6df59557a7d721abf jdk7-b96
7e406ebed9a5968b584f3c3e6b60893b5d6d9741 jdk7-b97
db6e660120446c407e2d908d52ec046592b21726 jdk7-b98
c4c8a5bc54f66abc68cd185d9294042121922154 jdk7-b99

1
.hgtags-top-repo
View File

@ -73,3 +73,4 @@ fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95
cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96
5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97
6cea9984d73d74de0cd01f30d07ac0a1ed196117 jdk7-b98
e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99

76
Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -29,10 +29,6 @@ ifndef TOPDIR
TOPDIR:=.
endif
ifndef CONTROL_TOPDIR
CONTROL_TOPDIR=$(TOPDIR)
endif
# Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true)
OPENJDK_SOURCETREE=$(TOPDIR)/openjdk
OPENJDK_BUILDDIR:=$(shell \
@ -120,7 +116,7 @@ endif
all_product_build::
@$(FINISH_ECHO)
# Generis build of basic repo series
# Generic build of basic repo series
generic_build_repo_series::
$(MKDIR) -p $(OUTPUTDIR)
$(MKDIR) -p $(OUTPUTDIR)/j2sdk-image
@ -179,11 +175,15 @@ endif
# The install process needs to know what the DEBUG_NAME is, so
# look for INSTALL_DEBUG_NAME in the install rules.
#
# NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME).
# Due to the use of short paths in $(ABS_OUTPUTDIR), this may
# not be the same location.
#
# Location of fresh bootdir output
ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image
FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image
FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME)/j2sdk-image
create_fresh_product_bootdir: FRC
@$(START_ECHO)
@ -248,10 +248,14 @@ build_product_image:
generic_build_repo_series
@$(FINISH_ECHO)
# NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME).
# Due to the use of short paths in $(ABS_OUTPUTDIR), this may
# not be the same location.
generic_debug_build:
@$(START_ECHO)
$(MAKE) \
ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \
ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME) \
DEBUG_NAME=$(DEBUG_NAME) \
GENERATE_DOCS=false \
$(BOOT_CYCLE_DEBUG_SETTINGS) \
@ -348,8 +352,8 @@ endif
clobber::
$(RM) -r $(OUTPUTDIR)/*
$(RM) -r $(OUTPUTDIR)-debug/*
$(RM) -r $(OUTPUTDIR)-fastdebug/*
$(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/*
$(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/*
-($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE))
clean: clobber
@ -550,6 +554,56 @@ ifeq ($(BUNDLE_RULES_AVAILABLE), true)
include $(BUNDLE_RULES)
endif
################################################################
# rule to test
################################################################
.NOTPARALLEL: test
test: test_clean test_start test_summary
test_start:
@$(ECHO) "Tests started at `$(DATE)`"
test_clean:
$(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt
test_summary: $(OUTPUTDIR)/test_failures.txt
@$(ECHO) "#################################################"
@$(ECHO) "Tests completed at `$(DATE)`"
@( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \
|| $(ECHO) "No TEST STATS seen in log" )
@$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt"
@$(ECHO) "#################################################"
@if [ -s $< ] ; then \
$(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \
$(CAT) $<; \
exit 1; \
else \
$(ECHO) "Success! No failures detected"; \
fi
# Get failure list from log
$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
@$(RM) $@
@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@
# Get log file of all tests run
JDK_TO_TEST := $(shell \
if [ -d "$(ABS_OUTPUTDIR)/j2sdk-image" ] ; then \
$(ECHO) "$(ABS_OUTPUTDIR)/j2sdk-image"; \
elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then \
$(ECHO) "$(ABS_OUTPUTDIR)"; \
elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then \
$(ECHO) "$(PRODUCT_HOME)"; \
fi \
)
$(OUTPUTDIR)/test_log.txt:
$(RM) $@
( $(CD) test && \
$(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \
) | tee $@
################################################################
# JPRT rule to build
################################################################
@ -560,7 +614,7 @@ include ./make/jprt.gmk
# PHONY
################################################################
.PHONY: all \
.PHONY: all test test_start test_summary test_clean \
generic_build_repo_series \
what clobber insane \
dev dev-build dev-sanity dev-clobber \

1
corba/.hgtags
View File

@ -73,3 +73,4 @@ bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91
edc2a2659c77dabc55cb55bb617bad89e3a05bb3 jdk7-b96
4ec9d59374caa1e5d72fa802291b4d66955a4936 jdk7-b97
3b99409057e4c255da946f9f540d051a5ef4ab23 jdk7-b98
95db968660e7d87c345d5cf3dc2e3db037fb7220 jdk7-b99

2
corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java
View File

@ -75,7 +75,7 @@ public class CorbaResourceUtil {
args[1] = (arg1 != null ? arg1.toString() : "null");
args[2] = (arg2 != null ? arg2.toString() : "null");
return java.text.MessageFormat.format(format, args);
return java.text.MessageFormat.format(format, (Object[]) args);
}
private static boolean resourcesInitialized = false;

2
corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java
View File

@ -350,7 +350,7 @@ public final class ObjectUtility {
if (useToString) {
try {
cls.getDeclaredMethod( "toString", null ) ;
cls.getDeclaredMethod( "toString", (Class[])null ) ;
return true ;
} catch (Exception exc) {
return false ;

4
corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java
View File

@ -108,8 +108,8 @@ public class ExceptionHandlerImpl implements ExceptionHandler
try {
helperClass = Class.forName( helperName, true, loader ) ;
Method idMethod = helperClass.getDeclaredMethod( "id", null ) ;
setId( (String)idMethod.invoke( null, null ) ) ;
Method idMethod = helperClass.getDeclaredMethod( "id", (Class[])null ) ;
setId( (String)idMethod.invoke( null, (Object[])null ) ) ;
} catch (Exception ex) {
throw wrapper.badHelperIdMethod( ex, helperName ) ;
}

2
corba/src/share/classes/org/omg/CORBA/ORB.java
View File

@ -589,7 +589,7 @@ abstract public class ORB {
this.getClass().getMethod("create_operation_list", argc);
// OK, the method exists, so invoke it and be happy.
Object[] argx = { oper };
java.lang.Object[] argx = { oper };
return (org.omg.CORBA.NVList)meth.invoke(this, argx);
}
catch( java.lang.reflect.InvocationTargetException exs ) {

2
corba/src/share/classes/sun/corba/Bridge.java
View File

@ -187,7 +187,7 @@ public final class Bridge
try {
// Invoke the ObjectInputStream.latestUserDefinedLoader method
return (ClassLoader)latestUserDefinedLoaderMethod.invoke(null,
NO_ARGS);
(Object[])NO_ARGS);
} catch (InvocationTargetException ite) {
Error err = new Error(
"sun.corba.Bridge.latestUserDefinedLoader: " + ite ) ;

1
hotspot/.hgtags
View File

@ -102,3 +102,4 @@ d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94
573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 hs19-b02
5f42499e57adc16380780f40541e1a66cd601891 jdk7-b97
8a045b3f5c13eaad92ff4baf15ca671845fcad1a jdk7-b98
6a236384a379642b5a2398e2819db9ab4e711e9b jdk7-b99

97
hotspot/make/windows/makefiles/defs.make
View File

@ -32,6 +32,17 @@ SLASH_JAVA ?= J:
PATH_SEP = ;
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
ifeq ($(ARCH_DATA_MODEL),32)
ARCH_DATA_MODEL=32
PLATFORM=windows-i586
VM_PLATFORM=windows_i486
HS_ARCH=x86
MAKE_ARGS += ARCH=x86
MAKE_ARGS += BUILDARCH=i486
MAKE_ARGS += Platform_arch=x86
MAKE_ARGS += Platform_arch_model=x86_32
endif
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),)
ARCH_DATA_MODEL=32
PLATFORM=windows-i586
@ -43,55 +54,57 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),)
MAKE_ARGS += Platform_arch_model=x86_32
endif
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
ARCH_DATA_MODEL=64
PLATFORM=windows-ia64
VM_PLATFORM=windows_ia64
HS_ARCH=ia64
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=ia64
MAKE_ARGS += BUILDARCH=ia64
MAKE_ARGS += Platform_arch=ia64
MAKE_ARGS += Platform_arch_model=ia64
endif
ifneq ($(ARCH_DATA_MODEL),32)
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
ARCH_DATA_MODEL=64
PLATFORM=windows-ia64
VM_PLATFORM=windows_ia64
HS_ARCH=ia64
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=ia64
MAKE_ARGS += BUILDARCH=ia64
MAKE_ARGS += Platform_arch=ia64
MAKE_ARGS += Platform_arch_model=ia64
endif
# http://support.microsoft.com/kb/888731 : this can be either
# AMD64 for AMD, or EM64T for Intel chips.
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
ARCH_DATA_MODEL=64
PLATFORM=windows-amd64
VM_PLATFORM=windows_amd64
HS_ARCH=x86
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=x86
MAKE_ARGS += BUILDARCH=amd64
MAKE_ARGS += Platform_arch=x86
MAKE_ARGS += Platform_arch_model=x86_64
endif
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
ARCH_DATA_MODEL=64
PLATFORM=windows-amd64
VM_PLATFORM=windows_amd64
HS_ARCH=x86
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=x86
MAKE_ARGS += BUILDARCH=amd64
MAKE_ARGS += Platform_arch=x86
MAKE_ARGS += Platform_arch_model=x86_64
endif
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
ARCH_DATA_MODEL=64
PLATFORM=windows-amd64
VM_PLATFORM=windows_amd64
HS_ARCH=x86
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=x86
MAKE_ARGS += BUILDARCH=amd64
MAKE_ARGS += Platform_arch=x86
MAKE_ARGS += Platform_arch_model=x86_64
endif
ARCH_DATA_MODEL=64
PLATFORM=windows-amd64
VM_PLATFORM=windows_amd64
HS_ARCH=x86
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=x86
MAKE_ARGS += BUILDARCH=amd64
MAKE_ARGS += Platform_arch=x86
MAKE_ARGS += Platform_arch_model=x86_64
endif
# NB later OS versions than 2003 may report "Intel64"
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
ARCH_DATA_MODEL=64
PLATFORM=windows-amd64
VM_PLATFORM=windows_amd64
HS_ARCH=x86
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=x86
MAKE_ARGS += BUILDARCH=amd64
MAKE_ARGS += Platform_arch=x86
MAKE_ARGS += Platform_arch_model=x86_64
ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
ARCH_DATA_MODEL=64
PLATFORM=windows-amd64
VM_PLATFORM=windows_amd64
HS_ARCH=x86
MAKE_ARGS += LP64=1
MAKE_ARGS += ARCH=x86
MAKE_ARGS += BUILDARCH=amd64
MAKE_ARGS += Platform_arch=x86
MAKE_ARGS += Platform_arch_model=x86_64
endif
endif
JDK_INCLUDE_SUBDIR=win32

1
jaxp/.hgtags
View File

@ -73,3 +73,4 @@ c725ca829c5aa4b50a8ed5728579ec8809fbfb1d jdk7-b93
9510ed0e1c7ab46a8b6659234e1dc7786407a72b jdk7-b96
ca01ec32561fee1855630b68a2fcd0042257a8ef jdk7-b97
d4adf4f2d14c7b79df0a81de884b6b57c6850802 jdk7-b98
7ef8469021fbc824ac49d57c83a14b1bb08f1766 jdk7-b99

26
jaxp/build-defs.xml
View File

@ -55,9 +55,29 @@
<drop-import name="jaxp_src"/>
<!-- <drop-import name="jaxp_tests"/> -->
<!-- Fail and print helpful messages if source does not exist. -->
<target name="-src-help">
<fail message="${failed.url.src.message}">
<condition>
<and>
<not>
<available file="${jaxp_src.src.dir}" type="dir"/>
</not>
<istrue value="${allow.downloads}"/>
</and>
</condition>
</fail>
<fail message="${failed.nourl.src.message}">
<condition>
<not>
<available file="${jaxp_src.src.dir}" type="dir"/>
</not>
</condition>
</fail>
</target>
<!-- Special build area preparation. -->
<target name="-drop-build-prep" depends="init, -init-src-dirs">
<!-- Special build area setup. -->
<target name="-drop-build-setup" depends="init, -init-src-dirs">
<mkdir dir="${build.classes.dir}"/>
<copy todir="${build.classes.dir}">
<fileset dir="${primary.src.dir}"
@ -84,7 +104,7 @@
<!-- Source directory selection. -->
<target name="-init-src-dirs"
depends="init, -use-drop">
depends="init, -use-drop,-src-help">
<echo message="Using primary.src.dir=${primary.src.dir}"/>
<pathconvert property="src.list.id" refid="src.dir.id"/>
<echo message="Using src.dir.id=${src.list.id}"/>

1
jaxp/build-drop-template.xml
View File

@ -75,6 +75,7 @@
<target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used">
<condition property="@DROP@.url.should.be.used">
<and>
<istrue value="${allow.downloads}"/>
<not>
<isset property="@DROP@.master.bundle.copy.exists"/>
</not>

20
jaxp/build.properties
View File

@ -104,4 +104,24 @@ sanity.info= Sanity Settings:${line.separator}\
drops.dir=${drops.dir}${line.separator}\
${line.separator}
# Failure messages when source cannot be found on the file system
failed.nourl.src.message=\
ERROR: Cannot find source for project ${ant.project.name}.\
${line.separator}${line.separator}\
HINT: Try setting drops.dir to indicate where the bundles can be found, \
or try setting the ant property allow.downloads=true to download the bundle from the URL.\
${line.separator}\
e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \
${line.separator}
# Failure message when source cannot be downloaded
failed.url.src.message=\
ERROR: Cannot find source for project ${ant.project.name}.\
${line.separator}${line.separator}\
HINT: Try setting drops.dir to indicate where the bundles can be found, \
or try checking the URL with your browser.\
${line.separator}\
e.g. ant -Ddrops.dir=some_directory \
${line.separator}
#------------------------------------------------------------

19
jaxp/build.xml
View File

@ -36,6 +36,11 @@
javac.debug - true or false for debug classfiles
javac.target - classfile version target
javac.source - source version
drops.dir - directory that holds source drop bundles
allow.download - permit downloads from public url (default is false)
(used if bundles not found in drops.dir)
Run 'make help' for help using the Makefile.
</description>
<!-- Mac is special, need to downgrade these before build.properties. -->
@ -106,16 +111,20 @@
<jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/>
</target>
<target name="-build-prep"
depends="init, -init-src-dirs, -drop-build-prep">
<target name="-build-setup"
depends="init, -init-src-dirs, -drop-build-setup">
</target>
<!-- Build (compilation) of sources to class files. -->
<target name="build"
depends="init, -init-src-dirs, -build-prep">
depends="compile, -build-setup">
</target>
<target name="compile"
depends="init, -init-src-dirs">
<mkdir dir="${build.classes.dir}"/>
<javac
includeAntRuntime="false"
classpath="${build.classes.dir}"
includeAntRuntime="false"
classpath="${build.classes.dir}:${tools.jar}"
fork="true"
destdir="${build.classes.dir}"
memoryInitialSize="${javac.memoryInitialSize}"

16
jaxp/jaxp.properties
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -24,13 +24,13 @@
#
drops.master.copy.base=${drops.dir}
drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/147490
jaxp_src.bundle.name=jdk7-jaxp-m6.zip
jaxp_src.bundle.md5.checksum=080827d779c114365f8504bd79b34604
jaxp_src.bundle.name=jdk7-jaxp-m7.zip
jaxp_src.bundle.md5.checksum=22e95fbdb9fb7d8b6b6fc0a1d76d1fbd
jaxp_src.master.bundle.dir=${drops.master.copy.base}
jaxp_src.master.bundle.url.base=${drops.master.url.base}
jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/147490
#jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip
#jaxp_tests.master.bundle.dir=${drops.master.copy.base}
#jaxp_tests.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/147490
jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip
jaxp_tests.master.bundle.dir=${drops.master.copy.base}
jaxp_tests.master.bundle.url.base=${drops.master.url.base}

7
jaxp/make/Makefile
View File

@ -65,6 +65,11 @@ else
endif
endif
# If downloads are allowed
ifeq ($(ALLOW_DOWNLOADS),true)
ANT_OPTIONS += -Dallow.downloads=true
endif
# Figure out the platform we are using
_SYSTEM_UNAME := $(shell uname)
_PLATFORM_KIND = unix
@ -159,6 +164,8 @@ help:
@echo " $(ANT_TARGETS)"
@echo " "
@echo " Environment or command line variables (all optional):"
$(call helpenvline, ALT_DROPS_DIR,\
"Directory that contains the drop source bundles i.e. drops.dir")
$(call helpenvline, ALT_BOOTDIR,\
"JAVA_HOME to use when running ant")
$(call helpenvline, ALT_LANGTOOLS_DIST,\

1
jaxws/.hgtags
View File

@ -73,3 +73,4 @@ ee06cfb113d554b5c8a9a53383bae2b168533829 jdk7-b95
208fd4451232f7a522ddb20334c598656844ccb7 jdk7-b96
dac23846092ad4956ed41b5278f8686476ae46ef jdk7-b97
4571098071094e705e680db5324bfa15a57b1290 jdk7-b98
818366ce23d8919cafaa4db4c51605ee2a7c8eaf jdk7-b99

33
jaxws/build-defs.xml
View File

@ -55,9 +55,36 @@
<drop-import name="jaxws_src"/>
<drop-import name="jaf_src"/>
<!-- <drop-import name="jaxws_tests"/> -->
<!-- Fail and print helpful messages if source does not exist. -->
<target name="-src-help">
<fail message="${failed.url.src.message}">
<condition>
<and>
<not>
<and>
<available file="${jaxws_src.src.dir}" type="dir"/>
<available file="${jaf_src.src.dir}" type="dir"/>
</and>
</not>
<istrue value="${allow.downloads}"/>
</and>
</condition>
</fail>
<fail message="${failed.nourl.src.message}">
<condition>
<not>
<and>
<available file="${jaxws_src.src.dir}" type="dir"/>
<available file="${jaf_src.src.dir}" type="dir"/>
</and>
</not>
</condition>
</fail>
</target>
<!-- Special build area preparation. -->
<target name="-drop-build-prep" depends="init, -init-src-dirs">
<!-- Special build area setup. -->
<target name="-drop-build-setup" depends="init, -init-src-dirs">
<mkdir dir="${build.classes.dir}"/>
<copy todir="${build.classes.dir}">
<fileset dir="${primary.src.dir}"
@ -99,7 +126,7 @@
<!-- Source directory selection. -->
<target name="-init-src-dirs"
depends="init, -use-drop">
depends="init, -use-drop,-src-help">
<echo message="Using primary.src.dir=${primary.src.dir}"/>
<pathconvert property="src.list.id" refid="src.dir.id"/>
<echo message="Using src.dir.id=${src.list.id}"/>

1
jaxws/build-drop-template.xml
View File

@ -75,6 +75,7 @@
<target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used">
<condition property="@DROP@.url.should.be.used">
<and>
<istrue value="${allow.downloads}"/>
<not>
<isset property="@DROP@.master.bundle.copy.exists"/>
</not>

20
jaxws/build.properties
View File

@ -104,4 +104,24 @@ sanity.info= Sanity Settings:${line.separator}\
drops.dir=${drops.dir}${line.separator}\
${line.separator}
# Failure messages when source cannot be found on the file system
failed.nourl.src.message=\
ERROR: Cannot find source for project ${ant.project.name}.\
${line.separator}${line.separator}\
HINT: Try setting drops.dir to indicate where the bundles can be found, \
or try setting the ant property allow.downloads=true to download the bundle from the URL.\
${line.separator}\
e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \
${line.separator}
# Failure message when source cannot be downloaded
failed.url.src.message=\
ERROR: Cannot find source for project ${ant.project.name}.\
${line.separator}${line.separator}\
HINT: Try setting drops.dir to indicate where the bundles can be found, \
or try checking the URL with your browser.\
${line.separator}\
e.g. ant -Ddrops.dir=some_directory \
${line.separator}
#------------------------------------------------------------

15
jaxws/build.xml
View File

@ -36,6 +36,11 @@
javac.debug - true or false for debug classfiles
javac.target - classfile version target
javac.source - source version
drops.dir - directory that holds source drop bundles
allow.download - permit downloads from public url (default is false)
(used if bundles not found in drops.dir)
Run 'make help' for help using the Makefile.
</description>
<!-- Mac is special, need to downgrade these before build.properties. -->
@ -106,13 +111,17 @@
<jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/>
</target>
<target name="-build-prep"
depends="init, -init-src-dirs, -drop-build-prep">
<target name="-build-setup"
depends="init, -init-src-dirs, -drop-build-setup">
</target>
<!-- Build (compilation) of sources to class files. -->
<target name="build"
depends="init, -init-src-dirs, -build-prep">
depends="compile, -build-setup">
</target>
<target name="compile"
depends="init, -init-src-dirs">
<mkdir dir="${build.classes.dir}"/>
<javac
includeAntRuntime="false"
classpath="${build.classes.dir}:${tools.jar}"

17
jaxws/jaxws.properties
View File

@ -24,19 +24,18 @@
#
drops.master.copy.base=${drops.dir}
drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip
jaxws_src.bundle.md5.checksum=f5010ebf636db9f465a61a7a74944543
jaxws_src.bundle.name=jdk7-jaxws-b100.zip
jaxws_src.bundle.md5.checksum=e4fea255c6222b118bb1d0d3054d36e1
jaxws_src.master.bundle.dir=${drops.master.copy.base}
#jaxws_src.bundle.url.base=https://jaxws.dev.java.net/files/documents/913/142147
jaxws_src.master.bundle.url.base=${drops.master.url.base}
jaxws_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/150896
jaf_src.bundle.name=jdk7-jaf-2009_08_28.zip
jaf_src.bundle.md5.checksum=eb8cb7a4a7f14e211fbe2354878a2472
jaf_src.master.bundle.dir=${drops.master.copy.base}
jaf_src.master.bundle.url.base=${drops.master.url.base}
jaf_src.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
#jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
#jaxws_tests.master.bundle.dir=${drops.master.copy.base}
#jaxws_tests.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download
jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
jaxws_tests.master.bundle.dir=${drops.master.copy.base}
jaxws_tests.master.bundle.url.base=${drops.master.url.base}

7
jaxws/make/Makefile
View File

@ -65,6 +65,11 @@ else
endif
endif
# If downloads are allowed
ifeq ($(ALLOW_DOWNLOADS),true)
ANT_OPTIONS += -Dallow.downloads=true
endif
# Figure out the platform we are using
_SYSTEM_UNAME := $(shell uname)
_PLATFORM_KIND = unix
@ -159,6 +164,8 @@ help:
@echo " $(ANT_TARGETS)"
@echo " "
@echo " Environment or command line variables (all optional):"
$(call helpenvline, ALT_DROPS_DIR,\
"Directory that contains the drop source bundles i.e. drops.dir")
$(call helpenvline, ALT_BOOTDIR,\
"JAVA_HOME to use when running ant")
$(call helpenvline, ALT_LANGTOOLS_DIST,\

1
jdk/.hgtags
View File

@ -74,3 +74,4 @@ db951e984ccf50756160fee3078c791300b0917e jdk7-b95
b1903d7528d33b521df42bc9291bdcdd2f444a29 jdk7-b97
82593186fa54ab12f17af31f86a7bf364efaf4df jdk7-b98
2587c9f0b60dc3146b4247b8674ada456a643d6f jdk7-b99
820b4e843d5168370a3bf166d19751a3271d8575 jdk7-b100

1
jdk/make/sun/security/mscapi/Makefile
View File

@ -150,6 +150,7 @@ OTHER_INCLUDES += \
# Rules
#
CLASSDESTDIR = $(TEMPDIR)/classes
JAVAHFLAGS += -classpath $(CLASSDESTDIR)
include $(BUILDDIR)/common/Mapfile-vers.gmk

1
jdk/make/sun/security/pkcs11/Makefile
View File

@ -148,6 +148,7 @@ OTHER_INCLUDES += \
# Rules
#
CLASSDESTDIR = $(TEMPDIR)/classes
JAVAHFLAGS += -classpath $(CLASSDESTDIR)
include $(BUILDDIR)/common/Mapfile-vers.gmk

2
jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java
View File

@ -41,7 +41,7 @@ import org.w3c.dom.Text;
* @author Raul Benito(Of the xerces copy, and little adaptations).
* @author Anli Shundi
* @author Christian Geuer-Pollmann
* @see <A HREF="ftp://ftp.isi.edu/in-notes/rfc2045.txt">RFC 2045</A>
* @see <A HREF="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</A>
* @see com.sun.org.apache.xml.internal.security.transforms.implementations.TransformBase64Decode
*/
public class Base64 {

4
jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java
View File

@ -31,7 +31,7 @@ import javax.naming.ldap.LdapName;
/**
* A principal identified by a distinguished name as specified by
* <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a>.
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
*
* <p>
* After successful authentication, a user {@link java.security.Principal}
@ -122,7 +122,7 @@ public final class LdapPrincipal implements Principal, java.io.Serializable {
/**
* Creates a string representation of this principal's name in the format
* defined by <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* defined by <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* If the name has zero components an empty string is returned.
*
* @return The principal's string name.

2
jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java
View File

@ -33,7 +33,7 @@ import java.util.logging.Level;
/**
* Implements the CRAM-MD5 SASL client-side mechanism.
* (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2195.txt">RFC 2195</A>).
* (<A HREF="http://www.ietf.org/rfc/rfc2195.txt">RFC 2195</A>).
* CRAM-MD5 has no initial response. It receives bytes from
* the server as a challenge, which it hashes by using MD5 and the password.
* It concatenates the authentication ID with this result and returns it

2
jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java
View File

@ -38,7 +38,7 @@ import java.util.logging.Level;
/**
* Implements the CRAM-MD5 SASL server-side mechanism.
* (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2195.txt">RFC 2195</A>).
* (<A HREF="http://www.ietf.org/rfc/rfc2195.txt">RFC 2195</A>).
* CRAM-MD5 has no initial response.
*
* client <---- M={random, timestamp, server-fqdn} ------- server

2
jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java
View File

@ -29,7 +29,7 @@ import javax.security.sasl.*;
/**
* Implements the EXTERNAL SASL client mechanism.
* (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2222.txt">RFC 2222</A>).
* (<A HREF="http://www.ietf.org/rfc/rfc2222.txt">RFC 2222</A>).
* The EXTERNAL mechanism returns the optional authorization ID as
* the initial response. It processes no challenges.
*

4
jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java
View File

@ -39,10 +39,10 @@ import org.ietf.jgss.*;
/**
* Implements the GSSAPI SASL client mechanism for Kerberos V5.
* (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2222.txt">RFC 2222</A>,
* (<A HREF="http://www.ietf.org/rfc/rfc2222.txt">RFC 2222</A>,
* <a HREF="http://www.ietf.org/internet-drafts/draft-ietf-cat-sasl-gssapi-04.txt">draft-ietf-cat-sasl-gssapi-04.txt</a>).
* It uses the Java Bindings for GSSAPI
* (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2853.txt">RFC 2853</A>)
* (<A HREF="http://www.ietf.org/rfc/rfc2853.txt">RFC 2853</A>)
* for getting GSSAPI/Kerberos V5 support.
*
* The client/server interactions are:

2
jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java
View File

@ -39,7 +39,7 @@ import org.ietf.jgss.*;
/**
* Implements the GSSAPI SASL server mechanism for Kerberos V5.
* (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2222.txt">RFC 2222</A>,
* (<A HREF="http://www.ietf.org/rfc/rfc2222.txt">RFC 2222</A>,
* <a HREF="http://www.ietf.org/internet-drafts/draft-ietf-cat-sasl-gssapi-00.txt">draft-ietf-cat-sasl-gssapi-00.txt</a>).
*
* Expects thread's Subject to contain server's Kerberos credentials

2
jdk/src/share/classes/java/net/URI.java
View File

@ -457,7 +457,7 @@ import java.lang.NullPointerException; // for javadoc
* @author Mark Reinhold
* @since 1.4
*
* @see <a href="http://ietf.org/rfc/rfc2279.txt"><i>RFC&nbsp;2279: UTF-8, a
* @see <a href="http://www.ietf.org/rfc/rfc2279.txt"><i>RFC&nbsp;2279: UTF-8, a
* transformation format of ISO 10646</i></a>, <br><a
* href="http://www.ietf.org/rfc/rfc2373.txt"><i>RFC&nbsp;2373: IPv6 Addressing
* Architecture</i></a>, <br><a

2
jdk/src/share/classes/java/nio/charset/package.html
View File

@ -48,7 +48,7 @@ Unicode characters.
<p> A <i>charset</i> is named mapping between sequences of sixteen-bit Unicode
characters and sequences of bytes, in the sense defined in <a
href="http://ietf.org/rfc/rfc2278.txt"><i>RFC&nbsp;2278</i></a>. A
href="http://www.ietf.org/rfc/rfc2278.txt"><i>RFC&nbsp;2278</i></a>. A
<i>decoder</i> is an engine which transforms bytes in a specific charset into
characters, and an <i>encoder</i> is an engine which transforms characters into
bytes. Encoders and decoders operate on byte and character buffers. They are

4
jdk/src/share/classes/javax/management/remote/JMXServiceURL.java
View File

@ -107,10 +107,10 @@ import java.util.StringTokenizer;
* significant in the <code><em>url-path</em></code>.</p>
*
* @see <a
* href="ftp://ftp.rfc-editor.org/in-notes/rfc2609.txt">RFC 2609,
* href="http://www.ietf.org/rfc/rfc2609.txt">RFC 2609,
* "Service Templates and <code>Service:</code> Schemes"</a>
* @see <a
* href="ftp://ftp.rfc-editor.org/in-notes/rfc3111.txt">RFC 3111,
* href="http://www.ietf.org/rfc/rfc3111.txt">RFC 3111,
* "Service Location Protocol Modifications for IPv6"</a>
*
* @since 1.5

6
jdk/src/share/classes/javax/naming/ldap/LdapName.java
View File

@ -42,7 +42,7 @@ import java.io.IOException;
/**
* This class represents a distinguished name as specified by
* <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a>.
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* A distinguished name, or DN, is composed of an ordered list of
* components called <em>relative distinguished name</em>s, or RDNs.
* Details of a DN's syntax are described in RFC 2253.
@ -115,7 +115,7 @@ public class LdapName implements Name {
*
* @param name This is a non-null distinguished name formatted
* according to the rules defined in
* <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
*
* @throws InvalidNameException if a syntax violation is detected.
* @see Rdn#escapeValue(Object value)
@ -614,7 +614,7 @@ public class LdapName implements Name {
/**
* Returns a string representation of this LDAP name in a format
* defined by <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* defined by <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* and described in the class description. If the name has zero
* components an empty string is returned.
*

16
jdk/src/share/classes/javax/naming/ldap/Rdn.java
View File

@ -45,7 +45,7 @@ import java.io.IOException;
/**
* This class represents a relative distinguished name, or RDN, which is a
* component of a distinguished name as specified by
* <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* An example of an RDN is "OU=Sales+CN=J.Smith". In this example,
* the RDN consist of multiple attribute type/value pairs. The
* RDN is parsed as described in the class description for
@ -117,7 +117,7 @@ public class Rdn implements Serializable, Comparable<Object> {
* {@link javax.naming.directory.Attributes Attributes}.
* <p>
* The string attribute values are not interpretted as
* <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* formatted RDN strings. That is, the values are used
* literally (not parsed) and assumed to be unescaped.
*
@ -152,7 +152,7 @@ public class Rdn implements Serializable, Comparable<Object> {
/**
* Constructs an Rdn from the given string.
* This constructor takes a string formatted according to the rules
* defined in <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a>
* defined in <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* and described in the class description for
* {@link javax.naming.ldap.LdapName}.
*
@ -180,7 +180,7 @@ public class Rdn implements Serializable, Comparable<Object> {
* Constructs an Rdn from the given attribute type and
* value.
* The string attribute values are not interpretted as
* <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* formatted RDN strings. That is, the values are used
* literally (not parsed) and assumed to be unescaped.
*
@ -216,7 +216,7 @@ public class Rdn implements Serializable, Comparable<Object> {
/*
* Adds the given attribute type and value to this Rdn.
* The string attribute values are not interpretted as
* <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>
* formatted RDN strings. That is the values are used
* literally (not parsed) and assumed to be unescaped.
*
@ -280,7 +280,7 @@ public class Rdn implements Serializable, Comparable<Object> {
/**
* Returns this Rdn as a string represented in a format defined by
* <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a> and described
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a> and described
* in the class description for {@link javax.naming.ldap.LdapName LdapName}.
*
* @return The string representation of the Rdn.
@ -503,7 +503,7 @@ public class Rdn implements Serializable, Comparable<Object> {
/**
* Given the value of an attribute, returns a string escaped according
* to the rules specified in
* <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>.
* <p>
* For example, if the val is "Sue, Grabbit and Runn", the escaped
* value returned by this method is "Sue\, Grabbit and Runn".
@ -582,7 +582,7 @@ public class Rdn implements Serializable, Comparable<Object> {
/**
* Given an attribute value string formated according to the rules
* specified in
* <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a>,
* <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>,
* returns the unformated value. Escapes and quotes are
* stripped away, and hex-encoded UTF-8 is converted to equivalent
* UTF-16 characters. Returns a string value as a String, and a

2
jdk/src/share/classes/javax/net/ssl/SSLContext.java
View File

@ -160,7 +160,7 @@ public class SSLContext {
*
* @param protocol the standard name of the requested protocol.
* See Appendix A in the <a href=
* "{@docRoot}/../technotes/guides//security/jsse/JSSERefGuide.html#AppA">
* "{@docRoot}/../technotes/guides/security/jsse/JSSERefGuide.html#AppA">
* Java Secure Socket Extension Reference Guide </a>
* for information about standard protocol names.
*

2
jdk/src/share/classes/javax/print/DocFlavor.java
View File

@ -450,7 +450,7 @@ public class DocFlavor implements Serializable, Cloneable {
/**
* A String representing the host operating system encoding.
* This will follow the conventions documented in
* <a href="http://ietf.org/rfc/rfc2278.txt">
* <a href="http://www.ietf.org/rfc/rfc2278.txt">
* <i>RFC&nbsp;2278:&nbsp;IANA Charset Registration Procedures</i></a>
* except where historical names are returned for compatibility with
* previous versions of the Java platform.

2
jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java
View File

@ -32,7 +32,7 @@ import java.awt.image.*;
import java.awt.Color;
/** PNG - Portable Network Graphics - image file reader.
See <a href=ftp://ds.internic.net/rfc/rfc2083.txt>RFC2083</a> for details. */
See <a href=http://www.ietf.org/rfc/rfc2083.txt>RFC2083</a> for details. */
/* this is changed
public class PNGImageDecoder extends FilterInputStream implements Runnable

1
langtools/.hgtags
View File

@ -73,3 +73,4 @@ bb3d7c75a56df0c00246072b996fad1858a771a1 jdk7-b94
89cd267c216751bdacf8629bb07a40c0950fc4f2 jdk7-b96
c0a41294297ed397098dd92b647f481f0e1bb8fa jdk7-b97
3b38f3aa3dc388eef0737a9fba99f54a1602ee3b jdk7-b98
005bec70ca27239bdd4e6169b9b078507401aa72 jdk7-b99

17
langtools/make/Makefile
View File

@ -26,9 +26,9 @@
# Makefile for langtools: wrapper around Ant build.xml file
#
# On Solaris, the 'make' utility from Sun will not work with these makefiles.
# This little rule is only understood by Sun's make, and is harmless
# when seen by the GNU make tool. If using Sun's make, this causes the
# On Solaris, the standard 'make' utility will not work with these makefiles.
# This little rule is only understood by Solaris make, and is harmless
# when seen by the GNU make tool. If using Solaris make, this causes the
# make command to fail.
#
SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
@ -40,15 +40,16 @@ SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
SYSTEM_UNAME := $(shell uname)
# Where is unwanted output to be delivered?
# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
ifeq ($(SYSTEM_UNAME), Windows_NT)
DEV_NULL = NUL
else
DEV_NULL = /dev/null
endif
ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
DEV_NULL = NUL
USING_CYGWIN = true
else
DEV_NULL = /dev/null
endif
endif
ifdef USING_CYGWIN
@ -202,7 +203,7 @@ $(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
#-------------------------------------------------------------------
#
# Targets for Sun's internal JPRT build system
# Targets for Oracle's internal JPRT build system
CD = cd
ZIP = zip

6
langtools/make/Makefile-classic
View File

@ -28,9 +28,9 @@
#
#
# On Solaris, the 'make' utility from Sun will not work with these makefiles.
# This little rule is only understood by Sun's make, and is harmless
# when seen by the GNU make tool. If using Sun's make, this causes the
# On Solaris, the standard 'make' utility will not work with these makefiles.
# This little rule is only understood by Solaris make, and is harmless
# when seen by the GNU make tool. If using Solaris make, this causes the
# make command to fail.
#
SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33

20
langtools/make/build.properties
View File

@ -76,17 +76,27 @@ javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Languag
javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&gt;:"
# jtreg, used to run the JDK regression tests
# See http://openjdk.java.net/jtreg/
# Override this path as needed, either on the command line or in
# one of the standard user build.properties files (see build.xml)
# jtreg.home = /opt/jtreg/3.2.2_02
# jtreg.home = /opt/jtreg/4.1
# findbugs
# See http://findbugs.sourceforge.net/
# Override this path as needed, either on the command line or in
# one of the standard user build.properties files (see build.xml)
# findbugs.home = /opt/findbugs/1.2.1
# vizant (graph visualization tool for Ant)
# See http://vizant.sourceforge.net/
# Override this path as needed, either on the command line or in
# one of the standard user build.properties files (see build.xml)
# vizant.jar = /opt/vizant/0.1.2/vizant-0.1.2.jar
# dot = dot
#------------------------------------------------------------
# The following properties define the packages for each of the tools.
@ -148,12 +158,14 @@ apt.tests = \
#
# The following files require the import JDK to be available
require.import.jdk.files = \
# The following files require the latest JDK to be available.
# The API can be provided by using a suitable boot.java.home
# or by setting import.jdk
require.latest.jdk.files = \
com/sun/tools/javac/nio/*.java
# The following files in the import jdk source directory are required
# in order to compile the files defined in ${require.import.jdk.files}
# in order to compile the files defined in ${require.latest.jdk.files}
#
# For NIO, the list of stub files is defined by the contents of the primary
# API packages, together with such types that may be required in order to

301
langtools/make/build.xml
View File

@ -25,12 +25,79 @@
-->
<!--
This is the main build file for the complete langtools workspace.
It is used both when working on the tools in NetBeans, and when building
JDK itself, in which case it is invoked from the wrapper Makefile.
This is the main build file for the complete langtools repository.
It is used when building JDK (in which case it is invoked from the
Makefile), and it can be used when working on the tools themselves,
in an IDE such as NetBeans.
External dependencies are specified via properties. These can be given
on the command line, or by providing a local build.properties file.
(They can also be edited into make/build.properties, although that is not
recommended.) At a minimum, boot.java.home must be set to the installed
location of the version of JDK used to build this repository. Additional
properties may be required, depending on the targets that are built.
For example, to run any of the jtreg tests you must set jtreg.home,
to run findbugs on the code you must set findbugs.home, and so on.
For the most part, javac can be built using the previous version of JDK.
However, a small number of javac files require access to the latest JDK,
which may not yet have been compiled. To compile these files, you can do
one of the following:
- Set boot.java.home to a recent build of the latest version of JDK.
- Set import.jdk to either a recent build (containing jre/lib/rt.jar)
or to jdk source repository. In the latter case, stub files will
automatically be generated and used for the required API, to avoid
unnecessary compilation of the source repository.
If you do neither, the relevant files will not be built.
The main build happens in two phases:
- First, javac and other tools as needed are built using ${boot.java.home}.
(This implies a constraint on the source code that they can be compiled
with the previous version of JDK.
- Second, all required classes are compiled with the latest javac, created
in the previous step.
The first phase is called the bootstrap phase. All targets, properties and
tasks that are specific to that phase have "bootstrap" in their name.
For more details on the JDK build, see
http://blogs.sun.com/kto/entry/anatomy_of_the_jdk_build
http://openjdk.java.net/groups/build/
For more details on the stub generator, see
http://blogs.sun.com/jjg/entry/building_javac_for_jdk7
Internal details ...
Interim build products are created in the build/ directory.
Final build products are created in the dist/ directory.
When building JDK, the dist/directory will contain:
- A bootstrap compiler suitable for running with ${boot.java.home}
suitable for compiling downstream parts of JDK
- Source files and class files for inclusion in the JDK being built
When building standalone, the dist/directory will contain:
- Separate jar files for each of the separate langtools components
- Simple scripts to invoke the tools by executing the corresponding
jar files.
These jar files and scripts are "for developer use only".
This file is organized into sections as follows:
- global property definitions
- general top level targets
- general diagnostic/debugging targets
- groups of targets for each tool: javac, javadoc, doclets, javah, javap, apt
Within each group, the following targets are provided, where applicable
build-bootstrap-TOOL build the bootstrap version of the tool
build-classes-TOOL build the classes for the tool
build-TOOL build the jar file and script for the tool
jtreg-TOOL build the tool and run the appropriate tests
findbugs-TOOL run findbugs on the tool's source oode
TOOL build the tool, run the tests, and run findbugs
- utility definitions
-->
<project name="langtools" default="build" basedir="..">
<!--
**** Global property definitions.
-->
<!-- Force full debuginfo for javac if the debug.classfiles
property is set. This must be BEFORE the include of
@ -107,35 +174,55 @@
ignoresystemclasses="true"
classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
<!-- Set the default value of the sourcepath used for javac. -->
<condition property="javac.sourcepath" value="${build.genstubs.dir}" else="">
<isset property="import.jdk.src.dir"/>
</condition>
<!-- Set the default value of the classpath used for javac. -->
<property name="javac.classpath" value=""/>
<!-- Set the default bootclasspath option used for javac.
Note that different variants of the option are used, meaning we can't just
define the value for the option.
Note the explicit use of the standard property ${path.separator} in the following.
This is because Ant is not clever enough to handle direct use of : or ; -->
<!-- Set the default bootclasspath option used for javac.
Note that different variants of the option are used, meaning we can't just
define the value for the option.
Note the explicit use of the standard property ${path.separator} in the following.
This is because Ant is not clever enough to handle direct use of : or ; -->
<condition property="javac.bootclasspath.opt"
value="-Xbootclasspath:${build.classes.dir}${path.separator}${import.jdk.jar}"
else="-Xbootclasspath/p:${build.classes.dir}">
<isset property="import.jdk.jar"/>
</condition>
<condition property="exclude.files" value="" else="${require.import.jdk.files}">
<isset property="import.jdk"/>
<condition property="boot.java.provides.latest.jdk">
<available
ignoresystemclasses="true"
classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
</condition>
<!-- for debugging -->
<target name="check-import.jdk">
<echo message="import.jdk: ${import.jdk}"/>
<echo message="import.jdk.jar: ${import.jdk.jar}"/>
<echo message="import.jdk.src.dir: ${import.jdk.src.dir}"/>
</target>
<condition property="bootstrap.exclude.files" value="" else="${require.latest.jdk.files}">
<isset property="boot.java.provides.latest.jdk"/>
</condition>
<condition property="exclude.files" value="" else="${require.latest.jdk.files}">
<or>
<isset property="boot.java.provides.latest.jdk"/>
<isset property="import.jdk"/>
</or>
</condition>
<condition property="require.import.jdk.stubs">
<and>
<not>
<isset property="boot.java.provides.latest.jdk"/>
</not>
<isset property="import.jdk.src.dir"/>
</and>
</condition>
<!-- Set the default value of the sourcepath used for javac. -->
<condition property="javac.sourcepath" value="${build.genstubs.dir}" else="">
<isset property="require.import.jdk.stubs"/>
</condition>
<!-- Set the default value of the classpath used for javac. -->
<property name="javac.classpath" value=""/>
<!--
**** General top level targets.
-->
<!-- Standard target to build deliverables for JDK build. -->
@ -235,7 +322,61 @@
datafile="${build.coverage.dir}/cobertura.ser"/>
</target>
<!-- javac targets -->
<!--
**** Debugging/diagnostic targets.
-->
<!-- standard JDK target -->
<target name="sanity"
description="display settings of configuration values">
<echo level="info">ant.home = ${ant.home}</echo>
<echo level="info">boot.java.home = ${boot.java.home}</echo>
<echo level="info">target.java.home = ${target.java.home}</echo>
<echo level="info">jtreg.home = ${jtreg.home}</echo>
<echo level="info">findbugs.home = ${findbugs.home}</echo>
</target>
<target name="post-sanity" depends="-def-jtreg,sanity,build"
description="perform basic validation after a standard build">
<jtreg
dir="make/test"
workDir="${build.jtreg.dir}/post-sanity/work"
reportDir="${build.jtreg.dir}/post-sanity/report"
jdk="${target.java.home}"
verbose="summary"
failonerror="false" resultproperty="jtreg.post-sanity.result">
</jtreg>
</target>
<!-- use vizant tool to generate graphical image of this Ant file.-->
<target name="vizant" depends="-def-vizant">
<mkdir dir="${build.dir}"/>
<echo message="Generating ${build.dir}/build.dot"/>
<vizant antfile="${make.dir}/build.xml" outfile="${build.dir}/build.dot"/>
<echo message="Generating ${build.dir}/build.png"/>
<exec executable="${dot}" >
<arg value="-Tpng"/>
<arg value="-o"/>
<arg file="${build.dir}/build.png"/>
<arg file="${build.dir}/build.dot"/>
</exec>
</target>
<target name="check-import.jdk">
<echo message="import.jdk: ${import.jdk}"/>
<echo message="import.jdk.jar: ${import.jdk.jar}"/>
<echo message="import.jdk.src.dir: ${import.jdk.src.dir}"/>
</target>
<target name="diagnostics">
<diagnostics/>
</target>
<!--
**** javac targets.
-->
<target name="build-bootstrap-javac"
depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
@ -267,7 +408,10 @@
<target name="javac" depends="build-javac,jtreg-javac,findbugs-javac"/>
<!-- javadoc targets -->
<!--
**** javadoc targets.
-->
<target name="build-bootstrap-javadoc" depends="build-bootstrap-javac">
<build-bootstrap-classes includes="${javadoc.includes}"/>
@ -300,7 +444,10 @@
<target name="javadoc" depends="build-javadoc,jtreg-javadoc,findbugs-javadoc"/>
<!-- doclets targets -->
<!--
**** doclets targets.
-->
<target name="build-bootstrap-doclets" depends="build-bootstrap-javadoc,-def-build-bootstrap-jar">
<build-bootstrap-classes includes="${doclets.includes}"/>
@ -330,7 +477,10 @@
<target name="doclets" depends="build-doclets,jtreg-doclets,findbugs-doclets"/>
<!-- javah targets -->
<!--
**** javah targets.
-->
<target name="build-bootstrap-javah" depends="build-bootstrap-javadoc">
<build-bootstrap-classes includes="${javah.includes}"/>
@ -360,7 +510,10 @@
<target name="javah" depends="build-javah,jtreg-javah,findbugs-javah"/>
<!-- javap targets -->
<!--
**** javap targets.
-->
<target name="build-bootstrap-javap"
depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool">
@ -393,7 +546,10 @@
<target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/>
<!-- apt targets -->
<!--
**** apt targets.
-->
<target name="build-bootstrap-apt" depends="build-bootstrap-javac">
<build-bootstrap-classes includes="${apt.includes}"/>
@ -426,9 +582,12 @@
<target name="apt" depends="build-apt,jtreg-apt,findbugs-apt"/>
<!-- Create import JDK stubs -->
<target name="-create-import-jdk-stubs" depends="-def-genstubs" if="import.jdk.src.dir">
<!--
**** Create import JDK stubs.
-->
<target name="-create-import-jdk-stubs" depends="-def-genstubs" if="require.import.jdk.stubs">
<mkdir dir="${build.genstubs.dir}"/>
<genstubs
srcdir="${import.jdk.src.dir}" destdir="${build.genstubs.dir}"
@ -437,7 +596,12 @@
/>
</target>
<!-- Check targets -->
<!--
**** Check targets.
**** "-check-*" targets check that a required property is set, and set to a reasonable value.
**** A user friendly message is generated if not, and the build exits.
-->
<target name="-check-boot.java.home" depends="-def-check">
<check name="bootstrap java" property="boot.java.home" marker="${java.marker}"/>
@ -459,7 +623,15 @@
<check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
</target>
<!-- Ant macro and preset defs -->
<target name="-check-vizant" depends="-def-check">
<check name="vizant" property="vizant.jar"/>
<check name="dot" property="dot"/>
</target>
<!--
**** Targets for Ant macro and task definitions.
-->
<target name="-def-build-tool">
<macrodef name="build-tool">
@ -599,7 +771,7 @@
sourcepath=""
release="${bootstrap.release}"
full.version="${bootstrap.full.version}"
excludes="${require.import.jdk.files} **/package-info.java"/>
excludes="${bootstrap.exclude.files} **/package-info.java"/>
</presetdef>
</target>
@ -617,7 +789,7 @@
classpath="${build.toolclasses.dir}/"/>
</target>
<target name="-def-genstubs" depends="build-bootstrap-javac">
<target name="-def-genstubs" depends="build-bootstrap-javac" if="require.import.jdk.stubs">
<mkdir dir="${build.toolclasses.dir}"/>
<javac fork="true"
source="${boot.javac.source}"
@ -640,7 +812,7 @@
<sequential>
<property name="javadoc.options" value=""/> <!-- default, can be overridden per user or per project -->
<!-- Note: even with this default value, includes
from src.classes.dir get javadoc'd; see packageset below -->
from src.classes.dir get javadoc'd; see packageset below -->
<property name="javadoc.packagenames" value="none"/> <!-- default, can be overridden per user or per project -->
<javadoc
executable="${target.java.home}/bin/javadoc"
@ -691,13 +863,15 @@
<attribute name="tests"/>
<attribute name="jdk" default="${target.java.home}"/>
<attribute name="samevm" default="true"/>
<attribute name="verbose" default="summary"/>
<attribute name="options" default=""/>
<attribute name="verbose" default="${default.jtreg.verbose}"/>
<attribute name="options" default="${other.jtreg.options}"/>
<attribute name="keywords" default="-keywords:!ignore"/>
<attribute name="jpda.jvmargs" default=""/>
<sequential>
<property name="coverage.options" value=""/> <!-- default -->
<property name="coverage.classpath" value=""/> <!-- default -->
<property name="coverage.options" value=""/> <!-- default -->
<property name="coverage.classpath" value=""/> <!-- default -->
<property name="default.jtreg.verbose" value="summary"/> <!-- default -->
<property name="other.jtreg.options" value=""/> <!-- default -->
<jtreg
dir="${test.dir}"
workDir="${build.jtreg.dir}/@{name}/work"
@ -766,11 +940,16 @@
<property name="findbugs.defined" value="true"/>
</target>
<target name="-def-vizant" unless="vizant.defined" depends="-check-vizant">
<taskdef name="vizant" classname="net.sourceforge.vizant.Vizant" classpath="${vizant.jar}"/>
<property name="vizant.defined" value="true"/>
</target>
<target name="-def-check">
<macrodef name="check">
<attribute name="name"/>
<attribute name="property"/>
<attribute name="marker"/>
<attribute name="marker" default=""/>
<sequential>
<fail message="Cannot locate @{name}: please set @{property} to its location">
<condition>
@ -781,41 +960,19 @@
</fail>
<fail message="@{name} is not installed in ${@{property}}">
<condition>
<not>
<available file="${@{property}}/@{marker}"/>
</not>
<and>
<not>
<equals arg1="@{marker}" arg2=""/>
</not>
<not>
<available file="${@{property}}/@{marker}"/>
</not>
</and>
</condition>
</fail>
</sequential>
</macrodef>
</target>
<!-- standard JDK target -->
<target name="sanity"
description="display settings of configuration values">
<echo level="info">ant.home = ${ant.home}</echo>
<echo level="info">boot.java.home = ${boot.java.home}</echo>
<echo level="info">target.java.home = ${target.java.home}</echo>
<echo level="info">jtreg.home = ${jtreg.home}</echo>
<echo level="info">findbugs.home = ${findbugs.home}</echo>
</target>
<!-- useful debugging targets -->
<target name="diagnostics">
<diagnostics/>
</target>
<target name="post-sanity" depends="-def-jtreg,sanity,build"
description="perform basic validation after a standard build">
<jtreg
dir="make/test"
workDir="${build.jtreg.dir}/post-sanity/work"
reportDir="${build.jtreg.dir}/post-sanity/report"
jdk="${target.java.home}"
verbose="summary"
failonerror="false" resultproperty="jtreg.post-sanity.result">
</jtreg>
</target>
</project>

2
langtools/src/share/classes/com/sun/source/tree/Tree.java
View File

@ -30,7 +30,7 @@ package com.sun.source.tree;
*
* <p><b>WARNING:</b> This interface and its sub-interfaces are
* subject to change as the Java&trade; programming language evolves.
* These interfaces are implemented by Sun's Java compiler (javac)
* These interfaces are implemented by the JDK Java compiler (javac)
* and should not be implemented either directly or indirectly by
* other applications.
*

2
langtools/src/share/classes/com/sun/source/util/JavacTask.java
View File

@ -36,7 +36,7 @@ import javax.tools.JavaCompiler.CompilationTask;
import javax.tools.JavaFileObject;
/**
* Provides access to functionality specific to the Sun Java Compiler, javac.
* Provides access to functionality specific to the JDK Java Compiler, javac.
*
* @author Peter von der Ah&eacute;
* @author Jonathan Gibbons

2
langtools/src/share/classes/com/sun/source/util/TaskEvent.java
View File

@ -30,7 +30,7 @@ import javax.lang.model.element.TypeElement;
import javax.tools.JavaFileObject;
/**
* Provides details about work that has been done by the Sun Java Compiler, javac.
* Provides details about work that has been done by the JDK Java Compiler, javac.
*
* @author Jonathan Gibbons
* @since 1.6

2
langtools/src/share/classes/com/sun/source/util/TaskListener.java
View File

@ -27,7 +27,7 @@ package com.sun.source.util;
/**
* Provides a listener to monitor the activity of the Sun Java Compiler, javac.
* Provides a listener to monitor the activity of the JDK Java Compiler, javac.
*
* @author Jonathan Gibbons
* @since 1.6

2
langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
View File

@ -60,7 +60,7 @@ import static com.sun.tools.apt.mirror.declaration.DeclarationMaker.isJavaIdenti
/**
* Apt compiler phase.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own
* risk. This code and its internal interfaces are subject to change
* or deletion without notice.</b>

4
langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java
View File

@ -35,8 +35,8 @@ import com.sun.tools.javac.util.ListBuffer;
/**
* Various utility methods for processing Java tool command line arguments.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

2
langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
View File

@ -45,7 +45,7 @@ import com.sun.mirror.apt.AnnotationProcessorFactory;
import com.sun.tools.javac.parser.DocCommentScanner;
/**
* <p><b>This is NOT part of any API supported by Sun Microsystems.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own
* risk. This code and its internal interfaces are subject to change
* or deletion without notice.</b>

2
langtools/src/share/classes/com/sun/tools/apt/main/Main.java
View File

@ -61,7 +61,7 @@ import static com.sun.tools.javac.file.Paths.pathToURLs;
/** This class provides a commandline interface to the apt build-time
* tool.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own
* risk. This code and its internal interfaces are subject to change
* or deletion without notice.</b>

4
langtools/src/share/classes/com/sun/tools/apt/util/Bark.java
View File

@ -34,8 +34,8 @@ import com.sun.tools.javac.util.Position;
/** A subtype of Log for use in APT.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
View File

@ -32,8 +32,8 @@ import java.util.Set;
/**
* See JVMS3, sections 4.2, 4.6, 4.7.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Annotation.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.16.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.15.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
View File

@ -31,8 +31,8 @@ import java.util.HashMap;
import java.util.Map;
/**
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/AttributeException.java
View File

@ -26,8 +26,8 @@
package com.sun.tools.classfile;
/*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Attributes.java
View File

@ -32,8 +32,8 @@ import java.util.Iterator;
import java.util.Map;
/*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
View File

@ -28,8 +28,8 @@ package com.sun.tools.classfile;
import java.io.IOException;
/**
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
View File

@ -35,8 +35,8 @@ import static com.sun.tools.classfile.AccessFlags.*;
/**
* See JVMS3, section 4.2.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ClassReader.java
View File

@ -32,8 +32,8 @@ import java.io.IOException;
import java.io.InputStream;
/**
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
View File

@ -42,8 +42,8 @@ import java.util.Map;
/**
* Rewrites a class file using a map of translations.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
View File

@ -41,8 +41,8 @@ import static com.sun.tools.classfile.StackMapTable_attribute.verification_type_
/**
* Write a ClassFile data structure to a file or stream.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java
View File

@ -32,8 +32,8 @@ import java.util.NoSuchElementException;
/**
* See JVMS3, section 4.8.3.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java
View File

@ -27,8 +27,8 @@ package com.sun.tools.classfile;
import java.io.IOException;
/**
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
View File

@ -33,8 +33,8 @@ import java.util.Iterator;
/**
* See JVMS3, section 4.5.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java
View File

@ -27,8 +27,8 @@
package com.sun.tools.classfile;
/*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.2.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java
View File

@ -26,8 +26,8 @@
package com.sun.tools.classfile;
/*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.15.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java
View File

@ -31,8 +31,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.4.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/DescriptorException.java
View File

@ -27,8 +27,8 @@
package com.sun.tools.classfile;
/*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java
View File

@ -31,8 +31,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.7.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.5.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
View File

@ -36,8 +36,8 @@ import static com.sun.tools.classfile.ExtendedAnnotation.TargetAttribute.*;
/**
* See JSR 308 specification, section 4.1
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Field.java
View File

@ -28,8 +28,8 @@ package com.sun.tools.classfile;
import java.io.IOException;
/*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java
View File

@ -32,8 +32,8 @@ import com.sun.tools.classfile.ConstantPool.*;
/**
* See JVMS3, section 4.8.6.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Instruction.java
View File

@ -28,8 +28,8 @@ package com.sun.tools.classfile;
/**
* See JVMS3, chapter 6.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*

4
langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.12.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.13.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.14.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Method.java
View File

@ -28,8 +28,8 @@ package com.sun.tools.classfile;
import java.io.IOException;
/*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Opcode.java
View File

@ -34,8 +34,8 @@ import static com.sun.tools.classfile.Opcode.Set.*;
* <p>In addition to providing all the standard opcodes defined in JVMS,
* this class also provides legacy support for the PicoJava extensions.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.16 and 4.8.17.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.17.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.18.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JSR 308 specification, section 4.1
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.18 and 4.8.19.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JSR 308 specification, section 4
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.16.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.18.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JSR 308 specification, section 4.1
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Signature.java
View File

@ -32,8 +32,8 @@ import com.sun.tools.classfile.Type.*;
/**
* See JVMS3 4.4.4.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java
View File

@ -30,8 +30,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.9.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

4
langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java
View File

@ -32,8 +32,8 @@ import java.io.IOException;
/**
* See JVMS3, section 4.8.15.
*
* <p><b>This is NOT part of any API supported by Sun Microsystems. If
* you write code that depends on this, you do so at your own risk.
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
* This code and its internal interfaces are subject to change or
* deletion without notice.</b>
*/

Some files were not shown because too many files have changed in this diff Show More