svn commit: r383183 - /jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java

[nb...@apache.org]

Author: nbubna
Date: Sat Mar  4 11:22:05 2006
New Revision: 383183

URL: http://svn.apache.org/viewcvs?rev=383183&view=rev
Log:
remove vestiges of obsolete ToolboxContext and implement patch for VELTOOLS-57 from Justin Patterson

Modified:
    jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java

Modified: jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java?rev=383183&r1=383182&r2=383183&view=diff
==============================================================================
--- jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java (original)
+++ jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java Sat Mar  4 11:22:05 2006
@@ -38,7 +38,6 @@
 import org.apache.velocity.tools.view.DataInfo;
 import org.apache.velocity.tools.view.ToolInfo;
 import org.apache.velocity.tools.view.XMLToolboxManager;
-import org.apache.velocity.tools.view.context.ToolboxContext;
 import org.apache.velocity.tools.view.context.ViewContext;
 import org.apache.velocity.tools.view.servlet.ServletToolboxRuleSet;
 
@@ -150,12 +149,12 @@
             toolboxFile = "/" + toolboxFile;
         }
 
-        // get config file pathname
-        String pathname = servletContext.getRealPath(toolboxFile);
+        // get the unique key for this toolbox file in this servlet context
+        String uniqueKey = servletContext.hashCode() + ':' + toolboxFile;
 
-        // check if a previous instance exists
+        // check if an instance already exists
         ServletToolboxManager toolboxManager = 
-            (ServletToolboxManager)managersMap.get(pathname);
+            (ServletToolboxManager)managersMap.get(uniqueKey);
 
         if (toolboxManager == null)
         {
@@ -174,7 +173,7 @@
                     toolboxManager.load(is);
 
                     // remember it
-                    managersMap.put(pathname, toolboxManager);
+                    managersMap.put(uniqueKey, toolboxManager);
 
                     LOG.info("Toolbox setup complete.");
                 }
@@ -210,11 +209,11 @@
      * current request and session-scoped tools have been defined for this
      * toolbox.</p>
      *
-     * <p>If true, then a call to {@link #getToolboxContext(Object)} will 
+     * <p>If true, then a call to {@link #getToolbox(Object)} will 
      * create a new session if none currently exists for this request and
      * the toolbox has one or more session-scoped tools designed.</p>
      *
-     * <p>If false, then a call to getToolboxContext(Object) will never
+     * <p>If false, then a call to getToolbox(Object) will never
      * create a new session for the current request.
      * This effectively means that no session-scoped tools will be added to 
      * the ToolboxContext for a request that does not have a session object.
@@ -277,7 +276,7 @@
 
     /**
      * Overrides XMLToolboxManager to separate tools by scope.
-     * For this to work, we obviously override getToolboxContext(Object) as well.
+     * For this to work, we obviously override getToolbox(Object) as well.
      */
     public void addTool(ToolInfo info)
     {



---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org