harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r799115 - in /harmony/enhanced/jdktools/branches/java6: ./ make/ modules/jdktools/ modules/jdktools/make/ modules/jpda/ modules/jpda/make/ modules/jretools/ modules/jretools/.settings/ modules/jretools/META-INF/ modules/jretools/make/ modul...
Date Wed, 29 Jul 2009 23:04:04 GMT
Author: hindessm
Date: Wed Jul 29 23:04:02 2009
New Revision: 799115

URL: http://svn.apache.org/viewvc?rev=799115&view=rev
Log:
Merge changes from 785363 to 798901.
Fixed svn:mergeinfo so that:

  svn merge https://svn.apache.org/repos/asf/harmony/enhanced/jdktools/trunk

should just work from now on (if we keep this branch).

Modified:
    harmony/enhanced/jdktools/branches/java6/   (props changed)
    harmony/enhanced/jdktools/branches/java6/make/build-test.xml
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/make/hyproperties.xml
    harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jpda/make/hyproperties.xml
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.classpath   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.project   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.core.prefs   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.ui.prefs   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.properties   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml   (contents, props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml   (contents, props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/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/Consts.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java   (props changed)
    harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/samsa/make/hyproperties.xml

Propchange: harmony/enhanced/jdktools/branches/java6/
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/jdktools/trunk:630107-798901

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=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/build-test.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/make/build-test.xml Wed Jul 29 23:04:02 2009
@@ -19,7 +19,7 @@
 
 <project name="jdktools-test" default="test-all" basedir="..">
 
-    <description> Tests for classlib package</description>
+    <description>Tests for classlib package</description>
 
     <!-- import common properties -->
     <import file="${basedir}/make/properties.xml" />
@@ -37,8 +37,10 @@
 
     <!-- this list of components to test will grow to eventually be all modules -->
     <target name="test-all"
-        depends="clean-tests-output, test-modules, process-empty, gen-report, check-test-result">
-    </target>
+        depends="clean-tests-output, test-modules, process-test-output" />
+
+    <target name="process-test-output"
+            depends="process-empty, gen-report, check-test-result" />
 
     <target name="clean" depends="clean-tests-output, clean-tests, clean-jre" />
 

Modified: harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml Wed Jul 29 23:04:02 2009
@@ -23,6 +23,8 @@
     <property name="tests.build.output" location="../../build/tests" />
     <import file="${basedir}/../../make/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -190,7 +192,7 @@
         <echo message="Running TOOLS tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <junit fork="yes"
                        forkmode="${hy.test.forkmode}"
@@ -199,7 +201,7 @@
                        errorproperty="test.errors"
                        failureproperty="test.failures"
                        showoutput="on"
-                       dir="${hy.tests.reports}"
+                       dir="${tests.output}"
                        jvm="${test.jre.home}/bin/java">
 
             <jvmarg line="${hy.test.vmargs}" />
@@ -211,10 +213,10 @@
 
             <formatter type="xml" />
 
-            <test name="${test.case}" todir="${hy.tests.reports}"
+            <test name="${test.case}" todir="${tests.output}"
                               if="test.case" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                                    unless="test.case">
 
                 <fileset dir="${hy.tools.src.test.java}">
@@ -232,12 +234,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">tools${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">tools${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/jdktools/branches/java6/modules/jdktools/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jdktools/make/hyproperties.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jdktools/make/hyproperties.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jdktools/make/hyproperties.xml Wed Jul 29 23:04:02 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml Wed Jul 29 23:04:02 2009
@@ -23,6 +23,8 @@
     <property name="tests.build.output" location="${basedir}/../../build/tests" />
     <import file="../../make/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
     
@@ -244,7 +246,7 @@
         <echo message="  Debugger JVM=${test.debugger.jvm}" />
         <echo message="  Debuggee JVM=${test.debuggee.jvm}" />
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <junit fork="yes"
                        forkmode="${hy.test.forkmode}"
@@ -253,7 +255,7 @@
                        errorproperty="test.errors"
                        failureproperty="test.failures"
                        showoutput="off"
-                       dir="${tests.build.output}/classes"
+                       dir="${tests.output}"
                        jvm="${test.debugger.jvm}">
 
             <!-- JVM arguments for debugger process -->
@@ -269,10 +271,10 @@
 
             <formatter type="xml" />
 
-            <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
+            <test name="${test.case}" todir="${tests.output}" if="test.case" />
 
             <!-- short running tests-->
-            <batchtest todir="${hy.tests.reports}" haltonfailure="off" unless="test.case">
+            <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
 
                 <fileset dir="${hy.jpda.src.test}">
                     <!-- if ${test.case}     -->
@@ -288,7 +290,7 @@
             </batchtest>
 
             <!-- long running tests-->
-            <batchtest todir="${hy.tests.reports}" haltonfailure="off" unless="test.case">
+            <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
                 <fileset dir="${hy.jpda.src.test}">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
@@ -307,12 +309,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">jpda${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">jpda${line.separator}</echo>
     </target>
 

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/make/hyproperties.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/make/hyproperties.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/make/hyproperties.xml Wed Jul 29 23:04:02 2009
@@ -44,10 +44,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-      <support>
-          <bin location="../../build/tests" />
-      </support>
-   </tests>
 </hy>

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.classpath
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.classpath:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.project
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/.project:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.project:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.core.prefs:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/.settings/org.eclipse.jdt.ui.prefs
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/.settings/org.eclipse.jdt.ui.prefs:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/META-INF/MANIFEST.MF:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/build.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/build.properties:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.properties:467609-476394

Modified: harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml Wed Jul 29 23:04:02 2009
@@ -23,6 +23,8 @@
     <property name="tests.build.output" location="../../build/tests" />
     <import file="${basedir}/../../make/properties.xml" />
 
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -176,7 +178,7 @@
         <echo message="Running TOOLS tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
-        <mkdir dir="${hy.tests.reports}" />
+        <mkdir dir="${tests.output}" />
 
         <junit fork="yes"
                        forkmode="${hy.test.forkmode}"
@@ -185,7 +187,7 @@
                        errorproperty="test.errors"
                        failureproperty="test.failures"
                        showoutput="on"
-                       dir="${hy.tests.reports}"
+                       dir="${tests.output}"
                        jvm="${test.jre.home}/bin/java">
 
             <jvmarg line="${hy.test.vmargs}" />
@@ -197,10 +199,10 @@
 
             <formatter type="xml" />
 
-            <test name="${test.case}" todir="${hy.tests.reports}"
+            <test name="${test.case}" todir="${tests.output}"
                               if="test.case" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+            <batchtest todir="${tests.output}" haltonfailure="no"
                                    unless="test.case">
 
                 <fileset dir="${hy.tools.src.test.java}">
@@ -218,12 +220,12 @@
     </target>
 
     <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
+        <echo file="${tests.output}/test.failures"
             append="true">tools${line.separator}</echo>
     </target>
 
     <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
+        <echo file="${tests.output}/test.errors"
             append="true">tools${line.separator}</echo>
     </target>
 

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/build.xml:467609-476394

Modified: harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml Wed Jul 29 23:04:02 2009
@@ -42,7 +42,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
 </hy>

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/make/hyproperties.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/make/hyproperties.xml:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java:467609-476394

Modified: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/pack200/Main.java Wed Jul 29 23:04:02 2009
@@ -17,12 +17,18 @@
 package org.apache.harmony.jretools.pack200;
 
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
 
-import org.apache.harmony.pack200.Archive;
 import org.apache.harmony.pack200.PackingOptions;
 
 /**
@@ -31,104 +37,348 @@
 public class Main {
 
     public static void main(String args[]) throws Exception {
-        // TODO: -f isn't implemented here yet
-
         String inputFileName = null;
         String outputFileName = null;
         PackingOptions options = new PackingOptions();
+        String value = null;
 
         for (int i = 0; i < args.length; i++) {
-            if (args[i].equals("--help") || args[i].equals("-help")
-                    || args[i].equals("-h") || args[i].equals("-?")) {
+            if ("--help".equals(args[i]) || "-help".equals(args[i])
+                    || "-h".equals(args[i]) || "-?".equals(args[i])) {
                 printHelp();
                 return;
-            } else if(args[i].equals("-V") || args[i].equals("--version")) {
+            } else if ("-V".equals(args[i]) || "--version".equals(args[i])) {
                 printVersion();
                 return;
-            } else if(args[i].equals("-g") || args[i].equals("--no-gzip")) {
+            } else if ("-g".equals(args[i]) || "--no-gzip".equals(args[i])) {
                 options.setGzip(false);
-            } else if(args[i].equals("--gzip")) {
+            } else if ("--gzip".equals(args[i])) {
                 options.setGzip(true);
-            } else if(args[i].equals("-G") || args[i].equals("--strip-debug")) {
+            } else if ("-G".equals(args[i]) || "--strip-debug".equals(args[i])) {
                 options.setStripDebug(true);
-            } else if(args[i].equals("-O") || args[i].equals("--no-keep-file-order")) {
+            } else if ("-O".equals(args[i])
+                    || "--no-keep-file-order".equals(args[i])) {
                 options.setKeepFileOrder(false);
-            } else if(args[i].equals("--keep-file-order")) {
+            } else if ("--keep-file-order".equals(args[i])) {
                 options.setKeepFileOrder(true);
-            } else if(args[i].startsWith("-S")) {
-                options.setSegmentLimit(Integer.parseInt(args[i].substring(2)));
+            } else if (args[i].startsWith("-S")) {
+                value = args[i].substring(2);
+                if(value.length() == 0) {
+                    if(i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -S ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                options.setSegmentLimit(Long.parseLong(value));
             } else if (args[i].startsWith("--segment-limit=")) {
-                options.setSegmentLimit(Integer.parseInt(args[i].substring(16)));
-            } else if(args[i].startsWith("-E")) {
-                options.setEffort(Integer.parseInt(args[i].substring(2)));
-            } else if(args[i].startsWith("--effort=")) {
-                options.setEffort(Integer.parseInt(args[i].substring(10)));
-            } else if(args[i].startsWith("-H")) {
-                options.setDeflateHint(args[i].substring(2));
-            } else if(args[i].startsWith("--deflate-hint=")) {
+                options.setSegmentLimit(Long.parseLong(args[i].substring(16)));
+            } else if (args[i].startsWith("-E")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -E ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                options.setEffort(Integer.parseInt(value));
+            } else if (args[i].startsWith("--effort=")) {
+                options.setEffort(Integer.parseInt(args[i].substring(9)));
+            } else if (args[i].startsWith("-H")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -H ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                options.setDeflateHint(value);
+            } else if (args[i].startsWith("--deflate-hint=")) {
                 options.setDeflateHint(args[i].substring(15));
-            } else if(args[i].startsWith("-m")) {
-                options.setModificationTime(args[i].substring(2));
-            } else if(args[i].startsWith("--modification-time=")) {
-                options.setModificationTime(args[i].substring(19));
-            } else if(args[i].startsWith("-P")) {
-                options.addPassFile(args[i].substring(2));
-            } else if(args[i].startsWith("--pass-file=")) {
+            } else if (args[i].startsWith("-m")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -m ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                options.setModificationTime(value);
+            } else if (args[i].startsWith("--modification-time=")) {
+                options.setModificationTime(args[i].substring(20));
+            } else if (args[i].startsWith("-P")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -P ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                options.addPassFile(value);
+            } else if (args[i].startsWith("--pass-file=")) {
                 options.addPassFile(args[i].substring(12));
-            } else if(args[i].startsWith("-U")) {
-                options.setUnknownAttributeAction(args[i].substring(2));
+            } else if (args[i].startsWith("-U")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -U ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                options.setUnknownAttributeAction(value);
             } else if (args[i].startsWith("--unknown-attribute=")) {
                 options.setUnknownAttributeAction(args[i].substring(20));
-            } else if(args[i].startsWith("-C")) {
-                String[] nameEqualsAction = args[i].substring(2).split("=");
-                options.addClassAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].startsWith("--class-attribute=")) {
+            } else if (args[i].startsWith("-C")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -C ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                String[] nameEqualsAction = value.split("=");
+                options.addClassAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if (args[i].startsWith("--class-attribute=")) {
                 String[] nameEqualsAction = args[i].substring(18).split("=");
-                options.addClassAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].startsWith("-F")) {
-                String[] nameEqualsAction = args[i].substring(2).split("=");
-                options.addFieldAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].startsWith("--field-attribute=")) {
+                options.addClassAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if (args[i].startsWith("-F")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -F ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                String[] nameEqualsAction = value.split("=");
+                options.addFieldAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if (args[i].startsWith("--field-attribute=")) {
                 String[] nameEqualsAction = args[i].substring(18).split("=");
-                options.addFieldAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].startsWith("-M")) {
-                String[] nameEqualsAction = args[i].substring(2).split("=");
-                options.addMethodAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].startsWith("--method-attribute=")) {
+                options.addFieldAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if (args[i].startsWith("-M")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -M ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                String[] nameEqualsAction = value.split("=");
+                options.addMethodAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if (args[i].startsWith("--method-attribute=")) {
                 String[] nameEqualsAction = args[i].substring(19).split("=");
-                options.addMethodAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].startsWith("-D")) {
-                String[] nameEqualsAction = args[i].substring(2).split("=");
-                options.addCodeAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].startsWith("--code-attribute=")) {
+                options.addMethodAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if (args[i].startsWith("-D")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -D ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                String[] nameEqualsAction = value.split("=");
+                options.addCodeAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if (args[i].startsWith("--code-attribute=")) {
                 String[] nameEqualsAction = args[i].substring(17).split("=");
-                options.addCodeAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
-            } else if(args[i].equals("-v") || args[i].equals("--verbose")) {
+                options.addCodeAttributeAction(nameEqualsAction[0],
+                        nameEqualsAction[1]);
+            } else if ("-v".equals(args[i]) || "--verbose".equals(args[i])) {
                 options.setVerbose(true);
                 options.setQuiet(false);
-            } else if(args[i].equals("-q") || args[i].equals("--quiet")) {
+            } else if ("-q".equals(args[i]) || "--quiet".equals(args[i])) {
                 options.setQuiet(true);
                 options.setVerbose(false);
-            } else if(args[i].startsWith("-l")) {
-                options.setLogFile(args[i].substring(2));
+            } else if (args[i].startsWith("-l")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -l ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                options.setLogFile(value);
+            } else if (args[i].startsWith("--log-file=")) {
+                options.setLogFile(args[i].substring(11));
+            } else if ("-r".equals(args[i]) || "--repack".equals(args[i])) {
+                options.setRepack(true);
+            } else if (args[i].startsWith("-f")) {
+                value = args[i].substring(2);
+                if (value.length() == 0) {
+                    if (i + 1 < args.length) {
+                        value = args[++i];
+                    } else {
+                        printErrorMessage("Bad argument: -f ?");
+                        printUsage();
+                        return;
+                    }
+                }
+                loadPackProperties(value, options);
+            } else if (args[i].startsWith("--config-file=")) {
+                loadPackProperties(args[i].substring(14), options);
             } else {
                 outputFileName = args[i];
-                if(args.length > i + 1) {
-                    inputFileName = args[i+1];
+                if (args.length > i + 1) {
+                    if (args.length == i + 2) {
+                        inputFileName = args[++i];
+                    } else {
+                        printUsage();
+                        return;
+                    }
                 }
-                break;
             }
         }
-        if(inputFileName == null || outputFileName == null) {
+
+        if (options.isRepack()) {
+            repack(inputFileName, outputFileName, options);
+        } else {
+            pack(inputFileName, outputFileName, options);
+        }
+    }
+
+    /*
+     * Load properties for packing
+     */
+    private static void loadPackProperties(String packPropertyFileName,
+            PackingOptions options) throws IOException {
+        Properties packProperties = new Properties();
+        packProperties.load(new FileInputStream(packPropertyFileName));
+        Enumeration propertyNames = packProperties.propertyNames();
+        String propretyName, propretyValue;
+        while (propertyNames.hasMoreElements()) {
+            propretyName = (String) propertyNames.nextElement();
+            propretyValue = packProperties.getProperty(propretyName);
+
+            if ("deflate.hint".equals(propretyName)) {
+                options.setDeflateHint(propretyValue);
+            } else if ("effort".equals(propretyName)) {
+                options.setEffort(Integer.parseInt(propretyValue));
+            } else if ("keep.file.order".equals(propretyName)) {
+                options.setKeepFileOrder(Boolean.getBoolean(propretyValue));
+            } else if ("modification.time".equals(propretyName)) {
+                options.setModificationTime(propretyName);
+            } else if ("segment.limit".equals(propretyName)) {
+                options.setSegmentLimit(Integer.parseInt(propretyValue));
+            } else if ("unknown.attribute".equals(propretyName)) {
+                options.setUnknownAttributeAction(propretyValue);
+            }
+        }
+    }
+
+    /*
+     * Pack input stream of jar file into output stream
+     */
+    private static void pack(String inputFileName, String outputFileName,
+            PackingOptions options) throws Exception {
+        if (inputFileName == null || outputFileName == null) {
+            printUsage();
+            return;
+        }
+
+        if (options.isGzip() && !outputFileName.endsWith(".gz")) {
+            printErrorMessage("To write a *.pack file, specify --no-gzip: "
+                    + outputFileName);
             printUsage();
             return;
         }
-        JarInputStream inputStream = new JarInputStream(new FileInputStream(inputFileName));
-        OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(outputFileName));
-        Archive archive = new Archive(inputStream, outputStream, options);
+
+        JarFile jarFile = new JarFile(inputFileName);
+        OutputStream outputStream = new BufferedOutputStream(
+                new FileOutputStream(outputFileName));
+        org.apache.harmony.pack200.Archive archive = new org.apache.harmony.pack200.Archive(
+                jarFile, outputStream, options);
         archive.pack();
     }
 
+    /*
+     * Repack input stream of jar file into output stream of jar file
+     */
+    private static void repack(String inputFileName, String outputFileName,
+            PackingOptions options) throws Exception {
+        if (outputFileName == null) {
+            printUsage();
+            return;
+        }
+
+        if (inputFileName == null) {
+            inputFileName = outputFileName;
+        }
+
+        // packing
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        org.apache.harmony.pack200.Archive packer;
+        // this is a workround for compatibility with RI
+        if (0 == options.getEffort()) {
+            packer = new org.apache.harmony.pack200.Archive(new JarInputStream(
+                    new FileInputStream(inputFileName)), outputStream, options);
+        } else {
+            packer = new org.apache.harmony.pack200.Archive(new JarFile(
+                    inputFileName), outputStream, options);
+        }
+        packer.pack();
+
+        // unpacking
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(
+                outputStream.toByteArray());
+        JarOutputStream jarOutputStream = new JarOutputStream(
+                new FileOutputStream(outputFileName));
+        org.apache.harmony.unpack200.Archive unpacker = new org.apache.harmony.unpack200.Archive(
+                inputStream, jarOutputStream);
+        unpacker.setVerbose(options.isVerbose());
+        unpacker.setQuiet(options.isQuiet());
+        // set deflate_hint option
+        if (!options.isKeepDeflateHint()) {
+            unpacker.setDeflateHint("true".equals(options.getDeflateHint()));
+        }
+        // set log file
+        String logFile = options.getLogFile();
+        if(logFile != null) {
+            unpacker.setLogFile(logFile, true);
+        }
+        unpacker.unpack();
+    }
+
+    private static void printErrorMessage(String mesg) {
+        System.out.println("Error: " + mesg);
+    }
+
     private static void printUsage() {
         System.out.println("Usage:  pack200 [-opt... | --option=value]... x.pack[.gz] y.jar");
         System.out.println("(For more information, run pack200 --help)");

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1 @@
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java:467609-476394

Propchange: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:04:02 2009
@@ -0,0 +1,2 @@
+/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:748417-798901
+/incubator/harmony/enhanced/jdktools/trunk/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java:467609-476394

Modified: harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml Wed Jul 29 23:04:02 2009
@@ -20,9 +20,12 @@
     <description>Build for samsa program</description>
 
     <!-- import common properties -->
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
     <import file="../../make/properties.xml" />
 
+    <property name="hy.hdk" location="${basedir}/../../deploy" />
+
+    <property name="tests.output" location="../../build/test_report" />
+
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
@@ -162,10 +165,10 @@
         <echo message="Running SAMSA tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 
-        <echo message="Run jdk/bin/java -version in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/java -version in ${tests.output}"/>
         <exec failonerror="true"
 	      executable="${test.jre.home}/../bin/java${exe.suffix}"
-	      dir="${hy.tests.reports}"
+	      dir="${tests.output}"
               outputproperty="java.out.text">
 	    <arg line="-version" />
         </exec>
@@ -185,52 +188,52 @@
             </condition>
         </fail>
 
-        <echo message="Run jdk/bin/javac -version in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/javac -version in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/../bin/javac${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="-version" />
         </exec>
 
-        <echo message="Run jdk/bin/javah in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/javah in ${tests.output}"/>
         <exec failonerror="false"
 	        executable="${test.jre.home}/../bin/javah${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/bin/javadoc in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/javadoc in ${tests.output}"/>
         <exec failonerror="false"
 	        executable="${test.jre.home}/../bin/javadoc${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/bin/jarsigner in ${hy.tests.reports}"/>
+        <echo message="Run jdk/bin/jarsigner in ${tests.output}"/>
         <exec failonerror="false"
 	        executable="${test.jre.home}/../bin/jarsigner${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/jre/bin/keytool -help in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/keytool -help in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/bin/keytool${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="-help" />
         </exec>
 
-        <echo message="Run jdk/jre/bin/unpack200 in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/unpack200 in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/bin/unpack200${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 
-        <echo message="Run jdk/jre/bin/pack200 in ${hy.tests.reports}"/>
+        <echo message="Run jdk/jre/bin/pack200 in ${tests.output}"/>
         <exec failonerror="true"
 	        executable="${test.jre.home}/bin/pack200${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	        dir="${tests.output}">
 	    <arg line="" />
         </exec>
 

Modified: harmony/enhanced/jdktools/branches/java6/modules/samsa/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/samsa/make/hyproperties.xml?rev=799115&r1=799114&r2=799115&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/samsa/make/hyproperties.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/samsa/make/hyproperties.xml Wed Jul 29 23:04:02 2009
@@ -43,10 +43,4 @@
    <jdk location="../../deploy/jdk" />
    <build location="../../build/classes" />
 
-   <tests>
-      <reports location="../../build/test_report" />
-      <support>
-          <bin location="../../build/tests" />
-      </support>
-   </tests>
 </hy>



Mime
View raw message