From ca7a6237da46f2f6d4d3de3815c48107076dcde9 Mon Sep 17 00:00:00 2001
From: David Hook <dgh@cryptoworkshop.com>
Date: Sat, 28 Sep 2013 08:38:31 +1000
Subject: update

---
 ant/bc+-build.xml | 6 ++++++
 ant/jdk15+.xml    | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'ant')

diff --git a/ant/bc+-build.xml b/ant/bc+-build.xml
index f95325f5..eaf5796c 100644
--- a/ant/bc+-build.xml
+++ b/ant/bc+-build.xml
@@ -146,6 +146,7 @@
                     </classpath>
                 </javac>
                 <copy todir="${build.dir}/@{target}/classes">
+                     <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.asc" />
                      <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.pem" />
                      <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.p7m" />
                      <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.message" />
@@ -160,6 +161,7 @@
                      <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.cer" />
                      <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.der" />
                      <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.txt" />
+                     <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.rsp" />
                 </copy>
                 <packJar jarbase="${artifacts.jars.dir}/@{target}">
                     <manifest-element>
@@ -170,6 +172,7 @@
                     <fileset-element>
                         <fileset dir="${build.dir}/@{target}/classes">
                             <include name="**/*.class" />
+                            <include name="**/*.asc" />
                             <include name="**/*.pem" />
                             <include name="**/*.p7m" />
                             <include name="**/*.crl" />
@@ -184,6 +187,7 @@
                             <include name="**/*.der" />
                             <include name="**/*.message" />
                             <include name="**/*.txt" />
+                            <include name="**/*.rsp" />
                             <include name="**/*.properties" />
                         </fileset>
                     </fileset-element>
@@ -612,6 +616,7 @@
              <fileset dir="${src.dir}" includes="**/util/io/pem/*Test.java" />
              <fileset dir="${src.dir}" includes="**/test/*.java" />
              <fileset dir="${src.dir}" includes="**/test/*/*.java" />
+             <fileset dir="${src.dir}" includes="**/*.asc" />
              <fileset dir="${src.dir}" includes="**/*.pem" />
              <fileset dir="${src.dir}" includes="**/*.p7m" />
              <fileset dir="${src.dir}" includes="**/*.eml" />
@@ -623,6 +628,7 @@
              <fileset dir="${src.dir}" includes="**/*.crl" />
              <fileset dir="${src.dir}" includes="**/*.csr" />
              <fileset dir="${src.dir}" includes="**/*.txt" />
+             <fileset dir="${src.dir}" includes="**/*.rsp" />
              <fileset dir="${src.dir}" includes="**/*.cvcert" />
              <fileset dir="${src.dir}" includes="**/*.properties" />
              <fileset dir="${src.dir}" includes="**/*.message" />
diff --git a/ant/jdk15+.xml b/ant/jdk15+.xml
index 2ba36ff9..dc52bfa2 100644
--- a/ant/jdk15+.xml
+++ b/ant/jdk15+.xml
@@ -29,7 +29,7 @@
 
             <fileset dir="prov/src/main/java" includes="**/*.java" />
             <fileset dir="prov/src/main/java" includes="**/*.html" />
-            <fileset dir="prov/src/main/java" includes="**/*.properties" />
+            <fileset dir="prov/src/main/resources" includes="**/*.properties" />
             <fileset dir="prov/src/test/java" includes="**/*.java" />
 
             <fileset dir="pkix/src/main/java" includes="**/*.java" />
@@ -42,10 +42,11 @@
             <fileset dir="pg/src/main/java" includes="**/*.html" />
             <fileset dir="pg/src/main/java" includes="**/*.properties" />
             <fileset dir="pg/src/test/java" includes="**/*.java" />
+            <fileset dir="pg/src/test/resources" includes="**/*.*" />
 
             <fileset dir="mail/src/main/java" includes="**/*.java" />
             <fileset dir="mail/src/main/java" includes="**/*.html" />
-            <fileset dir="mail/src/main/java" includes="**/*.properties" />
+            <fileset dir="mail/src/main/resources" includes="**/*.properties" />
             <fileset dir="mail/src/test/java" includes="**/*.java" />
 
             <fileset dir="core/src/test/data" includes="**/*.message" />
-- 
cgit v1.2.3