You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2009/03/27 17:56:08 UTC
svn commit: r759230 - in
/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container:
CatalinaContainer.java CrossSubdomainSessionValve.java
SslAcceleratorValve.java
Author: doogie
Date: Fri Mar 27 16:56:08 2009
New Revision: 759230
URL: http://svn.apache.org/viewvc?rev=759230&view=rev
Log:
Fix lines that *only* have 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/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=759230&r1=759229&r2=759230&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 Fri Mar 27 16:56:08 2009
@@ -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");
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=759230&r1=759229&r2=759230&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 Fri Mar 27 16:56:08 2009
@@ -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());
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=759230&r1=759229&r2=759230&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 Fri Mar 27 16:56:08 2009
@@ -33,9 +33,9 @@
* 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;
}