Author: wglass
Date: Mon Oct 9 17:01:11 2006
New Revision: 454562
URL: http://svn.apache.org/viewvc?view=rev&rev=454562
Log:
move ContextAware/RuntimeServicesAware to util package for more generic future
use
Added:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/ContextAware.java
- copied, changed from r454530,
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/RuntimeServicesAware.java
- copied, changed from r454530,
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java
Removed:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java?view=diff&rev=454562&r1=454561&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventCartridge.java
Mon Oct 9 17:01:11 2006
@@ -25,6 +25,7 @@
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalEventContext;
import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.util.RuntimeServicesAware;
/**
* Stores the event handlers. Event handlers can be assigned on a per
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java?view=diff&rev=454562&r1=454561&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/EventHandlerUtil.java
Mon Oct 9 17:01:11 2006
@@ -20,6 +20,7 @@
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.util.ContextAware;
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java?view=diff&rev=454562&r1=454561&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/EscapeReference.java
Mon Oct 9 17:01:11 2006
@@ -19,8 +19,8 @@
import org.apache.oro.text.perl.MalformedPerl5PatternException;
import org.apache.oro.text.perl.Perl5Util;
import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
-import org.apache.velocity.app.event.RuntimeServicesAware;
import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.util.RuntimeServicesAware;
import org.apache.velocity.util.StringUtils;
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java?view=diff&rev=454562&r1=454561&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
Mon Oct 9 17:01:11 2006
@@ -17,8 +17,8 @@
*/
import org.apache.velocity.app.event.IncludeEventHandler;
-import org.apache.velocity.app.event.RuntimeServicesAware;
import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.util.RuntimeServicesAware;
import org.apache.velocity.util.StringUtils;
/**
@@ -87,7 +87,7 @@
/**
- * @see
org.apache.velocity.app.event.RuntimeServicesAware#setRuntimeServices(org.apache.velocity.runtime.RuntimeServices)
+ * @see
org.apache.velocity.util.RuntimeServicesAware#setRuntimeServices(org.apache.velocity.runtime.RuntimeServices)
*/
public void setRuntimeServices(RuntimeServices rs) throws Exception
{
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java?view=diff&rev=454562&r1=454561&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java
Mon Oct 9 17:01:11 2006
@@ -19,8 +19,8 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import org.apache.velocity.app.event.MethodExceptionEventHandler;
-import org.apache.velocity.app.event.RuntimeServicesAware;
import org.apache.velocity.runtime.RuntimeServices;
+import org.apache.velocity.util.RuntimeServicesAware;
/**
* Simple event handler that renders method exceptions in the page
@@ -110,7 +110,7 @@
/**
- * @see
org.apache.velocity.app.event.RuntimeServicesAware#setRuntimeServices(org.apache.velocity.runtime.RuntimeServices)
+ * @see
org.apache.velocity.util.RuntimeServicesAware#setRuntimeServices(org.apache.velocity.runtime.RuntimeServices)
*/
public void setRuntimeServices(RuntimeServices rs) throws Exception
{
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java?view=diff&rev=454562&r1=454561&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
Mon Oct 9 17:01:11 2006
@@ -34,7 +34,6 @@
import org.apache.velocity.app.event.MethodExceptionEventHandler;
import org.apache.velocity.app.event.NullSetEventHandler;
import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
-import org.apache.velocity.app.event.RuntimeServicesAware;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.directive.Directive;
@@ -46,6 +45,7 @@
import org.apache.velocity.runtime.resource.ContentResource;
import org.apache.velocity.runtime.resource.ResourceManager;
import org.apache.velocity.util.ClassUtils;
+import org.apache.velocity.util.RuntimeServicesAware;
import org.apache.velocity.util.StringUtils;
import org.apache.velocity.util.introspection.Introspector;
import org.apache.velocity.util.introspection.Uberspect;
Copied:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/ContextAware.java
(from r454530,
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java)
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/ContextAware.java?view=diff&rev=454562&p1=jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java&r1=454530&p2=jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/ContextAware.java&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/ContextAware.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/ContextAware.java
Mon Oct 9 17:01:11 2006
@@ -1,4 +1,4 @@
-package org.apache.velocity.app.event;
+package org.apache.velocity.util;
/*
* Copyright 2001-2004 The Apache Software Foundation.
Copied:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/RuntimeServicesAware.java
(from r454530,
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java)
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/RuntimeServicesAware.java?view=diff&rev=454562&p1=jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java&r1=454530&p2=jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/RuntimeServicesAware.java&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/event/RuntimeServicesAware.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/util/RuntimeServicesAware.java
Mon Oct 9 17:01:11 2006
@@ -1,4 +1,4 @@
-package org.apache.velocity.app.event;
+package org.apache.velocity.util;
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -20,9 +20,9 @@
/**
- * Event handlers implementing this interface will automatically
- * have the method setRuntimeServices called when the associated
- * EventCartridge is attached to the context.
+ * Use this interface to automatically
+ * have the method setRuntimeServices called at initialization.
+ * Applies to EventHandler and Uberspect implementations.
*
* @author <a href="mailto:[EMAIL PROTECTED]@forio.com">Will Glass-Husain</a>
* @version $Id$
Modified:
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java?view=diff&rev=454562&r1=454561&r2=454562
==============================================================================
---
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java
(original)
+++
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java
Mon Oct 9 17:01:11 2006
@@ -29,10 +29,10 @@
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.event.EventCartridge;
import org.apache.velocity.app.event.IncludeEventHandler;
-import org.apache.velocity.app.event.RuntimeServicesAware;
import org.apache.velocity.context.Context;
import org.apache.velocity.runtime.RuntimeServices;
import org.apache.velocity.runtime.RuntimeSingleton;
+import org.apache.velocity.util.RuntimeServicesAware;
/**
* Tests event handling
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
