svn commit: r1819812 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/catalina/ofbiz-component.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1819812 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/catalina/ofbiz-component.xml

jleroux@apache.org
Author: jleroux
Date: Tue Jan  2 12:23:23 2018
New Revision: 1819812

URL: http://svn.apache.org/viewvc?rev=1819812&view=rev
Log:
"Applied fix from trunk for revision: 1819811"
------------------------------------------------------------------------
r1819811 | jleroux | 2018-01-02 13:22:17 +0100 (mar., 02 janv. 2018) | 6 lines

Fixed: Add WebSocket support in OFBiz
(OFBIZ-7073)

This was my bad at OFBIZ-7776

Thanks: Deepak for help on dev ML (good remembering)
------------------------------------------------------------------------


Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan  2 12:23:23 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811

Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml?rev=1819812&r1=1819811&r2=1819812&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/ofbiz-component.xml Tue Jan  2 12:23:23 2018
@@ -22,6 +22,7 @@ under the License.
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
+    <classpath type="dir" location="config"/>
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
 
     <container name="catalina-container" loaders="main" class="org.apache.ofbiz.catalina.container.CatalinaContainer">