svn commit: r1733958 - in /ofbiz/branches/release14.12: ./ framework/service/config/axis2/ framework/service/lib/ framework/service/src/org/ofbiz/service/engine/

Author: jleroux
Date: Mon Mar  7 18:58:14 2016
New Revision: 1733958

URL: http://svn.apache.org/viewvc?rev=1733958&view=rev
Log: (empty)

Added:
    ofbiz/branches/release14.12/framework/service/config/axis2/
      - copied from r1733956, ofbiz/trunk/framework/service/config/axis2/
    ofbiz/branches/release14.12/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/release14.12/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/release14.12/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/release14.12/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/release14.12/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/release14.12/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/release14.12/framework/service/lib/neethi-3.0.3.jar
      - copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/neethi-3.0.3.jar
    ofbiz/branches/release14.12/framework/service/lib/woden-core-1.0M10.jar
      - copied unchanged from r1733956, ofbiz/trunk/framework/service/lib/woden-core-1.0M10.jar
    ofbiz/branches/release14.12/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/release14.12/framework/service/lib/XmlSchema-1.4.3.jar
    ofbiz/branches/release14.12/framework/service/lib/axiom-api-1.2.14.jar
    ofbiz/branches/release14.12/framework/service/lib/axiom-impl-1.2.14.jar
    ofbiz/branches/release14.12/framework/service/lib/axis2-adb-1.6.3.jar
    ofbiz/branches/release14.12/framework/service/lib/axis2-kernel-1.6.3.jar
    ofbiz/branches/release14.12/framework/service/lib/axis2-transport-http-1.6.3.jar
    ofbiz/branches/release14.12/framework/service/lib/axis2-transport-local-1.6.3.jar
    ofbiz/branches/release14.12/framework/service/lib/commons-httpclient-3.1.jar
    ofbiz/branches/release14.12/framework/service/lib/neethi-3.0.2.jar
Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/LICENSE
    ofbiz/branches/release14.12/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  7 18:58:14 2016
@@ -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,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721
+/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,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733956

Modified: ofbiz/branches/release14.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/LICENSE?rev=1733958&r1=1733957&r2=1733958&view=diff
==============================================================================
--- ofbiz/branches/release14.12/LICENSE (original)
+++ ofbiz/branches/release14.12/LICENSE Mon Mar  7 18:58:14 2016
@@ -86,23 +86,25 @@ 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.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-3.0.2.jar
-framework/service/lib/XmlSchema-1.4.3.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/xmlgraphics-commons-1.5.jar
 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-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
@@ -111,9 +113,9 @@ applications/content/lib/tika-core-1.7.j
 applications/content/lib/tika-parsers-1.7.jar
 applications/product/lib/dozer-4.2.1.jar
 applications/product/lib/watermarker-0.0.4.jar
-framework/images/webapp/images/date/timezones*
-framework/resources/fonts/NotoSans/*
 tools/security/notsoserial/notsoserial-1.0-SNAPSHOT.jar
+specialpurpose/passport/lib/commons-httpclient-3.1.jar
+
 =========================================================================
                                  Apache License
                            Version 2.0, January 2004

Modified: ofbiz/branches/release14.12/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=1733958&r1=1733957&r2=1733958&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original)
+++ ofbiz/branches/release14.12/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Mon Mar  7 18:58:14 2016
@@ -30,11 +30,14 @@ import javax.xml.stream.XMLStreamReader;
 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;
@@ -83,9 +86,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);
@@ -122,7 +130,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);