svn commit: r674776 - in /ofbiz/trunk: ./ framework/base/lib/j2eespecs/ framework/catalina/lib/ framework/catalina/src/org/ofb
Locked
 
|
Author: jacopoc
Date: Tue Jul 8 04:47:02 2008 New Revision: 674776 URL: http://svn.apache.org/viewvc?rev=674776&view=rev Log: Upgraded (again) to Tomcat 6.0.16. Upgraded commons-dbcp to the HEAD revision (from snapshot taken in 20071125): the upgrade of the dbcp jar seems to have fixed all the issues we were having with "OutOfMemoryError: Java heap space" exceptions. Sorry for the noise (two big commits in the base and catalina components in the same day): hopefully this rather critical issue is now resolved (but I will continue my load tests). Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar (with props) ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar (with props) ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar (with props) ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-el.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar (with props) ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar (with props) Removed: ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jsp_2.0_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-servlet_2.4_spec-1.0.jar ofbiz/trunk/framework/catalina/lib/catalina-cluster.jar ofbiz/trunk/framework/catalina/lib/catalina-optional.jar ofbiz/trunk/framework/catalina/lib/catalina.jar ofbiz/trunk/framework/catalina/lib/jasper-compiler-jdt.jar ofbiz/trunk/framework/catalina/lib/jasper-compiler.jar ofbiz/trunk/framework/catalina/lib/jasper-runtime.jar ofbiz/trunk/framework/catalina/lib/naming-factory.jar ofbiz/trunk/framework/catalina/lib/naming-resources.jar ofbiz/trunk/framework/catalina/lib/servlets-default.jar ofbiz/trunk/framework/catalina/lib/tomcat-ajp.jar ofbiz/trunk/framework/catalina/lib/tomcat-coyote.jar ofbiz/trunk/framework/catalina/lib/tomcat-http.jar ofbiz/trunk/framework/catalina/lib/tomcat-util.jar ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20071125.225953-2.jar Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java ofbiz/trunk/startofbiz.sh Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=674776&r1=674775&r2=674776&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Tue Jul 8 04:47:02 2008 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +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 +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="framework/testtools/src"/> @@ -57,13 +75,16 @@ <classpathentry kind="lib" path="framework/guiapp/lib/XuiOptional-v3.2rc2b.jar"/> <classpathentry kind="lib" path="applications/content/lib/poi.jar"/> <classpathentry kind="lib" path="applications/content/lib/lucene-2.2.0.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-util.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-http.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-coyote.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/servlets-default.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/catalina-optional.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/catalina.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/catalina-cluster.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-catalina.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-el.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar"/> <classpathentry kind="lib" path="framework/webapp/lib/itext-2.0.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/> @@ -93,8 +114,10 @@ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-j2ee-connector_1.5_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-servlet_2.4_spec-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jsp_2.0_spec-1.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/> @@ -130,7 +153,7 @@ <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester-1.8.jar"/> - <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20071125.225953-2.jar"/> + <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-collections-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-codec-1.3.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-cli-1.0.jar"/> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=674776&r1=674775&r2=674776&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Tue Jul 8 04:47:02 2008 @@ -64,7 +64,7 @@ ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar -ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20071125.225953-2.jar +ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar ofbiz/trunk/framework/entity/lib/jdbc/derby-10.3.1.4.jar ofbiz/trunk/framework/jetty/lib/ant-1.6.5.jar ofbiz/trunk/framework/jetty/lib/jasper-compiler-5.5.15.jar Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-ha.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-el.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-el.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-el.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-dbcp.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream 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=674776&r1=674775&r2=674776&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 Tue Jul 8 04:47:02 2008 @@ -44,11 +44,16 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.Manager; import org.apache.catalina.ServerFactory; -import org.apache.catalina.cluster.mcast.McastService; -import org.apache.catalina.cluster.tcp.ReplicationListener; -import org.apache.catalina.cluster.tcp.ReplicationTransmitter; -import org.apache.catalina.cluster.tcp.ReplicationValve; -import org.apache.catalina.cluster.tcp.SimpleTcpCluster; +import org.apache.catalina.ha.tcp.ReplicationValve; +import org.apache.catalina.ha.tcp.SimpleTcpCluster; +import org.apache.catalina.tribes.Channel; +import org.apache.catalina.tribes.ChannelReceiver; +import org.apache.catalina.tribes.group.GroupChannel; +import org.apache.catalina.tribes.membership.McastService; +import org.apache.catalina.tribes.transport.MultiPointSender; +import org.apache.catalina.tribes.transport.ReplicationTransmitter; +import org.apache.catalina.tribes.transport.nio.NioReceiver; + import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardEngine; @@ -224,7 +229,7 @@ ProtocolHandler ph = con.getProtocolHandler(); if (ph instanceof Http11Protocol) { Http11Protocol hph = (Http11Protocol) ph; - Debug.logInfo("Connector " + hph.getProtocol() + " @ " + hph.getPort() + " - " + + Debug.logInfo("Connector " + hph.getProtocols() + " @ " + hph.getPort() + " - " + (hph.getSecure() ? "secure" : "not-secure") + " [" + con.getProtocolHandlerClassName() + "] started.", module); } else { Debug.logInfo("Connector " + con.getProtocol() + " @ " + con.getPort() + " - " + @@ -380,10 +385,10 @@ mcast.setMcastBindAddress(mcb); } - mcast.setMcastAddr(mca); - mcast.setMcastPort(mcp); + mcast.setAddress(mca); + mcast.setPort(mcp); mcast.setMcastDropTime(mcd); - mcast.setMcastFrequency(mcf); + mcast.setFrequency(mcf); String tla = ContainerConfig.getPropertyValue(clusterProps, "tcp-listen-host", "auto"); int tlp = ContainerConfig.getPropertyValue(clusterProps, "tcp-listen-port", 4001); @@ -395,16 +400,21 @@ throw new ContainerException("Cluster configuration requires tcp-listen-port property"); } - ReplicationListener listener = new ReplicationListener(); - listener.setTcpListenAddress(tla); - listener.setTcpListenPort(tlp); - listener.setTcpSelectorTimeout(tlt); - listener.setTcpThreadCount(tlc); + NioReceiver listener = new NioReceiver(); + listener.setAddress(tla); + listener.setPort(tlp); + listener.setSelectorTimeout(tlt); + listener.setMaxThreads(tlc); + listener.setMinThreads(tlc); //listener.setIsSenderSynchronized(false); ReplicationTransmitter trans = new ReplicationTransmitter(); - trans.setReplicationMode(ContainerConfig.getPropertyValue(clusterProps, "replication-mode", "pooled")); - + try { + MultiPointSender mps = (MultiPointSender)Class.forName(ContainerConfig.getPropertyValue(clusterProps, "replication-mode", "org.apache.catalina.tribes.transport.bio.PooledMultiSender")).newInstance(); + trans.setTransport(mps); + } catch(Exception exc) { + throw new ContainerException("Cluster configuration requires a valid replication-mode property: " + exc.getMessage()); + } String mgrClassName = ContainerConfig.getPropertyValue(clusterProps, "manager-class", "org.apache.catalina.cluster.session.DeltaManager"); //int debug = ContainerConfig.getPropertyValue(clusterProps, "debug", 0); // removed since 5.5.9? boolean expireSession = ContainerConfig.getPropertyValue(clusterProps, "expire-session", false); @@ -417,9 +427,12 @@ // removed since 5.5.9? cluster.setExpireSessionsOnShutdown(expireSession); // removed since 5.5.9? cluster.setUseDirtyFlag(useDirty); - cluster.setClusterReceiver(listener); - cluster.setClusterSender(trans); - cluster.setMembershipService(mcast); + GroupChannel channel = new GroupChannel(); + channel.setChannelReceiver(listener); + channel.setChannelSender(trans); + channel.setMembershipService(mcast); + + cluster.setChannel(channel); cluster.addValve(clusterValve); // removed since 5.5.9? cluster.setPrintToScreen(true); @@ -497,6 +510,9 @@ 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"); context.setDisplayName(appInfo.name); context.setDocBase(location); Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java?rev=674776&r1=674775&r2=674776&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java Tue Jul 8 04:47:02 2008 @@ -20,7 +20,7 @@ package org.ofbiz.catalina.container; import org.apache.tomcat.util.net.ServerSocketFactory; -import org.apache.tomcat.util.net.jsse.JSSE14SocketFactory; +import org.apache.tomcat.util.net.jsse.JSSEFactory; import org.apache.tomcat.util.net.jsse.JSSEImplementation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.SSLUtil; @@ -44,7 +44,7 @@ public SSLImpl() throws ClassNotFoundException { super(); - this.ssFactory = new ExtTomcatServerSocketFactory(); + this.ssFactory = (new JSSEFactory()).getSocketFactory(); this.allow = new TrustManager[] { new AllowTrustManager() }; Debug.log("SSLImpl loaded; using custom ServerSocketFactory", module); } @@ -53,12 +53,6 @@ return ssFactory; } - class ExtTomcatServerSocketFactory extends JSSE14SocketFactory { - protected TrustManager[] getTrustManagers(String keystoreType, String algorithm) throws Exception { - return allow; - } - } - class AllowTrustManager implements X509TrustManager { private TrustManager[] tm; Added: ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar?rev=674776&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20080708-r674758.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/startofbiz.sh URL: http://svn.apache.org/viewvc/ofbiz/trunk/startofbiz.sh?rev=674776&r1=674775&r2=674776&view=diff ============================================================================== --- ofbiz/trunk/startofbiz.sh (original) +++ ofbiz/trunk/startofbiz.sh Tue Jul 8 04:47:02 2008 @@ -34,8 +34,9 @@ #automatic IP address for linux #IPADDR=`/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'` #RMIIF="-Djava.rmi.server.hostname=$IPADDR" -MEMIF="-Xms128M -Xmx512M -Duser.language=en" -VMARGS="$MEMIF $DEBUG $RMIIF $ADMIN" +MEMIF="-Xms128M -Xmx512M" +MISC="-Duser.language=en" +VMARGS="$MEMIF $MISC $DEBUG $RMIIF $ADMIN" # Worldpay Config #VMARGS="-Xbootclasspath/p:applications/accounting/lib/cryptix.jar $VMARGS" |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |