Skip to content
This repository
Browse code

Little bit of cleanup to make sure everything builds and tests pass

  • Loading branch information...
commit 2e168c0df29e3c1237f2732c8e4a40a767503a22 1 parent 6111b05
Nicholas C. Zakas authored August 23, 2011
3  ant.properties
@@ -8,13 +8,14 @@ res.dir = res
8 8
 #Lib jars
9 9
 jargs.jar = jargs-1.0.jar
10 10
 junit.jar = junit-4.1.jar
  11
+ant.jar = ant.jar
11 12
 
12 13
 #Global properties
13 14
 class.version = 1.5
14 15
 
15 16
 #CSSEmbed properties
16 17
 cssembed.name = cssembed
17  
-cssembed.version = 0.3.6
  18
+cssembed.version = 0.4.0
18 19
 cssembed.jar = ${cssembed.name}-${cssembed.version}.jar
19 20
 cssembed.main = net.nczonline.web.cssembed.CSSEmbed
20 21
 
2  build.xml
@@ -23,6 +23,7 @@
23 23
                source="${class.version}"
24 24
                target="${class.version}">
25 25
             <classpath>
  26
+                <pathelement location="${lib.dir}/${ant.jar}"/>
26 27
                 <pathelement location="${lib.dir}/${jargs.jar}"/>
27 28
                 <pathelement location="${lib.dir}/${datauri.jar}"/>
28 29
             </classpath>
@@ -39,6 +40,7 @@
39 40
                source="${class.version}"
40 41
                target="${class.version}">
41 42
             <classpath>
  43
+                <pathelement location="${lib.dir}/${ant.jar}"/>
42 44
                 <pathelement location="${lib.dir}/${jargs.jar}"/>
43 45
                 <pathelement location="${lib.dir}/${junit.jar}"/>
44 46
                 <pathelement location="${build.dir}/classes"/>
2  src/net/nczonline/web/cssembed/CSSEmbedTask.java
@@ -28,9 +28,7 @@
28 28
 import org.apache.tools.ant.BuildException;
29 29
 
30 30
 import org.apache.tools.ant.types.Mapper;
31  
-import org.apache.tools.ant.types.Resource;
32 31
 import org.apache.tools.ant.types.ResourceCollection;
33  
-import org.apache.tools.ant.types.resources.FileProvider;
34 32
 import org.apache.tools.ant.types.resources.FileResource;
35 33
 
36 34
 import org.apache.tools.ant.util.FileNameMapper;
2  tests/net/nczonline/web/cssembed/CSSURLEmbedderTest.java
@@ -196,7 +196,7 @@ public void testAbsoluteLocalFileOverMaxImageSize() throws IOException {
196 196
     
197 197
     @Test
198 198
     public void testReadFromAndWriteToSameFile() throws IOException {
199  
-        String filename = this.getClass().getClassLoader().getResource("samefiletest.css").getPath().replace("%20", " ");
  199
+        String filename = CSSURLEmbedderTest.class.getResource("samefiletest.css").getPath().replace("%20", " ");
200 200
         File file = new File(filename);
201 201
         Reader in = new InputStreamReader(new FileInputStream(file));
202 202
         

0 notes on commit 2e168c0

Please sign in to comment.
Something went wrong with that request. Please try again.