You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/12/04 21:41:26 UTC
svn commit: r1718027 - in /ofbiz/branches/release14.12: ./
framework/service/lib/
Author: jleroux
Date: Fri Dec 4 20:41:26 2015
New Revision: 1718027
URL: http://svn.apache.org/viewvc?rev=1718027&view=rev
Log:
"Applied fix from trunk for revision: 1718023 " (.classpath handled by hand)
------------------------------------------------------------------------
r1718023 | jleroux | 2015-12-04 21:30:39 +0100 (ven. 04 déc. 2015) | 1 ligne
Upgrades Axis2 to 1.6.3, with its dependencies on Axiom 1.2.9 and Neethi 3.0.2
------------------------------------------------------------------------
Added:
ofbiz/branches/release14.12/framework/service/lib/axiom-api-1.2.14.jar
- copied unchanged from r1718023, ofbiz/trunk/framework/service/lib/axiom-api-1.2.14.jar
ofbiz/branches/release14.12/framework/service/lib/axiom-impl-1.2.14.jar
- copied unchanged from r1718023, ofbiz/trunk/framework/service/lib/axiom-impl-1.2.14.jar
ofbiz/branches/release14.12/framework/service/lib/axis2-adb-1.6.3.jar
- copied unchanged from r1718023, ofbiz/trunk/framework/service/lib/axis2-adb-1.6.3.jar
ofbiz/branches/release14.12/framework/service/lib/axis2-kernel-1.6.3.jar
- copied unchanged from r1718023, ofbiz/trunk/framework/service/lib/axis2-kernel-1.6.3.jar
ofbiz/branches/release14.12/framework/service/lib/axis2-transport-http-1.6.3.jar
- copied unchanged from r1718023, ofbiz/trunk/framework/service/lib/axis2-transport-http-1.6.3.jar
ofbiz/branches/release14.12/framework/service/lib/axis2-transport-local-1.6.3.jar
- copied unchanged from r1718023, ofbiz/trunk/framework/service/lib/axis2-transport-local-1.6.3.jar
ofbiz/branches/release14.12/framework/service/lib/neethi-3.0.2.jar
- copied unchanged from r1718023, ofbiz/trunk/framework/service/lib/neethi-3.0.2.jar
Removed:
ofbiz/branches/release14.12/framework/service/lib/axiom-api-1.2.9.jar
ofbiz/branches/release14.12/framework/service/lib/axiom-impl-1.2.9.jar
ofbiz/branches/release14.12/framework/service/lib/axis2-kernel-1.5.2.jar
ofbiz/branches/release14.12/framework/service/lib/axis2-transport-http-1.5.2.jar
ofbiz/branches/release14.12/framework/service/lib/axis2-transport-local-1.5.2.jar
ofbiz/branches/release14.12/framework/service/lib/neethi-2.0.4.jar
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/.classpath
ofbiz/branches/release14.12/LICENSE
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 4 20:41:26 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023
Modified: ofbiz/branches/release14.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/.classpath?rev=1718027&r1=1718026&r2=1718027&view=diff
==============================================================================
--- ofbiz/branches/release14.12/.classpath (original)
+++ ofbiz/branches/release14.12/.classpath Fri Dec 4 20:41:26 2015
@@ -125,13 +125,13 @@
<classpathentry kind="lib" path="specialpurpose/birt/lib/axis-ant-1.4.jar"/>
<classpathentry kind="lib" path="specialpurpose/birt/lib/commons-discovery-0.5.jar"/>
<classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.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/axiom-api-1.2.14.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.14.jar"/>
<classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.5.2.jar"/>
<classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.5.2.jar"/>
<classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.5.2.jar"/>
<classpathentry kind="lib" path="framework/service/lib/commons-httpclient-3.1.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/neethi-2.0.4.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/neethi-3.0.2.jar"/>
<classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
<classpathentry kind="lib" path="framework/testtools/lib/org.springframework.test-3.1.0.M2.jar"/>
<classpathentry kind="lib" path="framework/testtools/lib/org.springframework.core-3.1.0.M2.jar"/>
Modified: ofbiz/branches/release14.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/LICENSE?rev=1718027&r1=1718026&r2=1718027&view=diff
==============================================================================
--- ofbiz/branches/release14.12/LICENSE (original)
+++ ofbiz/branches/release14.12/LICENSE Fri Dec 4 20:41:26 2015
@@ -1,5 +1,5 @@
=========================================================================
-The source code that makes up The Apache OFBiz Project and the majority
+The source code that makes up The Apache OFBiz Project and the majority
of the libraries distributed with it are
licensed under the Apache License Version 2.0.
@@ -86,13 +86,13 @@ framework/catalina/lib/tomcat-extras-7.0
framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli-adapters.jar
framework/entity/lib/commons-dbcp2-2.1.jar
framework/entity/lib/jdbc/derby-10.11.1.1.jar
-framework/service/lib/axiom-api-1.2.9.jar
-framework/service/lib/axiom-impl-1.2.9.jar
-framework/service/lib/axis2-kernel-1.5.2.jar
-framework/service/lib/axis2-transport-http-1.5.2.jar
-framework/service/lib/axis2-transport-local-1.5.2.jar
+framework/service/lib/axiom-api-1.2.14.jar
+framework/service/lib/axiom-impl-1.2.14.jar
+framework/service/lib/axis2-kernel-1.6.3.jar
+framework/service/lib/axis2-transport-http-1.6.3.jar
+framework/service/lib/axis2-transport-local-1.6.3.jar
framework/service/lib/commons-httpclient-3.1.jar
-framework/service/lib/neethi-2.0.4.jar
+framework/service/lib/neethi-3.0.2.jar
framework/service/lib/XmlSchema-1.4.3.jar
framework/webapp/lib/fop-1.1.jar
framework/webapp/lib/xmlgraphics-commons-1.5.jar
@@ -2619,25 +2619,25 @@ Web-based Help from DocBook XML license
David Cramer <dcramer AT motive DOT com><david AT thingbag DOT net>
Kasun Gajasinghe <kasunbg AT gmail DOT com>
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the Software), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the Software), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial
+ * The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.
- * Except as contained in this notice, the names of individuals credited with contribution to this software
- shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software
+ * Except as contained in this notice, the names of individuals credited with contribution to this software
+ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software
without prior written authorization from the individuals in question.
- * Any stylesheet derived from this Software that is publicly distributed will be identified with a different
- name and the version strings in any derived Software will be changed so that no possibility of confusion
+ * Any stylesheet derived from this Software that is publicly distributed will be identified with a different
+ name and the version strings in any derived Software will be changed so that no possibility of confusion
between the derived package and this Software will exist.
-Warranty: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
-AND NONINFRINGEMENT. IN NO EVENT SHALL DAVID CRAMER, KASUN GAJASINGHE, OR ANY OTHER CONTRIBUTOR
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+Warranty: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+AND NONINFRINGEMENT. IN NO EVENT SHALL DAVID CRAMER, KASUN GAJASINGHE, OR ANY OTHER CONTRIBUTOR
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
This package is maintained by Kasun Gajasinghe, <kasunbg AT gmail DOT com> and David Cramer, <david AT thingbag DOT net>.
@@ -2645,17 +2645,17 @@ This package is maintained by Kasun Gaja
This package also includes the following software written and copyrighted by others:
This package also includes the following software written and copyrighted by others:
- * Files in template/common/jquery are copyrighted by JQuery under the MIT License.
+ * Files in template/common/jquery are copyrighted by JQuery under the MIT License.
The file jquery.cookie.js Copyright (c) 2006 Klaus Hartl under the MIT license.
- * Some files in the template/content/search and indexer directories were originally
- part of N. Quaine's htmlsearch DITA plugin. The htmlsearch DITA plugin is
- available from the files page of the DITA-users yahoogroup.
- The htmlsearch plugin was released under a BSD-style license.
+ * Some files in the template/content/search and indexer directories were originally
+ part of N. Quaine's htmlsearch DITA plugin. The htmlsearch DITA plugin is
+ available from the files page of the DITA-users yahoogroup.
+ The htmlsearch plugin was released under a BSD-style license.
See indexer/license.txt for details.
* Stemmers from the Snowball project released under a BSD license.
- * Code from the Apache Lucene search engine provides support for tokenizing Chinese,
+ * Code from the Apache Lucene search engine provides support for tokenizing Chinese,
Japanese, and Korean content released under the Apache 2.0 license.
- * Code that provides weighted search results and some other improvements was graciously
+ * Code that provides weighted search results and some other improvements was graciously
donated by SyncRO Soft Ltd., the publishers of the oXygen XML Editor.
* Cosmetic improvements provided by OpenStack.