Anonymous avatar Anonymous committed b68f2b2

Applied patch from WW-614: Cannot set velocity macro autoreloading.

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@571 573baa09-0c28-0410-bef9-dab3c582ae83

Comments (0)

Files changed (1)

src/java/com/opensymphony/webwork/views/velocity/VelocityManager.java

 
         Properties properties = new Properties();
 
+        // now apply our systemic defaults, then allow user to override
+        applyDefaultConfiguration(context, properties);
+
         /**
          * if the user has specified an external velocity configuration file, we'll want to search for it in the
          * following order
             }
         }
 
-        // now apply our systemic defaults
-        applyDefaultConfiguration(context, properties);
-
         // for debugging purposes, allows users to dump out the properties that have been configured
         if (log.isDebugEnabled()) {
             log.debug("Initializing Velocity with the following properties ...");
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.