harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qi...@apache.org
Subject svn commit: r748797 [1/2] - in /harmony/enhanced/jdktools/branches/java6: ./ make/ modules/jdktools/ modules/jdktools/.settings/ modules/jdktools/META-INF/ modules/jdktools/make/ modules/jdktools/src/ modules/jdktools/src/main/ modules/jdktools/src/mai...
Date Sat, 28 Feb 2009 09:10:37 GMT
Author: qiuxx
Date: Sat Feb 28 09:10:31 2009
New Revision: 748797

URL: http://svn.apache.org/viewvc?rev=748797&view=rev
Log:
Merge jdktools updates from Java 5 to Java 6 branch based on r630107

Added:
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/   (props changed)
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/.classpath
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/.classpath
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/.project
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/.project
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/.settings/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/.settings/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/.settings/org.eclipse.jdt.core.prefs
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/.settings/org.eclipse.jdt.core.prefs
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/.settings/org.eclipse.jdt.ui.prefs
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/.settings/org.eclipse.jdt.ui.prefs
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/META-INF/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/META-INF/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/META-INF/MANIFEST.MF
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/META-INF/MANIFEST.MF
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.properties
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/build.properties
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/make/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/make/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/make/hyproperties.xml
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/make/hyproperties.xml
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/com/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/com/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/com/sun/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/com/sun/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/com/sun/jdi/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/com/sun/jdi/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/com/sun/jdi/Bootstrap.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/com/sun/jdi/Bootstrap.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/com/sun/tools/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/com/sun/tools/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/com/sun/tools/javac/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/com/sun/tools/javac/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/com/sun/tools/javac/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/com/sun/tools/javac/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/ClassProvider.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/ClassProvider.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/Mangler.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/Mangler.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/AppletFrame.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/AppletFrame.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/AppletInfo.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/AppletInfo.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/HTMLParser.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/HTMLParser.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/ViewerAppletContext.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/ViewerAppletContext.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/ViewerAppletStub.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/ViewerAppletStub.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/ViewerAudioClip.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/appletviewer/ViewerAudioClip.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/jdi/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/jdi/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/jdi/Bootstrap.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/jdi/Bootstrap.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/jdi/Bootstrap.properties
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/jdi/Bootstrap.properties
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/nls/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/nls/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/nls/Messages.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/nls/Messages.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/nls/messages.properties
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/internal/nls/messages.properties
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/ArgParser.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/FileNameGenerator.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/FileNameGenerator.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSHelper.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSLogFormatter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSLogFormatter.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSParameters.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSSigner.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSSigner.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSVerifier.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JSVerifier.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JarSignerException.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/JarSignerException.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/TimeStampGenerator.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/jarsigner/UserInteractor.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javadoc/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javadoc/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javadoc/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javadoc/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/Clazz.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/Clazz.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/ClazzField.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/ClazzField.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/ClazzMethod.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/ClazzMethod.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/anttask/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/anttask/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/anttask/Adapter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javah/anttask/Adapter.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javap/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javap/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javap/Clazz.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javap/Clazz.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javap/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/javap/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/ArgumentsParser.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CRLManager.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CRLManager.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CSRGenerator.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CSRGenerator.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertChainVerifier.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertExporter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertExporter.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertImporter.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertReader.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/CertReader.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/Command.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/Command.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/EntryManager.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/EntryManager.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/HelpPrinter.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeyCertGenerator.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreCertPrinter.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreConverter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeyStoreConverter.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeytoolException.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeytoolException.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeytoolKSLoaderSaver.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeytoolKSLoaderSaver.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/KeytoolParameters.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/keytool/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/control/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/control/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/model/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/policytool/view/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/Util.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/toolutils/Util.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/unpack200/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/main/java/org/apache/harmony/tools/unpack200/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javac/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javac/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javac/MainTest.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javac/MainTest.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test/Test01.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test/Test01.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tests/tools/javah/Test02.java
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tools/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/keytool/tests/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/tests/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/tests/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/tests/KeyStoreLoaderSaverTest.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jdktools/src/test/java/org/apache/harmony/tools/toolutils/tests/KeyStoreLoaderSaverTest.java
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/common/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/common/LastTransportError_pd.h
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/exports.txt
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/exports.txt
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/common/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/common/LastTransportError_pd.h
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/   (props changed)
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.cpp
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.h
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/SharedMemTransport.h
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/dt_shmem.def
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/dt_shmem.def
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
    harmony/enhanced/jdktools/branches/java6/modules/jretools/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.classpath
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/.classpath
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.project
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/.project
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/.settings/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.core.prefs
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
    harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.properties
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/build.properties
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jretools/make/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/make/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/
      - copied from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
      - copied unchanged from r748416, harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
Removed:
    harmony/enhanced/jdktools/branches/java6/modules/jpda/build-test.xml
    harmony/enhanced/jdktools/branches/java6/modules/jpda/make/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/exports.txt
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/makefile
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/makefile
    harmony/enhanced/jdktools/branches/java6/modules/tools/
Modified:
    harmony/enhanced/jdktools/branches/java6/build.xml
    harmony/enhanced/jdktools/branches/java6/make/build-java.xml
    harmony/enhanced/jdktools/branches/java6/make/build-native.xml
    harmony/enhanced/jdktools/branches/java6/make/build-test.xml
    harmony/enhanced/jdktools/branches/java6/make/depends.properties
    harmony/enhanced/jdktools/branches/java6/make/depends.xml
    harmony/enhanced/jdktools/branches/java6/make/properties.xml
    harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ArrayReference.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ArrayType.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ClassType.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/ObjectReference.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/commands/VirtualMachine.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/Agent.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/AgentEventRequest.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ClassManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/CommandHandler.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/ObjectManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/RequestModifier.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/agent/core/TransportManager.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/common/transport/common/LastTransportError.h
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/core/TransportManager_pd.cpp
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/SocketTransport_pd.h
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/SocketTransport_pd.h
    harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/native/samsa/samsa.c
    harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/native/samsa/windows/javaw.c
    harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/jartool.dat
    harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/javac.dat
    harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/keysigner.dat

Modified: harmony/enhanced/jdktools/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/build.xml?rev=748797&r1=748796&r2=748797&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/build.xml Sat Feb 28 09:10:31 2009
@@ -23,6 +23,8 @@
     	Build jdktools
     </description>
 
+    <import file="make/properties.xml"/>
+        
     <target name="help">
         <echo>
 Apache Harmony Ant Build
@@ -52,73 +54,24 @@
 a single module by defining the 'build.module' variable on the ant
 command line.  For example, to run only the luni tests:
 
-  ant -Dbuild.module=tools test
+  ant -Dbuild.module=jdktools test
 
         </echo>
     </target>
-
-    <property file="jdktools.properties"/>
-    <property file="${user.home}/jdktools.properties"/>
     
-    <!-- set the path root for the classlib : must be relative to the build directory -->
-    <property name="external.classlib.loc" value="../working_classlib/deploy" />
-    <property name="external.drlvm.loc" value="../working_vm/build/deploy" />
-    <property name="external.resources.loc" value="../common_resources" />
-
-    <property name="external.resources" location="${external.resources.loc}" />
-
-    <property name="harmony.jdktools" location="${basedir}"/>
-
-    <property name="hy.deploy" location="${external.drlvm.loc}"/>
-    <condition property="hy.deploy" value="${hy.hdk}">
-        <isset property="hy.hdk"/>
-    </condition>
-
-    <property name="hy.hdk" location="${external.classlib.loc}" />
-    <property name="hy.drlvm" location="${external.drlvm.loc}" />
-    <property name="hy.jdk" location="deploy/jdk" />
-
-    <!-- import properties for snapshot targets -->
-    <import file="${basedir}/make/properties.xml" />
-
-    <!-- ================================
-	 target : rebuild
-	     
-	 builds with a clean first
-	 ================================= -->
     <target name="rebuild" depends="clean,build"
         description="Performs a full build - that is 'clean' then 'build'" />
-	
-    <!-- ================================
-	 target : build
-	     
-	 builds with w/o clean
-	 ================================= -->
+
     <target name="build" depends="build-java,build-native"
         description="Compiles the java and native code to produce a jdk">
     </target>
 
-    <!-- ================================
-	 target : clean
-	     
-	 removes all generated files
-	 ================================= -->
     <target name="clean" depends="clean-java,clean-native,clean-tests"
             description="Removes all the files generated by a build" />
 
-    <!-- ================================
-	 target : rebuild-java
-	     
-	 builds java source with a clean first
-	 ================================= -->
     <target name="rebuild-java" depends="clean-java,build-java"
             description="Like 'rebuild' but for java code only" />
 
-    <!-- ================================= 
-          target: build-java              
-
-          runs the build target in build-java.xml
-         ================================= -->
     <target name="build-java" 
             description="Compiles the java code only" >
         <echo>
@@ -129,17 +82,11 @@
         <ant antfile="make/build-java.xml" inheritall="false" target="build">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: clean-java              
-
-          runs the clean target in build-java.xml
-         ================================= -->
     <target name="clean-java" 
             description="Removes the compiled java code" >
         <echo>
@@ -150,25 +97,14 @@
         <ant antfile="make/build-java.xml" inheritall="false" target="clean">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================
-	 target : rebuild-native
-	     
-	 builds native source with a clean first
-	 ================================= -->
     <target name="rebuild-native" depends="clean-native,build-native"
             description="Like 'rebuild' but for native code only" />
 
-    <!-- ================================= 
-          target: build-native             
-
-          runs the build target in build-native.xml
-         ================================= -->
     <target name="build-native" 
             description="Compiles the native code only" >
         <echo>
@@ -179,17 +115,11 @@
         <ant antfile="make/build-native.xml" inheritall="false" target="build">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: clean-native              
-
-          runs the clean target in build-native.xml
-         ================================= -->
     <target name="clean-native"
         description="Removes the compiled native code" >
         <echo>
@@ -200,17 +130,11 @@
         <ant antfile="make/build-native.xml" inheritall="false" target="clean">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: clean-tests              
-
-          runs the clean target in build-tests.xml
-         ================================= -->
     <target name="clean-tests"
         description="Removes the compiled tests and results" >
         <echo>
@@ -221,17 +145,11 @@
         <ant antfile="make/build-test.xml" inheritall="false" target="clean">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-	    <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
         </ant>
     </target>
 
-    <!-- ================================= 
-          target: test              
-
-          runs the test-all target in build-test.xml
-         ================================= -->
     <target name="test"
             description="Runs all tests">
         <echo>
@@ -242,54 +160,23 @@
         <ant antfile="make/build-test.xml" inheritall="false" target="test-all">
             <property name="hy.hdk" value="${hy.hdk}"/>
             <property name="hy.jdk" value="${hy.jdk}"/>
-	    <property name="hy.drlvm" value="${hy.drlvm}"/>
             <property name="harmony.jdktools" value="${harmony.jdktools}"/>
             <property name="external.resources" value="${external.resources}"/>
-	    <property name="hy.deploy" value="${hy.deploy}"/>
         </ant>
     </target>
 
-
-    <!-- ================================= 
-          target: -properties
-         ================================= -->
-    <target name="-properties" depends="svn-prop">
-        <property name="deploy.file.prefix"
-                  value="incubator-harmony-classlib-r${svn.revision}" />
-        <property name="deploy.tar"
-                  value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.tar.gz" />
-        <property name="deploy.zip"
-                  value="${deploy.file.prefix}-${hy.os}-${hy.arch}-snapshot.zip" />
-    </target>
-
     <target name="check-depends"
             description="Report on whether the dependencies are met">
-        <ant antfile="make/depends.xml" inheritall="false" target="check">
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+        <ant antfile="make/depends.xml" target="check"/>
     </target>
 
     <target name="fetch-depends"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
-        <ant antfile="make/depends.xml" inheritall="false" target="download">
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+        <ant antfile="make/depends.xml" target="fetch"/>
     </target>
 
-    <target name="properties" depends="echo"
-        description="Display the properties that are use in the ant build files"
-            />
-
-    <macrodef name="chksum">
-        <attribute name="file" />
-        <attribute name="type" default="md5" />
-        <sequential>
-            <checksum property="@{file}.@{type}" file="@{file}"
-                      algorithm="@{type}" />
-            <echo file="@{file}.@{type}"
-                  message="${@{file}.@{type}}  @{file}${line.separator}" />
-        </sequential>
-    </macrodef>
+    <target name="properties" depends="tools-echo"
+        description="Display the properties that are use in the ant build files"/>
 
 </project>
 

Modified: harmony/enhanced/jdktools/branches/java6/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/make/build-java.xml?rev=748797&r1=748796&r2=748797&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/build-java.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/make/build-java.xml Sat Feb 28 09:10:31 2009
@@ -32,96 +32,47 @@
     <property name="depends.jars" location="${external.resources}/depends/jars" />
     <property name="depends.manifests" location="depends/manifests" />
     <property name="depends.files" location="depends/files" />
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="deploy/jdk" />
-    <property file="make/depends.properties" />
 
-
-    <!-- ================================= 
-          target: build
-         ================================= -->
     <target name="build" depends="-layout, build-modules"
             description="Compile Java source in modules and construct deploy directory." />
 
-    <!-- ================================= 
-          target: clean            
-         ================================= -->
     <target name="clean" depends="clean-modules, -clean-layout"
         description="Remove binaries generated by modules and delete the deploy directory."/>
 
-    <!-- =================================
-          target: clean-modules
-          invokes target clean-java for all modules
-         ================================= -->
     <target name="clean-modules">
         <call-modules target="clean-java" />
     </target>
 
-    <!-- =================================
-          target: build-modules
-          invokes target build-java for all modules
-         ================================= -->
     <target name="build-modules" depends="-prepare-depends">
-            <fail>
-                <condition>
-                    <and>
-                        <equals arg1="${hy.javac.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-                        <not>
-                            <available classname="${hy.javac.compiler}"/>
-                        </not>
-                    </and>
-                </condition>
-The Eclipse compiler class for Ant could not be found. Please place the ECJ JAR in ANT_HOME/lib.
-The JAR can be downloaded directly from eclipse.org or copied from COMMON_RESOURCES/depends/jars/ecj_3.x folder after the fetch-depends target for JDKTOOLS has been run.
-Alternatively, you can switch to another compiler, e.g. specify '-Dhy.javac.compiler=modern' for classic javac.                
-            </fail>
+        <ensure-javac/>
         <mkdir dir="${build.output}" />
         <call-modules target="build-java" />
     </target>
 
 
-    <!-- ================================= 
-          target: -layout              
-          Construct the correct directory structure for the class libs
-         ================================= -->
     <target name="-layout" depends="-prepare-depends">
-
-        <!-- Create the structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-
-        <!-- Create the structure -->
-        <mkdir dir="${hy.jdk}/bin" />
+        <!-- Create the target directory structure -->
+        <mkdir dir="${jdktools.deploy.dir}/jre/bin" />
+        <mkdir dir="${jdktools.deploy.dir}/bin" />
 
         <!-- Copy across the jdk/lib dependency jars -->
-        <copy todir="${hy.jdk}/lib" flatten="yes">
+        <copy todir="${jdktools.deploy.dir}/lib" flatten="yes">
             <fileset file="${ecj.jar}" />
         </copy>
     </target>
 
 
-    <!-- ================================= 
-          target: -clean-layout              
-         ================================= -->
     <target name="-clean-layout">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${hy.jdk}">
+            <fileset dir="${jdktools.deploy.dir}">
                 <exclude name="jre/bin/default/**" />
                 <exclude name="jre/bin/**" />
                 <exclude name="jre/lib/ext/**" />
             </fileset>
-            <!--fileset dir="${hy.hdk}">
-                <include name="LICENSE" />
-                <include name="NOTICE" />
-            </fileset-->
         </delete>
     </target>
 
-    <!-- =================================
-         target: -prepare-depends
-         Check for jars required to compile prefs
-         ================================= --> 
     <target name="-prepare-depends">
-
         <ant antfile="make/depends.xml" inheritall="false" target="check">
             <property name="external.resources" value="${external.resources}"/>
         </ant>

Modified: harmony/enhanced/jdktools/branches/java6/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/make/build-native.xml?rev=748797&r1=748796&r2=748797&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/build-native.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/make/build-native.xml Sat Feb 28 09:10:31 2009
@@ -28,67 +28,37 @@
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
 
-    <property file="make/depends.properties" />
-
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="deploy/jdk" />
     <property name="depends.build" location="depends/build" />
     <property name="depends.libs" location="depends/libs/${hy.platform}" />
     <property name="depends.files" location="depends/files" />
-    <property name="native.lib.target" location="${hy.jdk}/lib" />
+    <property name="native.lib.target" location="${jdktools.deploy.dir}/lib" />
+
+    <target name="build" depends="-layout, build-modules" />
+
+    <target name="clean" depends="clean-modules, -clean-layout" />
 
-    <!-- ================================= 
-          target: build
-         ================================= -->
-    <target name="build"
-        depends="-layout, build-modules" />
-
-
-    <!-- ================================= 
-          target: clean              
-         ================================= -->
-    <target name="clean"
-        depends="clean-modules, -clean-layout" />
-
-
-    <!-- ================================= 
-          target: build-modules
-          invokes target build-native for all modules              
-         ================================= -->
     <target name="build-modules" >
     	<mkdir dir="${native.lib.target}" />
         <call-modules target="build-native" />
     </target>
 
-
-    <!-- ================================= 
-          target: clean-modules              
-          invokes target calean-native for all modules              
-         ================================= -->
     <target name="clean-modules" >
         <call-modules target="clean-native" />
     	<delete dir="${native.lib.target}" />
     </target>
 
-
-    <!-- ================================= 
-          target: -layout              
-         ================================= -->
     <target name="-layout"
         description="Construct the correct directory structure for native binaries">
 
     	<!-- Create the target directory structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-        <mkdir dir="${hy.jdk}/include" />
+        <mkdir dir="${jdktools.deploy.dir}/jre/bin" />
+        <mkdir dir="${jdktools.deploy.dir}/include" />
     	<mkdir dir="${native.lib.target}"/>
     </target>
 
-    <!-- ================================= 
-          target: -clean-layout              
-         ================================= -->
     <target name="-clean-layout">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${hy.jdk}">
+            <fileset dir="${jdktools.deploy.dir}">
                 <include name="**/bin/java${exe.suffix}" />
                 <include name="**/bin/javaw${exe.suffix}" />
                 <include name="**/bin/*${shlib.suffix}*" />

Modified: harmony/enhanced/jdktools/branches/java6/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/make/build-test.xml?rev=748797&r1=748796&r2=748797&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/build-test.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/make/build-test.xml Sat Feb 28 09:10:31 2009
@@ -25,19 +25,15 @@
     <import file="${basedir}/make/properties.xml" />
 
     <!-- set global properties for this build. -->
-
     <property name="tests.output" location="build/test_report" />
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
 
     <condition property="not.copy.jre">
         <isset property="test.jre.home"/>
     </condition>
-    <property name="test.jre.home" location="${hy.jdk}" />
+    <property name="test.jre.home" location="${jdktools.deploy.dir}" />
 
     <property name="tests.build.output" location="build/tests" />
     <property name="tests.depends.jars" location="${hy.hdk}/jdk/jre/lib/boot" />
-    <property file="make/depends.properties" />
 
     <!-- this list of components to test will grow to eventually be all modules -->
     <target name="test-all"
@@ -101,17 +97,17 @@
     <target name="copy-jre" depends="copy-jre-files, chmod-jre-files" unless="not.copy.jre"/>
 
     <target name="copy-jre-files" unless="not.copy.jre">
-        <copy todir="${hy.jdk}/jre" overwrite="no">
+        <copy todir="${jdktools.deploy.dir}/jre" overwrite="no">
               <fileset dir="${hy.deploy}/jdk/jre" />
         </copy>
     </target>
 
     <target name="chmod-jre-files" if="is.unix" unless="not.copy.jre">
-        <chmod file="${hy.jdk}/jre/bin/java" perm="ugo+x" />
+        <chmod file="${jdktools.deploy.dir}/jre/bin/java" perm="ugo+x" />
     </target>
 
     <target name="clean-jre">
-        <delete dir="${hy.jdk}/jre" />
+        <delete dir="${jdktools.deploy.dir}/jre" />
     </target>
 
     <target name="process-empty" depends="-check-for-empty, -process-empty"/>

Modified: harmony/enhanced/jdktools/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/make/depends.properties?rev=748797&r1=748796&r2=748797&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/jdktools/branches/java6/make/depends.properties Sat Feb 28 09:10:31 2009
@@ -13,34 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.dir=${external.resources}/depends
-depends.jars=${depends.dir}/jars
-maven2.base=http://repo1.maven.org/maven2
-eclipse.base=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500
-
-ecj.dir=${depends.jars}/ecj_3.3
-ecj.jar=${ecj.dir}/ecj_3.3.jar
-ecj.url=${eclipse.base}/ecj.jar
-ecj.md5=412d8badd227807ef2f52608435240fb
-
-icu.dir=${depends.jars}/com.ibm.icu.base-3.3
-icu.zip=${icu.dir}/com.ibm.icu.base-3.3.zip
+icu=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base-3.3.zip
 icu.url=${eclipse.base}/com.ibm.icu.base-3.3.zip
 icu.md5=5b8a0fc0e48431d376c7efd7be8c0f7b
-icu.jar.name=com.ibm.icu.base_3.6.1.v20070417.jar
-icu.jar=${icu.dir}/${icu.jar.name}
+icu.unzip.path=eclipse/plugins/com.ibm.icu.base_3.6.1.v20070417.jar
+icu.jar=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base_3.6.1.v20070417.jar
 
-jdt.dir=${depends.jars}/eclipse-JDT-3.3
-jdt.zip=${jdt.dir}/eclipse-JDT-3.3.zip
+jdt=${depends.jars}/eclipse-JDT-3.3/eclipse-JDT-3.3.zip
 jdt.url=${eclipse.base}/eclipse-JDT-3.3.zip
 jdt.md5=7a82530972e2943a2f20cb6d3bffe0d6
-jdt.jdi.jar.name=jdi.jar
-jdt.jdi.jar=${jdt.dir}/${jdt.jdi.jar.name}
-jdt.jdimodel.jar.name=jdimodel.jar
-jdt.jdimodel.jar=${jdt.dir}/${jdt.jdimodel.jar.name}
-
-junit.dir=${depends.jars}/junit_3.8.2
-junit.jar=${junit.dir}/junit.jar
-junit.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
-junit.md5=28e7eb9eeefe31a657c68755bfccc541
-
+jdt.unzip.path=eclipse/plugins/org.eclipse.jdt.debug_*/*.jar
+jdt.jdi.jar=${depends.jars}/eclipse-JDT-3.3/jdi.jar
+jdt.jdimodel.jar=${depends.jars}/eclipse-JDT-3.3/jdimodel.jar

Modified: harmony/enhanced/jdktools/branches/java6/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/make/depends.xml?rev=748797&r1=748796&r2=748797&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/depends.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/make/depends.xml Sat Feb 28 09:10:31 2009
@@ -19,204 +19,44 @@
 
  -->
 
-<project name="dependencies" default="check" basedir="..">
+<project name="jdktools-depends">
     <description>
     Confirm that dependencies are present and fetch missing dependencies
     where possible.
     </description>
+    
+    <dirname property="dd.basedir" file="${ant.file.jdktools-depends}"/>
+    <import file="${dd.basedir}/properties.xml"/>
+    
+    <target name="check">
+        <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
+        <check-one-file src="${junit.jar.url}" dest="${junit.jar}" />
 
-    <property file="make/depends.properties" />
-    <import file="${basedir}/make/properties.xml" />
+        <poll-modules target="check-depends" dir="${jdktools.base.dir}/modules"/>
 
-    <target name="check" description="Check whether dependencies are available"
-            depends="-check" />
-
-    <target name="-check">
-        <check-one-file src="${ecj.url}" dest="${ecj.jar}" />
-        <check-one-file src="${junit.url}" dest="${junit.jar}" />
-    </target>
-
-    <target name="download" description="Download required jars"
-            depends="-download,-extract" />
-
-    <target name="-download">
-
-    <mkdir dir="${ecj.dir}" />
-    <download-one-file src="${ecj.url}" dest="${ecj.jar}"
-                           md5="${ecj.md5}" />
-        
-    <mkdir dir="${icu.dir}" />
-    <download-one-file src="${icu.url}" dest="${icu.zip}"
-                           md5="${icu.md5}" />
-        
-    <mkdir dir="${jdt.dir}" />
-    <download-one-file src="${jdt.url}" dest="${jdt.zip}"
-                           md5="${jdt.md5}" />
-        
-    <mkdir dir="${junit.dir}" />
-    <download-one-file src="${junit.url}" dest="${junit.jar}"
-                           md5="${junit.md5}" />
-
-    </target>
-
-    <target name="-extract" depends="-extract-props,-really-extract" />
-    <target name="-extract-props" depends="-extract-props-icu,-extract-props-jdt"/>
-    <target name="-really-extract" depends="-really-extract-icu,-really-extract-jdt"/>
-
-    <target name="-extract-props-icu">
-        <uptodate property="icu.uptodate"
-                  srcfile="${icu.zip}"
-                  targetfile="${icu.jar}" />
-    </target>
-    <target name="-extract-props-jdt">
-        <uptodate property="jdt.uptodate"
-                  srcfile="${jdt.zip}"
-                  targetfile="${jdt.jdi.jar}" />
-    </target>
-
-    <target name="-really-extract-icu" unless="icu.uptodate">
-        <unzip src="${icu.zip}" dest="${icu.dir}.tmp" />
-        <copy todir="${icu.dir}" flatten="yes">
-            <fileset dir="${icu.dir}.tmp/eclipse/plugins">
-                <include name="com.ibm.icu.base_*.jar"/>
-            </fileset>
-        </copy>
-        <delete dir="${icu.dir}.tmp" />
-    </target>
-    <target name="-really-extract-jdt" unless="jdt.uptodate">
-        <unzip src="${jdt.zip}" dest="${jdt.dir}.tmp" />
-        <copy todir="${jdt.dir}" flatten="yes">
-            <fileset dir="${jdt.dir}.tmp/eclipse/plugins">
-                <include name="org.eclipse.jdt.debug_*/jdi.jar"/>
-                <include name="org.eclipse.jdt.debug_*/jdimodel.jar"/>
-            </fileset>
-        </copy>
-        <delete dir="${jdt.dir}.tmp" />
-    </target>
-
-    <macrodef name="download-one-file">
-        <attribute name="src" />
-        <attribute name="dest" />
-        <attribute name="md5" />
-        <sequential>
-            <echo>Checking @{dest}</echo>
-        <available file="@{dest}" type="file"
-                       property="@{dest}.exists" />
-            <antcall target="-really-download">
-                <param name="src" value="@{src}" />
-                <param name="dest" value="@{dest}" />
-            </antcall>
-            <checksum file="@{dest}" property="@{dest}.md5" />
-            <condition property="@{dest}.md5.verified" value="true">
-                <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
-            </condition>
-            <antcall target="-remove-file-if-bad">
-                <param name="jar" value="@{dest}" />
-            </antcall>
-        <fail unless="@{dest}.md5.verified">
-...
-
-File @{dest} has incorrect md5 checksum.  Expected:
-  @{md5}
-found:
-  ${@{dest}.md5}
-
-            </fail>
-            <echo>Checksum verified (${@{dest}.md5.verified})</echo>
-        </sequential>
-    </macrodef>
-
-    <target name="-really-download" unless="${dest}.exists">
-        <echo>Fetching ${dest}</echo>
-    <get src="${src}" dest="${dest}" usetimestamp="true" verbose="true" />
-    </target>
-
-    <target name="-remove-file-if-bad" unless="${dest}.md5.verified">
-        <delete file="${dest}" />
-    </target>
-
-    <macrodef name="check-one-file">
-        <attribute name="src" />
-        <attribute name="dest" />
-        <sequential>
-            <echo>Checking for @{dest}</echo>
-        <available file="@{dest}" type="file"
-                       property="@{dest}.exists" />
-        <fail>
-        <condition>
-            <not>
-            <isset property="@{dest}.exists" />
-            </not>
-        </condition>
-...
-
-Missing dependency.  The jar from:
-
-  @{src}
-
-should be downloaded to:
-
-  @{dest}
-
-Run "ant fetch-depends" to automatically fetch dependencies.
-Note: Some of Harmony's dependencies are licensed under terms other
-than the Apache License v2.
-            </fail>
-        </sequential>
-    </macrodef>
-
-    <target name="-awt-tar-extract" unless="awtdeps.uptodate">
-        <echo>Extracting awt dependencies</echo>
-    <untar src="${awtdeps.tar}" dest="${awtdeps.extract.dir}"
-               compression="gzip" />
-        <echo file="${awtdeps.testfile}"
-              message="${awtdeps.tar} extracted${line.separator}" />
-    </target>
-
-    <macrodef name="check-one-link">
-        <attribute name="src" />
-        <attribute name="dest" />
-        <attribute name="message" />
-        <sequential>
-            <echo>Checking for @{dest}</echo>
-        <available file="@{dest}" type="file"
-                       property="@{dest}.exists" />
-        <available file="@{src}" type="file"
-                       property="@{src}.exists" />
+        <!-- TODO define which harmony externals are needed
         <fail>
-        <condition>
-                    <and>
+            <condition>
                 <not>
-                <isset property="@{dest}.exists" />
-                        </not>
-                        <not>
-                <isset property="@{src}.exists" />
-                </not>
+                    <and>
+                    <available file="${hy.hdk}/include"/>
+                    <available file="${hy.hdk}/lib"/>
                     </and>
-        </condition>
+                </not>
+            </condition>
 ...
 
-Missing dependency.  The file from:
-
-  @{src}
-
-should be linked to:
-
-  @{dest}
-
-But @{src} doesn't exist.
-@{message}
-            </fail>
-            <antcall target="-really-link">
-                <param name="src" value="@{src}" />
-                <param name="dest" value="@{dest}" />
-            </antcall>
-        </sequential>
-    </macrodef>
-
-    <target name="-really-link" unless="${dest}.exists">
-        <echo>Linking ${dest}</echo>
-        <symlink resource="${src}" link="${basedir}/${dest}" />
+Missing dependency: pre-built class library (or HDK)
+at ${hy.hdk}. 
+You may point to the correct location via "hy.hdk" property:
+"ant -Dhy.hdk=a-hdk-root"
+        </fail-->
+    </target>
+        
+    <target name="fetch">
+        <fetch dep="junit.jar"/>
+        <fetch dep="ecj.jar"/>
+        <poll-modules target="fetch-depends" dir="${jdktools.base.dir}/modules"/>
     </target>
 
 </project>



Mime
View raw message