harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r785721 - in /harmony/enhanced/jdktools/branches/java6: ./ make/ modules/jdktools/ modules/jdktools/src/main/java/org/apache/harmony/tools/jar/ modules/jdktools/src/main/java/org/apache/harmony/tools/javac/ modules/jpda/ modules/jpda/src/ma...
Date Wed, 17 Jun 2009 16:53:34 GMT
Author: hindessm
Date: Wed Jun 17 16:53:33 2009
New Revision: 785721

URL: http://svn.apache.org/viewvc?rev=785721&view=rev
Log:
Merge revisions of jdktools trunk up to 785363.

Added:
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java
Removed:
    harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/jartool.dat
    harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/keysigner.dat
Modified:
    harmony/enhanced/jdktools/branches/java6/LICENSE   (contents, props changed)
    harmony/enhanced/jdktools/branches/java6/NOTICE   (contents, props changed)
    harmony/enhanced/jdktools/branches/java6/make/depends.properties
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
    harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt
    harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/makefile
    harmony/enhanced/jdktools/branches/java6/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
    harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml
    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/unpack200/Main.java
    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/resources/data/javac.dat

Modified: harmony/enhanced/jdktools/branches/java6/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/LICENSE?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/LICENSE (original)
+++ harmony/enhanced/jdktools/branches/java6/LICENSE Wed Jun 17 16:53:33 2009
@@ -1,203 +1,203 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
    
\ No newline at end of file

Propchange: harmony/enhanced/jdktools/branches/java6/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/jdktools/branches/java6/NOTICE
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/NOTICE?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/NOTICE (original)
+++ harmony/enhanced/jdktools/branches/java6/NOTICE Wed Jun 17 16:53:33 2009
@@ -1,16 +1,10 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Harmony distribution.                  ==
-   =========================================================================
-
-This product includes software developed by The Apache Software
-Foundation (http://www.apache.org/).
-
-Portions of Harmony were originally developed by
-Intel Corporation and are licensed to the Apache Software
-Foundation under the "Software Grant and Corporate Contribution
-License Agreement", informally known as the "Intel Harmony CLA".
-
-
-
+Apache Harmony
+Copyright 2006, 2009 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Harmony were originally developed by
+Intel Corporation and are licensed to the Apache Software
+Foundation under the "Software Grant and Corporate Contribution
+License Agreement", informally known as the "Intel Harmony CLA".

Propchange: harmony/enhanced/jdktools/branches/java6/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/jdktools/branches/java6/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/make/depends.properties?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/make/depends.properties (original)
+++ harmony/enhanced/jdktools/branches/java6/make/depends.properties Wed Jun 17 16:53:33 2009
@@ -14,14 +14,16 @@
 # limitations under the License.
 
 icu=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base-3.3.zip
-icu.url=${eclipse.base}/com.ibm.icu.base-3.3.zip
+icu.url=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/com.ibm.icu.base-3.3.zip
 icu.md5=5b8a0fc0e48431d376c7efd7be8c0f7b
 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=${depends.jars}/eclipse-JDT-3.3/eclipse-JDT-3.3.zip
-jdt.url=${eclipse.base}/eclipse-JDT-3.3.zip
-jdt.md5=7a82530972e2943a2f20cb6d3bffe0d6
-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
+jdt.version=3.4.2
+jdt.url.base=${harmony.standard.base}/jars/eclipse-JDT-${jdt.version}
+jdt.jdi.jar=${depends.jars}/eclipse-JDT-${jdt.version}/jdi.jar
+jdt.jdi.jar.url=${jdt.url.base}/jdi.jar
+jdt.jdi.jar.md5=5dcceca8849747dc37c66f9f96c59eee
+jdt.jdimodel.jar=${depends.jars}/eclipse-JDT-${jdt.version}/jdimodel.jar
+jdt.jdimodel.jar.url=${jdt.url.base}/jdimodel.jar
+jdt.jdimodel.jar.md5=499d25ab45c118bda2f6fbe397095eaa

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=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jdktools/build.xml Wed Jun 17 16:53:33 2009
@@ -41,11 +41,16 @@
     </fileset>
     
     <target name="check-depends">
-        <check-one-file src="${jdt.url}" dest="${jdt.jdi.jar}" />
+        <check-one-file src="${jdt.jdi.jar.url}"
+                        dest="${jdt.jdi.jar}" />
+        <check-one-file src="${jdt.jdimodel.jar.url}"
+                        dest="${jdt.jdimodel.jar}" />
+        <check-one-file src="${icu.url}" dest="${icu.jar}" />
     </target>
     
     <target name="fetch-depends">
-        <fetch dep="jdt"/>
+        <fetch dep="jdt.jdi.jar"/>
+        <fetch dep="jdt.jdimodel.jar"/>
     </target>
 
 

Added: harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java?rev=785721&view=auto
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java (added)
+++ harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/jar/Main.java Wed Jun 17 16:53:33 2009
@@ -0,0 +1,238 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.harmony.tools.jar;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+/**
+ * This is a tool that allows you to create/unpack jar/zip 
+ * archives 
+ */
+public class Main {
+
+    /**
+     * Prints the usage information.
+     */
+    public static void usage() {
+        System.out.println("Usage:");
+        System.out.println("  jar c[v0Mmf] [-C dir] [manifest_file] [jar_file] [input_files]");
+        System.out.println("  jar u[v0Mmf] [-C dir] [manifest_file] [jar_file] [input_files]");
+        System.out.println("  jar x[vf] [jar_file] [input_files]");
+        System.out.println("  jar t[vf] [jar_file] [input_files]");
+        System.out.println("  jar i jar_file");
+        System.out.println("");
+        System.out.println("Examples:");
+        System.out.println("  To create a jar file called my.jar with manifest mymanifest.mf containing");
+        System.out.println("  a.class and b.class, execute the following:");
+        System.out.println("     jar cmf mymanifest.mf my.jar a.class b.class");
+        System.out.println("  To extract a jar file called my.jar with verbose output, execute the");
+        System.out.println("  following:");
+        System.out.println("     jar xvf my.jar");
+    }
+
+    /**
+     * A convenient way to run this tool from a command line.
+     */
+    public static void main(String args[]) throws Exception {
+        if (args.length == 0) {
+            // No options specified - just print usage string
+            usage();
+            return;
+        }
+
+        // Strip '-' at the start of options
+        if (args[0].charAt(0) == '-') {
+            args[0] = args[0].substring(1);
+        }
+
+        // Check for expected/unexpected options
+        switch (args[0].charAt(0)) {
+        case 'c':
+            createJar(args);
+            break;
+        case 'u':
+            updateJar(args);
+            break;
+        case 'x':
+            extractJar(args);
+            break;
+        case 't':
+            listJar(args);
+            break;
+        case 'i':
+            indexJar(args);
+            break;
+        default:
+            System.out.println("Error: Illegal option '"+args[0].charAt(0)+"'");
+            usage();
+            return;
+        }
+    }
+
+    /**
+     * Creates a jar file with the specified arguments
+     */
+    private static void createJar(String[] args) {
+        System.out.println("Error: Jar creation not yet implemented");
+    }
+
+    /**
+     * Updates a jar file with the specified arguments
+     */
+    private static void updateJar(String[] args) {
+        System.out.println("Error: Jar update not yet implemented");
+    }
+
+    /**
+     * Extracts a jar file with the specified arguments
+     */
+    private static void extractJar(String[] args) throws Exception {
+        boolean verboseFlag = false, fileFlag = false;
+
+        // Check for expected and unexpected flags
+        for (int i=1; i<args[0].length(); i++) {
+            switch (args[0].charAt(i)) {
+            case 'v':
+                verboseFlag = true;
+                break;
+            case 'f':
+                fileFlag = true;
+                break;
+            default:
+                System.out.println("Error: Illegal option for -x: '"+args[0].charAt(i)+"'");
+                return;
+            }
+        }
+
+        if (fileFlag && args.length<2) {
+            // Options specify 'f' but there is no filename present
+            System.out.println("Error: No file name specified for 'f' option");
+            return;
+        }
+    	
+    	ZipInputStream zis;
+        if (!fileFlag) {
+            // Read from stdin
+            if (verboseFlag) System.out.println("Reading input from stdin");
+            zis = new ZipInputStream(System.in);
+        } else {
+            // Read from the specified file
+            if (verboseFlag) System.out.println("Reading jar file: "+args[1]);
+            zis = new ZipInputStream(new FileInputStream(new File(args[1])));
+        }
+
+        // Read the zip entries - format and print their data
+        ZipEntry ze;
+        String workingDir = System.getProperty("user.dir");
+        
+        while ((ze = zis.getNextEntry()) != null) {
+        	if (ze.isDirectory()) {
+        		// create a new directory of the same name
+       			File newDir = new File(ze.getName());
+    			if (! newDir.exists()) {
+    				newDir.mkdirs();        				
+    			}
+    	        if (verboseFlag) {
+    	        	System.out.println("created: " + ze.getName());
+    	        }
+        	} else {
+        		// extract the file to the appropriate directory
+        		File f = new File(workingDir + File.separator + ze.getName());
+        		f.createNewFile();
+        		FileOutputStream fos = new FileOutputStream(f);
+        		int i;
+        		while ((i = zis.read()) != -1) {
+        			fos.write(i);
+        		}
+            	fos.close();
+            	if (verboseFlag) {
+            		System.out.println("inflated: " + ze.getName());
+            	}
+        	}           
+            zis.closeEntry();
+        }
+
+        zis.close();
+    }
+    	
+    /**
+     * Lists contents of jar file with the specified arguments
+     */
+    private static void listJar(String[] args) throws Exception {
+        boolean verboseFlag = false, fileFlag = false;
+
+        // Check for expected and unexpected flags
+        for (int i=1; i<args[0].length(); i++) {
+            switch (args[0].charAt(i)) {
+            case 'v':
+                verboseFlag = true;
+                break;
+            case 'f':
+                fileFlag = true;
+                break;
+            default:
+                System.out.println("Error: Illegal option for -t: '"+args[0].charAt(i)+"'");
+                return;
+            }
+        }
+
+        if (fileFlag && args.length<2) {
+            // Options specify 'f' but there is no filename present
+            System.out.println("Error: No file name specified for 'f' option");
+            return;
+        }
+
+        ZipInputStream zis;
+        if (!fileFlag) {
+            // Read from stdin
+            if (verboseFlag) System.out.println("Reading input from stdin");
+            zis = new ZipInputStream(System.in);
+        } else {
+            // Read from the specified file
+            if (verboseFlag) System.out.println("Reading jar file: "+args[1]);
+            zis = new ZipInputStream(new FileInputStream(new File(args[1])));
+        }
+
+        // Read the zip entries - format and print their data
+        ZipEntry ze;
+        if (verboseFlag) System.out.println("Listing files:");        
+        while ((ze = zis.getNextEntry()) != null) {
+            Date date = new Date(ze.getTime());
+            DateFormat dateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyy");
+            String formattedDate = dateFormat.format(date);
+            System.out.printf("%6d %s %s\n", ze.getSize(), formattedDate, ze.getName());
+        }
+
+        zis.close();
+    }
+
+    /**
+     * Indexes a jar file with the specified arguments
+     */
+    private static void indexJar(String[] args) {
+        System.out.println("Error: Jar indexing not yet implemented");
+    }
+
+}

Modified: harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jdktools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Wed Jun 17 16:53:33 2009
@@ -33,7 +33,7 @@
 class Compiler {
 
     /* FIXME: Hard-coded for now, the name of the ECJ JAR file */
-    static final String ECJ_JAR_FILE = "ecj_3.3.jar"; //$NON-NLS-1$
+    static final String ECJ_JAR_FILE = "ecj-3.4.2.jar"; //$NON-NLS-1$
 
     static final String TOOLS_JAR_FILE = "tools.jar"; //$NON-NLS-1$
 

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=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/build.xml Wed Jun 17 16:53:33 2009
@@ -41,13 +41,16 @@
     </fileset>
 
     <target name="fetch-depends">
-        <fetch dep="jdt"/>
+        <fetch dep="jdt.jdi.jar"/>
+        <fetch dep="jdt.jdimodel.jar"/>
         <fetch dep="icu"/>
     </target>
 
     <target name="check-depends">
-        <check-one-file src="${jdt.url}" dest="${jdt.jdi.jar}" />
-        <check-one-file src="${jdt.url}" dest="${jdt.jdimodel.jar}" />
+        <check-one-file src="${jdt.jdi.jar.url}"
+                        dest="${jdt.jdi.jar}" />
+        <check-one-file src="${jdt.jdimodel.jar.url}"
+                        dest="${jdt.jdimodel.jar}" />
         <check-one-file src="${icu.url}" dest="${icu.jar}" />
     </target>
 

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/exports.txt Wed Jun 17 16:53:33 2009
@@ -1 +1,2 @@
-*
+Agent_OnLoad
+Agent_OnUnload

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/makefile?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/makefile (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/agent/makefile Wed Jun 17 16:53:33 2009
@@ -30,7 +30,7 @@
 
 INCLUDES := -I../../../include $(INCLUDES)
 
-LDFLAGS += -lstdc++
+LDFLAGS += $(STDCLIBS)
 
 BUILDFILES = \
     $(CMNAGENT)commands/ArrayReference.o \

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/exports.txt?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/exports.txt (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/exports.txt Wed Jun 17 16:53:33 2009
@@ -1 +1,2 @@
-*
+jdwpTransport_OnLoad
+jdwpTransport_UnLoad

Modified: harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile Wed Jun 17 16:53:33 2009
@@ -33,7 +33,7 @@
             -I$(COMMON)generic -I. \
             -I../common
 
-LDFLAGS += -lstdc++
+LDFLAGS += $(STDCLIBS)
 
 BUILDFILES = \
     $(CMNTRANS)common/LastTransportError.o \
@@ -41,6 +41,6 @@
 
 MDLLIBFILES = 
 
-DLLNAME = ../libdt_socket.so
+DLLNAME = ../../libdt_socket.so
 
 include $(HY_HDK)/build/make/rules.mk

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=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jretools/build.xml Wed Jun 17 16:53:33 2009
@@ -40,16 +40,7 @@
         </or>
     </fileset>
     
-    <target name="check-depends">
-        <check-one-file src="${jdt.url}" dest="${jdt.jdi.jar}" />
-    </target>
-    
-    <target name="fetch-depends">
-        <fetch dep="jdt"/>
-    </target>
-
-
-    <target name="build" depends="check-depends, build-java, copy-resources, build-jar" />
+    <target name="build" depends="build-java, copy-resources, build-jar" />
     <target name="build-java" depends="compile-java, copy-resources, build-jar" />
     <target name="build-native" />
 

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=785721&r1=785720&r2=785721&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 Jun 17 16:53:33 2009
@@ -23,41 +23,94 @@
 import java.util.jar.JarInputStream;
 
 import org.apache.harmony.pack200.Archive;
+import org.apache.harmony.pack200.PackingOptions;
 
+/**
+ * Main class for the pack200 command line tool.
+ */
 public class Main {
 
     public static void main(String args[]) throws Exception {
+        // TODO: -f isn't implemented here yet
 
         String inputFileName = null;
         String outputFileName = null;
-        boolean verbose = false;
-        boolean quiet = false;
-        String logFileName = null;
-        boolean gzip = true;
-        int segmentLimit = -2;
+        PackingOptions options = new PackingOptions();
 
         for (int i = 0; i < args.length; i++) {
             if (args[i].equals("--help") || args[i].equals("-help")
                     || args[i].equals("-h") || args[i].equals("-?")) {
                 printHelp();
                 return;
+            } else if(args[i].equals("-V") || args[i].equals("--version")) {
+                printVersion();
+                return;
             } else if(args[i].equals("-g") || args[i].equals("--no-gzip")) {
-                gzip = false;
+                options.setGzip(false);
             } else if(args[i].equals("--gzip")) {
-                gzip = true;
-            }  else if(args[i].equals("-v") || args[i].equals("--verbose")) {
-                verbose = true;
-                quiet = false;
+                options.setGzip(true);
+            } else if(args[i].equals("-G") || args[i].equals("--strip-debug")) {
+                options.setStripDebug(true);
+            } else if(args[i].equals("-O") || args[i].equals("--no-keep-file-order")) {
+                options.setKeepFileOrder(false);
+            } else if(args[i].equals("--keep-file-order")) {
+                options.setKeepFileOrder(true);
+            } else if(args[i].startsWith("-S")) {
+                options.setSegmentLimit(Integer.parseInt(args[i].substring(2)));
+            } 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.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=")) {
+                options.addPassFile(args[i].substring(12));
+            } else if(args[i].startsWith("-U")) {
+                options.setUnknownAttributeAction(args[i].substring(2));
+            } 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=")) {
+                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=")) {
+                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=")) {
+                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=")) {
+                String[] nameEqualsAction = args[i].substring(17).split("=");
+                options.addCodeAttributeAction(nameEqualsAction[0], nameEqualsAction[1]);
+            } else if(args[i].equals("-v") || args[i].equals("--verbose")) {
+                options.setVerbose(true);
+                options.setQuiet(false);
             } else if(args[i].equals("-q") || args[i].equals("--quiet")) {
-                quiet = true;
-                verbose = false;
+                options.setQuiet(true);
+                options.setVerbose(false);
             } else if(args[i].startsWith("-l")) {
-                logFileName = args[i].substring(2);
-            } else if(args[i].equals("-V") || args[i].equals("--version")) {
-                printVersion();
-                return;
-            } else if(args[i].equals("-S") || args[i].equals("--segment-limit")) {
-                segmentLimit = Integer.parseInt(args[++i]);
+                options.setLogFile(args[i].substring(2));
             } else {
                 outputFileName = args[i];
                 if(args.length > i + 1) {
@@ -72,10 +125,7 @@
         }
         JarInputStream inputStream = new JarInputStream(new FileInputStream(inputFileName));
         OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(outputFileName));
-        Archive archive = new Archive(inputStream, outputStream, gzip);
-        if(segmentLimit > -2) {
-            archive.setSegmentLimit(segmentLimit);
-        }
+        Archive archive = new Archive(inputStream, outputStream, options);
         archive.pack();
     }
 
@@ -85,42 +135,41 @@
     }
 
     private static void printHelp() {
-        // TODO: Support all the options
         System.out.println("Usage:  pack200 [-opt... | --option=value]... x.pack[.gz] y.jar");
         System.out.println();
         System.out.println("Packing Options");
         System.out.println("  -g, --no-gzip                   output a plain *.pack file with no zipping");
         System.out.println("  --gzip                          (default) post-process the pack output with gzip");
-//        System.out.println("  -G, --strip-debug               remove debugging attributes while packing");
-//        System.out.println("  -O, --no-keep-file-order        do not transmit file ordering information");
-//        System.out.println("  --keep-file-order               (default) preserve input file ordering");
+        System.out.println("  -G, --strip-debug               remove debugging attributes while packing");
+        System.out.println("  -O, --no-keep-file-order        do not transmit file ordering information");
+        System.out.println("  --keep-file-order               (default) preserve input file ordering");
         System.out.println("  -S{N}, --segment-limit={N}      output segment limit (default N=1Mb)");
-//        System.out.println("  -E{N}, --effort={N}             packing effort (default N=5)");
-//        System.out.println("  -H{h}, --deflate-hint={h}       transmit deflate hint: true, false, or keep (default)");
-//        System.out.println("  -m{V}, --modification-time={V}  transmit modtimes: latest or keep (default)");
-//        System.out.println("  -P{F}, --pass-file={F}          transmit the given input element(s) uncompressed");
-//        System.out.println("  -U{a}, --unknown-attribute={a}  unknown attribute action: error, strip, or pass (default)");
-//        System.out.println("  -C{N}={L}, --class-attribute={N}={L}  (user-defined attribute)");
-//        System.out.println("  -F{N}={L}, --field-attribute={N}={L}  (user-defined attribute)");
-//        System.out.println("  -M{N}={L}, --method-attribute={N}={L} (user-defined attribute)");
-//        System.out.println("  -D{N}={L}, --code-attribute={N}={L}   (user-defined attribute)");
-//        System.out.println("  -f{F}, --config-file={F}        read file F for Pack200.Packer properties");
-//        System.out.println("  -v, --verbose                   increase program verbosity");
-//        System.out.println("  -q, --quiet                     set verbosity to lowest level");
-//        System.out.println("  -l{F}, --log-file={F}           output to the given log file, or '-' for System.out");
+        System.out.println("  -E{N}, --effort={N}             packing effort (default N=5)");
+        System.out.println("  -H{h}, --deflate-hint={h}       transmit deflate hint: true, false, or keep (default)");
+        System.out.println("  -m{V}, --modification-time={V}  transmit modtimes: latest or keep (default)");
+        System.out.println("  -P{F}, --pass-file={F}          transmit the given input element(s) uncompressed");
+        System.out.println("  -U{a}, --unknown-attribute={a}  unknown attribute action: error, strip, or pass (default)");
+        System.out.println("  -C{N}={L}, --class-attribute={N}={L}  (user-defined attribute)");
+        System.out.println("  -F{N}={L}, --field-attribute={N}={L}  (user-defined attribute)");
+        System.out.println("  -M{N}={L}, --method-attribute={N}={L} (user-defined attribute)");
+        System.out.println("  -D{N}={L}, --code-attribute={N}={L}   (user-defined attribute)");
+        System.out.println("  -f{F}, --config-file={F}        read file F for Pack200.Packer properties");
+        System.out.println("  -v, --verbose                   increase program verbosity");
+        System.out.println("  -q, --quiet                     set verbosity to lowest level");
+        System.out.println("  -l{F}, --log-file={F}           output to the given log file, or '-' for System.out");
         System.out.println("  -?, -h, --help                  print this message");
         System.out.println("  -V, --version                   print program version");
-//        System.out.println("  -J{X}                           pass option X to underlying Java VM");
-//        System.out.println("");
-//        System.out.println("Notes:");
-//        System.out.println("  The -P, -C, -F, -M, and -D options accumulate.");
-//        System.out.println("  Example attribute definition:  -C SourceFile=RUH .");
-//        System.out.println("  Config. file properties are defined by the Pack200 API.");
-//        System.out.println("  For meaning of -S, -E, -H-, -m, -U values, see Pack200 API.");
-//        System.out.println("  Layout definitions (like RUH) are defined by JSR 200.");
-//        System.out.println("");
-//        System.out.println("Repacking mode updates the JAR file with a pack/unpack cycle:");
-//        System.out.println("    pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar");
+        System.out.println("  -J{X}                           pass option X to underlying Java VM");
+        System.out.println("");
+        System.out.println("Notes:");
+        System.out.println("  The -P, -C, -F, -M, and -D options accumulate.");
+        System.out.println("  Example attribute definition:  -C SourceFile=RUH .");
+        System.out.println("  Config. file properties are defined by the Pack200 API.");
+        System.out.println("  For meaning of -S, -E, -H-, -m, -U values, see Pack200 API.");
+        System.out.println("  Layout definitions (like RUH) are defined by JSR 200.");
+        System.out.println("");
+        System.out.println("Repacking mode updates the JAR file with a pack/unpack cycle:");
+        System.out.println("    pack200 [-r|--repack] [-opt | --option=value]... [repackedy.jar] y.jar");
     }
 
     private static void printVersion() {

Modified: harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java Wed Jun 17 16:53:33 2009
@@ -18,6 +18,9 @@
 
 import org.apache.harmony.unpack200.Archive;
 
+/**
+ * Main class for the unpack200 command line tool
+ */
 public class Main {
 
     public static void main(String args[]) throws Exception {

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=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/samsa/build.xml Wed Jun 17 16:53:33 2009
@@ -90,6 +90,9 @@
         <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/policytool${exe.suffix}" />
         <chmod file="${jdktools.deploy.dir}/bin/policytool${exe.suffix}" perm="ugo+x" />
 
+        <copy file="${hy.samsa.exe}" tofile="${jdktools.deploy.dir}/bin/jar${exe.suffix}" />
+        <chmod file="${jdktools.deploy.dir}/bin/jar${exe.suffix}" perm="ugo+x" />
+
         <copy file="${hy.samsa.exe}" tofile="${jretools.deploy.dir}/bin/keytool${exe.suffix}" />
         <chmod file="${jretools.deploy.dir}/bin/keytool${exe.suffix}" perm="ugo+x" />
 
@@ -161,10 +164,26 @@
 
         <echo message="Run jdk/bin/java -version in ${hy.tests.reports}"/>
         <exec failonerror="true"
-	        executable="${test.jre.home}/../bin/java${exe.suffix}"
-	        dir="${hy.tests.reports}">
+	      executable="${test.jre.home}/../bin/java${exe.suffix}"
+	      dir="${hy.tests.reports}"
+              outputproperty="java.out.text">
 	    <arg line="-version" />
         </exec>
+        <fail message="java -version should contain a copyright statement">
+            <condition>
+                <not>
+                    <contains string="${java.out.text}"
+                              substring="Copyright 1991"/>
+                </not>
+            </condition>
+        </fail>
+        <fail message="java -version should contain svn revision information">
+            <condition>
+                <not>
+                    <contains string="${java.out.text}" substring="svn = r"/>
+                </not>
+            </condition>
+        </fail>
 
         <echo message="Run jdk/bin/javac -version in ${hy.tests.reports}"/>
         <exec failonerror="true"

Modified: harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/native/samsa/samsa.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/native/samsa/samsa.c?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/native/samsa/samsa.c (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/native/samsa/samsa.c Wed Jun 17 16:53:33 2009
@@ -462,8 +462,8 @@
     if (dladdr( (const void*)&main, &info) == 0) {
         return NULL;
     }
-    strncpy(buffer, info.dli_fname, PATH_MAX+1);
-    buffer[PATH_MAX+1] = '\0';
+    strncpy(buffer, info.dli_fname, PATH_MAX);
+    buffer[PATH_MAX] = '\0';
 
 #elif defined(WIN32)
     char buffer[512];

Modified: harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/javac.dat
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/javac.dat?rev=785721&r1=785720&r2=785721&view=diff
==============================================================================
--- harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/javac.dat (original)
+++ harmony/enhanced/jdktools/branches/java6/modules/samsa/src/main/resources/data/javac.dat Wed Jun 17 16:53:33 2009
@@ -1,3 +1,3 @@
-JDKToolJar = ecj_3.2.jar
+JDKToolJar = ecj-3.4.2.jar
 JDKToolJar = tools.jar
 



Mime
View raw message