From: Erik Brakkee <erik@brakkee.org>
Date: Mon, 27 Mar 2006 10:32:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: wamblee-utils-0.7~1059
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=47a3c10581499828a02071d5339fcf4fd8d854d6;p=utils

---

diff --git a/.classpath b/.classpath
index 544ec000..0de549e7 100644
--- a/.classpath
+++ b/.classpath
@@ -5,33 +5,15 @@
 	<classpathentry output="crawler/kiss/bin" kind="src" path="crawler/kiss/src"/>
 	<classpathentry output="support/bin" kind="src" path="support/src"/>
 	<classpathentry output="support/testbin" kind="src" path="support/test"/>
-	<classpathentry kind="lib" path="crawler/basic/lib/external/commons-httpclient-3.0.jar"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/external/jtidy-4aug2000r7-dev.jar"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/test/dbunit-2.1.jar"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/test/jmock-1.0.1.jar"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/test/jmock-cglib-1.0.1.jar"/>
-	<classpathentry kind="lib" path="crawler/basic/lib/test/jta.jar"/>
 	<classpathentry kind="lib" path="crawler/basic/lib/test/junit-3.8.1.jar"/>
 	<classpathentry kind="lib" path="crawler/kiss/lib/external/commons-httpclient-3.0.jar"/>
 	<classpathentry kind="lib" path="crawler/kiss/lib/external/jtidy-4aug2000r7-dev.jar"/>
-	<classpathentry kind="lib" path="crawler/kiss/lib/test/dbunit-2.1.jar"/>
 	<classpathentry kind="lib" path="crawler/kiss/lib/test/jmock-1.0.1.jar"/>
 	<classpathentry kind="lib" path="crawler/kiss/lib/test/jmock-cglib-1.0.1.jar"/>
-	<classpathentry kind="lib" path="crawler/kiss/lib/test/jta.jar"/>
-	<classpathentry kind="lib" path="crawler/kiss/lib/test/junit-3.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/ant/ant-contrib-1.0b2/ant-contrib.jar"/>
-	<classpathentry kind="lib" path="lib/ant/ant-dependencies.jar"/>
-	<classpathentry kind="lib" path="lib/ant/doccheck1.2b2/doccheck.jar"/>
-	<classpathentry kind="lib" path="lib/ant/downloaded/antlr-2.7.2.jar"/>
-	<classpathentry kind="lib" path="lib/ant/downloaded/checkstyle-4.1.jar"/>
-	<classpathentry kind="lib" path="lib/ant/downloaded/commons-beanutils-1.7.0.jar"/>
-	<classpathentry kind="lib" path="lib/ant/downloaded/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/ant/downloaded/commons-logging-1.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/ant/pdfdoclet-1.0.2-all.jar"/>
-	<classpathentry kind="lib" path="lib/special/hibernate/antlr-2.7.5H3.jar"/>
-	<classpathentry kind="lib" path="lib/special/hibernate/asm.jar"/>
-	<classpathentry kind="lib" path="lib/special/hibernate/asm-attrs.jar"/>
-	<classpathentry kind="lib" path="lib/special/test/jta.jar"/>
 	<classpathentry kind="lib" path="support/lib/external/dom4j-1.6.jar"/>
 	<classpathentry kind="lib" path="support/lib/external/ehcache-1.1.jar"/>
 	<classpathentry kind="lib" path="support/lib/external/log4j-1.2.9.jar"/>
@@ -40,12 +22,10 @@
 	<classpathentry kind="lib" path="support/lib/test/asm.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/asm-attrs.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/cglib-2.1.jar"/>
-	<classpathentry kind="lib" path="support/lib/test/dbunit-2.1.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/hibernate-3.0.5.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/jmock-1.0.1.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/jmock-cglib-1.0.1.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/jta.jar"/>
-	<classpathentry kind="lib" path="support/lib/test/junit-3.8.1.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/oro-2.0.6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="crawler/kiss/lib/external/commons-codec-1.3.jar"/>
@@ -57,5 +37,8 @@
 	<classpathentry kind="lib" path="support/lib/test/emma_ant-2.0.5312.jar"/>
 	<classpathentry kind="lib" path="support/lib/test/emma-2.0.5312.jar"/>
 	<classpathentry kind="lib" path="support/resources/test"/>
+	<classpathentry kind="lib" path="support/lib/external/commons-beanutils-1.7.0.jar"/>
+	<classpathentry kind="lib" path="support/lib/external/commons-logging-1.0.2.jar"/>
+	<classpathentry kind="lib" path="support/lib/external/jaxen-1.1-beta-4.jar"/>
 	<classpathentry kind="output" path="support/testbin"/>
 </classpath>
diff --git a/build/header.xml b/build/header.xml
index ab9c06f6..fed9d8d7 100644
--- a/build/header.xml
+++ b/build/header.xml
@@ -319,7 +319,7 @@
    
     <property name="ant.lib.dir" value="${build.dir}/lib/ant"/>
     <property name="ant.downloaded.lib.dir" value="${build.dir}/lib/ant/downloaded"/>
-    <property name="external.lib.dir" value="${build.dir}/lib/external"/>
+    <property name="external.lib.dir" value="lib/external"/>
     <property name="test.lib.dir" value="lib/test"/>
     <property name="special.lib.dir" value="${build.dir}/lib/special"/>
     <property name="forrest.xdocs.dir" value="${project.home}/site/xdocs"/>
diff --git a/crawler/basic/src/log4j.properties b/crawler/basic/src/log4j.properties
index ab710b36..65256149 100644
--- a/crawler/basic/src/log4j.properties
+++ b/crawler/basic/src/log4j.properties
@@ -10,7 +10,7 @@
 log4j.rootLogger=ERROR, console
 
 # Log level for wamblee.org
-log4j.logger.org.wamblee=DEBUG
+log4j.logger.org.wamblee=INFO
 log4j.logger.org.wamblee.usermgt.UserAdministrationImplTest=INFO
 log4j.logger.org.wamblee.security.authorization=ERROR
 log4j.logger.org.wamblee.cache=INFO
diff --git a/crawler/kiss/src/reportToHtml.xsl b/crawler/kiss/src/reportToHtml.xsl
index 521b85ce..fd117d1e 100644
--- a/crawler/kiss/src/reportToHtml.xsl
+++ b/crawler/kiss/src/reportToHtml.xsl
@@ -54,7 +54,9 @@
             </xsl:choose>
         </h2>
         <p>
-            <xsl:call-template name="programTable"/>
+            <xsl:if test="not(@result='OLDSHOW')">
+                <xsl:call-template name="programTable"/>
+            </xsl:if>
         </p>
     </xsl:template>
 
diff --git a/crawler/kiss/src/reportToText.xsl b/crawler/kiss/src/reportToText.xsl
index 4a3560a4..b50728e6 100644
--- a/crawler/kiss/src/reportToText.xsl
+++ b/crawler/kiss/src/reportToText.xsl
@@ -45,7 +45,9 @@
       </xsl:when>
     </xsl:choose>
     
-    <xsl:call-template name="programTable"/>
+    <xsl:if test="not(@result='OLDSHOW')">
+        <xsl:call-template name="programTable"/>
+    </xsl:if>
     
   </xsl:template>
   
diff --git a/support/test/org/wamblee/test/FileSystemUtils.java b/support/test/org/wamblee/test/FileSystemUtils.java
index 3778a970..da056870 100644
--- a/support/test/org/wamblee/test/FileSystemUtils.java
+++ b/support/test/org/wamblee/test/FileSystemUtils.java
@@ -28,8 +28,6 @@ import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import sun.security.krb5.internal.crypto.b;
-
 /**
  * File system utilities.
  */