Author: ashish
Date: Sun Sep 4 07:37:15 2016
New Revision: 1759152
URL: http://svn.apache.org/viewvc?rev=1759152&view=rev
Log:
Applied patch from jira issue - OFBIZ-8091 - Clean up commented out code in XML
for Common component. Thanks Aman for the contribution.
Modified:
ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml
ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml
ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml
ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
Modified: ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml?rev=1759152&r1=1759151&r2=1759152&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml (original)
+++ ofbiz/trunk/applications/commonext/config/SetupUiLabels.xml Sun Sep 4
07:37:15 2016
@@ -60,27 +60,19 @@
<value xml:lang="zh-TW">OFBiz: è¨ç½®æç¨ç¨å¼</value>
</property>
<property key="SetupCompanySubtitle">
- <!--value xml:lang="ar">جزء Ù
Ù Ø¹Ø§Ø¦ÙØ© Ø£ÙÙØ¨Ùز ÙÙØ¨Ø±Ù
Ø¬ÙØ§Øª Ø§ÙØØ±Ø©</value-->
<value xml:lang="ar">جزء Ù
Ù Ø¹Ø§Ø¦ÙØ© Ø£ÙÙØ¨Ùز
ÙÙØªØ·Ø¨ÙÙØ§Øª Ø§ÙØØ±Ø© ÙÙØªØ³ÙÙØ±</value>
<value xml:lang="de">Teil der Apache OFBiz Familie von Open Source
Software</value>
<value xml:lang="en">Part of the Apache OFBiz Family of Open Source
Software</value>
- <!--value xml:lang="es">Parte de la familia "Open for Bussiness" de
Software Libre</value-->
<value xml:lang="es">Parte de la familia de software Apache OFBiz de
código abierto</value>
<value xml:lang="fr">Un module de la famille Apache OFBiz, logiciel
libre de gestion d'entreprise.</value>
<value xml:lang="it">Un modulo della famiglia di software open source
Apache OFBiz</value>
- <!--value xml:lang="nl">Onderdeel van de Apache OFBiz'-suite</value-->
<value xml:lang="ja">Part of the Apache OFBiz Family of Open Source
Software</value>
<value xml:lang="nl">Deel van de Apache OFBiz-suite van Open Source
Software</value>
<value xml:lang="pt-BR">Parte da famÃlia OfBiz de software de fonte
aberta</value>
- <!--value xml:lang="pt-PT">Parte do Software de Fonte Aberta para Grupos
Abertos Para o Negócio</value-->
<value xml:lang="pt-PT">Parte da famÃlia OfBiz de software de fonte
aberta</value>
- <!--value xml:lang="ro">Parte accesibila pentru Business Family of Open
Source Software</valuevalue xml:lang="ro">Parte din Open for Business Family of
Open Source Software</value-->
<value xml:lang="ro">Partea de Deschidere Pentru Afaceri Familiale din
Open Source Software</value>
- <!--value xml:lang="ru">ЧаÑÑÑ ÑемейÑÑва ÐÐ Apache
OFBiz</valuevalue xml:lang="ru">ЧаÑÑÑ ÑемейÑÑва "Apache OFBiz
Family" пÑогÑаммнÑÑ
пÑодÑкÑов Open Source </value-->
<value xml:lang="ru">ÐÑ
Ð¾Ð´Ð¸Ñ Ð² ÑоÑÑав ÑемейÑÑва
Apache OFBiz</value>
- <!--value
xml:lang="th">à¹à¸à¹à¸à¸ªà¹à¸§à¸à¸«à¸à¸¶à¹à¸à¸à¸à¸à¸à¸¸à¸£à¸à¸´à¸à¹à¸à¸à¸à¸£à¸à¸à¸à¸£à¸±à¸§à¸à¸µà¹à¹à¸à¹à¸à¸à¸à¸à¸à¹à¹à¸§à¸£à¹à¹à¸à¹à¸à¸à¸à¸à¸ª</value-->
<value
xml:lang="th">สà¹à¸§à¸à¸«à¸à¸¶à¹à¸à¸à¸à¸à¸à¸¸à¸£à¸à¸´à¸à¹à¸à¸à¸à¸£à¸à¸à¸à¸£à¸±à¸§à¸à¸µà¹à¹à¸à¹à¸à¸à¸à¸à¸à¹à¹à¸§à¸£à¹à¹à¸à¹à¸à¸à¸à¸à¸ª</value>
- <!--value xml:lang="zh">弿ºè½¯ä»¶OFBizçç»æé¨å</valuevalue
xml:lang="zh">弿ºè½¯ä»¶OFBizçç»æé¨å</value-->
<value xml:lang="vi">Thà nh viên cá»§a gia Äình 'Apache OFBiz
Family' cá»§a 'Open Source Software'</value>
<value xml:lang="zh">弿ºè½¯ä»¶OFBizå®¶æçä¸é¨å</value>
<value xml:lang="zh-CN">OFBizçä¸é¨å</value>
Modified: ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml?rev=1759152&r1=1759151&r2=1759152&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml (original)
+++ ofbiz/trunk/applications/commonext/minilang/setup/SetupEvents.xml Sun Sep
4 07:37:15 2016
@@ -236,8 +236,6 @@
<call-service service-name="createPartyContactMechPurpose"
in-map-name="emailPurposeContext"/>
</if-not-empty>
- <!-- General Ledger Setup for the new organization -->
- <!--<call-simple-method method-name="setupDefaultGeneralLedger"/>-->
<!-- create CustomTimePeriod within one years -->
<now-timestamp field="nowTimestamp"/>
Modified: ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml?rev=1759152&r1=1759151&r2=1759152&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/commonext/webapp/WEB-INF/web.xml Sun Sep 4
07:37:15 2016
@@ -67,8 +67,6 @@ under the License.
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
- <!-- NOTE: not all app servers support mounting implementations of the
HttpSessionActivationListener interface -->
- <!--
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener>
-->
<servlet>
<description>Main Control Servlet</description>
Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=1759152&r1=1759151&r2=1759152&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
(original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Sun
Sep 4 07:37:15 2016
@@ -67,8 +67,6 @@
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
- <!-- NOTE: not all app servers support mounting implementations of the
HttpSessionActivationListener interface -->
- <!--
<listener><listener-class>org.apache.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener>
-->
<servlet>
<description>Main Control Servlet</description>
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=1759152&r1=1759151&r2=1759152&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
(original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml Sun
Sep 4 07:37:15 2016
@@ -37,9 +37,6 @@
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.SetupCompanySubtitle" global="true"/>
<!-- layoutSettings.headerImageUrl can be used to specify an
application specific logo; if not set,
then the global layoutSettings.commonHeaderImageUrl
(specified in GlobalDecorator) will be used. -->
- <!--<set field="layoutSettings.headerImageUrl"
value="/images/ofbiz_logo.gif" global="true"/>-->
- <!-- <set field="layoutSettings.headerMiddleBackgroundUrl"
value="" global="true"/> -->
- <!-- <set field="layoutSettings.headerRightBackgroundUrl"
value="" global="true"/> -->
<set field="activeApp" value="ofbizsetup" global="true"/>
<set field="applicationMenuName" value="SetupAppBar"
global="true"/>
<set field="applicationMenuLocation"
value="component://commonext/widget/ofbizsetup/Menus.xml" global="true"/>