ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r488437 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/Jar.java src/tests/antunit/taskdefs/jar-spi-test.xml
Date Mon, 18 Dec 2006 21:57:26 GMT
Author: peterreilly
Date: Mon Dec 18 13:57:25 2006
New Revision: 488437

URL: http://svn.apache.org/viewvc?view=rev&rev=488437
Log:
Bugzilla 41201: [jar-task] wrong name for services folder

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
    ant/core/trunk/src/tests/antunit/taskdefs/jar-spi-test.xml

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=488437&r1=488436&r2=488437
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Mon Dec 18 13:57:25 2006
@@ -6,6 +6,8 @@
 
 Fixed bugs:
 -----------
+* SPI support in jar was broken.
+  Bugzilla report 41201.
 
 Other changes:
 --------------

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java?view=diff&rev=488437&r1=488436&r2=488437
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java Mon Dec 18 13:57:25 2006
@@ -397,7 +397,7 @@
            service = (Service) serviceIterator.next();
            //stolen from writeManifest
            super.zipFile(service.getAsStream(), zOut,
-                         "META-INF/service/" + service.getType(),
+                         "META-INF/services/" + service.getType(),
                          System.currentTimeMillis(), null,
                          ZipFileSet.DEFAULT_FILE_MODE);
         }

Modified: ant/core/trunk/src/tests/antunit/taskdefs/jar-spi-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/jar-spi-test.xml?view=diff&rev=488437&r1=488436&r2=488437
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/jar-spi-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/jar-spi-test.xml Mon Dec 18 13:57:25 2006
@@ -23,7 +23,7 @@
            dest="${jar.dir}/output"/>
 
     <loadfile property="simple"
-              srcfile="${jar.dir}/output/META-INF/service/a.b.c"
+              srcfile="${jar.dir}/output/META-INF/services/a.b.c"
               encoding="UTF-8"/>
 
     <au:assertTrue>
@@ -46,7 +46,7 @@
            dest="${jar.dir}/output"/>
 
     <loadfile property="providers"
-              srcfile="${jar.dir}/output/META-INF/service/a.b.c"
+              srcfile="${jar.dir}/output/META-INF/services/a.b.c"
               encoding="UTF-8"/>
     <au:assertTrue>
       <matches string="${providers}" pattern="^a\.X\na\.D$"/>
@@ -72,7 +72,7 @@
            dest="${jar.dir}/output"/>
 
     <loadfile property="multi-a"
-              srcfile="${jar.dir}/output/META-INF/service/a.b.c"
+              srcfile="${jar.dir}/output/META-INF/services/a.b.c"
               encoding="UTF-8"/>
 
     <au:assertTrue>
@@ -80,7 +80,7 @@
     </au:assertTrue>
 
     <loadfile property="multi-b"
-              srcfile="${jar.dir}/output/META-INF/service/javax.a.service"
+              srcfile="${jar.dir}/output/META-INF/services/javax.a.service"
               encoding="UTF-8"/>
 
     <au:assertTrue>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message