svn commit: r1597615 - in /ofbiz/trunk: .gitignore build.xml runtime/ themes/bizznesstime/includes/footer.ftl themes/droppingcrumbs/includes/footer.ftl themes/flatgrey/includes/footer.ftl themes/tomahawk/includes/footer.ftl

Author: jleroux
Date: Mon May 26 17:23:12 2014
New Revision: 1597615

URL: http://svn.apache.org/r1597615
Log:
Adds the gitinfo and the clean-gitinfo (last one used in build target) targets
Uses the new runtime/gitinfo.ftl in footers (all themes) like is the runtime/ftlinfo.ftl one
Actually both are shown (if you have a mix of repos, like I do) or one or the other
Adds the runtime/gitinfo.ftl file in both .gitignore and svn ignore

Modified:
    ofbiz/trunk/.gitignore
    ofbiz/trunk/build.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/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=1597615&r1=1597614&r2=1597615&view=diff
==============================================================================
--- ofbiz/trunk/.gitignore (original)
+++ ofbiz/trunk/.gitignore Mon May 26 17:23:12 2014
@@ -12,6 +12,7 @@ ofbiz.jar
 changelog
 runtime/git-rebase/*
 runtime/svninfo.ftl
+runtime/gitnfo.ftl
 runtime/test-list-build.xml
 runtime/logs/access_log.*
 runtime/logs/cobertura-base.dat
@@ -39,3 +40,4 @@ themes/flatgrey/webapp/flatgrey/mainrtl-
 .*.swp
 .*.swo
 framework/entity/lib/jdbc
+/runtime/gitinfo.ftl

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1597615&r1=1597614&r2=1597615&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Mon May 26 17:23:12 2014
@@ -223,6 +223,29 @@ under the License.
         <echo message=" " file="runtime/svninfo.ftl"/>
         <echo message="Done!"/>
     </target>
+    
+    <target name="gitinfo"
+        description="Update the Git Branch-revision info in the footer.">
+        <echo message="Creating gitinfo..."/>
+        <exec executable="git" outputproperty="branch">
+            <arg value="rev-parse"/>
+            <arg value="--abbrev-ref"/>
+            <arg value="HEAD"/>
+        </exec>
+        <exec executable="git" outputproperty="revision">
+            <arg value="rev-parse"/>
+            <arg value="HEAD"/>
+        </exec>
+        <echo message="Found Branch-revision: ${branch}-${revision}"/>
+        <echo message=" - Branch-revision: ${branch}-${revision}" file="runtime/gitinfo.ftl"/>
+        <echo message="Done!"/>
+    </target>
+
+    <target name="clean-gitinfo">
+        <echo message="Resetting svninfo..."/>
+        <echo message=" " file="runtime/gitinfo.ftl"/>
+        <echo message="Done!"/>
+    </target>
 
     <!-- ================================================================== -->
     <!-- Apply patches where needed                                         -->
@@ -301,6 +324,7 @@ under the License.
 
         <hotdeployant/>
         <antcall target="clean-svninfo"/>
+        <antcall target="clean-gitinfo"/>
 
         <echo message="[build] ========== Done Building (Compile) =========="/>
     </target>

Propchange: ofbiz/trunk/runtime/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon May 26 17:23:12 2014
@@ -3,3 +3,4 @@ svninfo.ftl
 data.zip
 test-list-build.xml
 uploads
+gitinfo.ftl

Modified: ofbiz/trunk/themes/bizznesstime/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/footer.ftl?rev=1597615&r1=1597614&r2=1597615&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/footer.ftl Mon May 26 17:23:12 2014
@@ -25,7 +25,7 @@ under the License.
 </div>
 <!-- footer -->
 <div id="footer">
-    <div class="poweredBy"><span>Powered by <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" /></span></div>
+    <div class="poweredBy"><span>Powered by <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 -->

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl?rev=1597615&r1=1597614&r2=1597615&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl Mon May 26 17:23:12 2014
@@ -27,7 +27,7 @@ under the License.
   <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" /></p>
+  ${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=1597615&r1=1597614&r2=1597615&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/footer.ftl Mon May 26 17:23:12 2014
@@ -23,7 +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" />
+  ${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=1597615&r1=1597614&r2=1597615&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/footer.ftl Mon May 26 17:23:12 2014
@@ -23,7 +23,7 @@ under the License.
   <ul>
     <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" />
+      ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a> <#include "ofbizhome://runtime/svninfo.ftl" /> <#include "ofbizhome://runtime/gitinfo.ftl" />
     </li>
     <li class="opposed">${nowTimestamp?datetime?string.short} -
   <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a>