svn commit: r1061893 - in /ofbiz/branches/release10.04: ./ NOTICE framework/entity/src/org/ofbiz/entity/model/ModelInfo.java

Author: jleroux
Date: Fri Jan 21 16:42:36 2011
New Revision: 1061893

URL: http://svn.apache.org/viewvc?rev=1061893&view=rev
Log:
"Applied fix from trunk for revision: 1061886"  (handled conflict by hand)
------------------------------------------------------------------------
r1061886 | jleroux | 2011-01-21 17:33:22 +0100 (ven., 21 janv. 2011) | 3 lines

Update copyright from 2010 to 2011, BTW this closes "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

I have changed ModelInfo.getCopyright() in order to automatize (I believe the copyright is always valid so we don't care about the date really used, if you disagree please let me know, I have a doubt about this...)
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/NOTICE
    ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 21 16:42:36 2011
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060261,1060368,1060933,1061167
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990339,990
 539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060261,1060368,1060933,1061167,1061886

Modified: ofbiz/branches/release10.04/NOTICE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/NOTICE?rev=1061893&r1=1061892&r2=1061893&view=diff
==============================================================================
--- ofbiz/branches/release10.04/NOTICE (original)
+++ ofbiz/branches/release10.04/NOTICE Fri Jan 21 16:42:36 2011
@@ -4,7 +4,7 @@
 =========================================================================
 
 The Apache Open For Business Project (Apache OFBiz)
-Copyright 2001-2008 The Apache Software Foundation
+Copyright 2001-2011 The Apache Software Foundation
 
 =========================================================================
 ==  Apache General Notice (Covers OFBiz and all ASF libraries)         ==

Modified: ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java?rev=1061893&r1=1061892&r2=1061893&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java (original)
+++ ofbiz/branches/release10.04/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java Fri Jan 21 16:42:36 2011
@@ -18,7 +18,12 @@
  *******************************************************************************/
 package org.ofbiz.entity.model;
 
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
 import org.ofbiz.base.util.StringUtil;
+import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilXml;
 import org.w3c.dom.Element;
 
@@ -65,7 +70,7 @@ public class ModelInfo {
         @Override
         public String getAuthor()               { return "None"; }
         @Override
-        public String getCopyright()            { return "Copyright 2001-2009 The Apache Software Foundation"; }
+        public String getCopyright()            { int year = UtilDateTime.getYear(UtilDateTime.nowTimestamp(), TimeZone.getDefault(), Locale.getDefault()); return "Copyright 2001-" + year + " The Apache Software Foundation"; }
         @Override
         public String getVersion()              { return "1.0"; }
         @Override