harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r984578 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/swing/META-INF/MANIFEST.MF classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF drlvm/ jdktools/
Date Wed, 11 Aug 2010 21:04:44 GMT
Author: hindessm
Date: Wed Aug 11 21:04:44 2010
New Revision: 984578

URL: http://svn.apache.org/viewvc?rev=984578&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@983879:

  r983879 | hindessm | 2010-08-10 09:23:20 +0100 (Tue, 10 Aug 2010) | 2 lines
  
  Make java_cup.runtime dependency explict.
  


Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/swing/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 21:04:44 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887
+/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 21:04:44 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887
+/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 21:04:44 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/classlib/modules/swing/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/swing/META-INF/MANIFEST.MF?rev=984578&r1=984577&r2=984578&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/swing/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/swing/META-INF/MANIFEST.MF Wed Aug
11 21:04:44 2010
@@ -1,3 +1,4 @@
+
 Manifest-Version: 1.0
 Specification-Title: Java Platform API Specification
 Specification-Version: 1.6
@@ -51,7 +52,8 @@ Import-Package: java.applet,
  org.apache.harmony.misc,
  org.apache.harmony.security.asn1;version="1.0.0",
  org.xml.sax,
- org.xml.sax.helpers
+ org.xml.sax.helpers,
+ java_cup.runtime
 Export-Package: javax.swing,
  javax.swing.border,
  javax.swing.colorchooser,

Modified: harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF?rev=984578&r1=984577&r2=984578&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xalan-j_2.7.0/META-INF/MANIFEST.MF
Wed Aug 11 21:04:44 2010
@@ -6,4 +6,4 @@ Bundle-Version: 2.7.0
 Bundle-ClassPath: xalan.jar
 Eclipse-JREBundle: true
 Export-Package: org.apache.xpath,
- org.apache.xpath.objects
+ org.apache.xpath.objects, java_cup.runtime

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 21:04:44 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887
+/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 21:04:44 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887
+/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682,979897,980326,980632,981356,981763,981811,981820,982146,982148,982183,982250,982377,982498,982614,982650,982777,982887,983879
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message