svn commit: r984286 - in /forrest/trunk/main: build.xml java/org/apache/forrest/locationmap/LocationMapModule.java webapp/WEB-INF/logkit.xconf

Author: twilliams
Date: Wed Aug 11 02:15:46 2010
New Revision: 984286

URL: http://svn.apache.org/viewvc?rev=984286&view=rev
Log:
Don't inherit properties from the main build, so that classpath can include everything

Modified:
    forrest/trunk/main/build.xml
    forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java
    forrest/trunk/main/webapp/WEB-INF/logkit.xconf

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=984286&r1=984285&r2=984286&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Wed Aug 11 02:15:46 2010
@@ -391,7 +391,8 @@ Remove any build directories in a tree b
 	  depends="testSeedSiteType,testReplacePluginsList"
           if="test.site.type"
 	  description="Called by test target - Seeds, replaces list of required plugins and generates a new site for testing">
-    <ant antfile="${forrest.core}/forrest.build.xml" target="site">
+
+    <ant antfile="${forrest.core}/forrest.build.xml" target="site" inheritAll="false">
       <property name="forrest.home" value="${forrest.home}"/>
       <property name="project.home" value="${test.dir}"/>
     </ant>

Modified: forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java?rev=984286&r1=984285&r2=984286&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/locationmap/LocationMapModule.java Wed Aug 11 02:15:46 2010
@@ -35,6 +35,7 @@ import org.apache.avalon.framework.servi
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.components.CocoonComponentManager;
 import org.apache.cocoon.components.modules.input.InputModule;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
@@ -192,7 +193,7 @@ public class LocationMapModule extends A
     	
     	Object result = null;
     	boolean hasBeenCached = false;
-    	
+
         try {
         	if (this.m_cacheAll == true) {
         		hasBeenCached = m_cache.isKeyInCache(name);

Modified: forrest/trunk/main/webapp/WEB-INF/logkit.xconf
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/logkit.xconf?rev=984286&r1=984285&r2=984286&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/logkit.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/logkit.xconf Wed Aug 11 02:15:46 2010
@@ -223,7 +223,7 @@
       </category>
 
       <!-- Locationmap logger -->
-      <category name="modules.mapper.lm" log-level="INFO">
+      <category name="modules.mapper.lm" log-level="DEBUG">
         <log-target id-ref="locationmap"/>
         <!-- duplicate the locationmap messages into the linkrewriter log
              to provide context:
@@ -237,7 +237,7 @@
       <log-target id-ref="error"/>
     </category>
 
-    <category name="sitemap" log-level="ERROR">
+    <category name="sitemap" log-level="INFO">
       <category name="transformer.idgen" log-level="INFO">
         <log-target id-ref="idgen"/>
         <log-target id-ref="error"/>