harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r492197 - in /harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/imageio/ modules/instrume...
Date Wed, 03 Jan 2007 16:26:35 GMT
Author: tellison
Date: Wed Jan  3 08:26:33 2007
New Revision: 492197

URL: http://svn.apache.org/viewvc?view=rev&rev=492197
Log:
Move names of required JAR meta files into a file set.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    harmony/enhanced/classlib/trunk/modules/applet/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/beans/build.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    harmony/enhanced/classlib/trunk/modules/logging/build.xml
    harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/math/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/regex/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/sound/build.xml
    harmony/enhanced/classlib/trunk/modules/sql/build.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/tools/build.xml
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Jan  3 08:26:33 2007
@@ -38,6 +38,12 @@
         <equals arg1="${hy.cfg}" arg2="debug" />
     </condition>
 
+    <!-- During packaging, these files must be copied into the meta-inf dir -->
+    <fileset id="hy.required.metainf-files" dir="${hy.hdk}">
+        <include name="NOTICE" />
+        <include name="LICENSE" />
+    </fileset>
+
     <!-- Test run property -->
     <property name="hy.test.forkmode" value="once" />
     <property name="hy.test.timeout" value="900000" />

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Wed Jan  3 08:26:33 2007
@@ -109,9 +109,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <!-- metainf refid="${hy.required.metafiles}"/ -->
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>    
+            <metainf refid="hy.required.metainf-files"/>    
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}-src.jar">
@@ -120,8 +118,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>            
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
     </target>

Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Wed Jan  3 08:26:33 2007
@@ -102,8 +102,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}-src.jar">
@@ -112,8 +111,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Wed Jan  3 08:26:33 2007
@@ -101,8 +101,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>            
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/applet-src.jar">
@@ -111,8 +110,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>            
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
     </target>

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Wed Jan  3 08:26:33 2007
@@ -165,8 +165,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/archive-src.jar">
@@ -175,8 +174,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Wed Jan  3 08:26:33 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -138,8 +138,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}-src.jar">
@@ -149,8 +148,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Wed Jan  3 08:26:33 2007
@@ -122,8 +122,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/awt-src.jar">
@@ -133,8 +132,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Wed Jan  3 08:26:33 2007
@@ -106,8 +106,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/beans-src.jar">
@@ -116,8 +115,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Wed Jan  3 08:26:33 2007
@@ -101,8 +101,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.concurrent.packaging.jarname}-src.jar">
@@ -112,8 +111,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Wed Jan  3 08:26:33 2007
@@ -104,8 +104,8 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}-src.jar">
@@ -113,8 +113,8 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Wed Jan  3 08:26:33 2007
@@ -118,8 +118,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/imageio-src.jar">
@@ -128,8 +127,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Wed Jan  3 08:26:33 2007
@@ -133,8 +133,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/instrument-src.jar">
@@ -143,8 +142,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Wed Jan  3 08:26:33 2007
@@ -103,8 +103,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/jndi-src.jar">
@@ -113,8 +112,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Wed Jan  3 08:26:33
2007
@@ -94,8 +94,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}-src.jar">
@@ -104,8 +103,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Wed Jan  3 08:26:33 2007
@@ -94,8 +94,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/logging-src.jar">
@@ -104,8 +103,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml Wed Jan  3 08:26:33 2007
@@ -56,6 +56,8 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
+
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Jan  3 08:26:33 2007
@@ -243,9 +243,8 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/>
             </manifest>
-            
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>            
+
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/luni-src.jar">
@@ -253,9 +252,8 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/>
             </manifest>
-            
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>            
+
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Wed Jan  3 08:26:33 2007
@@ -103,8 +103,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/math-src.jar">
@@ -113,8 +112,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Wed Jan  3 08:26:33 2007
@@ -105,8 +105,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}-src.jar">
@@ -115,8 +114,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Wed Jan  3 08:26:33 2007
@@ -133,8 +133,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/nio-src.jar">
@@ -143,8 +142,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Wed Jan  3 08:26:33 2007
@@ -107,8 +107,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}-src.jar">
@@ -117,8 +116,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Wed Jan  3 08:26:33 2007
@@ -127,8 +127,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/prefs-src.jar">
@@ -137,8 +136,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Wed Jan  3 08:26:33 2007
@@ -137,8 +137,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.print.packaging.jarname}-src.jar">
@@ -154,8 +153,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Wed Jan  3 08:26:33 2007
@@ -104,8 +104,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/regex-src.jar">
@@ -114,8 +113,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Wed Jan  3 08:26:33 2007
@@ -106,8 +106,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}-src.jar">
@@ -116,8 +115,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml Wed Jan  3 08:26:33
2007
@@ -56,6 +56,8 @@
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
+
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Wed Jan  3 08:26:33 2007
@@ -157,8 +157,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}-src.jar">
@@ -168,8 +167,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Wed Jan  3 08:26:33 2007
@@ -103,8 +103,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.sound.packaging.jarname}-src.jar">
@@ -113,8 +112,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Wed Jan  3 08:26:33 2007
@@ -101,8 +101,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/sql-src.jar">
@@ -111,8 +110,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Wed Jan  3 08:26:33 2007
@@ -101,8 +101,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/suncompat-src.jar">
@@ -111,8 +110,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Wed Jan  3 08:26:33 2007
@@ -122,8 +122,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}-src.jar">
@@ -132,8 +131,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Wed Jan  3 08:26:33 2007
@@ -133,8 +133,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/text-src.jar">
@@ -143,8 +142,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/tools/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/tools/build.xml Wed Jan  3 08:26:33 2007
@@ -109,8 +109,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/lib/tools-src.jar">
@@ -119,8 +118,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?view=diff&rev=492197&r1=492196&r2=492197
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Wed Jan  3 08:26:33 2007
@@ -105,8 +105,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}-src.jar">
@@ -115,8 +114,7 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
 
-            <metainf file="${hy.hdk}/NOTICE"/>
-            <metainf file="${hy.hdk}/LICENSE"/>
+            <metainf refid="hy.required.metainf-files"/>
         </jar>
     </target>
 



Mime
View raw message