svn commit: r659490 - in /ofbiz/trunk: ./ framework/base/config/ framework/base/lib/j2eespecs/ framework/catalina/lib/ framework/catalina/src/org/ofb
Locked
 
|
Author: jacopoc
Date: Fri May 23 03:26:46 2008 New Revision: 659490 URL: http://svn.apache.org/viewvc?rev=659490&view=rev Log: Upgrade to Tomcat 6 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) 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 Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/NOTICE ofbiz/trunk/framework/base/config/log4j.xml ofbiz/trunk/framework/base/config/ofbiz-containers.xml ofbiz/trunk/framework/base/config/test-containers.xml ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=659490&r1=659489&r2=659490&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Fri May 23 03:26:46 2008 @@ -55,13 +55,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-transaction-1.0.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/jencks-1.1.3.jar"/> @@ -83,16 +86,18 @@ <classpathentry kind="lib" path="framework/base/lib/ant-launcher-1.7.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/ant-1.7.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-net-1.4.1.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-saaj_1.1_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.0.1B_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/geronimo-jms_1.1_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/> <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/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"/> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=659490&r1=659489&r2=659490&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Fri May 23 03:26:46 2008 @@ -44,24 +44,25 @@ ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jaxr_1.0_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar -ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jsp_2.0_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jta_1.0.1B_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar -ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-servlet_2.4_spec-1.0.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-el_2.1_spec.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-servlet_2.5_spec.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-jsp_2.1_spec.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.16-annotations_spec.jar ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar ofbiz/trunk/framework/base/lib/scripting/groovy-1.5.6.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/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/catalina/lib/tomcat-6.0.16-catalina-ha.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina-tribes.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-catalina.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-el.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-coyote.jar +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-20070730.jar ofbiz/trunk/framework/entity/lib/jdbc/derby-10.3.1.4.jar ofbiz/trunk/framework/jetty/lib/ant.jar @@ -300,10 +301,7 @@ ========================================================================= The following libraries distributed with Apache OFBiz are licensed under the Apache Software License: -ofbiz/trunk/framework/catalina/lib/jasper-compiler-jdt.jar -ofbiz/trunk/framework/catalina/lib/jasper-compiler.jar ofbiz/trunk/framework/jetty/lib/jasper-compiler.jar -ofbiz/trunk/framework/catalina/lib/jasper-runtime.jar ofbiz/trunk/framework/jetty/lib/jasper-runtime.jar ofbiz/trunk/framework/webapp/lib/DataVision-1.0.0.jar ========================================================================= @@ -2275,6 +2273,223 @@ discretion of the Open Applications Group without notice, at any time. Please contact the Open Applications Group at www.openapplications.org with any questions or comments regarding the usage of this material. + +========================================================================= +The following libraries distributed with Apache OFBiz are licensed under the +Eclipse Public License - v 1.0: +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-jasper-jdt.jar +========================================================================= +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement , including but not limited to the risks and costs +of program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation +may assign the responsibility to serve as the Agreement Steward to a suitable +separate entity. Each new version of the Agreement will be given a +distinguishing version number. The Program (including Contributions) may always +be distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to distribute the Program (including its Contributions) +under the new version. Except as expressly stated in Sections 2(a) and 2(b) +above, Recipient receives no rights or licenses to the intellectual property of +any Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted under +this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + ================================================================================== Apache Ofbiz includes prototype.js from http://www.prototypejs.org licensed under the terms of the MIT License Modified: ofbiz/trunk/NOTICE URL: http://svn.apache.org/viewvc/ofbiz/trunk/NOTICE?rev=659490&r1=659489&r2=659490&view=diff ============================================================================== --- ofbiz/trunk/NOTICE (original) +++ ofbiz/trunk/NOTICE Fri May 23 03:26:46 2008 @@ -114,6 +114,15 @@ http://snowball.tartarus.org/ ========================================================================= +== Apache Tomcat Notice == +========================================================================= + +Java compilation software for JSP pages is provided by Eclipse, +which is open source software. The orginal software and +related infomation is available at +http://www.eclipse.org. + +========================================================================= == Apache Xerces Java Notice == ========================================================================= Modified: ofbiz/trunk/framework/base/config/log4j.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/log4j.xml?rev=659490&r1=659489&r2=659490&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/log4j.xml (original) +++ ofbiz/trunk/framework/base/config/log4j.xml Fri May 23 03:26:46 2008 @@ -137,6 +137,10 @@ </layout> </appender> + <category name="org.apache.catalina"> + <priority value="warn"/> + </category> + <!-- log4j category --> <category name="org.apache.log4j"> <priority value="warn"/> Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=659490&r1=659489&r2=659490&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original) +++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Fri May 23 03:26:46 2008 @@ -115,7 +115,7 @@ </property> <property name="manager-class" value="org.apache.catalina.cluster.session.DeltaManager"/> <property name="debug" value="5"/> - <property name="replication-mode" value="pooled"/> + <property name="replication-mode" value="org.apache.catalina.tribes.transport.bio.PooledMultiSender"/> <property name="tcp-listen-host" value="auto"/> <property name="tcp-listen-port" value="4001"/> <property name="tcp-sector-timeout" value="100"/> Modified: ofbiz/trunk/framework/base/config/test-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=659490&r1=659489&r2=659490&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/test-containers.xml (original) +++ ofbiz/trunk/framework/base/config/test-containers.xml Fri May 23 03:26:46 2008 @@ -88,7 +88,7 @@ </property> <property name="manager-class" value="org.apache.catalina.cluster.session.DeltaManager"/> <property name="debug" value="5"/> - <property name="replication-mode" value="pooled"/> + <property name="replication-mode" value="org.apache.catalina.tribes.transport.bio.PooledMultiSender"/> <property name="tcp-listen-host" value="auto"/> <property name="tcp-listen-port" value="4001"/> <property name="tcp-sector-timeout" value="100"/> 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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&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=659490&r1=659489&r2=659490&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 May 23 03:26:46 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() + " - " + @@ -395,7 +400,7 @@ throw new ContainerException("Cluster configuration requires tcp-listen-port property"); } - ReplicationListener listener = new ReplicationListener(); + NioReceiver listener = new NioReceiver(); listener.setTcpListenAddress(tla); listener.setTcpListenPort(tlp); listener.setTcpSelectorTimeout(tlt); @@ -403,8 +408,12 @@ //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 +426,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); 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=659490&r1=659489&r2=659490&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 Fri May 23 03:26:46 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; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |