hg: jigsaw/jigsaw/jdk: 2 new changesets

[mandy.chung at oracle.com]

Changeset: 638a21385dfa
Author:    mchung
Date:      2011-11-18 12:01 -0800
URL:       http://hg.openjdk.java.net/jigsaw/jigsaw/jdk/rev/638a21385dfa

Remove jpkg -r option and -m accepts classes and resources
Reviewed-by: alanb, chegar

! make/common/BuildNativePackages.gmk
! make/java/java/FILES_java.gmk
! make/modules/Makefile
! make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java
! src/share/classes/org/openjdk/jigsaw/Manifest.java
+ src/share/classes/org/openjdk/jigsaw/ModuleFile.java
- src/share/classes/org/openjdk/jigsaw/ModuleFileFormat.java
! src/share/classes/org/openjdk/jigsaw/ModuleFileSigner.java
! src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java
+ src/share/classes/org/openjdk/jigsaw/ModuleFileWriter.java
! src/share/classes/org/openjdk/jigsaw/SignedModule.java
! src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
! src/share/classes/org/openjdk/jigsaw/cli/Librarian.java
! src/share/classes/org/openjdk/jigsaw/cli/Packager.java
! src/share/classes/org/openjdk/jigsaw/cli/Signer.java
! test/org/openjdk/jigsaw/circular-deps.sh
! test/org/openjdk/jigsaw/cli/JpkgArgsTest.java
+ test/org/openjdk/jigsaw/cli/ModuleFileTest.java
! test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java
- test/org/openjdk/jigsaw/cli/ModuleFormatTest01.java
- test/org/openjdk/jigsaw/cli/ModuleFormatTest01.sh
! test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java
+ test/org/openjdk/jigsaw/cli/SignedModuleFileTest.sh
! test/org/openjdk/jigsaw/cli/jmod-basic.sh
! test/org/openjdk/jigsaw/cli/jmod-signed.sh
! test/org/openjdk/jigsaw/cli/signed-module.sh
! test/org/openjdk/jigsaw/cli/timestamp-test.sh
! test/org/openjdk/jigsaw/library.sh
! test/org/openjdk/jigsaw/preinstall.sh
! test/org/openjdk/jigsaw/resource.sh

Changeset: a07343ae2797
Author:    mchung
Date:      2011-11-18 13:15 -0800
URL:       http://hg.openjdk.java.net/jigsaw/jigsaw/jdk/rev/a07343ae2797

Merge

! make/modules/Makefile
- make/modules/jdk7.depconfig