Author: nbelaevski Date: 2008-11-13 18:58:13 -0500 (Thu, 13 Nov 2008) New Revision: 11158 Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java Log: Changes from previous revision reverted Modified: trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java =================================================================== --- trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-11-13 22:34:03 UTC (rev 11157) +++ trunk/framework/test/src/main/java/org/ajax4jsf/tests/AbstractAjax4JsfTestCase.java 2008-11-13 23:58:13 UTC (rev 11158) @@ -24,7 +24,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; @@ -388,9 +387,8 @@ webConnection = new MockWebConnection(webClient) { public WebResponse getResponse(WebRequestSettings settings) throws IOException { - String resourcePath = settings.getURL().getFile().substring( - request.getContextPath().length()); - String resourceKey = WebXml.getInstance(facesContext).getFacesResourceKey(resourcePath); + String resourceKey = WebXml.getInstance(facesContext).getFacesResourceKey(settings.getURL().getFile().substring( + request.getContextPath().length())); if (resourceKey != null) { InternetResourceBuilder resourceBuilder = InternetResourceBuilder.getInstance(); @@ -422,54 +420,7 @@ }; } else { - WebResponse webResponse = super.getResponse(settings); - if (webResponse == null || webResponse.getStatusCode() == HttpServletResponse.SC_NOT_FOUND) { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - if (resourcePath.length() != 0) { - URL url = classLoader.getResource(resourcePath); - if (url == null) { - char charAt = resourcePath.charAt(0); - String alternatePath = charAt == '/' ? resourcePath.substring(1) : "/" + resourcePath; - - url = classLoader.getResource(alternatePath); - } - - if (url != null) { - final String extension; - int extensionIndex = resourcePath.lastIndexOf('.'); - - if (extensionIndex != -1) { - extension = resourcePath.substring(extensionIndex + 1); - } else { - extension = null; - } - - return new WebResponseImpl( - new WebResponseData( - url.openStream(), - HttpServletResponse.SC_OK, - "OK", - Collections.EMPTY_LIST), - settings.getURL(), - settings.getSubmitMethod(), - 0) { - - public String getContentType() { - if ("js".equals(extension)) { - return "text/javascript"; - } else if ("css".equals(extension)) { - return "text/css"; - } else { - //TODO return text/plain for unknown types? - return "text/html"; - } - } - }; - } - } - } - - return webResponse; + return super.getResponse(settings); } } };