Author: jleroux
Date: Tue Sep 26 13:29:10 2017
New Revision: 1809747
URL: http://svn.apache.org/viewvc?rev=1809747&view=rev
Log:
No functional change.
Clarifies in log when a weppabb is not mounted (overriding another)
Modified:
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
ofbiz/ofbiz-plugins/trunk/birt/ofbiz-component.xml
Modified:
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java?rev=1809747&r1=1809746&r2=1809747&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
Tue Sep 26 13:29:10 2017
@@ -442,7 +442,7 @@ public class CatalinaContainer implement
/* webapp is loaded already (overridden). Therefore, disable
* app bar display on overridden apps and do not load */
appInfo.setAppBarDisplay(false);
- Debug.logInfo("Duplicate webapp mount; not loading : " +
appInfo.getName() + " / " + appInfo.getLocation(), module);
+ Debug.logInfo("Duplicate webapp mount (overridding); not
loading : " + appInfo.getName() + " / " + appInfo.getLocation(), module);
}
}
ExecutionPool.getAllFutures(futures);
Modified: ofbiz/ofbiz-plugins/trunk/birt/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/ofbiz-component.xml?rev=1809747&r1=1809746&r2=1809747&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/birt/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/birt/ofbiz-component.xml Tue Sep 26 13:29:10 2017
@@ -35,6 +35,7 @@ under the License.
<service-resource type="model" loader="main"
location="servicedef/services.xml"/>
+ <!-- this overrides the accounting, facility and order applications in
order to use Birt in these applications -->
<webapp name="accounting"
title="Accounting"
server="default-server"
