harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r803061 - in /harmony/enhanced/classlib/trunk/modules/nio_char: build.xml src/main/java/org/apache/harmony/niochar/java.nio.charset.spi.CharsetProvider
Date Tue, 11 Aug 2009 10:39:52 GMT
Author: odeakin
Date: Tue Aug 11 10:39:52 2009
New Revision: 803061

URL: http://svn.apache.org/viewvc?rev=803061&view=rev
Log:
Use new ant 1.7.0 service element for jar task to automatically specify the CharsetProvider
in the nio_char jars and remove previously used file.

Removed:
    harmony/enhanced/classlib/trunk/modules/nio_char/src/main/java/org/apache/harmony/niochar/java.nio.charset.spi.CharsetProvider
Modified:
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml

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?rev=803061&r1=803060&r2=803061&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Tue Aug 11 10:39:52 2009
@@ -103,7 +103,6 @@
         <copy todir="../../build/classes" includeemptydirs="false">
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
-                <exclude name="**/java.nio.charset.spi.CharsetProvider" />
             </fileset>
         </copy>
     </target>
@@ -112,9 +111,7 @@
         <jar destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
-            <metainf prefix="META-INF/services"
-                dir="src/main/java/org/apache/harmony/niochar"
-                includes="java.nio.charset.spi.CharsetProvider"/>
+            <service type="java.nio.charset.spi.CharsetProvider" provider="org.apache.harmony.niochar.CharsetProviderImpl"
/>
             <fileset refid="classes" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -124,9 +121,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/nio_char-src.jar">
-            <metainf prefix="META-INF/services"
-                dir="src/main/java/org/apache/harmony/niochar"
-                includes="java.nio.charset.spi.CharsetProvider"/>
+            <service type="java.nio.charset.spi.CharsetProvider" provider="org.apache.harmony.niochar.CharsetProviderImpl"
/>
             <fileset dir="src/main/java">
                 <excludesfile name="${basedir}/make/excludesfile"/>
             </fileset>



Mime
View raw message