Bugzilla 41201: [jar-task] wrong name for services folder

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@488437 13f79535-47bb-0310-9956-ffa450edef68

WHATSNEW

@@ -6,6 +6,8 @@ Changes that could break older environments:
 
 Fixed bugs:
 -----------
+* SPI support in jar was broken.
+  Bugzilla report 41201.
 
 Other changes:
 --------------

src/main/org/apache/tools/ant/taskdefs/Jar.java

@@ -397,7 +397,7 @@ public class Jar extends Zip {
            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);
         }

src/tests/antunit/taskdefs/jar-spi-test.xml

@@ -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>