Hey -
That's a non backwards-compatible change.
Where did we document this would happen in 1.3 or 1.4?
WILL
----- Original Message -----
From: <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Monday, September 26, 2005 10:37 AM
Subject: svn commit: r291687 - in /jakarta/velocity/core/trunk:
src/java/org/apache/velocity/ src/java/org/apache/velocity/app/
src/java/org/apache/velocity/runtime/configuration/
src/test/org/apache/velocity/test/ xdocs/docs/
Author: henning
Date: Mon Sep 26 10:37:14 2005
New Revision: 291687
URL: http://svn.apache.org/viewcvs?rev=291687&view=rev
Log:
Remove the configuration package and the Configuration class. This was
scheduled to be done in 1.3 or 1.4. Now we do it. :-)
Removed:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/ConfigurationTestCase.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/VelocityContext.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/Velocity.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/VelocityEngine.java
jakarta/velocity/core/trunk/xdocs/docs/changes.xml
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/VelocityContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/VelocityContext.java?rev=291687&r1=291686&r2=291687&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/VelocityContext.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/VelocityContext.java
Mon Sep 26 10:37:14 2005
@@ -51,6 +51,7 @@
* Version Id for serializable
*/
private static final long serialVersionUID = 9033846851064645037L;
+
/**
* Storage for key/value pairs.
*/
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/Velocity.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/Velocity.java?rev=291687&r1=291686&r2=291687&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/Velocity.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/Velocity.java
Mon Sep 26 10:37:14 2005
@@ -32,7 +32,6 @@
import org.apache.velocity.runtime.RuntimeSingleton;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.configuration.Configuration;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.ParseErrorException;
@@ -136,30 +135,6 @@
public static void clearProperty(String key)
{
RuntimeSingleton.clearProperty(key);
- }
-
- /**
- * Set an entire configuration at once. This is
- * useful in cases where the parent application uses
- * the Configuration class and the velocity configuration
- * is a subset of the parent application's configuration.
- *
- * @param Configuration configuration
- *
- * @deprecated Use
- * [EMAIL PROTECTED] #setExtendedProperties( ExtendedProperties ) }
- */
- public static void setConfiguration(Configuration configuration)
- {
- /*
- * Yuk. We added a little helper to Configuration to
- * help with deprecation. The Configuration class
- * contains a 'shadow' ExtendedProperties
- */
-
- ExtendedProperties ep = configuration.getExtendedProperties();
-
- RuntimeSingleton.setConfiguration( ep );
}
/**
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/VelocityEngine.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/VelocityEngine.java?rev=291687&r1=291686&r2=291687&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/VelocityEngine.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/VelocityEngine.java
Mon Sep 26 10:37:14 2005
@@ -32,7 +32,6 @@
import org.apache.velocity.runtime.RuntimeInstance;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.runtime.configuration.Configuration;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.exception.ParseErrorException;
@@ -170,30 +169,6 @@
public void clearProperty(String key)
{
ri.clearProperty(key);
- }
-
- /**
- * Set an entire configuration at once. This is
- * useful in cases where the parent application uses
- * the Configuration class and the velocity configuration
- * is a subset of the parent application's configuration.
- *
- * @param configuration
- *
- * @deprecated Use
- * [EMAIL PROTECTED] #setExtendedProperties( ExtendedProperties ) }
- */
- public void setConfiguration(Configuration configuration)
- {
- /*
- * Yuk. We added a little helper to Configuration to
- * help with deprecation. The Configuration class
- * contains a 'shadow' ExtendedProperties
- */
-
- ExtendedProperties ep = configuration.getExtendedProperties();
-
- ri.setConfiguration( ep );
}
/**
Modified: jakarta/velocity/core/trunk/xdocs/docs/changes.xml
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/xdocs/docs/changes.xml?rev=291687&r1=291686&r2=291687&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/xdocs/docs/changes.xml (original)
+++ jakarta/velocity/core/trunk/xdocs/docs/changes.xml Mon Sep 26 10:37:14
2005
@@ -22,6 +22,8 @@
</p>
<ul>
+<li>Removed the Configuration class and all methods that references it.
This class was deprecated since Velocity 1.1 and was scheduled to be gone
for Velocity 1.3 or 1.4. Now
+it was finally removed in 1.5 (henning)</li>
<li>Added support for decimal numbers. Bug #25874. Thanks to Peter
Romianowski for the initial implementation. (wgh)</li>
<li>MethodInvocationException now consistently thrown
(previously was hidden when in parameter to Velocimacro). As suggested by
Mike Rettig. Bug #30220. (wgh)</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
