diff --git a/repository/src/plugin-resources/repository-audit.xml b/repository/src/plugin-resources/repository-audit.xml
index 91d2344f..727ca9c4 100644
--- a/repository/src/plugin-resources/repository-audit.xml
+++ b/repository/src/plugin-resources/repository-audit.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
      Things to do:
-       * create license directories on ibiblio via jelly
-       * upload licenses available via http via jelly
-       * ensure all versions on ibiblio are covered by licenses
+       * DONE - create license directories on ibiblio via jelly
+       * DONE - upload licenses available via http via jelly
+       * WIP - ensure all versions on ibiblio are covered by licenses
        * remove violations if any still exist
        * set up pom directories for all hosted groups
        * upload poms for all artifacts
@@ -796,7 +796,7 @@ Template:
   <project>
     <groupId>javacc</groupId>
     <url>http://www.webgain.com/products/java_cc</url>
-    <file>http://www.webgain.com/products/java_cc/usage.html</file>
+    <file>http://www.webgain.com/java_cc_web_sla.html</file>
     <comments>Free</comments>
   </project>
 
@@ -817,7 +817,7 @@ Template:
   <project>
     <groupId>jaxen</groupId>
     <url>http://jaxen.sourceforge.net/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jaxen/jaxen/LICENSE.txt</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jaxen/jaxen/LICENSE.txt</file>
     <comments>ASL Style</comments>
   </project>
 
@@ -892,14 +892,14 @@ Template:
   <project>
     <groupId>jcs-javagroups</groupId>
     <url>http://jakarta.apache.org/turbine/jcs/</url>
-    <file>http://cvs.apache.org/viewcvs.cgi/jakarta-turbine-jcs/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs.cgi/*checkout*/jakarta-turbine-jcs/LICENSE.txt</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>jcs</groupId>
     <url>http://jakarta.apache.org/turbine/jcs/</url>
-    <file>http://cvs.apache.org/viewcvs.cgi/jakarta-turbine-jcs/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs.cgi/*checkout*/jakarta-turbine-jcs/LICENSE.txt</file>
     <comments>ASL</comments>
   </project>
 
@@ -920,7 +920,7 @@ Template:
   <project>
     <groupId>jdbm</groupId>
     <url>http://jdbm.sourceforge.net/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jdbm/jdbm/LICENSE.txt</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jdbm/jdbm/LICENSE.txt</file>
     <comments>BSD style</comments>
   </project>
 
@@ -934,7 +934,7 @@ Template:
   <project>
     <groupId>jdiff</groupId>
     <url>http://javadiff.sourceforge.net/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/javadiff/jdiff/LICENSE.txt</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/javadiff/jdiff/LICENSE.txt</file>
     <comments>LGPL</comments>
   </project>
 
@@ -979,7 +979,7 @@ Template:
   <project>
     <groupId>jgen</groupId>
     <url>http://www.flashgap.com/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jgen/jgen/LICENSE</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jgen/jgen/LICENSE</file>
     <comments>BSD style</comments>
   </project>
 
@@ -1018,6 +1018,8 @@ Template:
     <comments>BSD Style</comments>
   </project>
 
+  <!-- jsr94 needs to be looked at -->
+  
   <project>
     <groupId>jsse</groupId>
     <url>http://java.sun.com/products/jsse/</url>
@@ -1028,7 +1030,7 @@ Template:
   <project>
     <groupId>jstl</groupId>
     <url>http://java.sun.com/products/jsp/jstl/</url>
-    <file>http://cvs.apache.org/viewcvs.cgi/jakarta-taglibs/LICENSE</file>
+    <file>http://cvs.apache.org/viewcvs.cgi/*checkout*/jakarta-taglibs/LICENSE</file>
     <comments>This is the Jakarta Taglibs implementation</comments>
   </project>
 
@@ -1042,7 +1044,7 @@ Template:
   <project>
     <groupId>jtidy</groupId>
     <url>http://lempinen.net/sami/jtidy/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jtidy/jtidy/LICENSE</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jtidy/jtidy/LICENSE</file>
     <comments>Custom</comments>
   </project>
 
@@ -1077,14 +1079,14 @@ Template:
   <project>
     <groupId>ldapsdk</groupId>
     <url>http://www.mozilla.org/directory/javasdk.html</url>
-    <file>http://www.mozilla.org/NPL/</file>
+    <file>http://www.mozilla.org/NPL/NPL-1.0.txt</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>log4j</groupId>
     <url>http://jakarta.apache.org/log4j/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-log4j/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-log4j/LICENSE.txt</file>
     <comments></comments>
   </project>
 
@@ -1098,7 +1100,7 @@ Template:
   <project>
     <groupId>lucene</groupId>
     <url>http://jakarta.apache.org/lucene/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-lucene/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-lucene/LICENSE.txt</file>
     <comments></comments>
   </project>
 
@@ -1190,7 +1192,7 @@ Template:
   <project>
     <groupId>oro</groupId>
     <url>http://jakarta.apache.org/oro/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-oro/LICENSE</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-oro/LICENSE</file>
     <comments></comments>
   </project>
   
@@ -1225,14 +1227,14 @@ Template:
   <project>
     <groupId>plexus</groupId>
     <url>http://cvs.werken.com/viewcvs.cgi/plexus-container/?cvsroot=plexus</url>
-    <file>http://cvs.werken.com/viewcvs.cgi/plexus-container/LICENSE.txt?cvsroot=plexus</file>
+    <file>http://cvs.werken.com/viewcvs.cgi/*checkout*/plexus-container/LICENSE.txt?cvsroot=plexus</file>
     <comments>ASL</comments>
   </project>
   
   <project>
     <groupId>poi</groupId>
     <url>http://jakarta.apache.org/poi/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-poi/legal/LICENSE</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-poi/legal/LICENSE</file>
     <comments></comments>
   </project>
 
@@ -1260,14 +1262,14 @@ Template:
   <project>
     <groupId>quartz</groupId>
     <url>http://www.part.net/quartz.html</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/quartz/Quartz/license.txt</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/quartz/Quartz/license.txt</file>
     <comments>ASL style</comments>
   </project>
 
   <project>
     <groupId>regexp</groupId>
     <url>http://jakarta.apache.org/regexp/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-regexp/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-regexp/LICENSE.txt</file>
     <comments></comments>
   </project>
 
@@ -1305,7 +1307,7 @@ Template:
   <project>
     <groupId>saxpath</groupId>
     <url>http://sourceforge.net/projects/saxpath/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/saxpath/saxpath/LICENSE</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/saxpath/saxpath/LICENSE</file>
     <comments>BSD style</comments>
   </project>
 
@@ -1326,28 +1328,28 @@ Template:
   <project>
     <groupId>soap</groupId>
     <url>http://ws.apache.org/soap/</url>
-    <file>http://cvs.apache.org/viewcvs.cgi/xml-soap/LICENSE</file>
+    <file>http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-soap/LICENSE</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>statcvs</groupId>
     <url>http://statcvs.sourceforge.net/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/statcvs/statcvs/license.txt</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/statcvs/statcvs/license.txt</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>stratum</groupId>
     <url>http://jakarta.apache.org/turbine/stratum/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-turbine-stratum/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-turbine-stratum/LICENSE.txt</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>struts</groupId>
     <url>http://jakarta.apache.org/struts/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-struts/LICENSE</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-struts/LICENSE</file>
     <comments></comments>
   </project>
 
@@ -1361,7 +1363,7 @@ Template:
   <project>
     <groupId>strutstestcase</groupId>
     <url>http://strutstestcase.sourceforge.net/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/strutstestcase/strutstestcase/LICENSE.TXT</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/strutstestcase/strutstestcase/LICENSE.TXT</file>
     <comments></comments>
   </project>
 
@@ -1382,28 +1384,28 @@ Template:
   <project>
     <groupId>taglibs</groupId>
     <url>http://jakarta.apache.org/taglibs/</url>
-    <file>http://cvs.apache.org/viewcvs.cgi/jakarta-taglibs/LICENSE</file>
+    <file>http://cvs.apache.org/viewcvs.cgi/*checkout*/jakarta-taglibs/LICENSE</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>tapestry</groupId>
     <url>http://jakarta.apache.org/proposals/tapestry/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-tapestry/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-tapestry/LICENSE.txt</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>tjdo</groupId>
     <url>http://tjdo.sourceforge.net/</url>
-    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tjdo/tjdo/docs/LICENSE.txt</file>
+    <file>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/tjdo/tjdo/docs/LICENSE.txt</file>
     <comments></comments>
   </project>
 
   <project>
     <groupId>tomcat-util</groupId>
     <url>http://jakarta.apache.org/tomcat/</url>
-    <file>http://cvs.apache.org/viewcvs/jakarta-tomcat-4.0/LICENSE</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-tomcat-4.0/LICENSE</file>
     <comments></comments>
   </project>
 
@@ -1417,21 +1419,21 @@ Template:
   <project>
     <groupId>torque</groupId>
     <url>http://db.apache.org/torque/</url>
-    <file>http://cvs.apache.org/viewcvs/db-torque/LICENSE.txt</file>
+    <file>http://cvs.apache.org/viewcvs/*checkout*/db-torque/LICENSE.txt</file>
     <comments></comments>
   </project>
 
     <project>
       <groupId>touchstone</groupId>
       <url>http://jakarta.apache.org/turbine/maven/</url>
-      <file>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/LICENSE.txt</file>
+      <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-turbine-maven/LICENSE.txt</file>
       <comments>ASL</comments>
     </project>
 
     <project>
       <groupId>turbine</groupId>
       <url>http://jakarta.apache.org/turbine/</url>
-      <file>http://cvs.apache.org/viewcvs/jakarta-turbine-2/LICENSE.txt</file>
+      <file>http://cvs.apache.org/viewcvs/*checkout*/jakarta-turbine-2/LICENSE.txt</file>
       <comments>ASL</comments>
     </project>
 
@@ -1466,7 +1468,7 @@ Template:
   <project>
     <groupId>village</groupId>
     <url>http://share.whichever.com/index.php?SCREEN=village</url>
-    <file>http://share.whichever.com/viewcvs.cgi/village/docs/LICENSE.txt</file>
+    <file>http://share.whichever.com/viewcvs.cgi/*checkout*/village/docs/LICENSE.txt</file>
     <comments>ASL Style</comments>
   </project>
   
@@ -1555,7 +1557,7 @@ Template:
   9980720)
      For the rest : Apache license
     </comments>
-    </project>
+  </project>
 
   <project>
     <groupId>xml-security</groupId>