aboutsummaryrefslogtreecommitdiff
path: root/id.server/build.xml
diff options
context:
space:
mode:
Diffstat (limited to 'id.server/build.xml')
-rw-r--r--id.server/build.xml22
1 files changed, 16 insertions, 6 deletions
diff --git a/id.server/build.xml b/id.server/build.xml
index e46aed57b..00d15e1ab 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -55,6 +55,8 @@
<property name="lib.httpsclient" value="${lib}/httpsclient_JSSE-1.0"/>
<property name="lib.mail" value="${lib}/tomcat-libs"/>
<property name="lib.activation" value="${lib}/tomcat-libs"/>
+ <property name="handbook" value="../spss.handbook" />
+ <property name="spss.certstore" value="${handbook}/conf/moa-spss/certstore" />
<!--IAIK libraries for commercial use (target VM=1.3)-->
<path id="compile.iaik.full">
<pathelement location="${lib.iaik-moa-full}/iaik-moa-full.jar"/>
@@ -444,6 +446,10 @@
<copy toDir="${dist.auth}/conf">
<fileset dir="${data}/deploy/conf" excludes="moa-id/oa/**"/>
</copy>
+ <!-- use the same certstore as within moa-spss -->
+ <copy toDir="${dist.auth}/conf/moa-spss/certstore">
+ <fileset dir="${spss.certstore}"/>
+ </copy>
<mkdir dir="${dist.auth}/conf/moa-id/certs/certstore"/>
<mkdir dir="${dist.auth}/conf/moa-id/certs/ca-certs"/>
<mkdir dir="${dist.auth}/conf/moa-id/certs/server-certs"/>
@@ -593,13 +599,17 @@
</copy>
<copy toDir="${dist.src}/id.server">
<!--fileset dir="." excludes="tmp/**, bin/**, $(lib.iaik-moa)/**"/-->
- <fileset dir=".">
- <exclude name="tmp/**"/>
- <exclude name="bin/**"/>
- <exclude name="${lib.iaik-moa}/**"/>
- </fileset>
+ <fileset dir=".">
+ <exclude name="tmp/**"/>
+ <exclude name="bin/**"/>
+ <exclude name="${lib.iaik-moa}/**"/>
+ </fileset>
+ </copy>
+ <!-- use the same certstore as within moa-spss -->
+ <copy toDir="${dist.src}/id.server/data/deploy/conf/moa-spss/certstore">
+ <fileset dir="${spss.certstore}"/>
</copy>
- <copy toDir="${dist.src}/id.server/${lib.iaik-moa}">
+ <copy toDir="${dist.src}/id.server/${lib.iaik-moa}">
<fileset dir="${lib.iaik-moa-full}"/>
</copy>
<copy toDir="${dist.src}/id.oa">