OFBiz › OFBiz - Commits

svn commit: r1625907 - in /ofbiz/trunk: build.xml framework/common/config/CommonUiLabels.xml runtime/ themes/bizznesstime/includes/footer.ftl themes/droppingcrumbs/includes/footer.ftl themes/flatgrey/includes/footer.ftl themes/tomahawk/includes/footer.ftl

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1625907 - in /ofbiz/trunk: build.xml framework/common/config/CommonUiLabels.xml runtime/ themes/bizznesstime/includes/footer.ftl themes/droppingcrumbs/includes/footer.ftl themes/flatgrey/includes/footer.ftl themes/tomahawk/includes/footer.ftl

jleroux@apache.org
Author: jleroux
Date: Thu Sep 18 07:46:14 2014
New Revision: 1625907

URL: http://svn.apache.org/r1625907
Log:
Finally keeps Release.revision date simple in footer as suggested by Scott on Dev ML
No needs to over-engineering things there. A bit more smart than before though
This reverts r1625006 and r1624886 and adds CommonBuiltOn and better svninfo and gitinfo targets
I just regret that I lose the formatting effort I did in footer.ftl files, but I have not the guts to do it again.

Modified:
    ofbiz/trunk/build.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/runtime/   (props changed)
    ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
    ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
    ofbiz/trunk/themes/flatgrey/includes/footer.ftl
    ofbiz/trunk/themes/tomahawk/includes/footer.ftl

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1625907&r1=1625906&r2=1625907&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Thu Sep 18 07:46:14 2014
@@ -212,21 +212,19 @@ under the License.
     <target name="svninfo"
         description="Update the Release-revision info in the footer. Note that you need a valid Internet connection and Subversion connected to the OFBiz repository for that ">
         <echo message="Creating svninfo..."/>
-        <exec executable="svn" dir="." output="runtime/svninfo_tmp.xml" failonerror="true" resultproperty="hasSvnRepo">
+        <exec executable="svn" dir="." output="runtime/svninfo_tmp.xml">
             <arg value="info"/>
             <arg value="--xml"/>
         </exec>
-        <if>
-            <isset property="hasSvnRepo"/>
-            <then>                          
-                <xmlproperty file="runtime/svninfo_tmp.xml"/>
-                <basename property="releasePath" file="${info.entry.url}"/>
-                <echo message="Found Release-revision: ${releasePath}-r${info.entry.commit(revision)}"/>
-                <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)}" file="runtime/svninfo.ftl"/>
-                <delete file="runtime/svninfo_tmp.xml"/>
-                <echo message="Done!"/>
-            </then>                                  
-        </if>                      
+        <xmlproperty file="runtime/svninfo_tmp.xml"/>
+        <echo message="Rev:${info.entry.commit(revision)}"/>
+        <basename property="releasePath" file="${info.entry.url}"/>
+        <tstamp>
+            <format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/>
+        </tstamp>        
+        <echo message=" - Release-revision : ${releasePath}-r${info.entry.commit(revision)},  ${uiLabelMap.CommonBuiltOn} ${dateTime}" file="runtime/svninfo.ftl"/>
+        <delete file="runtime/svninfo_tmp.xml"/>
+        <echo message="Done!"/>
     </target>
 
     <target name="clean-svninfo">
@@ -243,18 +241,16 @@ under the License.
             <arg value="--abbrev-ref"/>
             <arg value="HEAD"/>
         </exec>
-        <exec executable="git" outputproperty="revision" failonerror="true" resultproperty="hasGitRepo">
+        <exec executable="git" outputproperty="revision">
             <arg value="rev-parse"/>
             <arg value="HEAD"/>
         </exec>
-        <if>
-            <isset property="hasGitRepo"/>
-            <then>                          
-                <echo message="Found Branch-revision: ${branch}-${revision}"/>
-                <echo message=" - Branch-revision: ${branch}-${revision}" file="runtime/gitinfo.ftl"/>
-                <echo message="Done!"/>
-            </then>                                  
-        </if>                
+        <tstamp>
+            <format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/>
+        </tstamp>        
+        <echo message="Found Branch-revision: ${branch}-${revision}"/>
+        <echo message=" - Branch-revision: ${branch}-${revision}, ${uiLabelMap.CommonBuiltOn} ${dateTime}" file="runtime/gitinfo.ftl"/>
+        <echo message="Done!"/>
     </target>
 
     <target name="clean-gitinfo">
@@ -262,22 +258,7 @@ under the License.
         <echo message=" " file="runtime/gitinfo.ftl"/>
         <echo message="Done!"/>
     </target>
-    
-    <target name="deployed-on"
-        description="Set the date and time of last deployment info in the footer.">
-        <tstamp>
-            <format property="dateTime" pattern="yyyy-MM-dd HH:mm:ss"/>
-        </tstamp>
-        <echo message="${dateTime}" file="runtime/deployedOn.ftl"/>
-        <echo message="Done!"/>
-    </target>
 
-    <target name="clean-deployed-on">
-        <echo message="Resetting deployed-on..."/>
-        <delete file="runtime/deployedOn.ftl"/>
-        <echo message="Done!"/>
-    </target>    
-    
     <!-- ================================================================== -->
     <!-- Apply patches where needed                                         -->
     <!-- ================================================================== -->

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1625907&r1=1625906&r2=1625907&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Thu Sep 18 07:46:14 2014
@@ -1299,6 +1299,10 @@
         <value xml:lang="zh_CN">让利</value>
         <value xml:lang="zh_TW">回報</value>
     </property>
+    <property key="CommonBuiltOn">
+        <value xml:lang="en">built on</value>
+        <value xml:lang="fr">compilée le</value>
+    </property>
     <property key="CommonBut">
         <value xml:lang="ar">إلا</value>
         <value xml:lang="cs">ale</value>
@@ -2786,10 +2790,6 @@
         <value xml:lang="zh-CN">深度</value>
         <value xml:lang="zh_TW">深度</value>
     </property>
-    <property key="CommonDeployedOn">
-        <value xml:lang="en">Deployed on</value>
-        <value xml:lang="fr">Déployé le</value>
-    </property>
     <property key="CommonDescription">
         <value xml:lang="ar">وصف</value>
         <value xml:lang="cs">Popis</value>

Propchange: ofbiz/trunk/runtime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Sep 18 07:46:14 2014
@@ -4,4 +4,3 @@ data.zip
 test-list-build.xml
 uploads
 gitinfo.ftl
-deployedThe.ftl

Modified: ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/footer.ftl?rev=1625907&r1=1625906&r2=1625907&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/footer.ftl Thu Sep 18 07:46:14 2014
@@ -25,16 +25,8 @@ under the License.
 </div>
 <!-- footer -->
 <div id="footer">
-    <div class="poweredBy">
-      <span>
-        ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a>
-        <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
-        <#assign isDeployed = Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
-        <#if isDeployed == "true">
-          - ${uiLabelMap.CommonDeployedOn} <#include "ofbizhome://runtime/deployedOn.ftl" />
-        </#if>
-      </span>
-    </div>
+    <div class="poweredBy"><span>${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" class="noicon">OFBiz</a></span><span>Copyright 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" class="noicon">The Apache Software Foundation - www.apache.org</a></span><span><#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" /></span></div>
+
 </div>
 <!-- footer -->
 </body>

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl?rev=1625907&r1=1625906&r2=1625907&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl Thu Sep 18 07:46:14 2014
@@ -26,13 +26,8 @@ under the License.
   <p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a>
   <a href="http://validator.w3.org/check?uri=referer"><img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
   <p>
-    ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
-    ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
-    <#assign isDeployed = Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
-    <#if isDeployed == "true">
-      - ${uiLabelMap.CommonDeployedOn} <#include "ofbizhome://runtime/deployedOn.ftl" />
-    </#if>
-  </p>
+  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
+  ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" /></p>
 </div>
 <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
   <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>

Modified: ofbiz/trunk/themes/flatgrey/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/footer.ftl?rev=1625907&r1=1625906&r2=1625907&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/footer.ftl Thu Sep 18 07:46:14 2014
@@ -23,12 +23,7 @@ under the License.
         <li class="last"><a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
     </ul>
   <p>
-    ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>.
-    ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
-    <#assign isDeployed = Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
-    <#if isDeployed == "true">
-      - ${uiLabelMap.CommonDeployedOn} <#include "ofbizhome://runtime/deployedOn.ftl" />
-    </#if>
+  ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
   </p>
 </div>
 </div>

Modified: ofbiz/trunk/themes/tomahawk/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/footer.ftl?rev=1625907&r1=1625906&r2=1625907&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/footer.ftl Thu Sep 18 07:46:14 2014
@@ -24,10 +24,6 @@ under the License.
     <li>
       ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br/>
       ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
-      <#assign isDeployed = Static["org.ofbiz.base.util.FileUtil"].isFile("runtime/deployedOn.ftl")?c />
-      <#if isDeployed == "true">
-        - ${uiLabelMap.CommonDeployedOn} <#include "ofbizhome://runtime/deployedOn.ftl" />
-      </#if>
     </li>
     <li class="opposed">${nowTimestamp?datetime?string.short} -
   <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>


Free forum by Nabble Edit this page