svn commit: r757067 - in /ofbiz/trunk/framework/catalin
Locked
 
|
Author: doogie
Date: Sat Mar 21 23:22:57 2009 New Revision: 757067 URL: http://svn.apache.org/viewvc?rev=757067&view=rev Log: Fix purely empty whitespace lines, and remove trailing whitespace. Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SslAcceleratorValve.java Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=757067&r1=757066&r2=757067&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Sat Mar 21 23:22:57 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -149,7 +149,7 @@ protected boolean distribute = false; protected boolean enableDefaultMimeTypes = true; - + protected String catalinaRuntimeHome; /** @@ -171,7 +171,7 @@ this.contextReloadable = ContainerConfig.getPropertyValue(cc, "apps-context-reloadable", false); this.crossContext = ContainerConfig.getPropertyValue(cc, "apps-cross-context", true); this.distribute = ContainerConfig.getPropertyValue(cc, "apps-distributable", true); - + this.catalinaRuntimeHome = ContainerConfig.getPropertyValue(cc, "catalina-runtime-home", "runtime/catalina"); // set catalina_home @@ -301,7 +301,7 @@ CrossSubdomainSessionValve sessionValve = new CrossSubdomainSessionValve(); engine.addValve(sessionValve); } - + // configure the access log valve String logDir = ContainerConfig.getPropertyValue(engineConfig, "access-log-dir", null); AccessLogValve al = null; @@ -316,7 +316,7 @@ } al.setDirectory(logFile.getAbsolutePath()); } - + // configure the SslAcceleratorValve String sslAcceleratorPortStr = ContainerConfig.getPropertyValue(engineConfig, "ssl-accelerator-port", null); if (UtilValidate.isNotEmpty(sslAcceleratorPortStr)) { @@ -325,7 +325,7 @@ sslAcceleratorValve.setSslAcceleratorPort(sslAcceleratorPort); engine.addValve(sslAcceleratorValve); } - + String alp2 = ContainerConfig.getPropertyValue(engineConfig, "access-log-pattern", null); if (al != null && !UtilValidate.isEmpty(alp2)) { @@ -438,7 +438,7 @@ channel.setChannelReceiver(listener); channel.setChannelSender(trans); channel.setMembershipService(mcast); - + cluster.setChannel(channel); cluster.addValve(clusterValve); // removed since 5.5.9? cluster.setPrintToScreen(true); @@ -517,7 +517,7 @@ context.setJ2EEApplication(J2EE_APP); context.setJ2EEServer(J2EE_SERVER); context.setLoader(embedded.createLoader(ClassLoaderContainer.getClassLoader())); - + context.setCookies(appInfo.isSessionCookieAccepted()); context.addParameter("cookies", appInfo.isSessionCookieAccepted() ? "true" : "false"); @@ -609,12 +609,12 @@ if (!loadedMounts.contains(mount)) { createContext(appInfo); loadedMounts.add(mount); - } else { + } else { appInfo.appBarDisplay = false; // disable app bar display on overrided apps Debug.logInfo("Duplicate webapp mount; not loading : " + appInfo.getName() + " / " + appInfo.getLocation(), module); } } - } + } } public void stop() throws ContainerException { Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=757067&r1=757066&r2=757067&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java Sat Mar 21 23:22:57 2009 @@ -24,7 +24,7 @@ super(); } - public @Override void invoke(Request request, Response response) throws IOException, ServletException { + public @Override void invoke(Request request, Response response) throws IOException, ServletException { // this will cause Request.doGetSession to create the session cookie if necessary request.getSession(true); @@ -45,7 +45,7 @@ } protected void replaceCookie(Request request, Response response, Cookie cookie) { - + // copy the existing session cookie, but use a different domain (only if domain is valid) String cookieDomain = null; cookieDomain = UtilProperties.getPropertyValue("url", "cookie.domain", ""); @@ -68,7 +68,7 @@ cookieDomain = "." + domainArray[domainArray.length - 2] + "." + domainArray[domainArray.length - 1]; } } - + if (UtilValidate.isNotEmpty(cookieDomain)) { Cookie newCookie = new Cookie(cookie.getName(), cookie.getValue()); @@ -81,7 +81,7 @@ if (cookie.getComment() != null) { newCookie.setComment(cookie.getComment()); } - newCookie.setSecure(cookie.getSecure()); + newCookie.setSecure(cookie.getSecure()); // if the response has already been committed, our replacement strategy will have no effect if (response.isCommitted()) { @@ -95,7 +95,7 @@ MessageBytes value = mimeHeaders.getValue(i); if (value.indexOf(cookie.getName()) >= 0) { StringBuffer buffer = new StringBuffer(); - ServerCookie.appendCookieValue(buffer, newCookie.getVersion(), newCookie.getName(), newCookie.getValue(), newCookie.getPath(), + ServerCookie.appendCookieValue(buffer, newCookie.getVersion(), newCookie.getName(), newCookie.getValue(), newCookie.getPath(), newCookie.getDomain(), newCookie.getComment(), newCookie.getMaxAge(), newCookie.getSecure()); Debug.logVerbose("CrossSubdomainSessionValve: old Set-Cookie value: " + value.toString(), module); Debug.logVerbose("CrossSubdomainSessionValve: new Set-Cookie value: " + buffer, module); Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java?rev=757067&r1=757066&r2=757067&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java Sat Mar 21 23:22:57 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SslAcceleratorValve.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SslAcceleratorValve.java?rev=757067&r1=757066&r2=757067&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SslAcceleratorValve.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SslAcceleratorValve.java Sat Mar 21 23:22:57 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +29,13 @@ /** * To use add (or uncomment) the following line to the Tomcat/Catalina configuarion (ie in ofbiz-containers.xml under the <property name="default-server" value="engine"> element) * <property name="ssl-accelerator-port" value="8443"/> - * + * * Once that is done just setup a connector just like the example http-connector and have it listen on the port you set in the ssl-accelerator-port value. */ public class SslAcceleratorValve extends ValveBase { - + protected Integer sslAcceleratorPort = null; - + public void setSslAcceleratorPort(Integer sslAcceleratorPort) { this.sslAcceleratorPort = sslAcceleratorPort; } @@ -45,7 +45,7 @@ } public @Override void invoke(Request req, Response resp) throws IOException, ServletException { - if (sslAcceleratorPort != null && req.getLocalPort() == sslAcceleratorPort.intValue()) { + if (sslAcceleratorPort != null && req.getLocalPort() == sslAcceleratorPort.intValue()) { req.setSecure(true); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |