Copy endorsed dir over to IdP home and use it for command line tools

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2679 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/build.xml b/build.xml
index efcc360..c28d4e7 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -180,6 +180,7 @@
                 <mkdir dir="${idp.home}/conf" />
                 <mkdir dir="${idp.home}/credentials" />
                 <mkdir dir="${idp.home}/lib" />
+                <mkdir dir="${idp.home}/lib/endorsed" />
                 <mkdir dir="${idp.home}/logs" />
                 <mkdir dir="${idp.home}/metadata" />
                 <mkdir dir="${idp.home}/war" />
@@ -237,6 +238,10 @@
             <fileset file="${dist.dir}/${jar.name}" />
             <fileset file="${build-lib.dir}/servlet-2.4.jar" />
         </copy>
+            
+        <copy todir="${idp.home}/lib/endorsed" preservelastmodified="true" failonerror="false">
+            <fileset dir="endorsed" />
+        </copy>
 
         <copy todir="${webinf-temp.dir}">
             <fileset dir="${webinf.dir}" />
@@ -254,7 +259,6 @@
         </jar>
     </target>
 
-
     <!-- **************************************************************** -->
     <!-- ***                                                          *** -->
     <!-- ***                     Developer Tasks                      *** -->

diff --git a/tools/aacli.bat b/tools/aacli.bat
index 0cfc54c..48d3fdd 100755 (executable)
--- a/tools/aacli.bat
+++ b/tools/aacli.bat
@@ -41,4 +41,4 @@ if exist %JAVA_HOME%\lib\classes.zip (
 
 REM Go to it !
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI %*
\ No newline at end of file
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Djava.endorsed.dirs="%LIBDIR%/endorsed" edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI %*
\ No newline at end of file

diff --git a/tools/aacli.sh b/tools/aacli.sh
index 52b81a9..a4e7a3c 100755 (executable)
--- a/tools/aacli.sh
+++ b/tools/aacli.sh
@@ -41,4 +41,4 @@ do
     fi
 done
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" 'edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"
\ No newline at end of file
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" '-Djava.endorsed.dirs='"$LIBDIR/endorsed" edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"
\ No newline at end of file