Upgrade to xmlsectool 1.1.5. Move its endorsed directory so that the …

…layout corresponds to that in the distribution, and adjust the calling macro accordingly.
InCommon · Jul 25, 2011 · b62667d · b62667d
1 parent 3fa4198
commit b62667d
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 2 deletions.
diff --git a/build.xml b/build.xml
@@ -660,10 +660,10 @@
 				fork="true" failonerror="true" maxmemory="${java.max.memory}">
 				<classpath>
 					<fileset dir="${tools.xmlsectool}/lib">
-						<include name="**/*.jar"/>
+						<include name="*.jar"/>
 					</fileset>
 				</classpath>
-				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/endorsed"/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/lib/endorsed"/>
 				<jvmarg value="-Dedu.internet2.middleware.security.XmlSecTool.home=${tools.xmlsectool}"/>
 				<args/>
 				<arg value="--validateSchema"/>

diff --git a/...xmlsectool/endorsed/serializer-2.10.0.jar → ...ectool/lib/endorsed/serializer-2.10.0.jar b/...xmlsectool/endorsed/serializer-2.10.0.jar → ...ectool/lib/endorsed/serializer-2.10.0.jar
diff --git a/tools/xmlsectool/endorsed/xalan-2.7.1.jar → ...s/xmlsectool/lib/endorsed/xalan-2.7.1.jar b/tools/xmlsectool/endorsed/xalan-2.7.1.jar → ...s/xmlsectool/lib/endorsed/xalan-2.7.1.jar
diff --git a/...xmlsectool/endorsed/xercesImpl-2.10.0.jar → ...ectool/lib/endorsed/xercesImpl-2.10.0.jar b/...xmlsectool/endorsed/xercesImpl-2.10.0.jar → ...ectool/lib/endorsed/xercesImpl-2.10.0.jar
diff --git a/...s/xmlsectool/endorsed/xml-apis-2.10.0.jar → ...lsectool/lib/endorsed/xml-apis-2.10.0.jar b/...s/xmlsectool/endorsed/xml-apis-2.10.0.jar → ...lsectool/lib/endorsed/xml-apis-2.10.0.jar
diff --git a/.../xmlsectool/endorsed/xml-resolver-1.2.jar → ...sectool/lib/endorsed/xml-resolver-1.2.jar b/.../xmlsectool/endorsed/xml-resolver-1.2.jar → ...sectool/lib/endorsed/xml-resolver-1.2.jar
diff --git a/tools/xmlsectool/lib/openws-1.4.2.jar b/tools/xmlsectool/lib/openws-1.4.2.jar
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.4.jar b/tools/xmlsectool/lib/xmlsectool-1.1.4.jar
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.5.jar b/tools/xmlsectool/lib/xmlsectool-1.1.5.jar
diff --git a/tools/xmlsectool/lib/xmltooling-1.3.1.jar b/tools/xmlsectool/lib/xmltooling-1.3.1.jar
diff --git a/tools/xmlsectool/lib/xmltooling-1.3.2.jar b/tools/xmlsectool/lib/xmltooling-1.3.2.jar