[jboss-svn-commits] JBL Code SVN: r34048 - in labs/jbossrules/trunk: drools-ant/src/test/java/org/drools/contrib and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: baunax
Date: 2010-07-19 15:59:03 -0400 (Mon, 19 Jul 2010)
New Revision: 34048

Modified:
   labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java
   labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java
Log:
JBRULES-2583 Verifier Ant Task isn't finding the images from verifier classpath
  - fixed how the gif is referenced in the classpath


Modified: labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java	2010-07-19 19:55:15 UTC (rev 34047)
+++ labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsVerifierAntTask.java	2010-07-19 19:59:03 UTC (rev 34048)
@@ -118,8 +118,7 @@
 			VerifierReportWriter vReportWriter = VerifierReportWriterFactory
 					.newHTMLReportWriter();
 
-			String path = toFile.getAbsolutePath() + File.separatorChar
-					+ "report.zip";
+			File path = new File(toFile, "report.zip");
 
 			OutputStream out = new FileOutputStream(path);
 
@@ -142,7 +141,7 @@
 		}
 
 		droolsVerifier.addResourcesToVerify(ResourceFactory
-				.newClassPathResource(filename, Verifier.class),
+				.newFileResource(new File(srcdir.getAbsolutePath(), filename)),
 				ResourceType.DRL);
 	}
 

Modified: labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java	2010-07-19 19:55:15 UTC (rev 34047)
+++ labs/jbossrules/trunk/drools-ant/src/test/java/org/drools/contrib/DroolsAntTaskTest.java	2010-07-19 19:59:03 UTC (rev 34048)
@@ -45,6 +45,7 @@
             executeTarget( "verifierreport" );
         } catch ( Exception e ) {
             e.printStackTrace();
+            fail();
         }
     }
 

Modified: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java	2010-07-19 19:55:15 UTC (rev 34047)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/ReportModeller.java	2010-07-19 19:59:03 UTC (rev 34048)
@@ -18,7 +18,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
@@ -54,13 +53,12 @@
                          String filename) throws IOException {
         zout.putNextEntry( new JarEntry( destination + File.separator + filename ) );
 
-        File source = new File( HTMLReportWriter.class.getResource( filename ).getFile() );
-        InputStream in = new FileInputStream( source );
+        InputStream in = HTMLReportWriter.class.getResourceAsStream( filename );
 
         // Transfer bytes from in to out
         byte[] buf = new byte[1024];
         int len;
-        while ( (len = in.read( buf )) > 0 ) {
+        while ( (len = in.read( buf )) != -1 ) {
             zout.write( buf,
                         0,
                         len );