You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/05/15 04:50:14 UTC
svn commit: r1743879 - in /ofbiz/trunk/framework/webtools: template/
template/cert/ template/datafile/ template/entity/ template/log/
template/service/ template/tempexpr/ webapp/webtools/WEB-INF/ widget/
Author: deepak
Date: Sun May 15 04:50:13 2016
New Revision: 1743879
URL: http://svn.apache.org/viewvc?rev=1743879&view=rev
Log:
(OFBIZ-7021) Renamed webtools component ftl file name from lower case to upper case pattern.
Added:
ofbiz/trunk/framework/webtools/template/Main.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/main.ftl
ofbiz/trunk/framework/webtools/template/Ping.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/ping.ftl
ofbiz/trunk/framework/webtools/template/ShowDateTime.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/showDateTime.ftl
ofbiz/trunk/framework/webtools/template/cert/ViewBrowserCerts.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/cert/viewbrowsercerts.ftl
ofbiz/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/datafile/viewdatafile.ftl
ofbiz/trunk/framework/webtools/template/entity/XmlDsDump.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/entity/xmldsdump.ftl
ofbiz/trunk/framework/webtools/template/log/LogContent.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/log/logContent.ftl
ofbiz/trunk/framework/webtools/template/service/AvailableServices.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/service/availableservices.ftl
ofbiz/trunk/framework/webtools/template/service/ServiceResult.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/service/serviceResult.ftl
ofbiz/trunk/framework/webtools/template/service/SetServiceParameter.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/service/setServiceParameter.ftl
ofbiz/trunk/framework/webtools/template/service/SetServiceParameterSync.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/service/setServiceParameterSync.ftl
ofbiz/trunk/framework/webtools/template/service/Threads.ftl
- copied unchanged from r1743788, ofbiz/trunk/framework/webtools/template/service/threads.ftl
ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl
- copied, changed from r1743788, ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl
ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl
- copied, changed from r1743788, ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl
Removed:
ofbiz/trunk/framework/webtools/template/cert/viewbrowsercerts.ftl
ofbiz/trunk/framework/webtools/template/datafile/viewdatafile.ftl
ofbiz/trunk/framework/webtools/template/entity/xmldsdump.ftl
ofbiz/trunk/framework/webtools/template/log/logContent.ftl
ofbiz/trunk/framework/webtools/template/main.ftl
ofbiz/trunk/framework/webtools/template/ping.ftl
ofbiz/trunk/framework/webtools/template/service/availableservices.ftl
ofbiz/trunk/framework/webtools/template/service/serviceResult.ftl
ofbiz/trunk/framework/webtools/template/service/setServiceParameter.ftl
ofbiz/trunk/framework/webtools/template/service/setServiceParameterSync.ftl
ofbiz/trunk/framework/webtools/template/service/threads.ftl
ofbiz/trunk/framework/webtools/template/showDateTime.ftl
ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl
ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
ofbiz/trunk/framework/webtools/widget/LogScreens.xml
ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
Copied: ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl (from r1743788, ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl?p2=ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl&p1=ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl&r1=1743788&r2=1743879&rev=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMacros.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMacros.ftl Sun May 15 04:50:13 2016
@@ -20,7 +20,7 @@ under the License.
<#--
To use these macros in your template, insert the following line in
your template file:
-<#include "component://common/template/includes/tempExprMacros.ftl"/>
+<#include "component://common/template/includes/empExprMacros.ftl"/>
-->
<#include "component://common/template/includes/commonMacros.ftl"/>
Copied: ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl (from r1743788, ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl?p2=ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl&p1=ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl&r1=1743788&r2=1743879&rev=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/template/tempexpr/tempExprMaint.ftl (original)
+++ ofbiz/trunk/framework/webtools/template/tempexpr/TempExprMaint.ftl Sun May 15 04:50:13 2016
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#include "component://webtools/template/tempexpr/tempExprMacros.ftl"/>
+<#include "component://webtools/template/tempexpr/TempExprMacros.ftl"/>
<h1>${title}</h1>
<#if temporalExpression?has_content>
<#-- Edit existing expression -->
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1743879&r1=1743878&r2=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sun May 15 04:50:13 2016
@@ -609,8 +609,8 @@ under the License.
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://webtools/widget/CommonScreens.xml#main"/>
- <view-map name="ping" type="ftl" page="component://webtools/template/ping.ftl"/>
- <view-map name="showDateTime" type="ftl" page="component://webtools/template/showDateTime.ftl"/>
+ <view-map name="ping" type="ftl" page="component://webtools/template/Ping.ftl"/>
+ <view-map name="showDateTime" type="ftl" page="component://webtools/template/ShowDateTime.ftl"/>
<view-map name="entityref" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityRef"/>
<view-map name="entityref_list" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityRefList"/>
Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=1743879&r1=1743878&r2=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Sun May 15 04:50:13 2016
@@ -57,7 +57,7 @@ under the License.
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/template/main.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/Main.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
@@ -86,7 +86,7 @@ under the License.
<widgets>
<decorator-screen name="CommonConfigurationDecorator" location="component://webtools/widget/CommonScreens.xml">
<decorator-section name="body">
- <platform-specific><html><html-template location="component://webtools/template/cert/viewbrowsercerts.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/cert/ViewBrowserCerts.ftl"/></html></platform-specific>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/EntityScreens.xml?rev=1743879&r1=1743878&r2=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/EntityScreens.xml Sun May 15 04:50:13 2016
@@ -465,7 +465,7 @@ under the License.
<decorator-screen name="CommonImportExportDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
- <platform-specific><html><html-template location="component://webtools/template/entity/xmldsdump.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/entity/XmlDsDump.ftl"/></html></platform-specific>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LogScreens.xml?rev=1743879&r1=1743878&r2=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LogScreens.xml Sun May 15 04:50:13 2016
@@ -115,7 +115,7 @@ under the License.
<label>${logFileName}</label>
</container>
<platform-specific>
- <html><html-template location="component://webtools/template/log/logContent.ftl"/></html>
+ <html><html-template location="component://webtools/template/log/LogContent.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
Modified: ofbiz/trunk/framework/webtools/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/MiscScreens.xml?rev=1743879&r1=1743878&r2=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/MiscScreens.xml Sun May 15 04:50:13 2016
@@ -33,7 +33,7 @@ under the License.
<decorator-screen name="CommonImportExportDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet>
- <platform-specific><html><html-template location="component://webtools/template/datafile/viewdatafile.ftl"/></html></platform-specific>
+ <platform-specific><html><html-template location="component://webtools/template/datafile/ViewDataFile.ftl"/></html></platform-specific>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml?rev=1743879&r1=1743878&r2=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/ServiceScreens.xml Sun May 15 04:50:13 2016
@@ -33,7 +33,7 @@ under the License.
<decorator-section name="body">
<platform-specific>
<html>
- <html-template location="component://webtools/template/service/availableservices.ftl"/>
+ <html-template location="component://webtools/template/service/AvailableServices.ftl"/>
</html>
</platform-specific>
</decorator-section>
@@ -112,7 +112,7 @@ under the License.
</screenlet>
<screenlet title="${uiLabelMap.WebtoolsGeneralJavaThreads}">
<platform-specific>
- <html><html-template location="component://webtools/template/service/threads.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/Threads.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -172,7 +172,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.WebtoolsStep2ServiceParameters}">
<platform-specific>
- <html><html-template location="component://webtools/template/service/setServiceParameter.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/SetServiceParameter.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -194,7 +194,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleScheduleJob}">
<platform-specific>
- <html><html-template location="component://webtools/template/service/setServiceParameterSync.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/SetServiceParameterSync.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -215,7 +215,7 @@ under the License.
<decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<platform-specific>
- <html><html-template location="component://webtools/template/service/serviceResult.ftl"/></html>
+ <html><html-template location="component://webtools/template/service/ServiceResult.ftl"/></html>
</platform-specific>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=1743879&r1=1743878&r2=1743879&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Sun May 15 04:50:13 2016
@@ -106,7 +106,7 @@ under the License.
<not><if-empty field="childExpressionList"/></not>
</condition>
<widgets>
- <include-form name="ListChildExpressions" location="component://webtools/widget/tempExprForms.xml"/>
+ <include-form name="ListChildExpressions" location="component://webtools/widget/TempExprForms.xml"/>
</widgets>
</section>
</decorator-section>