svn commit: r1733956 - in /ofbiz/trunk: ./ framework/service/config/axis2
Locked
svn commit: r1733956 - in /ofbiz/trunk: ./ framework/service/config/axis2
 
|
Author: jleroux
Date: Mon Mar 7 18:48:14 2016 New Revision: 1733956 URL: http://svn.apache.org/viewvc?rev=1733956&view=rev Log: "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/trunk/framework/service/config/axis2/ ofbiz/trunk/framework/service/config/axis2/conf/ ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml (with props) ofbiz/trunk/framework/service/lib/axiom-api-1.2.17.jar - copied unchanged from r1732636, ofbiz/trunk/framework/service/lib/axiom-api-1.2.17.jar ofbiz/trunk/framework/service/lib/axiom-impl-1.2.17.jar - copied unchanged from r1732636, ofbiz/trunk/framework/service/lib/axiom-impl-1.2.17.jar ofbiz/trunk/framework/service/lib/axis2-adb-1.7.1.jar (with props) ofbiz/trunk/framework/service/lib/axis2-kernel-1.7.1.jar (with props) ofbiz/trunk/framework/service/lib/axis2-transport-http-1.7.1.jar (with props) ofbiz/trunk/framework/service/lib/axis2-transport-local-1.7.1.jar (with props) ofbiz/trunk/framework/service/lib/neethi-3.0.3.jar - copied unchanged from r1732636, ofbiz/trunk/framework/service/lib/neethi-3.0.3.jar ofbiz/trunk/framework/service/lib/woden-core-1.0M10.jar - copied unchanged from r1732636, ofbiz/trunk/framework/service/lib/woden-core-1.0M10.jar ofbiz/trunk/framework/service/lib/xmlschema-core-2.2.1.jar - copied unchanged from r1732636, ofbiz/trunk/framework/service/lib/xmlschema-core-2.2.1.jar ofbiz/trunk/specialpurpose/passport/lib/ - copied from r1732636, ofbiz/trunk/specialpurpose/passport/lib/ Removed: ofbiz/trunk/framework/service/lib/XmlSchema-1.4.3.jar ofbiz/trunk/framework/service/lib/axiom-api-1.2.14.jar ofbiz/trunk/framework/service/lib/axiom-impl-1.2.14.jar ofbiz/trunk/framework/service/lib/axis2-adb-1.6.3.jar ofbiz/trunk/framework/service/lib/axis2-kernel-1.6.3.jar ofbiz/trunk/framework/service/lib/axis2-transport-http-1.6.3.jar ofbiz/trunk/framework/service/lib/axis2-transport-local-1.6.3.jar ofbiz/trunk/framework/service/lib/commons-httpclient-3.1.jar ofbiz/trunk/framework/service/lib/neethi-3.0.2.jar Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java ofbiz/trunk/specialpurpose/passport/build.xml Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1733956&r1=1733955&r2=1733956&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Mon Mar 7 18:48:14 2016 @@ -104,15 +104,16 @@ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.65-tomcat-juli-adapters.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp2-2.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.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.6.3.jar"/> - <classpathentry kind="lib" path="framework/service/lib/axis2-transport-http-1.6.3.jar"/> - <classpathentry kind="lib" path="framework/service/lib/axis2-transport-local-1.6.3.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/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-adb-1.7.1.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/woden-core-1.0M10.jar"/> <classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.jar"/> - <classpathentry kind="lib" path="framework/service/lib/XmlSchema-1.4.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/ezmorph-0.9.1.jar"/> @@ -133,6 +134,7 @@ <classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/> <classpathentry kind="lib" path="specialpurpose/googlecheckout/lib/checkout-sdk-0.8.8.jar"/> <classpathentry kind="lib" path="specialpurpose/ldap/lib/cas-server-core-3.3.jar"/> + <classpathentry kind="lib" path="specialpurpose/passport/lib/commons-httpclient-3.1.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/jcl.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/jpos18-controls.jar"/> <classpathentry kind="lib" path="specialpurpose/pos/lib/looks-2.0.2.jar"/> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1733956&r1=1733955&r2=1733956&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Mon Mar 7 18:48:14 2016 @@ -89,23 +89,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-2.0.jar framework/webapp/lib/xmlgraphics-commons-2.0.1.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.8.5.jar applications/content/lib/jempbox-1.8.5.jar applications/content/lib/pdfbox-1.8.5.jar @@ -114,9 +116,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 Added: ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml?rev=1733956&view=auto ============================================================================== --- ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml (added) +++ ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml Mon Mar 7 18:48:14 2016 @@ -0,0 +1,530 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<axisconfig name="AxisJava2.0"> + <!-- ================================================= --> + <!-- Parameters --> + <!-- ================================================= --> + <parameter name="hotdeployment">true</parameter> + <parameter name="hotupdate">false</parameter> + <parameter name="enableMTOM">false</parameter> + <parameter name="enableSwA">false</parameter> + + <!--Uncomment if you want to enable file caching for attachments --> + <!--parameter name="cacheAttachments">true</parameter> + <parameter name="attachmentDIR"></parameter> + <parameter name="sizeThreshold">4000</parameter--> + + <parameter name="EnableChildFirstClassLoading">false</parameter> + + <!-- + The exposeServiceMetadata parameter decides whether the metadata (WSDL, schema, policy) of + the services deployed on Axis2 should be visible when ?wsdl, ?wsdl2, ?xsd, ?policy requests + are received. + This parameter can be defined in the axi2.xml file, in which case this will be applicable + globally, or in the services.xml files, in which case, it will be applicable to the + Service groups and/or services, depending on the level at which the parameter is declared. + This value of this parameter defaults to true. + --> + <parameter name="exposeServiceMetadata">true</parameter> + + + <!--Uncomment if you want to plugin your own attachments lifecycle implementation --> + <!--<attachmentsLifecycleManager class="org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl"/>--> + + + <!--Uncomment if you want to enable the reduction of the in-memory cache of WSDL definitions --> + <!--In some server environments, the available memory heap is limited and can fill up under load --> + <!--Since in-memory copies of WSDL definitions can be large, some steps can be taken--> + <!--to reduce the memory needed for the cached WSDL definitions. --> + <!--parameter name="reduceWSDLMemoryCache">true</parameter--> + + <!--This will give out the timout of the configuration contexts, in milliseconds--> + <parameter name="ConfigContextTimeoutInterval">30000</parameter> + + <!--During a fault, stack trace can be sent with the fault message. The following flag will control --> + <!--that behavior.--> + <parameter name="sendStacktraceDetailsWithFaults">false</parameter> + + <!--If there aren't any information available to find out the fault reason, we set the message of the exception--> + <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be --> + <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag--> + <!--is set, then Axis2 tries to get the first exception and set its message as the faultreason/Reason.--> + <parameter name="DrillDownToRootCauseForFaultReason">false</parameter> + + <parameter name="userName">admin</parameter> + <parameter name="password">axis2</parameter> + + <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.--> + <!--ServicesDirectory only works on the following cases--> + <!---File based configurator and in that case the value should be a file URL (http:// not allowed)--> + <!---When creating URL Based configurator with URL file:// --> + <!--- War based configurator with expanded case , --> + + <!--All the other scenarios it will be ignored.--> + <!--<parameter name="ServicesDirectory">service</parameter>--> + <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path--> + <!--<parameter name="ModulesDirectory">modules</parameter>--> + + + <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context--> + <!--root which can configured using the following contextRoot parameter--> + <!--<parameter name="contextRoot">axis2</parameter>--> + + <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguiush those endpoints--> + <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this --> + <!--context path to proper Axis2 servlets--> + <!--<parameter name="servicePath">services</parameter>--> + <!--<parameter name="restPath">rest</parameter>--> + + <!-- Following parameter will completely disable REST handling in Axis2--> + <parameter name="disableREST" locked="false">false</parameter> + + <!-- Following parameter will suppress generation of SOAP 1.2 bindings in auto-generated WSDL files --> + <parameter name="disableSOAP12" locked="true">false</parameter> + + <!-- ================================================= --> + <!-- Deployers --> + <!-- ================================================= --> + + <!--Service deployer , this will alow users to deploy AAR or exploded AAR as axis2 services--> + <deployer extension=".aar" directory="services" class="org.apache.axis2.deployment.ServiceDeployer"> + <serviceBuilderExtension name ="jwsbuilderExt" class="org.apache.axis2.jaxws.framework.JAXWSServiceBuilderExtension"/> + <serviceBuilderExtension name ="wsdlbuilderExt" class="org.apache.axis2.deployment.WSDLServiceBuilderExtension"/> + </deployer> + + <!--POJO deployer , this will alow users to drop .class file and make that into a service--> + <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/> + <deployer extension=".jar" directory="servicejars" + class="org.apache.axis2.jaxws.framework.JAXWSDeployer"/> + <deployer extension=".jar" directory="transports" + class="org.apache.axis2.deployment.TransportDeployer"/> + + <!--CORBA deployer , this will alow users to invoke remote CORBA services through Axis2--> + <!--<deployer extension=".xml" directory="corba" class="org.apache.axis2.corba.deployer.CorbaDeployer"/>--> + + <!--<deployer extension=".jsa" directory="rmiservices" class="org.apache.axis2.rmi.deploy.RMIServiceDeployer"/>--> + + + <!-- Following parameter will set the host name for the epr--> + <!--<parameter name="hostname" locked="true">myhost.com</parameter>--> + + <!-- If you have a front end host which exposes this webservice using a different public URL --> + <!-- use this parameter to override autodetected url --> + <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>--> + + <!--By default, JAXWS services are created by reading annotations. WSDL and schema are generated--> + <!--using a separate WSDL generator only when ?wsdl is called. Therefore, even if you engage--> + <!--policies etc.. to AxisService, it doesn't appear in the WSDL. By setting the following property--> + <!--to true, you can create the AxisService using the generated WSDL and remove the need for a--> + <!--WSDL generator. When ?wsdl is called, WSDL is generated in the normal way.--> + <parameter name="useGeneratedWSDLinJAXWS">false</parameter> + + <!-- The way of adding listener to the system--> + <!-- <listener class="org.apache.axis2.ObserverIMPL">--> + <!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>--> + <!-- </listener>--> + + <threadContextMigrators> + <threadContextMigrator listId="JAXWS-ThreadContextMigrator-List" + class="org.apache.axis2.jaxws.addressing.migrator.EndpointContextMapMigrator"/> + </threadContextMigrators> + + <!-- ================================================= --> + <!-- Message Receivers --> + <!-- ================================================= --> + <!--This is the default MessageReceiver for the system , if you want to have MessageReceivers for --> + <!--all the other MEP implement it and add the correct entry to here , so that you can refer from--> + <!--any operation --> + <!--Note : You can override this for a particular service by adding the same element with your requirement--> + <messageReceivers> + <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only" + class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/> + <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out" + class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> + </messageReceivers> + + <!-- ================================================= --> + <!-- Message Formatter --> + <!-- ================================================= --> + <!--Following content type to message formatter mapping can be used to implement support for different message --> + <!--format serialization in Axis2. These message formats are expected to be resolved based on the content type. --> + <messageFormatters> + <messageFormatter contentType="application/x-www-form-urlencoded" + class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/> + <messageFormatter contentType="multipart/form-data" + class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/> + <messageFormatter contentType="application/xml" + class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/> + <messageFormatter contentType="text/xml" + class="org.apache.axis2.transport.http.SOAPMessageFormatter"/> + <messageFormatter contentType="application/soap+xml" + class="org.apache.axis2.transport.http.SOAPMessageFormatter"/> + </messageFormatters> + + <!-- ================================================= --> + <!-- Message Builders --> + <!-- ================================================= --> + <!--Following content type to builder mapping can be used to implement support for different message --> + <!--formats in Axis2. These message formats are expected to be resolved based on the content type. --> + <messageBuilders> + <messageBuilder contentType="application/xml" + class="org.apache.axis2.builder.ApplicationXMLBuilder"/> + <messageBuilder contentType="application/x-www-form-urlencoded" + class="org.apache.axis2.builder.XFormURLEncodedBuilder"/> + <messageBuilder contentType="multipart/form-data" + class="org.apache.axis2.builder.MultipartFormDataBuilder"/> + </messageBuilders> + + <!-- ================================================= --> + <!-- Transport Ins --> + <!-- ================================================= --> + <transportReceiver name="http" + class="org.apache.axis2.transport.http.SimpleHTTPServer"> + <parameter name="port">8080</parameter> + <!-- Here is the complete list of supported parameters (see example settings further below): + port: the port to listen on (default 6060) + hostname: if non-null, url prefix used in reply-to endpoint references (default null) + originServer: value of http Server header in outgoing messages (default "Simple-Server/1.1") + requestTimeout: value in millis of time that requests can wait for data (default 20000) + requestTcpNoDelay: true to maximize performance and minimize latency (default true) + false to minimize bandwidth consumption by combining segments + requestCoreThreadPoolSize: number of threads available for request processing (unless queue fills up) (default 25) + requestMaxThreadPoolSize: number of threads available for request processing if queue fills up (default 150) + note that default queue never fills up: see HttpFactory + threadKeepAliveTime: time to keep threads in excess of core size alive while inactive (default 180) + note that no such threads can exist with default unbounded request queue + threadKeepAliveTimeUnit: TimeUnit of value in threadKeepAliveTime (default SECONDS) (default SECONDS) + --> + <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> --> + <!-- <parameter name="originServer">My-Server/1.1</parameter> --> + <!-- <parameter name="requestTimeout">10000</parameter> --> + <!-- <parameter name="requestTcpNoDelay">false</parameter> --> + <!-- <parameter name="requestCoreThreadPoolSize">50</parameter> --> + <!-- <parameter name="requestMaxThreadPoolSize">100</parameter> --> + <!-- <parameter name="threadKeepAliveTime">240000</parameter> --> + <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> --> + </transportReceiver> + + <!-- This is where you'd put custom transports. See the transports project --> + <!-- for more. http://ws.apache.org/commons/transport --> + + <!-- ================================================= --> + <!-- Transport Outs --> + <!-- ================================================= --> + + <transportSender name="local" + class="org.apache.axis2.transport.local.LocalTransportSender"/> + <transportSender name="http" + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> + <parameter name="PROTOCOL">HTTP/1.1</parameter> + <parameter name="Transfer-Encoding">chunked</parameter> + + <!-- If following is set to 'true', optional action part of the Content-Type will not be added to the SOAP 1.2 messages --> + <!-- <parameter name="OmitSOAP12Action">true</parameter> --> + </transportSender> + + <transportSender name="https" + class="org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender"> + <parameter name="PROTOCOL">HTTP/1.1</parameter> + <parameter name="Transfer-Encoding">chunked</parameter> + </transportSender> + + <!-- Please enable this if you need the java transport --> + <!-- <transportSender name="java" + class="org.apache.axis2.transport.java.JavaTransportSender"/> --> + + <!-- ================================================= --> + <!-- Global Modules --> + <!-- ================================================= --> + <!-- Comment this to disable Addressing --> + <!-- <module ref="addressing"/> --> + + <!--Configuring module , providing parameters for modules whether they refer or not--> + <!--<moduleConfig name="addressing">--> + <!--<parameter name="addressingPara">N/A</parameter>--> + <!--</moduleConfig>--> + + <!-- ================================================= --> + <!-- Clustering --> + <!-- ================================================= --> + <!-- + To enable clustering for this node, set the value of "enable" attribute of the "clustering" + element to "true". The initialization of a node in the cluster is handled by the class + corresponding to the "class" attribute of the "clustering" element. It is also responsible for + getting this node to join the cluster. + --> + <clustering class="org.apache.axis2.clustering.tribes.TribesClusteringAgent" enable="false"> + + <!-- + This parameter indicates whether the cluster has to be automatically initalized + when the AxisConfiguration is built. If set to "true" the initialization will not be + done at that stage, and some other party will have to explictly initialize the cluster. + --> + <parameter name="AvoidInitiation">true</parameter> + + <!-- + The membership scheme used in this setup. The only values supported at the moment are + "multicast" and "wka" + + 1. multicast - membership is automatically discovered using multicasting + 2. wka - Well-Known Address based multicasting. Membership is discovered with the help + of one or more nodes running at a Well-Known Address. New members joining a + cluster will first connect to a well-known node, register with the well-known node + and get the membership list from it. When new members join, one of the well-known + nodes will notify the others in the group. When a member leaves the cluster or + is deemed to have left the cluster, it will be detected by the Group Membership + Service (GMS) using a TCP ping mechanism. + --> + <parameter name="membershipScheme">multicast</parameter> + + <!-- + The clustering domain/group. Nodes in the same group will belong to the same multicast + domain. There will not be interference between nodes in different groups. + --> + <parameter name="domain">wso2.carbon.domain</parameter> + + <!-- + When a Web service request is received, and processed, before the response is sent to the + client, should we update the states of all members in the cluster? If the value of + this parameter is set to "true", the response to the client will be sent only after + all the members have been updated. Obviously, this can be time consuming. In some cases, + such this overhead may not be acceptable, in which case the value of this parameter + should be set to "false" + --> + <parameter name="synchronizeAll">true</parameter> + + <!-- + The maximum number of times we need to retry to send a message to a particular node + before giving up and considering that node to be faulty + --> + <parameter name="maxRetries">10</parameter> + + <!-- The multicast address to be used --> + <parameter name="mcastAddress">228.0.0.4</parameter> + + <!-- The multicast port to be used --> + <parameter name="mcastPort">45564</parameter> + + <!-- The frequency of sending membership multicast messages (in ms) --> + <parameter name="mcastFrequency">500</parameter> + + <!-- The time interval within which if a member does not respond, the member will be + deemed to have left the group (in ms) + --> + <parameter name="memberDropTime">3000</parameter> + + <!-- + The IP address of the network interface to which the multicasting has to be bound to. + Multicasting would be done using this interface. + --> + <parameter name="mcastBindAddress">127.0.0.1</parameter> + + <!-- The host name or IP address of this member --> + <parameter name="localMemberHost">127.0.0.1</parameter> + + <!-- + The TCP port used by this member. This is the port through which other nodes will + contact this member + --> + <parameter name="localMemberPort">4000</parameter> + + <!-- + Preserve message ordering. This will be done according to sender order. + --> + <parameter name="preserveMessageOrder">true</parameter> + + <!-- + Maintain atmost-once message processing semantics + --> + <parameter name="atmostOnceMessageSemantics">true</parameter> + + <!-- + Properties specific to this member + --> + <parameter name="properties"> + <property name="backendServerURL" value="https://${hostName}:${httpsPort}/services/"/> + <property name="mgtConsoleURL" value="https://${hostName}:${httpsPort}/"/> + </parameter> + + <!-- + The list of static or well-known members. These entries will only be valid if the + "membershipScheme" above is set to "wka" + --> + <members> + <member> + <hostName>127.0.0.1</hostName> + <port>4000</port> + </member> + <member> + <hostName>127.0.0.1</hostName> + <port>4001</port> + </member> + </members> + + <!-- + Enable the groupManagement entry if you need to run this node as a cluster manager. + Multiple application domains with different GroupManagementAgent implementations + can be defined in this section. + --> + <groupManagement enable="false"> + <applicationDomain name="apache.axis2.application.domain" + description="Axis2 group" + agent="org.apache.axis2.clustering.management.DefaultGroupManagementAgent"/> + </groupManagement> + + <!-- + This interface is responsible for handling management of a specific node in the cluster + The "enable" attribute indicates whether Node management has been enabled + --> + <nodeManager class="org.apache.axis2.clustering.management.DefaultNodeManager" + enable="true"/> + + <!-- + This interface is responsible for handling state replication. The property changes in + the Axis2 context hierarchy in this node, are propagated to all other nodes in the cluster. + + The "excludes" patterns can be used to specify the prefixes (e.g. local_*) or + suffixes (e.g. *_local) of the properties to be excluded from replication. The pattern + "*" indicates that all properties in a particular context should not be replicated. + + The "enable" attribute indicates whether context replication has been enabled + --> + <stateManager class="org.apache.axis2.clustering.state.DefaultStateManager" + enable="true"> + <replication> + <defaults> + <exclude name="local_*"/> + <exclude name="LOCAL_*"/> + </defaults> + <context class="org.apache.axis2.context.ConfigurationContext"> + <exclude name="local_*"/> + </context> + <context class="org.apache.axis2.context.ServiceGroupContext"> + <exclude name="local_*"/> + </context> + <context class="org.apache.axis2.context.ServiceContext"> + <exclude name="local_*"/> + </context> + </replication> + </stateManager> + </clustering> + + <!-- ================================================= --> + <!-- Phases --> + <!-- ================================================= --> + <phaseOrder type="InFlow"> + <!-- System predefined phases --> + <phase name="Transport"> + <handler name="RequestURIBasedDispatcher" + class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"> + <order phase="Transport"/> + </handler> + <handler name="SOAPActionBasedDispatcher" + class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"> + <order phase="Transport"/> + </handler> + </phase> + <phase name="Addressing"> + <handler name="AddressingBasedDispatcher" + class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"> + <order phase="Addressing"/> + </handler> + </phase> + <phase name="Security"/> + <phase name="PreDispatch"/> + <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> + <handler name="RequestURIBasedDispatcher" + class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> + <handler name="SOAPActionBasedDispatcher" + class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/> + <handler name="RequestURIOperationDispatcher" + class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/> + <handler name="SOAPMessageBodyBasedDispatcher" + class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/> + <handler name="HTTPLocationBasedDispatcher" + class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/> + <handler name="GenericProviderDispatcher" + class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/> + <handler name="MustUnderstandValidationDispatcher" + class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/> + </phase> + <phase name="RMPhase"/> + <!-- System predefined phases --> + <!-- After Postdispatch phase module author or service author can add any phase he want --> + <phase name="OperationInPhase"> + <handler name="MustUnderstandChecker" + class="org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker"> + <order phase="OperationInPhase"/> + </handler> + </phase> + <phase name="soapmonitorPhase"/> + </phaseOrder> + <phaseOrder type="OutFlow"> + <!-- user can add his own phases to this area --> + <phase name="soapmonitorPhase"/> + <phase name="OperationOutPhase"/> + <!--system predefined phase--> + <!--these phase will run irrespective of the service--> + <phase name="RMPhase"/> + <phase name="PolicyDetermination"/> + <phase name="MessageOut"/> + <phase name="Security"/> + </phaseOrder> + <phaseOrder type="InFaultFlow"> + <phase name="Addressing"> + <handler name="AddressingBasedDispatcher" + class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"> + <order phase="Addressing"/> + </handler> + </phase> + <phase name="Security"/> + <phase name="PreDispatch"/> + <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> + <handler name="RequestURIBasedDispatcher" + class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> + <handler name="SOAPActionBasedDispatcher" + class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/> + <handler name="RequestURIOperationDispatcher" + class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/> + <handler name="SOAPMessageBodyBasedDispatcher" + class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/> + <handler name="HTTPLocationBasedDispatcher" + class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/> + <handler name="GenericProviderDispatcher" + class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/> + <handler name="MustUnderstandValidationDispatcher" + class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/> + </phase> + <phase name="RMPhase"/> + <!-- user can add his own phases to this area --> + <phase name="OperationInFaultPhase"/> + <phase name="soapmonitorPhase"/> + </phaseOrder> + <phaseOrder type="OutFaultFlow"> + <!-- user can add his own phases to this area --> + <phase name="soapmonitorPhase"/> + <phase name="OperationOutFaultPhase"/> + <phase name="RMPhase"/> + <phase name="PolicyDetermination"/> + <phase name="MessageOut"/> + <phase name="Security"/> + </phaseOrder> +</axisconfig> + Propchange: ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/framework/service/config/axis2/conf/axis2.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/framework/service/lib/axis2-adb-1.7.1.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/lib/axis2-adb-1.7.1.jar?rev=1733956&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/service/lib/axis2-adb-1.7.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/service/lib/axis2-kernel-1.7.1.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/lib/axis2-kernel-1.7.1.jar?rev=1733956&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/service/lib/axis2-kernel-1.7.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/service/lib/axis2-transport-http-1.7.1.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/lib/axis2-transport-http-1.7.1.jar?rev=1733956&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/service/lib/axis2-transport-http-1.7.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/service/lib/axis2-transport-local-1.7.1.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/lib/axis2-transport-local-1.7.1.jar?rev=1733956&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/service/lib/axis2-transport-local-1.7.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java?rev=1733956&r1=1733955&r2=1733956&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java Mon Mar 7 18:48: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); Modified: ofbiz/trunk/specialpurpose/passport/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/passport/build.xml?rev=1733956&r1=1733955&r2=1733956&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/passport/build.xml (original) +++ ofbiz/trunk/specialpurpose/passport/build.xml Mon Mar 7 18:48:14 2016 @@ -30,6 +30,7 @@ under the License. <property name="ofbiz.home.dir" value="../.."/> <path id="local.class.path"> + <fileset dir="${lib.dir}" includes="*.jar"/> <fileset dir="../../framework/base/lib" includes="*.jar"/> <fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/> <fileset dir="../../framework/base/build/lib" includes="*.jar"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |