Complete migration to OpenJDK 7. Thanks to Volker Berlin for the bulk of this patch.

1 files changed, 176 insertions, 175 deletions

diff --git a/openjdk/tools.rsp b/openjdk/tools.rsp
index 888faf2a..7e360717 100644
--- a/openjdk/tools.rsp
+++ b/openjdk/tools.rsp
@@ -26,183 +26,184 @@
 -removeassertions
 {
     -out:../bin/IKVM.OpenJDK.Tools.dll
-    -resource:META-INF/services/com.sun.jdi.connect.Connector=@OPENJDK6@/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector
-    -resource:META-INF/services/com.sun.jdi.connect.spi.TransportService=@OPENJDK6@/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService
-    -recurse:@OPENJDK6@/langtools/src/share/classes/*.properties
+    -resource:META-INF/services/com.sun.jdi.connect.Connector=@OPENJDK7@/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector
+    -resource:META-INF/services/com.sun.jdi.connect.spi.TransportService=@OPENJDK7@/jdk/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService
+    -recurse:@OPENJDK7@/langtools/src/share/classes/*.properties
     # ignore the warning that KeyStoreUtil already exists in IKVM.OpenJDK.Security.dll
     -nowarn:109:sun.security.tools.KeyStoreUtil
-    @OPENJDK6@/build/linux-amd64/gensrc/com/sun/tools/jdi/*.class
-    @OPENJDK6@/build/linux-amd64/gensrc/com/sun/tools/jdi/resources/*.class
-    @OPENJDK6@/build/linux-amd64/gensrc/sun/tools/jar/resources/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/codemodel/internal/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/codemodel/internal/fmt/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/codemodel/internal/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/codemodel/internal/writer/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/istack/internal/tools/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/istack/internal/ws/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/constExpr/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/som/cff/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/som/idlemit/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/toJavaPortable/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/corba/se/logutil/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/apt/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/gen/config/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/model/nav/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/api/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/api/wsdl/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/generator/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/exporter/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/java/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/jaxb/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/annotation/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/wsdl/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/resources/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/spi/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/util/xml/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wscompile/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/http/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/jaxws/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/mime/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/schema/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/soap/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/framework/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/parser/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/at_generated/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/code_injector/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/episode/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/locator/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/sync/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/impl/j2s/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/impl/s2j/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/annotation/ri/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/annotation/spec/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/bean/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/bean/field/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/model/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/model/nav/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/outline/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/dtd/bindinfo/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/dtd/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/gbind/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/internalizer/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/relaxng/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/ct/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/parser/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/runtime/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/writer/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/dtdparser/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/builder/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/om/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/binary/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/binary/visitor/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/digested/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/dt/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/dt/builtin/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/nc/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/compact/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/host/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/xml/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/xml/sax/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/xml/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/parser/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/parser/state/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/scd/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/parser/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/util/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/visitor/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/org/relaxng/datatype/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/org/relaxng/datatype/helpers/*.class
-    @OPENJDK6@/build/linux-amd64/impsrc/sun/rmi/rmic/iiop/*.class
-    @OPENJDK6@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/apt/resources/*.class
-    @OPENJDK6@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/doclets/formats/html/resources/*.class
-    @OPENJDK6@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/doclets/internal/toolkit/resources/*.class
-    @OPENJDK6@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javac/resources/*.class
-    @OPENJDK6@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javadoc/resources/*.class
-    @OPENJDK6@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javah/resources/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/jarsigner/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/jdi/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/jdi/connect/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/jdi/connect/spi/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/jdi/event/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/jdi/request/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/tools/attach/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/tools/attach/spi/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/tools/jdi/*.class
-    @OPENJDK6@/jdk/src/share/classes/com/sun/tools/script/shell/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/rmi/rmic/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/rmi/rmic/newrmic/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/*.class
+    @OPENJDK7@/build/linux-amd64/gensrc/com/sun/tools/jdi/*.class
+    @OPENJDK7@/build/linux-amd64/gensrc/com/sun/tools/jdi/resources/*.class
+    @OPENJDK7@/build/linux-amd64/gensrc/sun/tools/jar/resources/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/fmt/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/codemodel/internal/writer/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/istack/internal/tools/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/istack/internal/ws/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/constExpr/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/som/cff/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/som/idlemit/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/idl/toJavaPortable/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/corba/se/logutil/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/apt/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/gen/config/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/jxc/model/nav/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/api/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/api/wsdl/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/generator/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/exporter/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/java/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/model/jaxb/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/annotation/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/modeler/wsdl/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/processor/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/resources/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/spi/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/util/xml/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wscompile/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/http/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/jaxws/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/mime/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/schema/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/document/soap/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/framework/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/ws/wsdl/parser/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/at_generated/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/code_injector/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/episode/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/locator/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/addon/sync/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/impl/j2s/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/impl/s2j/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/api/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/annotation/ri/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/annotation/spec/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/bean/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/bean/field/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/generator/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/model/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/model/nav/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/outline/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/dtd/bindinfo/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/dtd/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/gbind/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/internalizer/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/relaxng/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/ct/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/reader/xmlschema/parser/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/runtime/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/tools/internal/xjc/writer/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/dtdparser/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/builder/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/om/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/ast/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/binary/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/binary/visitor/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/digested/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/dt/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/dt/builtin/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/nc/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/compact/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/host/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/parse/xml/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/xml/sax/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/rngom/xml/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/parser/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/parser/state/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/scd/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/impl/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/parser/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/util/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/com/sun/xml/internal/xsom/visitor/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/org/relaxng/datatype/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/org/relaxng/datatype/helpers/*.class
+    @OPENJDK7@/build/linux-amd64/impsrc/sun/rmi/rmic/iiop/*.class
+    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/apt/resources/*.class
+    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/doclets/formats/html/resources/*.class
+    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/doclets/internal/toolkit/resources/*.class
+    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javac/resources/*.class
+    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javadoc/resources/*.class
+    @OPENJDK7@/build/linux-amd64/langtools/build/gensrc/com/sun/tools/javah/resources/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/jarsigner/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/connect/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/connect/spi/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/event/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/jdi/request/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/attach/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/attach/spi/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/jdi/*.class
+    @OPENJDK7@/jdk/src/share/classes/com/sun/tools/script/shell/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/rmi/rmic/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/rmi/rmic/newrmic/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp/*.class
     @OPENJDK7@/jdk/src/share/classes/sun/security/tools/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/tools/asm/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/tools/asm/*.class
     @OPENJDK7@/jdk/src/share/classes/sun/tools/jar/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/tools/java/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/tools/javac/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/tools/native2ascii/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/tools/serialver/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/tools/tree/*.class
-    @OPENJDK6@/jdk/src/share/classes/sun/tools/util/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/javadoc/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/mirror/apt/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/mirror/declaration/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/mirror/type/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/mirror/util/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/source/tree/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/source/util/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/comp/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/main/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/mirror/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/mirror/type/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/mirror/util/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/apt/util/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/standard/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/api/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/code/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/comp/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/file/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/jvm/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/main/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/model/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/parser/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/processing/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/sym/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/tree/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javac/util/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javadoc/*.class
-    @OPENJDK6@/langtools/src/share/classes/com/sun/tools/javah/*.class
-    @OPENJDK6@/langtools/src/share/classes/sun/tools/javap/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/tools/java/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/tools/javac/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/tools/native2ascii/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/tools/serialver/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/tools/tree/*.class
+    @OPENJDK7@/jdk/src/share/classes/sun/tools/util/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/javadoc/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/apt/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/declaration/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/type/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/mirror/util/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/source/tree/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/source/util/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/comp/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/main/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/type/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/mirror/util/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/apt/util/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/classfile/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/standard/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/api/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/code/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/comp/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/file/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/jvm/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/main/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/model/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/parser/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/processing/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/sym/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/tree/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javac/util/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javadoc/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javah/*.class
+    @OPENJDK7@/langtools/src/share/classes/com/sun/tools/javap/*.class
 }