hg: jdk7/modules/jdk: 6 new changesets
kumar.srinivasan at sun.com
kumar.srinivasan at sun.com
Wed Aug 6 19:50:43 PDT 2008
Changeset: ffb2dafa2dbb
Author: ksrini
Date: 2008-08-05 13:00 -0700
URL: http://hg.openjdk.java.net/jdk7/modules/jdk/rev/ffb2dafa2dbb
6724362: (jam-tool) make jam tool compliant with EDR II specification, rev 1.
Summary: Incorporates most of the new features specified in latest EDR2 277 spec.
Reviewed-by: bristor, mchung, jjg
! make/java/module/Makefile
! src/share/classes/sun/module/JamUtils.java
+ src/share/classes/sun/module/MetadataParser.java
+ src/share/classes/sun/module/ModuleParsingException.java
! src/share/classes/sun/module/tools/Jam.java
! src/share/classes/sun/module/tools/Messenger.java
+ src/share/classes/sun/module/tools/resources/messenger.properties
+ src/share/classes/sun/module/tools/util/JamModuleMetadata.java
+ src/share/classes/sun/module/tools/util/JamToolUtils.java
+ src/share/classes/sun/module/tools/util/ModuleMetadata.java
! src/share/classes/sun/tools/jar/Main.java
! src/share/classes/sun/tools/jar/resources/jar.properties
+ src/share/sample/modules/README
! src/share/sample/modules/dependencies/dep/Entry.java
! src/share/sample/modules/dependencies/dep/module_info.java
+ src/share/sample/modules/dependencies/module-info.java
! src/share/sample/modules/hello-world/hello/Main.java
! src/share/sample/modules/hello-world/hello/module_info.java
+ src/share/sample/modules/hello-world/module-info.java
! test/java/module/basic/BasicLauncherTests.java
! test/java/module/basic/HttpRepositoryTest.java
+ test/java/module/basic/LauncherTestHelper.java
! test/java/module/basic/Utils.java
! test/java/module/query/QueryTest.java
! test/java/module/repository/LegacyJarTest.java
! test/java/module/repository/LibraryTest.java
! test/java/module/repository/NativeLibraryTest.java
! test/java/module/tools/JamBuilder.java
! test/java/module/tools/jam/ChangeDirTest.java
+ test/java/module/tools/jam/JamTester.java
! test/java/module/tools/jam/Pack200Test.java
+ test/java/module/tools/jam/hello/module-info.java
! test/java/module/tools/jam/hello/module_info.java
! test/tools/jar/ChangeDir.java
! test/tools/jar/JarEntryTime.java
! test/tools/jar/UpdateManifest.java
! test/tools/jar/index/MetaInf.java
Changeset: 9267a03c3a44
Author: ksrini
Date: 2008-08-05 13:06 -0700
URL: http://hg.openjdk.java.net/jdk7/modules/jdk/rev/9267a03c3a44
6733236: (jam-tool) move the classfile libraries to rt.jar.
Summary: A temporary fix for class loading issues with jam and jar tools
Reviewed-by: bristor
! make/common/Release.gmk
Changeset: e92973a92c3b
Author: ksrini
Date: 2008-08-05 13:15 -0700
URL: http://hg.openjdk.java.net/jdk7/modules/jdk/rev/e92973a92c3b
Merge
! make/java/module/Makefile
- src/share/classes/sun/module/repository/MetadataXMLWriter.java
- src/share/classes/sun/module/repository/URLModuleInfo.java
! test/java/module/query/QueryTest.java
Changeset: 9fc03df46a6e
Author: mchung
Date: 2008-07-22 19:01 -0700
URL: http://hg.openjdk.java.net/jdk7/modules/jdk/rev/9fc03df46a6e
6724082: Support for the module attribute and member/export table attributes
Summary: Change the module system runtime to integrate with javac and jam tool support
Reviewed-by: stanleyh, bristor
! make/java/java/FILES_java.gmk
! src/share/classes/java/lang/ClassLoader.java
! src/share/classes/java/lang/ModuleInfo.java
! src/share/classes/java/module/ModuleDefinition.java
! src/share/classes/sun/module/bootstrap/BootstrapModuleSystem.java
+ src/share/classes/sun/module/bootstrap/VirtualModuleDefinition.java
! src/share/classes/sun/module/bootstrap/VirtualModuleDefinitions.java
+ src/share/classes/sun/module/core/AbstractModuleDefinition.java
! src/share/classes/sun/module/core/JamModuleDefinition.java
! src/share/classes/sun/module/core/JamPackageDefinition.java
! src/share/classes/sun/module/core/ServiceProcessor.java
! test/java/module/modinit/RunMTest.java
! test/java/module/modinit/cl-template.java
! test/java/module/modinit/mtest/classpath/basic1.mtest
+ test/java/module/modinit/mtest/deepvalidate/Foo.java
! test/java/module/modinit/mtest/deepvalidate/deepvalidate.mtest
! test/java/module/modinit/mtest/exportlegacyclasses/exportlegacyclasses1.mtest
+ test/java/module/modinit/mtest/exportlegacyclasses/p/Bar.java
+ test/java/module/modinit/mtest/exportlegacyclasses/p/Foo.java
+ test/java/module/modinit/mtest/exportlegacyclasses/q/Gus.java
+ test/java/module/modinit/mtest/getresource/Dup.java
! test/java/module/modinit/mtest/getresource/basic2.mtest
! test/java/module/service/ServiceTest.java
! test/java/module/service/src/charserv/client/Main.java
+ test/java/module/service/src/charserv/client/module-info.java
- test/java/module/service/src/charserv/client/module_info.java
! test/java/module/service/src/charserv/provider/CharsetServiceProvider.java
+ test/java/module/service/src/charserv/provider/module-info.java
- test/java/module/service/src/charserv/provider/module_info.java
! test/java/module/service/src/cliserv/client/Main.java
! test/java/module/service/src/cliserv/client/MainCP.java
+ test/java/module/service/src/cliserv/client/module-info.java
- test/java/module/service/src/cliserv/client/module_info.java
! test/java/module/service/src/cliserv/provider/BarService.java
! test/java/module/service/src/cliserv/provider/BarServiceProvider.java
! test/java/module/service/src/cliserv/provider/FooService2Provider.java
+ test/java/module/service/src/cliserv/provider/module-info.java
- test/java/module/service/src/cliserv/provider/module_info.java
! test/java/module/service/src/cliserv/service/FooService.java
! test/java/module/service/src/cliserv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/cliserv/service/module-info.java
- test/java/module/service/src/cliserv/service/module_info.java
! test/java/module/service/src/cpserv/client/Main.java
+ test/java/module/service/src/cpserv/client/module-info.java
- test/java/module/service/src/cpserv/client/module_info.java
! test/java/module/service/src/cpserv/service/FooService.java
! test/java/module/service/src/cpserv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/cpserv/service/module-info.java
- test/java/module/service/src/cpserv/service/module_info.java
! test/java/module/service/src/defserv/client/Main.java
+ test/java/module/service/src/defserv/client/module-info.java
- test/java/module/service/src/defserv/client/module_info.java
! test/java/module/service/src/defserv/provider/BarService.java
! test/java/module/service/src/defserv/provider/BarServiceDefaultProvider.java
! test/java/module/service/src/defserv/provider/FooService2Provider.java
+ test/java/module/service/src/defserv/provider/module-info.java
- test/java/module/service/src/defserv/provider/module_info.java
! test/java/module/service/src/defserv/service/FooService.java
! test/java/module/service/src/defserv/service/FooServiceDefaultProvider.java
! test/java/module/service/src/defserv/service/FooServiceDefaultProvider2.java
+ test/java/module/service/src/defserv/service/module-info.java
- test/java/module/service/src/defserv/service/module_info.java
! test/java/module/service/src/modserv/client/Main.java
+ test/java/module/service/src/modserv/client/module-info.java
- test/java/module/service/src/modserv/client/module_info.java
! test/java/module/service/src/modserv/provider1/AdvancedCodecs.java
! test/java/module/service/src/modserv/provider1/StandardCodecs.java
+ test/java/module/service/src/modserv/provider1/module-info.java
- test/java/module/service/src/modserv/provider1/module_info.java
! test/java/module/service/src/modserv/provider2/AdvancedCodecs.java
+ test/java/module/service/src/modserv/provider2/module-info.java
- test/java/module/service/src/modserv/provider2/module_info.java
! test/java/module/service/src/modserv/provider3/ImplCodecs.java
+ test/java/module/service/src/modserv/provider3/module-info.java
- test/java/module/service/src/modserv/provider3/module_info.java
! test/java/module/service/src/modserv/service/CodecSet.java
! test/java/module/service/src/modserv/service/Encoder.java
+ test/java/module/service/src/modserv/service/module-info.java
- test/java/module/service/src/modserv/service/module_info.java
! test/java/module/service/src/reposerv/client/Main.java
+ test/java/module/service/src/reposerv/client/module-info.java
- test/java/module/service/src/reposerv/client/module_info.java
! test/java/module/service/src/reposerv/provider/BarService.java
! test/java/module/service/src/reposerv/provider/BarServiceDefaultProvider.java
! test/java/module/service/src/reposerv/provider/FooService2Provider.java
+ test/java/module/service/src/reposerv/provider/module-info.java
- test/java/module/service/src/reposerv/provider/module_info.java
! test/java/module/service/src/reposerv/service/FooService.java
! test/java/module/service/src/reposerv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/reposerv/service/module-info.java
- test/java/module/service/src/reposerv/service/module_info.java
! test/java/module/service/src/rxpserv/client/Main.java
+ test/java/module/service/src/rxpserv/client/module-info.java
- test/java/module/service/src/rxpserv/client/module_info.java
+ test/java/module/service/src/rxpserv/extra/module-info.java
- test/java/module/service/src/rxpserv/extra/module_info.java
! test/java/module/service/src/rxpserv/provider/FooServiceProvider.java
+ test/java/module/service/src/rxpserv/provider/module-info.java
- test/java/module/service/src/rxpserv/provider/module_info.java
! test/java/module/service/src/rxpserv/service/FooService.java
+ test/java/module/service/src/rxpserv/service/module-info.java
- test/java/module/service/src/rxpserv/service/module_info.java
+ test/java/module/service/src/rxpserv/transitive/module-info.java
- test/java/module/service/src/rxpserv/transitive/module_info.java
! test/java/module/service/src/verserv/client/Main.java
+ test/java/module/service/src/verserv/client/module-info.java
- test/java/module/service/src/verserv/client/module_info.java
! test/java/module/service/src/verserv/provider/BarService.java
! test/java/module/service/src/verserv/provider/BarServiceDefaultProvider.java
! test/java/module/service/src/verserv/provider/FooService2Provider.java
+ test/java/module/service/src/verserv/provider/module-info.java
- test/java/module/service/src/verserv/provider/module_info.java
! test/java/module/service/src/verserv/service/FooService.java
! test/java/module/service/src/verserv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/verserv/service/module-info.java
- test/java/module/service/src/verserv/service/module_info.java
Changeset: 361c29dc295b
Author: ksrini
Date: 2008-08-06 15:40 -0700
URL: http://hg.openjdk.java.net/jdk7/modules/jdk/rev/361c29dc295b
Merge
! src/share/classes/java/lang/ClassLoader.java
! src/share/classes/java/lang/ModuleInfo.java
! src/share/classes/java/module/ModuleDefinition.java
! src/share/classes/sun/module/bootstrap/BootstrapModuleSystem.java
+ src/share/classes/sun/module/bootstrap/VirtualModuleDefinition.java
! src/share/classes/sun/module/bootstrap/VirtualModuleDefinitions.java
+ src/share/classes/sun/module/core/AbstractModuleDefinition.java
! src/share/classes/sun/module/core/JamModuleDefinition.java
! test/java/module/modinit/RunMTest.java
! test/java/module/modinit/cl-template.java
! test/java/module/modinit/mtest/deepvalidate/deepvalidate.mtest
! test/java/module/modinit/mtest/exportlegacyclasses/exportlegacyclasses1.mtest
Changeset: 1ddad60c8ff9
Author: ksrini
Date: 2008-08-06 15:42 -0700
URL: http://hg.openjdk.java.net/jdk7/modules/jdk/rev/1ddad60c8ff9
6734590: (jam) merge changes for edr2
Summary: Merge of Jam tool, Runtime and API changes for EDRII.
Reviewed-by: stanleyh
- test/java/module/service/src/charserv/client/module_info.java
- test/java/module/service/src/charserv/provider/module_info.java
- test/java/module/service/src/cliserv/client/module_info.java
- test/java/module/service/src/cliserv/provider/module_info.java
! test/java/module/service/src/cliserv/service/FooService.java
! test/java/module/service/src/cliserv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/cliserv/service/module-info.java
- test/java/module/service/src/cliserv/service/module_info.java
! test/java/module/service/src/cpserv/client/Main.java
+ test/java/module/service/src/cpserv/client/module-info.java
- test/java/module/service/src/cpserv/client/module_info.java
! test/java/module/service/src/cpserv/service/FooService.java
! test/java/module/service/src/cpserv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/cpserv/service/module-info.java
- test/java/module/service/src/cpserv/service/module_info.java
! test/java/module/service/src/defserv/client/Main.java
+ test/java/module/service/src/defserv/client/module-info.java
- test/java/module/service/src/defserv/client/module_info.java
! test/java/module/service/src/defserv/provider/BarService.java
! test/java/module/service/src/defserv/provider/BarServiceDefaultProvider.java
! test/java/module/service/src/defserv/provider/FooService2Provider.java
+ test/java/module/service/src/defserv/provider/module-info.java
- test/java/module/service/src/defserv/provider/module_info.java
! test/java/module/service/src/defserv/service/FooService.java
! test/java/module/service/src/defserv/service/FooServiceDefaultProvider.java
! test/java/module/service/src/defserv/service/FooServiceDefaultProvider2.java
+ test/java/module/service/src/defserv/service/module-info.java
- test/java/module/service/src/defserv/service/module_info.java
! test/java/module/service/src/modserv/client/Main.java
+ test/java/module/service/src/modserv/client/module-info.java
- test/java/module/service/src/modserv/client/module_info.java
! test/java/module/service/src/modserv/provider1/AdvancedCodecs.java
! test/java/module/service/src/modserv/provider1/StandardCodecs.java
+ test/java/module/service/src/modserv/provider1/module-info.java
- test/java/module/service/src/modserv/provider1/module_info.java
! test/java/module/service/src/modserv/provider2/AdvancedCodecs.java
+ test/java/module/service/src/modserv/provider2/module-info.java
- test/java/module/service/src/modserv/provider2/module_info.java
! test/java/module/service/src/modserv/provider3/ImplCodecs.java
+ test/java/module/service/src/modserv/provider3/module-info.java
- test/java/module/service/src/modserv/provider3/module_info.java
! test/java/module/service/src/modserv/service/CodecSet.java
! test/java/module/service/src/modserv/service/Encoder.java
+ test/java/module/service/src/modserv/service/module-info.java
- test/java/module/service/src/modserv/service/module_info.java
! test/java/module/service/src/reposerv/client/Main.java
+ test/java/module/service/src/reposerv/client/module-info.java
- test/java/module/service/src/reposerv/client/module_info.java
! test/java/module/service/src/reposerv/provider/BarService.java
! test/java/module/service/src/reposerv/provider/BarServiceDefaultProvider.java
! test/java/module/service/src/reposerv/provider/FooService2Provider.java
+ test/java/module/service/src/reposerv/provider/module-info.java
- test/java/module/service/src/reposerv/provider/module_info.java
! test/java/module/service/src/reposerv/service/FooService.java
! test/java/module/service/src/reposerv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/reposerv/service/module-info.java
- test/java/module/service/src/reposerv/service/module_info.java
! test/java/module/service/src/rxpserv/client/Main.java
+ test/java/module/service/src/rxpserv/client/module-info.java
- test/java/module/service/src/rxpserv/client/module_info.java
+ test/java/module/service/src/rxpserv/extra/module-info.java
- test/java/module/service/src/rxpserv/extra/module_info.java
! test/java/module/service/src/rxpserv/provider/FooServiceProvider.java
+ test/java/module/service/src/rxpserv/provider/module-info.java
- test/java/module/service/src/rxpserv/provider/module_info.java
! test/java/module/service/src/rxpserv/service/FooService.java
+ test/java/module/service/src/rxpserv/service/module-info.java
- test/java/module/service/src/rxpserv/service/module_info.java
+ test/java/module/service/src/rxpserv/transitive/module-info.java
- test/java/module/service/src/rxpserv/transitive/module_info.java
! test/java/module/service/src/verserv/client/Main.java
+ test/java/module/service/src/verserv/client/module-info.java
- test/java/module/service/src/verserv/client/module_info.java
! test/java/module/service/src/verserv/provider/BarService.java
! test/java/module/service/src/verserv/provider/BarServiceDefaultProvider.java
! test/java/module/service/src/verserv/provider/FooService2Provider.java
+ test/java/module/service/src/verserv/provider/module-info.java
- test/java/module/service/src/verserv/provider/module_info.java
! test/java/module/service/src/verserv/service/FooService.java
! test/java/module/service/src/verserv/service/FooServiceDefaultProvider.java
+ test/java/module/service/src/verserv/service/module-info.java
- test/java/module/service/src/verserv/service/module_info.java
More information about the jdk7-changes
mailing list