velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r544332 - in /velocity/tools/branches/2.x: ./ build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
Date Tue, 05 Jun 2007 00:27:43 GMT
Author: nbubna
Date: Mon Jun  4 17:27:42 2007
New Revision: 544332

URL: http://svn.apache.org/viewvc?view=rev&rev=544332
Log:
ignore target dir

Modified:
    velocity/tools/branches/2.x/   (props changed)
    velocity/tools/branches/2.x/build.xml
    velocity/tools/branches/2.x/examples.xml
    velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java

Propchange: velocity/tools/branches/2.x/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun  4 17:27:42 2007
@@ -1,3 +1,4 @@
+target
 build
 classes
 dist

Modified: velocity/tools/branches/2.x/build.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/build.xml?view=diff&rev=544332&r1=544331&r2=544332
==============================================================================
--- velocity/tools/branches/2.x/build.xml (original)
+++ velocity/tools/branches/2.x/build.xml Mon Jun  4 17:27:42 2007
@@ -374,7 +374,7 @@
   </target>
 
   <!-- Build VelocityView - Showcase application -->
-  <target name="showcase" depends="jar.view,prepare.examples"
+  <target name="showcase" depends="jar,prepare.examples"
           description="Compiles and jars the VelocityView Showcase example application.">
     <property name="target" value="war"/>
     <ant antfile="${basedir}/examples.xml" target="showcase-example" />

Modified: velocity/tools/branches/2.x/examples.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/examples.xml?view=diff&rev=544332&r1=544331&r2=544332
==============================================================================
--- velocity/tools/branches/2.x/examples.xml (original)
+++ velocity/tools/branches/2.x/examples.xml Mon Jun  4 17:27:42 2007
@@ -52,7 +52,7 @@
     <antcall target="example-${target}"/>
   </target>
   <target name="simple-dependencies">
-    <copy todir="${lib}" file="${dist.dir}/${view.id}.jar"/>
+    <copy todir="${lib}" file="${dist.dir}/${struts.id}.jar"/>
     <copy todir="${lib}" file="${commons-beanutils.jar}"/>
     <copy todir="${lib}" file="${commons-collections.jar}"/>
     <copy todir="${lib}" file="${commons-digester.jar}"/>

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java?view=diff&rev=544332&r1=544331&r2=544332
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
(original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/VelocityView.java
Mon Jun  4 17:27:42 2007
@@ -43,6 +43,7 @@
 import org.apache.velocity.tools.generic.log.LogChuteCommonsLog;
 import org.apache.velocity.tools.Toolbox;
 import org.apache.velocity.tools.ToolboxFactory;
+import org.apache.velocity.tools.config.ConfigurationCleaner;
 import org.apache.velocity.tools.config.FactoryConfiguration;
 import org.apache.velocity.tools.config.FileFactoryConfiguration;
 import org.apache.velocity.tools.config.PropertiesFactoryConfiguration;
@@ -496,6 +497,11 @@
 
             factoryConfig.addConfiguration(servletConfig);
         }
+
+        // remove invalid tools, data, and properties from the configuration
+        ConfigurationCleaner cleaner = new ConfigurationCleaner();
+        cleaner.setLog(getLog());
+        cleaner.clean(factoryConfig);
 
         getLog().debug("Configuring toolboxFactory with: "+factoryConfig);
 



Mime
View raw message