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 2016/03/07 22:46:43 UTC
svn commit: r1733991 - in /ofbiz/branches/release13.07: ./
framework/service/config/axis2/ framework/service/lib/
framework/service/src/org/ofbiz/service/engine/
Author: jleroux
Date: Mon Mar 7 21:46:43 2016
New Revision: 1733991
URL: http://svn.apache.org/viewvc?rev=1733991&view=rev
Log:
"Applied fix from trunk for revision: 1733956" (conflicts in LICENCE and .classpath handled by hand)
------------------------------------------------------------------------
r1733956 | jleroux | 2016-03-07 19:48:14 +0100 (lun. 07 mars 2016) | 36 lignes
"Upgrade Axis2 to 1.7.0" - https://issues.apache.org/jira/browse/OFBIZ-6916 - Actually this upgrades Axis2 to 1.7.1
Replacing Axis2 1.6.3 by 1.7.1 version is easy as long as you don't try to replace the commons-httpclient-3.1 lib. The only noticeable change is this warning shown in log
|http-bio-8443-exec-1 |AxisConfigBuilder |W| Unable to instantiate deployer org.apache.axis2.deployment.ServiceDeployer; see debug logs for more details|
It has no effects on the SOAP test services, both works.
But the main goal of this issue is a security update because commons-httpclient-3.1 lib is deprecated, no longer maintained and vulnerable and must be replaced.
This commit also concerns OFBIZ-6755 but to not mix things OFBIZ-6755 will be completed later. So to not block this issue, the commons-httpclient-3.1 lib is moved from framework/service/lib to specialpurpose/passport/lib/ where it's still required.
Normally, as explained at https://axis.apache.org/axis2/java/core/release-notes/1.7.0.html, Axis2 1.7.1 requires "HttpClient 4.2.x and should work with 4.3.x and 4.4.x, but is incompatible with 4.5.x". I did not replace commons-httpclient-3.1 by HttpClient 4.2.1, which is bundled with Axis2 1.7.1, because we have already HttpClient/Core 4.4.1 in base/lib and it works well as is (HttpClient/Core 4.4.1 is in the classpath).
To use HttpClient/Core 4.4.1 you need to change the axis2.xml files as specified in the 1.7.0 release note. But where to place this file in OFBiz is not obvious!
I decided the best way was to use Axis2 ConfigurationContextFactory.createConfigurationContextFromFileSystem() method to let know Axis2 we want the new httpclient instead of the default one (I really don't understand why the Axis2 team still prefers commons-httpclient-3.1 as default). I had to pass both locations to avoid hardcoding the repository location in the axis2.xml file.
I have also decided the best place for the "Axis2 repository" (as they call it) was in framework/service/axis2. So following Axis2 convention http://wso2.com/library/tutorials/axis2-repository/ I put the axis2.xml file in framework/service/axis2/conf.
Note: the Axis2 repository could be used to put [Apache Rampart|https://axis.apache.org/axis2/java/rampart/] as a module to secure web services...
After this change, there are a number of warnings thrown by Axis2 but they are actually interesting as they provide guidance for future use of modules and such (notably Apache Rampart)
|ttp-bio-8443-exec-10 |Utils |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher
|ttp-bio-8443-exec-10 |Utils |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher
|ttp-bio-8443-exec-10 |Utils |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker
|ttp-bio-8443-exec-10 |Utils |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher
|ttp-bio-8443-exec-10 |Utils |W| [JAXWS] - unable to load org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher
|ttp-bio-8443-exec-10 |AxisConfigBuilder |W| Unable to instantiate deployer org.apache.axis2.deployment.ServiceDeployer; see debug logs for more details
|ttp-bio-8443-exec-10 |AxisConfigBuilder |W| Unable to instantiate deployer org.apache.axis2.jaxws.framework.JAXWSDeployer; see debug logs for more details
While at it I replaced StAXOMBuilder (deprecated) by OMXMLBuilderFactory
I will backport the changes in the supported releases branches but R12.04 which use a too old version of HttpClient/Core. Others all use versions older than 4.2.1. I'm aware I will have to handle several conflicts by hand, some are easy others "harder". We have the passport component only in R15.12, it will be easy to neglect in older releases. I expect more work with the LICENSE file and even more with the .classpath file. Since R15.12 we use tabs in it (Adrian rightly told us to use Eclipse internal tools to edit this file, though I noted it does not respect the alphabetical order) but older releases still use spaces (and this is often a pain now, but a bright future ahead ;))
Crossing fingers with this commit, I have other changes pending in this instance (notably for OFBIZ-6849) and it got quite complicated...
------------------------------------------------------------------------
Added:
ofbiz/branches/release13.07/framework/service/config/axis2/
- copied from r1733956, ofbiz/trunk/framework/service/config/axis2/
ofbiz/branches/release13.07/framework/service/lib/axiom-api-1.2.17.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/axiom-api-1.2.17.jar
ofbiz/branches/release13.07/framework/service/lib/axiom-impl-1.2.17.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/axiom-impl-1.2.17.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-adb-1.7.1.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/axis2-adb-1.7.1.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-kernel-1.7.1.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/axis2-kernel-1.7.1.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-transport-http-1.7.1.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/axis2-transport-http-1.7.1.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-transport-local-1.7.1.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/axis2-transport-local-1.7.1.jar
ofbiz/branches/release13.07/framework/service/lib/neethi-3.0.3.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/neethi-3.0.3.jar
ofbiz/branches/release13.07/framework/service/lib/woden-core-1.0M10.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/woden-core-1.0M10.jar
ofbiz/branches/release13.07/framework/service/lib/xmlschema-core-2.2.1.jar
- copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/xmlschema-core-2.2.1.jar
Removed:
ofbiz/branches/release13.07/framework/service/lib/XmlSchema-1.4.3.jar
ofbiz/branches/release13.07/framework/service/lib/axiom-api-1.2.14.jar
ofbiz/branches/release13.07/framework/service/lib/axiom-impl-1.2.14.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-adb-1.6.3.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-kernel-1.6.3.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-transport-http-1.6.3.jar
ofbiz/branches/release13.07/framework/service/lib/axis2-transport-local-1.6.3.jar
ofbiz/branches/release13.07/framework/service/lib/commons-httpclient-3.1.jar
ofbiz/branches/release13.07/framework/service/lib/neethi-3.0.2.jar
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/.classpath
ofbiz/branches/release13.07/LICENSE
ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 7 21:46:43 2016
@@ -5,4 +5,4 @@
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release12.04:1557118
-/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1534062,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,
1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,16121
90,1612202,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,16
64602,1664604,1666633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1672862,1672873,1673764,1674447,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1680155,1680304,1680672,1680733,1680840,1680873,1680881,1682272,1682415,1683998,1686566,1686569,1686574,1686583,1686635,1686651,1687427,1690086,1692458,1693579,1696018,1696234,1697993,1701164,1702704,1703121,1703586,1703965,1703977,1703981,1704000,1704018,1704043,1704052,1704082,1704140,1704230,1705004,1706316,1706561,1706591,1706694,1707837,1708341,1708742,1710178,1710348,1711513,1714244,1714410,1714571,1714657,1715477,1715501,1717058,1717180,1717682,1717760,1718023,1718109,1719094,1720883,1721067,1721625,1722712,1724402,1724916,1724918,1724925,1724943,1724946,1724978,1726828,1729609,1729809,1730735,1730882,1731359,1732721
+/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1534062,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,
1561327,1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,16121
90,1612202,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984,1647266,1647338,1647559,1647606,1648668,1649239,1649393,1650240,1650583,1650642,1650678,1650882,1650938,1651593,1652361,1652725,1652731,1652739,1653456,1654175,1654273,1655046,1655795,1656983,1660389,1660444,1661358,1661612,1661778,1661853,1661873,1661940,1661951,1661977,1662361,1662500,1663912,1663979,16
64602,1664604,1666633,1666836,1666939,1666949,1667055,1667253,1668214,1668246,1668258,1668265,1668314,1669317,1672862,1672873,1673764,1674447,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1680155,1680304,1680672,1680733,1680840,1680873,1680881,1682272,1682415,1683998,1686566,1686569,1686574,1686583,1686635,1686651,1687427,1690086,1692458,1693579,1696018,1696234,1697993,1701164,1702704,1703121,1703586,1703965,1703977,1703981,1704000,1704018,1704043,1704052,1704082,1704140,1704230,1705004,1706316,1706561,1706591,1706694,1707837,1708341,1708742,1710178,1710348,1711513,1714244,1714410,1714571,1714657,1715477,1715501,1717058,1717180,1717682,1717760,1718023,1718109,1719094,1720883,1721067,1721625,1722712,1724402,1724916,1724918,1724925,1724943,1724946,1724978,1726828,1729609,1729809,1730735,1730882,1731359,1732721,1733956
Modified: ofbiz/branches/release13.07/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/.classpath?rev=1733991&r1=1733990&r2=1733991&view=diff
==============================================================================
--- ofbiz/branches/release13.07/.classpath (original)
+++ ofbiz/branches/release13.07/.classpath Mon Mar 7 21:46:43 2016
@@ -132,14 +132,13 @@
<classpathentry kind="lib" path="specialpurpose/birt/lib/axis-1.4.jar"/>
<classpathentry kind="lib" path="specialpurpose/birt/lib/axis-ant-1.4.jar"/ -->
<classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.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-3.0.2.jar"/>
- <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.3.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axiom-api-1.2.17.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axiom-impl-1.2.17.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis2-kernel-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.7.1.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/neethi-3.0.3.jar"/>
+ <classpathentry kind="lib" path="framework/service/lib/xmlschema-core-2.2.1.jar"/>
<classpathentry kind="lib" path="framework/testtools/lib/spring-core-4.2.3.jar"/>
<classpathentry kind="lib" path="framework/testtools/lib/spring-test-4.2.3.jar"/>
<classpathentry kind="lib" path="framework/webapp/lib/DataVision-1.0.0.jar"/>
Modified: ofbiz/branches/release13.07/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/LICENSE?rev=1733991&r1=1733990&r2=1733991&view=diff
==============================================================================
--- ofbiz/branches/release13.07/LICENSE (original)
+++ ofbiz/branches/release13.07/LICENSE Mon Mar 7 21:46:43 2016
@@ -91,14 +91,20 @@ framework/catalina/lib/tomcat-extras-7.0
framework/entity/lib/commons-dbcp-1.4.jar
framework/entity/lib/jdbc/derby-10.8.2.2.jar
framework/entity/lib/jdbc/derbytools-10.8.2.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.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/commons-httpclient-3.1.jar
-framework/service/lib/neethi-3.0.2.jar
-framework/service/lib/XmlSchema-1.4.3.jar
+framework/geronimo/lib/geronimo-connector-3.1.1.jar
+framework/geronimo/lib/geronimo-transaction-3.1.1.jar
+framework/images/webapp/images/date/timezones*
+framework/resources/fonts/NotoSans/*
+framework/service/lib/axiom-api-1.2.17.jar
+framework/service/lib/axiom-impl-1.2.17.jar
+framework/service/lib/axis2-kernel-1.7.1.jar
+framework/service/lib/axis2-transport-http-1.7.1.jar
+framework/service/lib/axis2-transport-local-1.7.3.jar1
+framework/service/lib/neethi-3.0.3.jar
+framework/service/lib/woden-core-1.0M10.jar
+framework/service/lib/xmlschema-core-2.2.1.jar
+framework/testtools/lib/spring-core-4.2.3.jar
+framework/testtools/lib/spring-test-4.2.3.jar
framework/webapp/lib/fop-1.1.jar
framework/webapp/lib/velocity-1.6.1.jar
framework/webapp/lib/xmlgraphics-commons-1.5.jar
@@ -107,10 +113,6 @@ framework/webapp/lib/ezmorph-0.9.1.jar
framework/webapp/lib/rome-0.9.jar
framework/webapp/lib/serializer-2.7.0.jar
framework/webapp/lib/xalan-2.7.1.jar
-framework/geronimo/lib/geronimo-connector-3.1.1.jar
-framework/geronimo/lib/geronimo-transaction-3.1.1.jar
-framework/testtools/lib/spring-core-4.2.3.jar
-framework/testtools/lib/spring-test-4.2.3.jar
applications/content/lib/fontbox-1.7.1.jar
applications/content/lib/jempbox-1.7.1.jar
applications/content/lib/pdfbox-1.7.1.jar
@@ -119,7 +121,6 @@ applications/content/lib/tika-core-1.0.j
applications/content/lib/tika-parsers-1.0.jar
applications/product/lib/dozer-4.2.1.jar
applications/product/lib/watermarker-0.0.4.jar
-framework/images/webapp/images/date/timezones*
=========================================================================
Apache License
Version 2.0, January 2004
Modified: ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=1733991&r1=1733990&r2=1733991&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original)
+++ ofbiz/branches/release13.07/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Mon Mar 7 21:46:43 2016
@@ -31,11 +31,14 @@ import javolution.util.FastMap;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilValidate;
@@ -84,9 +87,14 @@ public final class SOAPClientEngine exte
ServiceClient client = null;
QName serviceName = null;
+ String axis2Repo = "/framework/service/config/axis2";
+ String axis2RepoLocation = System.getProperty("ofbiz.home") + axis2Repo;
+ String axis2XmlFile = "/framework/service/config/axis2/conf/axis2.xml";
+ String axis2XmlFileLocation = System.getProperty("ofbiz.home") + axis2XmlFile;
try {
- client = new ServiceClient();
+ ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem(axis2RepoLocation, axis2XmlFileLocation);
+ client = new ServiceClient(configContext, null);
Options options = new Options();
EndpointReference endPoint = new EndpointReference(this.getLocation(modelService));
options.setTo(endPoint);
@@ -123,7 +131,7 @@ public final class SOAPClientEngine exte
try {
String xmlParameters = SoapSerializer.serialize(parameterMap);
XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xmlParameters));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(reader);
parameterSer = builder.getDocumentElement();
} catch (Exception e) {
Debug.logError(e, module);