[Wonder-cvs] SF.net SVN: wonder:[10901] branches/Wonder_2_0_0_Branch/Wonder/Common/ Frameworks/ERExtensions/Sources/er/extensions/appserver/ERXResourceManager. java

[<ms...@us...>]

Revision: 10901
          http://wonder.svn.sourceforge.net/wonder/?rev=10901&view=rev
Author:   mschrag
Date:     2010-05-25 23:24:49 +0000 (Tue, 25 May 2010)

Log Message:
-----------
er.extensions.ERXResourceManager.isUsingWebServerOverride=true -- turns on WebServerConnect static URL generation ONLY. This will leave the serverName and serverPort calculations alone and ONLY impact URL generation.

Modified Paths:
--------------
    branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/appserver/ERXResourceManager.java

Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/appserver/ERXResourceManager.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/appserver/ERXResourceManager.java	2010-05-25 18:15:28 UTC (rev 10900)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/appserver/ERXResourceManager.java	2010-05-25 23:24:49 UTC (rev 10901)
@@ -140,7 +140,8 @@
 
 	public String urlForResourceNamed(String name, String bundleName, NSArray languages, WORequest request) {
 		String completeURL = null;
-		if (request == null || request.isUsingWebServer() && !WOApplication.application()._rapidTurnaroundActiveForAnyProject()) {
+		boolean isUsingWebServer = request == null || request.isUsingWebServer() || ERXProperties.booleanForKeyWithDefault("er.extensions.ERXResourceManager.isUsingWebServerOverride", false);
+		if (isUsingWebServer && !WOApplication.application()._rapidTurnaroundActiveForAnyProject()) {
 			completeURL = _cachedURLForResource(name, bundleName, languages, request);
 		}
 		else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.