You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by Sérgio 7 Reais <co...@newenterprise.com.br> on 2007/06/05 06:45:08 UTC
Re: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
----- Original Message -----
From: nbubna@apache.org
To: commits@velocity.apache.org
Sent: Monday, June 04, 2007 9:29 PM
Subject: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
Author: nbubna
Date: Mon Jun 4 17:29:56 2007
New Revision: 544334
URL: http://svn.apache.org/viewvc?view=rev&rev=544334
Log:
remove unintended changes that snuck in with propedit
Modified:
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
Modified: velocity/tools/branches/2.x/build.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/build.xml?view=diff&rev=544334&r1=544333&r2=544334
==============================================================================
--- velocity/tools/branches/2.x/build.xml (original)
+++ velocity/tools/branches/2.x/build.xml Mon Jun 4 17:29:56 2007
@@ -374,7 +374,7 @@
</target>
<!-- Build VelocityView - Showcase application -->
- <target name="showcase" depends="jar,prepare.examples"
+ <target name="showcase" depends="jar.view,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=544334&r1=544333&r2=544334
==============================================================================
--- velocity/tools/branches/2.x/examples.xml (original)
+++ velocity/tools/branches/2.x/examples.xml Mon Jun 4 17:29:56 2007
@@ -52,7 +52,7 @@
<antcall target="example-${target}"/>
</target>
<target name="simple-dependencies">
- <copy todir="${lib}" file="${dist.dir}/${struts.id}.jar"/>
+ <copy todir="${lib}" file="${dist.dir}/${view.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=544334&r1=544333&r2=544334
==============================================================================
--- 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:29:56 2007
@@ -43,7 +43,6 @@
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;
@@ -497,11 +496,6 @@
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);
--
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: 3/6/2007 12:47
Re: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
Posted by Sérgio 7 Reais <co...@newenterprise.com.br>.
----- Original Message -----
From: Sérgio 7 Reais
To: dev@velocity.apache.org
Sent: Wednesday, June 06, 2007 11:27 PM
Subject: Re: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
----- Original Message -----
From: Sérgio 7 Reais
To: dev@velocity.apache.org
Sent: Tuesday, June 05, 2007 1:45 AM
Subject: Re: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
----- Original Message -----
From: nbubna@apache.org
To: commits@velocity.apache.org
Sent: Monday, June 04, 2007 9:29 PM
Subject: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
Author: nbubna
Date: Mon Jun 4 17:29:56 2007
New Revision: 544334
URL: http://svn.apache.org/viewvc?view=rev&rev=544334
Log:
remove unintended changes that snuck in with propedit
Modified:
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
Modified: velocity/tools/branches/2.x/build.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/build.xml?view=diff&rev=544334&r1=544333&r2=544334
==============================================================================
--- velocity/tools/branches/2.x/build.xml (original)
+++ velocity/tools/branches/2.x/build.xml Mon Jun 4 17:29:56 2007
@@ -374,7 +374,7 @@
</target>
<!-- Build VelocityView - Showcase application -->
- <target name="showcase" depends="jar,prepare.examples"
+ <target name="showcase" depends="jar.view,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=544334&r1=544333&r2=544334
==============================================================================
--- velocity/tools/branches/2.x/examples.xml (original)
+++ velocity/tools/branches/2.x/examples.xml Mon Jun 4 17:29:56 2007
@@ -52,7 +52,7 @@
<antcall target="example-${target}"/>
</target>
<target name="simple-dependencies">
- <copy todir="${lib}" file="${dist.dir}/${struts.id}.jar"/>
+ <copy todir="${lib}" file="${dist.dir}/${view.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=544334&r1=544333&r2=544334
==============================================================================
--- 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:29:56 2007
@@ -43,7 +43,6 @@
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;
@@ -497,11 +496,6 @@
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);
--
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: 3/6/2007 12:47
------------------------------------------------------------------------------
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: 3/6/2007 12:47
------------------------------------------------------------------------------
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.9/834 - Release Date: 5/6/2007 14:38
Re: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
Posted by Sérgio 7 Reais <co...@newenterprise.com.br>.
----- Original Message -----
From: Sérgio 7 Reais
To: dev@velocity.apache.org
Sent: Tuesday, June 05, 2007 1:45 AM
Subject: Re: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
----- Original Message -----
From: nbubna@apache.org
To: commits@velocity.apache.org
Sent: Monday, June 04, 2007 9:29 PM
Subject: svn commit: r544334 - in /velocity/tools/branches/2.x: build.xml examples.xml src/main/java/org/apache/velocity/tools/view/VelocityView.java
Author: nbubna
Date: Mon Jun 4 17:29:56 2007
New Revision: 544334
URL: http://svn.apache.org/viewvc?view=rev&rev=544334
Log:
remove unintended changes that snuck in with propedit
Modified:
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
Modified: velocity/tools/branches/2.x/build.xml
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/build.xml?view=diff&rev=544334&r1=544333&r2=544334
==============================================================================
--- velocity/tools/branches/2.x/build.xml (original)
+++ velocity/tools/branches/2.x/build.xml Mon Jun 4 17:29:56 2007
@@ -374,7 +374,7 @@
</target>
<!-- Build VelocityView - Showcase application -->
- <target name="showcase" depends="jar,prepare.examples"
+ <target name="showcase" depends="jar.view,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=544334&r1=544333&r2=544334
==============================================================================
--- velocity/tools/branches/2.x/examples.xml (original)
+++ velocity/tools/branches/2.x/examples.xml Mon Jun 4 17:29:56 2007
@@ -52,7 +52,7 @@
<antcall target="example-${target}"/>
</target>
<target name="simple-dependencies">
- <copy todir="${lib}" file="${dist.dir}/${struts.id}.jar"/>
+ <copy todir="${lib}" file="${dist.dir}/${view.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=544334&r1=544333&r2=544334
==============================================================================
--- 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:29:56 2007
@@ -43,7 +43,6 @@
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;
@@ -497,11 +496,6 @@
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);
--
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: 3/6/2007 12:47
------------------------------------------------------------------------------
No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.5.472 / Virus Database: 269.8.7/830 - Release Date: 3/6/2007 12:47