Revert to version 1.1.1 of xmlsectool.

InCommon · Apr 14, 2011 · 4e5ac48 · 4e5ac48
1 parent 57e7e80
commit 4e5ac48
Show file tree

Hide file tree

Showing 32 changed files with 5 additions and 5 deletions.
diff --git a/build.xml b/build.xml
@@ -625,16 +625,16 @@
 		<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
 		<element name="args" optional="yes"/>
 		<sequential>
-			<java classname="org.opensaml.xml.util.XmlTool"
+			<java classname="edu.internet2.middleware.security.XmlSecTool"
 				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}/lib/endorsed"/>
-				<jvmarg value="-Dorg.opensaml.xml.util.XmlTool.home=${tools.xmlsectool}"/>
-				<args/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/endorsed"/>
+				<jvmarg value="-Dedu.internet2.middleware.security.XmlSecTool.home=${tools.xmlsectool}"/>
+				<args/>
 				<arg value="--validateSchema"/>
 				<arg value="--schemaDirectory"/>
 				<arg value="${xml.dir}"/>

diff --git a/...lsectool/lib/endorsed/resolver-2.10.0.jar → tools/xmlsectool/endorsed/resolver-2.9.1.jar b/...lsectool/lib/endorsed/resolver-2.10.0.jar → tools/xmlsectool/endorsed/resolver-2.9.1.jar
diff --git a/...ectool/lib/endorsed/serializer-2.10.0.jar → .../xmlsectool/endorsed/serializer-2.9.1.jar b/...ectool/lib/endorsed/serializer-2.10.0.jar → .../xmlsectool/endorsed/serializer-2.9.1.jar
diff --git a/...s/xmlsectool/lib/endorsed/xalan-2.7.1.jar → tools/xmlsectool/endorsed/xalan-2.7.1.jar b/...s/xmlsectool/lib/endorsed/xalan-2.7.1.jar → tools/xmlsectool/endorsed/xalan-2.7.1.jar
diff --git a/tools/xmlsectool/endorsed/xercesImpl-2.9.1.jar b/tools/xmlsectool/endorsed/xercesImpl-2.9.1.jar
diff --git a/...lsectool/lib/endorsed/xml-apis-2.10.0.jar → tools/xmlsectool/endorsed/xml-apis-2.9.1.jar b/...lsectool/lib/endorsed/xml-apis-2.10.0.jar → tools/xmlsectool/endorsed/xml-apis-2.9.1.jar
diff --git a/tools/xmlsectool/lib/commons-collections-3.1.jar b/tools/xmlsectool/lib/commons-collections-3.1.jar
diff --git a/tools/xmlsectool/lib/commons-lang-2.1.jar b/tools/xmlsectool/lib/commons-lang-2.1.jar
diff --git a/tools/xmlsectool/lib/endorsed/serializer-2.7.1.jar b/tools/xmlsectool/lib/endorsed/serializer-2.7.1.jar
diff --git a/tools/xmlsectool/lib/endorsed/xercesImpl-2.10.0.jar b/tools/xmlsectool/lib/endorsed/xercesImpl-2.10.0.jar
diff --git a/tools/xmlsectool/lib/endorsed/xml-resolver-1.2.jar b/tools/xmlsectool/lib/endorsed/xml-resolver-1.2.jar
diff --git a/...s/xmlsectool/lib/jcl-over-slf4j-1.6.1.jar → .../xmlsectool/lib/jcl-over-slf4j-1.5.11.jar b/...s/xmlsectool/lib/jcl-over-slf4j-1.6.1.jar → .../xmlsectool/lib/jcl-over-slf4j-1.5.11.jar
diff --git a/tools/xmlsectool/lib/joda-time-1.6.2.jar → tools/xmlsectool/lib/joda-time-1.6.jar b/tools/xmlsectool/lib/joda-time-1.6.2.jar → tools/xmlsectool/lib/joda-time-1.6.jar
diff --git a/tools/xmlsectool/lib/jul-to-slf4j-1.5.10.jar b/tools/xmlsectool/lib/jul-to-slf4j-1.5.10.jar
diff --git a/tools/xmlsectool/lib/jul-to-slf4j-1.6.1.jar b/tools/xmlsectool/lib/jul-to-slf4j-1.6.1.jar
diff --git a/tools/xmlsectool/lib/log4j-over-slf4j-1.5.11.jar b/tools/xmlsectool/lib/log4j-over-slf4j-1.5.11.jar
diff --git a/tools/xmlsectool/lib/log4j-over-slf4j-1.6.1.jar b/tools/xmlsectool/lib/log4j-over-slf4j-1.6.1.jar
diff --git a/tools/xmlsectool/lib/logback-classic-0.9.20.jar b/tools/xmlsectool/lib/logback-classic-0.9.20.jar
diff --git a/tools/xmlsectool/lib/logback-classic-0.9.27.jar b/tools/xmlsectool/lib/logback-classic-0.9.27.jar
diff --git a/tools/xmlsectool/lib/logback-core-0.9.27.jar → tools/xmlsectool/lib/logback-core-0.9.20.jar b/tools/xmlsectool/lib/logback-core-0.9.27.jar → tools/xmlsectool/lib/logback-core-0.9.20.jar
diff --git a/tools/xmlsectool/lib/not-yet-commons-ssl-0.3.9.jar b/tools/xmlsectool/lib/not-yet-commons-ssl-0.3.9.jar
diff --git a/tools/xmlsectool/lib/opensaml-2.4.1.jar b/tools/xmlsectool/lib/opensaml-2.4.1.jar
diff --git a/tools/xmlsectool/lib/openws-1.3.1.jar b/tools/xmlsectool/lib/openws-1.3.1.jar
diff --git a/tools/xmlsectool/lib/openws-1.4.1.jar b/tools/xmlsectool/lib/openws-1.4.1.jar
diff --git a/tools/xmlsectool/lib/shibboleth-jce-1.1.0.jar b/tools/xmlsectool/lib/shibboleth-jce-1.1.0.jar
diff --git a/tools/xmlsectool/lib/slf4j-api-1.5.11.jar b/tools/xmlsectool/lib/slf4j-api-1.5.11.jar
diff --git a/tools/xmlsectool/lib/slf4j-api-1.6.1.jar b/tools/xmlsectool/lib/slf4j-api-1.6.1.jar
diff --git a/tools/xmlsectool/lib/velocity-1.5.jar b/tools/xmlsectool/lib/velocity-1.5.jar
diff --git a/tools/xmlsectool/lib/xmlsec-1.4.4.jar → tools/xmlsectool/lib/xmlsec-1.4.3.jar b/tools/xmlsectool/lib/xmlsec-1.4.4.jar → tools/xmlsectool/lib/xmlsec-1.4.3.jar
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.1.jar b/tools/xmlsectool/lib/xmlsectool-1.1.1.jar
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.3.jar b/tools/xmlsectool/lib/xmlsectool-1.1.3.jar
diff --git a/tools/xmlsectool/lib/xmltooling-1.3.1.jar → tools/xmlsectool/lib/xmltooling-1.2.2.jar b/tools/xmlsectool/lib/xmltooling-1.3.1.jar → tools/xmlsectool/lib/xmltooling-1.2.2.jar