You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacques Le Roux <ja...@les7arts.com> on 2012/04/15 12:23:36 UTC

Re: svn commit: r1326293 - in /ofbiz/trunk: ./ framework/service/lib/

Sorry, I thought I had removed the AnyEdit setting which automatically remove trailing spaces from my Eclipse. But it seems, 
upgrading to Indigo (3.7.2), I missed something
So there are a lot of false changes here.
Not a big deal, no functionnal changes: only libs renaming

Jacques

From: <jl...@apache.org>
> Author: jleroux
> Date: Sun Apr 15 09:42:42 2012
> New Revision: 1326293
>
> URL: http://svn.apache.org/viewvc?rev=1326293&view=rev
> Log:
> Add version names to some libs, WIP...
>
> Added:
>    ofbiz/trunk/framework/service/lib/axis-1.4.jar   (with props)
>    ofbiz/trunk/framework/service/lib/axis-ant-1.4.jar
>      - copied unchanged from r1326100, ofbiz/trunk/framework/service/lib/axis-ant.jar
>    ofbiz/trunk/framework/service/lib/wsdl4j-1.5.1.jar   (with props)
> Removed:
>    ofbiz/trunk/framework/service/lib/axis-ant.jar
>    ofbiz/trunk/framework/service/lib/axis.jar
>    ofbiz/trunk/framework/service/lib/wsdl4j.jar
> Modified:
>    ofbiz/trunk/.classpath
>    ofbiz/trunk/LICENSE
>
> Modified: ofbiz/trunk/.classpath
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1326293&r1=1326292&r2=1326293&view=diff
> ==============================================================================
> --- ofbiz/trunk/.classpath (original)
> +++ ofbiz/trunk/.classpath Sun Apr 15 09:42:42 2012
> @@ -152,9 +152,9 @@
>     <classpathentry kind="lib" path="framework/jetty/lib/org.apache.jasper.glassfish-2.2.2.v201112011158.jar"/>
>     <classpathentry kind="lib" path="framework/jetty/lib/org.apache.taglibs.standard.glassfish-1.2.0.v201112081803.jar"/>
>     <classpathentry kind="lib" path="framework/jetty/lib/org.eclipse.jdt.core-3.7.1.jar"/>
> -    <classpathentry kind="lib" path="framework/service/lib/axis.jar"/>
> -    <classpathentry kind="lib" path="framework/service/lib/axis-ant.jar"/>
> -    <classpathentry kind="lib" path="framework/service/lib/wsdl4j.jar"/>
> +    <classpathentry kind="lib" path="framework/service/lib/axis-1.4.jar"/>
> +    <classpathentry kind="lib" path="framework/service/lib/axis-ant-1.4.jar"/>
> +    <classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.5.1.jar"/>
>     <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.9.jar"/>
>     <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.9.jar"/>
>     <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.2.jar"/>
>
> Modified: ofbiz/trunk/LICENSE
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1326293&r1=1326292&r2=1326293&view=diff
> ==============================================================================
> --- ofbiz/trunk/LICENSE (original)
> +++ ofbiz/trunk/LICENSE Sun Apr 15 09:42:42 2012
> @@ -93,8 +93,8 @@ ofbiz/framework/catalina/lib/tomcat-7.0.
> ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
> ofbiz/trunk/framework/entity/lib/jdbc/derby-10.8.2.2.jar
> ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
> -ofbiz/trunk/framework/service/lib/axis-ant.jar
> -ofbiz/trunk/framework/service/lib/axis.jar
> +ofbiz/trunk/framework/service/lib/axis-ant-1.4.jar
> +ofbiz/trunk/framework/service/lib/axis-1.4.jar
> ofbiz/trunk/framework/service/lib/axiom-api-1.2.9.jar
> ofbiz/trunk/framework/service/lib/axiom-impl-1.2.9.jar
> ofbiz/trunk/framework/service/lib/axis2-kernel-1.5.2.jar
> @@ -1008,7 +1008,7 @@ The following libraries distributed with
> Common Public License:
> ofbiz/trunk/specialpurpose/pos/lib/jcl.jar
> ofbiz/trunk/specialpurpose/pos/lib/jpos18-controls.jar
> -ofbiz/trunk/framework/service/lib/wsdl4j.jar
> +ofbiz/trunk/framework/service/lib/wsdl4j-1.5.1.jar
> ofbiz/trunk/framework/base/lib/junit-dep-4.10.jar
> =========================================================================
> Common Public License Version 1.0
> @@ -2632,7 +2632,7 @@ Apache OFBiz system in an email to H.Bak
> Tue, 25 Aug 2009 07:27:51 -0400 (18:27 ICT)
> =========================================================================
> Apache Ofbiz includes images in the ofbiz/framework/images/webapp/images/icons
> -directory with the following licence: Creative Commons Attribution 2.5 License
> +directory with the following licence: Creative Commons Attribution 2.5 License
> and condition :
>
>
> @@ -2641,17 +2641,17 @@ Creative Commons Attribution 2.5 License
> http://creativecommons.org/licenses/by/2.5/
>
> THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
> -COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
> +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
> COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
> AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
>
> -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
> +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
> TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS
> CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
>
> 1. Definitions
>  1. "Collective Work" means a work, such as a periodical issue,
> -     anthology or encyclopedia, in which the Work in its
> +     anthology or encyclopedia, in which the Work in its
>      entirety in unmodified form, along with a number of
>      other contributions, constituting separate and independent
>      works in themselves, are assembled into a collective whole.
> @@ -2659,20 +2659,20 @@ CONTAINED HERE IN CONSIDERATION OF YOUR
>      considered a Derivative Work (as defined below) for the
>      purposes of this License.
>  2. "Derivative Work" means a work based upon the Work or upon
> -     the Work and other pre-existing works, such as a
> +     the Work and other pre-existing works, such as a
>      translation, musical arrangement, dramatization,
>      fictionalization, motion picture version, sound recording,
> -     art reproduction, abridgment, condensation, or any other
> +     art reproduction, abridgment, condensation, or any other
>      form in which the Work may be recast, transformed,
> -     or adapted, except that a work that constitutes
> +     or adapted, except that a work that constitutes
>      a Collective Work will not be considered a Derivative
> -     Work for the purpose of this License.
> +     Work for the purpose of this License.
>      For the avoidance of doubt, where the Work is a musical
> -     composition or sound recording, the synchronization of
> +     composition or sound recording, the synchronization of
>      the Work in timed-relation with a moving image ("synching")
>      will be considered a Derivative Work for the purpose
>      of this License.
> - 3. "Licensor" means the individual or entity that offers
> + 3. "Licensor" means the individual or entity that offers
>     the Work under the terms of this License.
>  4. "Original Author" means the individual or entity who
>     created the Work.
> @@ -2681,7 +2681,7 @@ CONTAINED HERE IN CONSIDERATION OF YOUR
>  6. "You" means an individual or entity exercising rights under
>     this License who has not previously violated the terms of
>     this License with respect to the Work, or who has received
> -    express permission from the Licensor to exercise rights
> +    express permission from the Licensor to exercise rights
>     under this License despite a previous violation.
>
> 2. Fair Use Rights. Nothing in this license is intended to reduce,
> @@ -2700,7 +2700,7 @@ CONTAINED HERE IN CONSIDERATION OF YOUR
>     Work as incorporated in the Collective Works;
>  2. to create and reproduce Derivative Works;
>  3. to distribute copies or phonorecords of, display
> -    publicly, perform publicly, and perform publicly
> +    publicly, perform publicly, and perform publicly
>     by means of a digital audio transmission the Work
>     including as incorporated in Collective Works;
>  4. to distribute copies or phonorecords of, display publicly,
> @@ -2714,7 +2714,7 @@ CONTAINED HERE IN CONSIDERATION OF YOUR
>        society (e.g. ASCAP, BMI, SESAC), royalties for the
>        public performance or public digital performance
>        (e.g. webcast) of the Work.
> -    2. Mechanical Rights and Statutory Royalties.
> +    2. Mechanical Rights and Statutory Royalties.
>        Licensor waives the exclusive right to collect,
>        whether individually or via a music rights agency
>        or designated agent (e.g. Harry Fox Agency),
> @@ -2723,11 +2723,11 @@ CONTAINED HERE IN CONSIDERATION OF YOUR
>        subject to the compulsory license created by
>        17 USC Section 115 of the US Copyright Act
>        (or the equivalent in other jurisdictions).
> - 6. Webcasting Rights and Statutory Royalties.
> -    For the avoidance of doubt, where the Work is a sound
> + 6. Webcasting Rights and Statutory Royalties.
> +    For the avoidance of doubt, where the Work is a sound
>     recording, Licensor waives the exclusive right to collect,
>     whether individually or via a performance-rights society
> -    (e.g. SoundExchange), royalties for the public digital
> +    (e.g. SoundExchange), royalties for the public digital
>     performance (e.g. webcast) of the Work, subject to the
>     compulsory license created by 17 USC Section 114 of the
>     US Copyright Act (or the equivalent in other jurisdictions).
> @@ -2740,18 +2740,18 @@ granted by Licensor are hereby reserved.
>
> 4. Restrictions.The license granted in Section 3 above is expressly
>    made subject to and limited by the following restrictions:
> - 1. You may distribute, publicly display, publicly perform,
> + 1. You may distribute, publicly display, publicly perform,
>     or publicly digitally perform the Work only under the terms
> -    of this License, and You must include a copy of, or the
> -    Uniform Resource Identifier for, this License with every
> -    copy or phonorecord of the Work You distribute, publicly
> +    of this License, and You must include a copy of, or the
> +    Uniform Resource Identifier for, this License with every
> +    copy or phonorecord of the Work You distribute, publicly
>     display, publicly perform, or publicly digitally perform.
>     You may not offer or impose any terms on the Work that alter
> -    or restrict the terms of this License or the recipients'
> -    exercise of the rights granted hereunder. You may not
> +    or restrict the terms of this License or the recipients'
> +    exercise of the rights granted hereunder. You may not
>     sublicense the Work. You must keep intact all notices
>     that refer to this License and to the disclaimer of warranties.
> -    You may not distribute, publicly display, publicly perform,
> +    You may not distribute, publicly display, publicly perform,
>     or publicly digitally perform the Work with any technological
>     measures that control access or use of the Work in a manner
>     inconsistent with the terms of this License Agreement.
> @@ -2759,13 +2759,13 @@ granted by Licensor are hereby reserved.
>     Work, but this does not require the Collective Work apart from
>     the Work itself to be made subject to the terms of this License.
>     If You create a Collective Work, upon notice from any Licensor
> -    You must, to the extent practicable, remove from the Collective
> -    Work any credit as required by clause 4(b), as requested.
> +    You must, to the extent practicable, remove from the Collective
> +    Work any credit as required by clause 4(b), as requested.
>     If You create a Derivative Work, upon notice from any Licensor
>     You must, to the extent practicable, remove from the Derivative
>     Work any credit as required by clause 4(b), as requested.
> -   2. If you distribute, publicly display, publicly perform,
> -      or publicly digitally perform the Work or any Derivative
> +   2. If you distribute, publicly display, publicly perform,
> +      or publicly digitally perform the Work or any Derivative
>       Works or Collective Works, You must keep intact all copyright
>       notices for the Work and provide, reasonable to the medium
>       or means You are utilizing: (i) the name of the Original Author
> @@ -2778,13 +2778,13 @@ granted by Licensor are hereby reserved.
>       reasonably practicable, the Uniform Resource Identifier,
>       if any, that Licensor specifies to be associated with the Work,
>       unless such URI does not refer to the copyright notice or
> -      licensing information for the Work; and in the case of a
> +      licensing information for the Work; and in the case of a
>       Derivative Work, a credit identifying the use of the Work
>       in the Derivative Work (e.g., "French translation of the Work
>       by Original Author," or "Screenplay based on original Work by
> -      Original Author"). Such credit may be implemented in any
> -      reasonable manner; provided, however, that in the case of a
> -      Derivative Work or Collective Work, at a minimum such credit
> +      Original Author"). Such credit may be implemented in any
> +      reasonable manner; provided, however, that in the case of a
> +      Derivative Work or Collective Work, at a minimum such credit
>       will appear where any other comparable authorship credit appears
>       and in a manner at least as prominent as such other comparable
>       authorship credit.
> @@ -2799,7 +2799,7 @@ LATENT OR OTHER DEFECTS, ACCURACY, OR TH
> WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
> EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
>
> -6. Limitation on Liability.
> +6. Limitation on Liability.
> EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR
> BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL,
> CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE
> @@ -2842,7 +2842,7 @@ OF SUCH DAMAGES.
>       by the party to be charged with such waiver or consent.
>   5. This License constitutes the entire agreement between the parties with
>      respect to the Work licensed here. There are no understandings, agreements
> -     or representations with respect to the Work not specified here.
> +     or representations with respect to the Work not specified here.
>      Licensor shall not be bound by any additional provisions that may appear
>      in any communication from You. This License may not be modified without
>      the mutual written agreement of the Licensor and You.
>
> Added: ofbiz/trunk/framework/service/lib/axis-1.4.jar
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/lib/axis-1.4.jar?rev=1326293&view=auto
> ==============================================================================
> Binary file - no diff available.
>
> Propchange: ofbiz/trunk/framework/service/lib/axis-1.4.jar
> ------------------------------------------------------------------------------
>    svn:mime-type = application/octet-stream
>
> Added: ofbiz/trunk/framework/service/lib/wsdl4j-1.5.1.jar
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/lib/wsdl4j-1.5.1.jar?rev=1326293&view=auto
> ==============================================================================
> Binary file - no diff available.
>
> Propchange: ofbiz/trunk/framework/service/lib/wsdl4j-1.5.1.jar
> ------------------------------------------------------------------------------
>    svn:mime-type = application/octet-stream
>
>