Merge pull request w3c#100 from w3c/sideshowbarker/velocity-classpath-resource-loader

Make css-validator.jar CLI runnable anywhere

Author: ylafon

build.xml

@@ -116,14 +116,13 @@
       windowtitle="W3C CSS Validator API"/>
   </target>
 
-  <target name="jar" depends="build" description="Creates the lib archive">
+  <target name="jar" depends="build" description="Creates the lib archive with all dependency jars included">
     <delete file="${jar.file}"/>
     <jar jarfile="${jar.file}" basedir="build" excludes="org/**/*.java">
       <zipgroupfileset dir="lib" includes="*.jar"/>
       <include name="org/**"/>
       <manifest>
         <attribute name="Main-Class" value="org.w3c.css.css.CssValidator"/>
-        <attribute name="Class-path" value=". lib/commons-beanutils-1.9.2.jar lib/commons-collections-3.2.1.jar lib/commons-digester-1.8.1.jar lib/commons-text-1.1.jar lib/commons-logging-1.1.1.jar lib/jigsaw-2.2.6.jar lib/tagsoup-1.2.1.jar lib/velocity-1.7.jar lib/velocity-tools-generic-2.0.jar lib/xercesImpl-2.11.0.jar lib/xml-apis-1.4.01.jar lib/htmlparser-1.4.1.jar"/>
       </manifest>
     </jar>
   </target>

org/w3c/css/css/StyleSheetGenerator.java

@@ -5,6 +5,8 @@
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import org.apache.velocity.tools.ToolManager;
 import org.w3c.css.error.ErrorReportHTML;
 import org.w3c.css.parser.CssError;
@@ -83,17 +85,10 @@ public class StyleSheetGenerator extends StyleReport {
 		}
 
 		try {
-			Velocity.setProperty(Velocity.RESOURCE_LOADER, "file");
-			Velocity.addProperty(Velocity.RESOURCE_LOADER, "jar");
-			Velocity.setProperty("jar." + Velocity.RESOURCE_LOADER + ".class",
-					"org.apache.velocity.runtime.resource.loader.JarResourceLoader");
-			URL path = StyleSheetGenerator.class.getResource("/");
-			if (path != null) {
-				Velocity.addProperty("file." + Velocity.RESOURCE_LOADER +
-						".path", path.getFile());
-				Velocity.setProperty("jar." + Velocity.RESOURCE_LOADER + ".path",
-						"jar:" + path + "css-validator.jar");
-			}
+			Velocity.setProperty(RuntimeConstants.RESOURCE_LOADER,
+				"classpath");
+			Velocity.setProperty("classpath.resource.loader.class",
+				ClasspathResourceLoader.class.getName());
 			Velocity.init();
 			velocityToolManager = new ToolManager();
 			velocityToolManager.configure("org/w3c/css/css/velocity-tools.xml");