Menu
▾
▴
objectlabkit-svn
|
From: <be...@us...> - 2009-01-28 22:32:11
|
Revision: 264
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=264&view=rev
Author: benoitx
Date: 2009-01-28 22:32:03 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Updating stats.
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/statsvn.bat
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2008-05-05 16:37:50 UTC (rev 263)
+++ trunk/datecalc-common/qalab.xml 2009-01-28 22:32:03 UTC (rev 264)
@@ -205,6 +205,14 @@
project="objectlabkit" statvalue="45" type="cobertura-line"/>
<summaryresult date="2008-03-27" filecount="20" module="common"
project="objectlabkit" statvalue="33" type="cobertura-branch"/>
+ <summaryresult date="2008-05-05" filecount="21" module="common"
+ project="objectlabkit" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2008-05-05" filecount="2" module="common"
+ project="objectlabkit" statvalue="2" type="findbugs"/>
+ <summaryresult date="2008-05-05" filecount="20" module="common"
+ project="objectlabkit" statvalue="45" type="cobertura-line"/>
+ <summaryresult date="2008-05-05" filecount="20" module="common"
+ project="objectlabkit" statvalue="33" type="cobertura-branch"/>
</summary>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_package.html"
@@ -297,6 +305,9 @@
<result date="2008-03-27" statvalue="1" type="findbugs"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="92" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="1" type="findbugs"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="92" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_WorkingWeek.java"
@@ -376,6 +387,8 @@
<result date="2008-03-24" statvalue="90" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="95" type="cobertura-line"/>
<result date="2008-03-27" statvalue="90" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="95" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="90" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_TenorCode.java"
@@ -447,6 +460,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandlerType.java"
@@ -485,6 +500,7 @@
<result date="2007-01-22" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_PeriodCountBasis.java"
@@ -521,6 +537,7 @@
<result date="2007-01-22" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_StandardTenor.java"
@@ -591,6 +608,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="93" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="93" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
@@ -604,6 +623,8 @@
<result date="2008-03-24" statvalue="1" type="findbugs"/>
<result date="2008-03-27" statvalue="1" type="checkstyle"/>
<result date="2008-03-27" statvalue="1" type="findbugs"/>
+ <result date="2008-05-05" statvalue="4" type="checkstyle"/>
+ <result date="2008-05-05" statvalue="1" type="findbugs"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_DateCalculatorGeneric.java"
@@ -670,6 +691,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandler.java"
@@ -731,6 +754,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java"
@@ -823,6 +848,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_Utils.java"
@@ -877,6 +904,8 @@
<result date="2008-03-24" statvalue="64" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="77" type="cobertura-line"/>
<result date="2008-03-27" statvalue="64" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="77" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="64" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMPeriod.java"
@@ -906,6 +935,7 @@
<result date="2007-01-22" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_ExcelDateUtil.java"
@@ -957,6 +987,8 @@
<result date="2008-03-24" statvalue="83" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="82" type="cobertura-line"/>
<result date="2008-03-27" statvalue="83" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="82" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="83" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMDateCalculator.java"
@@ -1006,6 +1038,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java"
@@ -1033,6 +1067,7 @@
<result date="2007-01-22" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java"
@@ -1078,6 +1113,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayCalendar.java"
@@ -1095,6 +1132,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_DefaultHolidayCalendar.java"
@@ -1111,6 +1150,7 @@
<result date="2007-01-22" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2008-05-05 16:37:50 UTC (rev 263)
+++ trunk/datecalc-jdk/qalab.xml 2009-01-28 22:32:03 UTC (rev 264)
@@ -211,6 +211,14 @@
project="objectlabkit" statvalue="82" type="cobertura-branch"/>
<summaryresult date="2008-03-27" filecount="1" module="jdk"
project="objectlabkit" statvalue="1" type="pmd"/>
+ <summaryresult date="2008-05-05" filecount="22" module="jdk"
+ project="objectlabkit" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2008-05-05" filecount="21" module="jdk"
+ project="objectlabkit" statvalue="94" type="cobertura-line"/>
+ <summaryresult date="2008-05-05" filecount="21" module="jdk"
+ project="objectlabkit" statvalue="81" type="cobertura-branch"/>
+ <summaryresult date="2008-05-05" filecount="2" module="jdk"
+ project="objectlabkit" statvalue="3" type="pmd"/>
</summary>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_package.html"
@@ -496,6 +504,8 @@
<result date="2008-03-24" statvalue="78" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="78" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="78" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java"
@@ -554,6 +564,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_ExcelDateUtil.java"
@@ -625,6 +637,8 @@
<result date="2008-03-24" statvalue="75" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="91" type="cobertura-line"/>
<result date="2008-03-27" statvalue="75" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="91" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java"
@@ -849,6 +863,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java"
@@ -896,6 +912,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java"
@@ -943,6 +961,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java"
@@ -992,6 +1012,9 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="2" type="checkstyle"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="2" type="pmd"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateBackwardHandler.java"
@@ -1041,6 +1064,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateForwardHandler.java"
@@ -1088,6 +1113,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java"
@@ -1135,6 +1162,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java"
@@ -1184,6 +1213,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java"
@@ -1229,6 +1259,8 @@
<result date="2008-03-24" statvalue="76" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="88" type="cobertura-line"/>
<result date="2008-03-27" statvalue="76" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="88" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="76" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java"
@@ -1280,6 +1312,9 @@
<result date="2008-03-27" statvalue="1" type="checkstyle"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="74" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="1" type="checkstyle"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="74" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java"
@@ -1333,6 +1368,10 @@
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="1" type="pmd"/>
+ <result date="2008-05-05" statvalue="1" type="checkstyle"/>
+ <result date="2008-05-05" statvalue="96" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="92" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="1" type="pmd"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateDateCalculator.java"
@@ -1378,6 +1417,8 @@
<result date="2008-03-24" statvalue="78" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="89" type="cobertura-line"/>
<result date="2008-03-27" statvalue="78" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="89" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="78" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateIMMDateCalculator.java"
@@ -1425,6 +1466,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java"
@@ -1470,6 +1513,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="96" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="92" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarForwardUnlessNegativeHandler.java"
@@ -1489,6 +1534,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateForwardUnlessNegativeHandler.java"
@@ -1508,6 +1555,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarBackwardHandler.java"
@@ -1642,4 +1691,18 @@
<result date="2007-01-04" statvalue="91" type="cobertura-line"/>
<result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
</file>
+ <file
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedPrecedingHandler.java"
+ module="jdk"
+ path="net/objectlab/kit/datecalc/jdk/CalendarModifiedPrecedingHandler.java" project="objectlabkit">
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedPrecedingHandler.java"
+ module="jdk"
+ path="net/objectlab/kit/datecalc/jdk/DateModifiedPrecedingHandler.java" project="objectlabkit">
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2008-05-05 16:37:50 UTC (rev 263)
+++ trunk/datecalc-joda/qalab.xml 2009-01-28 22:32:03 UTC (rev 264)
@@ -217,6 +217,14 @@
project="objectlabkit" statvalue="84" type="cobertura-branch"/>
<summaryresult date="2008-03-27" filecount="1" module="joda"
project="objectlabkit" statvalue="1" type="pmd"/>
+ <summaryresult date="2008-05-05" filecount="24" module="joda"
+ project="objectlabkit" statvalue="2" type="checkstyle"/>
+ <summaryresult date="2008-05-05" filecount="23" module="joda"
+ project="objectlabkit" statvalue="93" type="cobertura-line"/>
+ <summaryresult date="2008-05-05" filecount="23" module="joda"
+ project="objectlabkit" statvalue="83" type="cobertura-branch"/>
+ <summaryresult date="2008-05-05" filecount="1" module="joda"
+ project="objectlabkit" statvalue="1" type="pmd"/>
</summary>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_package.html"
@@ -382,6 +390,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_BackwardHandler.java"
@@ -639,6 +649,8 @@
<result date="2008-03-24" statvalue="75" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="91" type="cobertura-line"/>
<result date="2008-03-27" statvalue="75" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="91" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java"
@@ -692,6 +704,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateCalculator.java"
@@ -746,6 +760,8 @@
<result date="2008-03-24" statvalue="73" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="85" type="cobertura-line"/>
<result date="2008-03-27" statvalue="73" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="85" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="73" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java"
@@ -799,6 +815,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java"
@@ -852,6 +870,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java"
@@ -905,6 +925,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java"
@@ -958,6 +979,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java"
@@ -1011,6 +1034,8 @@
<result date="2008-03-24" statvalue="82" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="90" type="cobertura-line"/>
<result date="2008-03-27" statvalue="82" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="90" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="82" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java"
@@ -1064,6 +1089,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java"
@@ -1117,6 +1144,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java"
@@ -1170,6 +1199,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_JodaExcelDateUtil.java"
@@ -1219,6 +1249,8 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="85" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
+ <result date="2008-05-05" statvalue="85" type="cobertura-line"/>
+ <result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda...
[truncated message content] |
|
From: <be...@us...> - 2009-02-06 23:53:23
|
Revision: 265
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=265&view=rev
Author: benoitx
Date: 2009-02-06 23:53:19 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
Added 3 methods to unregister holiday calendars.
also added a Twitter widget on main page...
Modified Paths:
--------------
trunk/datecalc-common/.classpath
trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs
trunk/datecalc-common/qalab.xml
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/src/site/changes.xml
trunk/src/site/index.xml
Property Changed:
----------------
trunk/
trunk/datecalc-common/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- target
*.log
+ target
*.log
*.1
Property changes on: trunk/datecalc-common
___________________________________________________________________
Modified: svn:ignore
- target
.fbwarnings
velocity.log
ydocErr.log
+ target
.fbwarnings
velocity.log
ydocErr.log
targetEclipse
Modified: trunk/datecalc-common/.classpath
===================================================================
--- trunk/datecalc-common/.classpath 2009-01-28 22:32:03 UTC (rev 264)
+++ trunk/datecalc-common/.classpath 2009-02-06 23:53:19 UTC (rev 265)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"></classpathentry>
- <classpathentry excluding="" kind="src" path="src/main/java"></classpathentry>
- <classpathentry output="target/test-classes" kind="src" path="src/test/java"></classpathentry>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar"></classpathentry>
- <classpathentry kind="output" path="target/classes"></classpathentry>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar"/>
+ <classpathentry kind="output" path="targetEclipse/classes"/>
+</classpath>
Modified: trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs 2009-01-28 22:32:03 UTC (rev 264)
+++ trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs 2009-02-06 23:53:19 UTC (rev 265)
@@ -1,9 +1,7 @@
-
-
-
-
-
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=5
-org.eclipse.jdt.core.compiler.compliance=5
-org.eclipse.jdt.core.compiler.source=1.5
+#Fri Feb 06 23:10:41 GMT 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2009-01-28 22:32:03 UTC (rev 264)
+++ trunk/datecalc-common/qalab.xml 2009-02-06 23:53:19 UTC (rev 265)
@@ -213,6 +213,14 @@
project="objectlabkit" statvalue="45" type="cobertura-line"/>
<summaryresult date="2008-05-05" filecount="20" module="common"
project="objectlabkit" statvalue="33" type="cobertura-branch"/>
+ <summaryresult date="2009-02-06" filecount="21" module="common"
+ project="objectlabkit" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2009-02-06" filecount="2" module="common"
+ project="objectlabkit" statvalue="2" type="findbugs"/>
+ <summaryresult date="2009-02-06" filecount="20" module="common"
+ project="objectlabkit" statvalue="43" type="cobertura-line"/>
+ <summaryresult date="2009-02-06" filecount="20" module="common"
+ project="objectlabkit" statvalue="30" type="cobertura-branch"/>
</summary>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_package.html"
@@ -308,6 +316,9 @@
<result date="2008-05-05" statvalue="1" type="findbugs"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="92" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="1" type="findbugs"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="92" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_WorkingWeek.java"
@@ -389,6 +400,8 @@
<result date="2008-03-27" statvalue="90" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="95" type="cobertura-line"/>
<result date="2008-05-05" statvalue="90" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="95" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="90" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_TenorCode.java"
@@ -462,6 +475,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandlerType.java"
@@ -501,6 +516,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_PeriodCountBasis.java"
@@ -538,6 +554,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_StandardTenor.java"
@@ -610,6 +627,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="93" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="93" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
@@ -625,6 +644,8 @@
<result date="2008-03-27" statvalue="1" type="findbugs"/>
<result date="2008-05-05" statvalue="4" type="checkstyle"/>
<result date="2008-05-05" statvalue="1" type="findbugs"/>
+ <result date="2009-02-06" statvalue="4" type="checkstyle"/>
+ <result date="2009-02-06" statvalue="1" type="findbugs"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_DateCalculatorGeneric.java"
@@ -693,6 +714,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandler.java"
@@ -756,6 +779,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java"
@@ -850,6 +875,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_Utils.java"
@@ -906,6 +933,8 @@
<result date="2008-03-27" statvalue="64" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="77" type="cobertura-line"/>
<result date="2008-05-05" statvalue="64" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="77" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="64" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMPeriod.java"
@@ -936,6 +965,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_ExcelDateUtil.java"
@@ -989,6 +1019,8 @@
<result date="2008-03-27" statvalue="83" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="82" type="cobertura-line"/>
<result date="2008-05-05" statvalue="83" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="82" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="83" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMDateCalculator.java"
@@ -1040,6 +1072,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java"
@@ -1068,6 +1102,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java"
@@ -1115,6 +1150,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayCalendar.java"
@@ -1134,6 +1171,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_DefaultHolidayCalendar.java"
@@ -1151,6 +1190,7 @@
<result date="2008-03-24" statvalue="100" type="cobertura-branch"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java 2009-01-28 22:32:03 UTC (rev 264)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java 2009-02-06 23:53:19 UTC (rev 265)
@@ -32,6 +32,7 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -131,6 +132,29 @@
dc.setHolidayCalendar(holidays.get(name));
}
}
+
+ /**
+ * @return an immutable set of registered calendar names
+ */
+ public Set<String> getRegisteredHolidayCalendarNames() {
+ return Collections.unmodifiableSet(holidays.keySet());
+ }
+
+ /**
+ * Unregister a given holiday calendar
+ * @param calendarName
+ * the calendar name to unregister.
+ */
+ public void unregisterHolidayCalendar(final String calendarName) {
+ holidays.remove(calendarName);
+ }
+
+ /**
+ * unregister all holiday calendars;
+ */
+ public void unregisterAllHolidayCalendars() {
+ holidays.clear();
+ }
}
/*
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java 2009-01-28 22:32:03 UTC (rev 264)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java 2009-02-06 23:53:19 UTC (rev 265)
@@ -66,7 +66,7 @@
* @exception IllegalArgumentException
* if the type is not null or a valid value.
*/
- DateCalculator<E> getDateCalculator(final String name, final String holidayHandlerType);
+ DateCalculator<E> getDateCalculator(String name, String holidayHandlerType);
/**
* Use this method to register a set of holidays for a given calendar.
@@ -78,28 +78,44 @@
* @deprecated should use the registerHolidays with HolidayCalendar
*/
@Deprecated
- void registerHolidays(final String name, Set<E> holidays);
+ void registerHolidays(String name, Set<E> holidays);
/**
* Use this method to register a holidays calendar.
*
- * @param name
+ * @param calendarName
* the calendar name to register these holidays under.
* @param holidaysCalendar
* the holiday calendar (non-working days with boundaries).
*/
- void registerHolidays(final String name, HolidayCalendar<E> holidaysCalendar);
+ void registerHolidays(String calendarName, HolidayCalendar<E> holidaysCalendar);
/**
- * @return true if the holiday name is registered.
+ * @return true if the holiday calendar name is registered.
*/
- boolean isHolidayCalendarRegistered(final String name);
+ boolean isHolidayCalendarRegistered(String calendarName);
/**
- * @return an immutable Holiday Calendar that is registered.
+ * @return an immutable Holiday Calendar name that is registered.
*/
- HolidayCalendar<E> getHolidayCalendar(final String name);
+ HolidayCalendar<E> getHolidayCalendar(String calendarName);
+ /**
+ * @return an immutable set of registered calendar names
+ */
+ Set<String> getRegisteredHolidayCalendarNames();
+
+ /**
+ * Unregister a given holiday calendar
+ * @param calendarName
+ * the calendar name to unregister.
+ */
+ void unregisterHolidayCalendar(String calendarName);
+
+ /**
+ * unregister all holiday calendars;
+ */
+ void unregisterAllHolidayCalendars();
// -----------------------------------------------------------------------
//
// ObjectLab, world leaders in the design and development of bespoke
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2009-01-28 22:32:03 UTC (rev 264)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2009-02-06 23:53:19 UTC (rev 265)
@@ -66,6 +66,67 @@
Assert.assertNotSame(cal1, cal2);
}
+ public void testGetCalendarsNames() {
+ getDateCalculatorFactory().registerHolidays("UK", createUKHolidayCalendar());
+ getDateCalculatorFactory().registerHolidays("US", createUSHolidayCalendar());
+
+ {
+ final Set<String> cals = getDateCalculatorFactory().getRegisteredHolidayCalendarNames();
+ Assert.assertNotNull("cal1", cals);
+ Assert.assertEquals("cals size", 2, cals.size());
+ Assert.assertTrue("UK", cals.contains("UK"));
+ Assert.assertTrue("US", cals.contains("US"));
+ Assert.assertTrue("BLA", !cals.contains("BLA"));
+ }
+ // unregister 1 name that does not exist
+ getDateCalculatorFactory().unregisterHolidayCalendar("ZZZ");
+ {
+ final Set<String> cals = getDateCalculatorFactory().getRegisteredHolidayCalendarNames();
+ Assert.assertNotNull("cal1", cals);
+ Assert.assertEquals("cals size", 2, cals.size());
+ Assert.assertTrue("UK", cals.contains("UK"));
+ Assert.assertTrue("US", cals.contains("US"));
+ Assert.assertTrue("BLA", !cals.contains("BLA"));
+ }
+ // unregister 1 name that does exist
+ getDateCalculatorFactory().unregisterHolidayCalendar("UK");
+ {
+ final Set<String> cals = getDateCalculatorFactory().getRegisteredHolidayCalendarNames();
+ Assert.assertNotNull("cal1", cals);
+ Assert.assertEquals("cals size", 1, cals.size());
+ Assert.assertTrue("UK", !cals.contains("UK"));
+ Assert.assertTrue("US", cals.contains("US"));
+ Assert.assertTrue("BLA", !cals.contains("BLA"));
+ }
+ // unregister 1 name that does exist
+ getDateCalculatorFactory().unregisterHolidayCalendar("US");
+ {
+ final Set<String> cals = getDateCalculatorFactory().getRegisteredHolidayCalendarNames();
+ Assert.assertNotNull("cal1", cals);
+ Assert.assertEquals("cals size", 0, cals.size());
+ }
+
+ // re-register
+ getDateCalculatorFactory().registerHolidays("UK", createUKHolidayCalendar());
+ getDateCalculatorFactory().registerHolidays("US", createUSHolidayCalendar());
+ {
+ final Set<String> cals = getDateCalculatorFactory().getRegisteredHolidayCalendarNames();
+ Assert.assertNotNull("cal1", cals);
+ Assert.assertEquals("cals size", 2, cals.size());
+ Assert.assertTrue("UK", cals.contains("UK"));
+ Assert.assertTrue("US", cals.contains("US"));
+ Assert.assertTrue("BLA", !cals.contains("BLA"));
+ }
+
+ // unregister all
+ getDateCalculatorFactory().unregisterAllHolidayCalendars();
+ {
+ final Set<String> cals = getDateCalculatorFactory().getRegisteredHolidayCalendarNames();
+ Assert.assertNotNull("cal1", cals);
+ Assert.assertEquals("cals size", 0, cals.size());
+ }
+}
+
// -----------------------------------------------------------------------
//
// ObjectLab, world leaders in the design and development of bespoke
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2009-01-28 22:32:03 UTC (rev 264)
+++ trunk/datecalc-jdk/qalab.xml 2009-02-06 23:53:19 UTC (rev 265)
@@ -219,6 +219,14 @@
project="objectlabkit" statvalue="81" type="cobertura-branch"/>
<summaryresult date="2008-05-05" filecount="2" module="jdk"
project="objectlabkit" statvalue="3" type="pmd"/>
+ <summaryresult date="2009-02-06" filecount="22" module="jdk"
+ project="objectlabkit" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2009-02-06" filecount="21" module="jdk"
+ project="objectlabkit" statvalue="95" type="cobertura-line"/>
+ <summaryresult date="2009-02-06" filecount="21" module="jdk"
+ project="objectlabkit" statvalue="82" type="cobertura-branch"/>
+ <summaryresult date="2009-02-06" filecount="2" module="jdk"
+ project="objectlabkit" statvalue="3" type="pmd"/>
</summary>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_package.html"
@@ -506,6 +514,8 @@
<result date="2008-03-27" statvalue="78" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="78" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="82" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java"
@@ -566,6 +576,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_ExcelDateUtil.java"
@@ -639,6 +651,8 @@
<result date="2008-03-27" statvalue="75" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="91" type="cobertura-line"/>
<result date="2008-05-05" statvalue="75" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="92" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java"
@@ -865,6 +879,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java"
@@ -914,6 +930,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java"
@@ -963,6 +981,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java"
@@ -1015,6 +1035,9 @@
<result date="2008-05-05" statvalue="2" type="checkstyle"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="2" type="pmd"/>
+ <result date="2009-02-06" statvalue="2" type="checkstyle"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="2" type="pmd"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateBackwardHandler.java"
@@ -1066,6 +1089,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateForwardHandler.java"
@@ -1115,6 +1140,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java"
@@ -1164,6 +1191,8 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java"
@@ -1214,6 +1243,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-line"/>
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java"
@@ -1261,6 +1291,8 @@
<result date="2008-03-27" statvalue="76" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="88" type="cobertura-line"/>
<result date="2008-05-05" statvalue="76" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="89" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="76" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java"
@@ -1315,6 +1347,9 @@
<result date="2008-05-05" statvalue="1" type="checkstyle"/>
<result date="2008-05-05" statvalue="100" type="cobertura-line"/>
<result date="2008-05-05" statvalue="74" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="1" type="checkstyle"/>
+ <result date="2009-02-06" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="77" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java"
@@ -1372,6 +1407,10 @@
<result date="2008-05-05" statvalue="96" type="cobertura-line"/>
<result date="2008-05-05" statvalue="92" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="1" type="pmd"/>
+ <result date="2009-02-06" statvalue="1" type="checkstyle"/>
+ <result date="2009-02-06" statvalue="96" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="92" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="1" type="pmd"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateDateCalculator.java"
@@ -1419,6 +1458,8 @@
<result date="2008-03-27" statvalue="78" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="89" type="cobertura-line"/>
<result date="2008-05-05" statvalue="78" type="cobertura-branch"/>
+ <result date="2009-02-06" statvalue="90" type="cobertura-line"/>
+ <result date="2009-02-06" statvalue="78" type="cobertura-bra...
[truncated message content] |
|
From: <be...@us...> - 2009-02-09 15:55:26
|
Revision: 267
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=267&view=rev
Author: benoitx
Date: 2009-02-09 15:55:20 +0000 (Mon, 09 Feb 2009)
Log Message:
-----------
Removed the deprecated method registerHolidays( Set dates)
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/src/site/changes.xml
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2009-02-06 23:54:46 UTC (rev 266)
+++ trunk/datecalc-common/qalab.xml 2009-02-09 15:55:20 UTC (rev 267)
@@ -221,6 +221,14 @@
project="objectlabkit" statvalue="43" type="cobertura-line"/>
<summaryresult date="2009-02-06" filecount="20" module="common"
project="objectlabkit" statvalue="30" type="cobertura-branch"/>
+ <summaryresult date="2009-02-07" filecount="21" module="common"
+ project="objectlabkit" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2009-02-07" filecount="2" module="common"
+ project="objectlabkit" statvalue="2" type="findbugs"/>
+ <summaryresult date="2009-02-07" filecount="20" module="common"
+ project="objectlabkit" statvalue="44" type="cobertura-line"/>
+ <summaryresult date="2009-02-07" filecount="20" module="common"
+ project="objectlabkit" statvalue="33" type="cobertura-branch"/>
</summary>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_package.html"
@@ -319,6 +327,9 @@
<result date="2009-02-06" statvalue="1" type="findbugs"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="92" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="1" type="findbugs"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="92" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_WorkingWeek.java"
@@ -402,6 +413,8 @@
<result date="2008-05-05" statvalue="90" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="95" type="cobertura-line"/>
<result date="2009-02-06" statvalue="90" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="95" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="90" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_TenorCode.java"
@@ -477,6 +490,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandlerType.java"
@@ -517,6 +532,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_PeriodCountBasis.java"
@@ -555,6 +571,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_StandardTenor.java"
@@ -629,6 +646,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="93" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="93" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
@@ -646,6 +665,8 @@
<result date="2008-05-05" statvalue="1" type="findbugs"/>
<result date="2009-02-06" statvalue="4" type="checkstyle"/>
<result date="2009-02-06" statvalue="1" type="findbugs"/>
+ <result date="2009-02-07" statvalue="4" type="checkstyle"/>
+ <result date="2009-02-07" statvalue="1" type="findbugs"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_DateCalculatorGeneric.java"
@@ -716,6 +737,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandler.java"
@@ -781,6 +804,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java"
@@ -877,6 +902,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_Utils.java"
@@ -935,6 +962,8 @@
<result date="2008-05-05" statvalue="64" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="77" type="cobertura-line"/>
<result date="2009-02-06" statvalue="64" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="77" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="64" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMPeriod.java"
@@ -966,6 +995,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_ExcelDateUtil.java"
@@ -1021,6 +1051,8 @@
<result date="2008-05-05" statvalue="83" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="82" type="cobertura-line"/>
<result date="2009-02-06" statvalue="83" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="82" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="83" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMDateCalculator.java"
@@ -1074,6 +1106,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java"
@@ -1103,6 +1137,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java"
@@ -1152,6 +1187,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayCalendar.java"
@@ -1173,6 +1210,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_DefaultHolidayCalendar.java"
@@ -1191,6 +1230,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java 2009-02-06 23:54:46 UTC (rev 266)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java 2009-02-09 15:55:20 UTC (rev 267)
@@ -55,30 +55,6 @@
private final ConcurrentMap<String, HolidayCalendar<E>> holidays = new ConcurrentHashMap<String, HolidayCalendar<E>>();
/**
- * Use this method to register a set of holidays for a given calendar, it
- * will replace any existing set. It won't update any existing
- * DateCalculator as these should not be amended whilst in existence (we
- * could otherwise get inconsistent results).
- *
- * @param name
- * the calendar name to register these holidays under.
- * @param holidaysSet
- * the set of holidays (non-working days).
- * @deprecated use the HolidayCalendar
- */
- @Deprecated
- public void registerHolidays(final String name, final Set<E> holidaysSet) {
- if (name != null) {
- final Set<E> hol = new HashSet<E>();
- if (holidaysSet != null) {
- hol.addAll(holidaysSet);
- }
- final DefaultHolidayCalendar<E> defaultHolidayCalendar = new DefaultHolidayCalendar<E>(hol);
- this.holidays.put(name, new ImmutableHolidayCalendar<E>(defaultHolidayCalendar));
- }
- }
-
- /**
* Use this method to register a given calendar, it will replace any
* existing one with the same name. An immutable copy is made so that any changes outside this class
* will have no affect. It won't update any existing DateCalculator as these should
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java 2009-02-06 23:54:46 UTC (rev 266)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java 2009-02-09 15:55:20 UTC (rev 267)
@@ -69,18 +69,6 @@
DateCalculator<E> getDateCalculator(String name, String holidayHandlerType);
/**
- * Use this method to register a set of holidays for a given calendar.
- *
- * @param name
- * the calendar name to register these holidays under.
- * @param holidays
- * the set of holidays (non-working days).
- * @deprecated should use the registerHolidays with HolidayCalendar
- */
- @Deprecated
- void registerHolidays(String name, Set<E> holidays);
-
- /**
* Use this method to register a holidays calendar.
*
* @param calendarName
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2009-02-06 23:54:46 UTC (rev 266)
+++ trunk/datecalc-jdk/qalab.xml 2009-02-09 15:55:20 UTC (rev 267)
@@ -227,6 +227,14 @@
project="objectlabkit" statvalue="82" type="cobertura-branch"/>
<summaryresult date="2009-02-06" filecount="2" module="jdk"
project="objectlabkit" statvalue="3" type="pmd"/>
+ <summaryresult date="2009-02-07" filecount="22" module="jdk"
+ project="objectlabkit" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2009-02-07" filecount="21" module="jdk"
+ project="objectlabkit" statvalue="94" type="cobertura-line"/>
+ <summaryresult date="2009-02-07" filecount="21" module="jdk"
+ project="objectlabkit" statvalue="81" type="cobertura-branch"/>
+ <summaryresult date="2009-02-07" filecount="2" module="jdk"
+ project="objectlabkit" statvalue="3" type="pmd"/>
</summary>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_package.html"
@@ -516,6 +524,8 @@
<result date="2008-05-05" statvalue="78" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="82" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="78" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java"
@@ -578,6 +588,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_ExcelDateUtil.java"
@@ -653,6 +665,8 @@
<result date="2008-05-05" statvalue="75" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="92" type="cobertura-line"/>
<result date="2009-02-06" statvalue="75" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="91" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java"
@@ -881,6 +895,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java"
@@ -932,6 +948,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java"
@@ -983,6 +1001,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java"
@@ -1038,6 +1058,9 @@
<result date="2009-02-06" statvalue="2" type="checkstyle"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="2" type="pmd"/>
+ <result date="2009-02-07" statvalue="2" type="checkstyle"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="2" type="pmd"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateBackwardHandler.java"
@@ -1091,6 +1114,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateForwardHandler.java"
@@ -1142,6 +1167,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java"
@@ -1193,6 +1220,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java"
@@ -1244,6 +1273,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java"
@@ -1293,6 +1323,8 @@
<result date="2008-05-05" statvalue="76" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="89" type="cobertura-line"/>
<result date="2009-02-06" statvalue="76" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="88" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="76" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java"
@@ -1350,6 +1382,9 @@
<result date="2009-02-06" statvalue="1" type="checkstyle"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="77" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="1" type="checkstyle"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="74" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java"
@@ -1411,6 +1446,10 @@
<result date="2009-02-06" statvalue="96" type="cobertura-line"/>
<result date="2009-02-06" statvalue="92" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="1" type="pmd"/>
+ <result date="2009-02-07" statvalue="1" type="checkstyle"/>
+ <result date="2009-02-07" statvalue="96" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="92" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="1" type="pmd"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateDateCalculator.java"
@@ -1460,6 +1499,8 @@
<result date="2008-05-05" statvalue="78" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="90" type="cobertura-line"/>
<result date="2009-02-06" statvalue="78" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="89" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="78" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateIMMDateCalculator.java"
@@ -1511,6 +1552,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java"
@@ -1560,6 +1603,8 @@
<result date="2008-05-05" statvalue="92" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="96" type="cobertura-line"/>
<result date="2009-02-06" statvalue="92" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="96" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="92" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarForwardUnlessNegativeHandler.java"
@@ -1583,6 +1628,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateForwardUnlessNegativeHandler.java"
@@ -1606,6 +1653,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarBackwardHandler.java"
@@ -1748,6 +1797,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedPrecedingHandler.java"
@@ -1757,5 +1808,7 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2009-02-06 23:54:46 UTC (rev 266)
+++ trunk/datecalc-joda/qalab.xml 2009-02-09 15:55:20 UTC (rev 267)
@@ -233,6 +233,14 @@
project="objectlabkit" statvalue="84" type="cobertura-branch"/>
<summaryresult date="2009-02-06" filecount="1" module="joda"
project="objectlabkit" statvalue="1" type="pmd"/>
+ <summaryresult date="2009-02-07" filecount="24" module="joda"
+ project="objectlabkit" statvalue="2" type="checkstyle"/>
+ <summaryresult date="2009-02-07" filecount="23" module="joda"
+ project="objectlabkit" statvalue="93" type="cobertura-line"/>
+ <summaryresult date="2009-02-07" filecount="23" module="joda"
+ project="objectlabkit" statvalue="83" type="cobertura-branch"/>
+ <summaryresult date="2009-02-07" filecount="1" module="joda"
+ project="objectlabkit" statvalue="1" type="pmd"/>
</summary>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_package.html"
@@ -402,6 +410,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_BackwardHandler.java"
@@ -663,6 +673,8 @@
<result date="2008-05-05" statvalue="75" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="92" type="cobertura-line"/>
<result date="2009-02-06" statvalue="75" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="91" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java"
@@ -720,6 +732,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateCalculator.java"
@@ -778,6 +792,8 @@
<result date="2008-05-05" statvalue="73" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="85" type="cobertura-line"/>
<result date="2009-02-06" statvalue="73" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="85" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="73" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java"
@@ -835,6 +851,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java"
@@ -892,6 +910,8 @@
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-line"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-line"/>
+ <result date="2009-02-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java"
@@ -947,6 +967,7 @@
<result date="2008-03-27" statvalue="100" type="cobertura-branch"/>
<result date="2008-05-05" statvalue="100" type="cobertura-branch"/>
<result date="2009-02-06" statvalue="100" type="cobertura-branch"/>
+ <result date="2009-02-07" statvalue="10...
[truncated message content] |
|
From: <ma...@us...> - 2009-02-25 21:00:36
|
Revision: 268
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=268&view=rev
Author: marchy
Date: 2009-02-25 21:00:30 +0000 (Wed, 25 Feb 2009)
Log Message:
-----------
Fix for bug 2389053
Modified Paths:
--------------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java 2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java 2009-02-25 21:00:30 UTC (rev 268)
@@ -41,8 +41,13 @@
public abstract class AbstractForwardUnlessNegativeCalculatorTest<E> extends AbstractDateTestCase<E> {
+ public void testType() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
+ assertEquals(HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK, cal.getHolidayHandlerType());
+ }
+
public void testSimpleForwardWithWeekend() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
Assert.assertEquals("Name", "bla", cal.getName());
Assert.assertEquals("Holidays size", 0, cal.getHolidayCalendar().getHolidays().size());
@@ -236,6 +241,15 @@
checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31");
cal.setStartDate(newDate("2006-08-24"));
checkDate("Move by 1W with 1 bank holiday", cal.moveByBusinessDays(7), "2006-09-05");
+
+ cal.setStartDate(newDate("2006-08-17"));
+ checkDate("Negative move by 1 day", cal.moveByBusinessDays(-1), "2006-08-16");
+
+ cal.setStartDate(newDate("2006-08-25"));
+ checkDate("Negative move by 4 days", cal.moveByBusinessDays(-4), "2006-08-21");
+
+ cal.setStartDate(newDate("2006-08-29"));
+ checkDate("Negative move by x days, across weekend, and bank holiday", cal.moveByBusinessDays(-5), "2006-08-21");
}
public void testMoveByTenorDays() {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java 2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java 2009-02-25 21:00:30 UTC (rev 268)
@@ -89,7 +89,7 @@
* @return algorithm name.
*/
public String getType() {
- return HolidayHandlerType.FORWARD;
+ return HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
}
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java 2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java 2009-02-25 21:00:30 UTC (rev 268)
@@ -92,7 +92,7 @@
* @return algorithm name.
*/
public String getType() {
- return HolidayHandlerType.FORWARD;
+ return HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
}
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java 2009-02-09 15:55:20 UTC (rev 267)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java 2009-02-25 21:00:30 UTC (rev 268)
@@ -89,7 +89,7 @@
* @return algorithm name.
*/
public String getType() {
- return HolidayHandlerType.FORWARD;
+ return HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://digg.com/img/badges/91x17-digg-button.png"](http://digg.com/img/badges/91x17-digg-button.png"){kind=link}
|
From: <ma...@us...> - 2009-03-17 17:51:09
|
Revision: 271
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=271&view=rev
Author: marchy
Date: 2009-03-17 17:50:59 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
removed deprecated MODIFIED_PRECEEDING, and releated classes
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
trunk/src/site/changes.xml
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -35,7 +35,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import java.util.ArrayList;
@@ -309,8 +308,7 @@
public DateCalculator<E> moveByBusinessDays(final int businessDays) {
if (businessDays > 0
&& holidayHandler != null
- && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEEDING) || holidayHandler.getType().equals(
- MODIFIED_PRECEDING))) {
+ && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEDING))) {
throw new IllegalArgumentException("A " + MODIFIED_PRECEDING + " or " + BACKWARD + " does not allow positive steps for moveByBusinessDays");
} else if (businessDays < 0 && holidayHandler != null
&& (holidayHandler.getType().equals(FORWARD) || holidayHandler.getType().equals(MODIFIED_FOLLOWING))) {
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -70,15 +70,6 @@
public static final String MODIFIED_FOLLOWING = "modifiedFollowing";
/**
- * A modified preceeding handler will move the date backward if it falls on
- * a non working day BUT, if the new date falls into another month, it will
- * revert to moving forward until it finds a working day.
- * @deprecated uses MODIFIED_PRECEDING (spelling...)
- */
- @Deprecated
- public static final String MODIFIED_PRECEEDING = "modifiedPreceeding";
-
- /**
* A modified preceding handler will move the date backward if it falls on
* a non working day BUT, if the new date falls into another month, it will
* revert to moving forward until it finds a working day.
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -36,7 +36,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import java.util.Calendar;
@@ -94,8 +93,6 @@
cal.setHolidayHandler(new CalendarBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new CalendarModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -36,7 +36,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import java.util.Date;
@@ -93,8 +92,6 @@
cal.setHolidayHandler(new DateBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new DateModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -35,7 +35,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
@@ -95,8 +94,6 @@
cal.setHolidayHandler(new LocalDateBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new LocalDateModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -36,7 +36,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.DateCalculator;
@@ -101,8 +100,6 @@
cal.setHolidayHandler(new YearMonthDayBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new YearMonthDayModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/src/site/changes.xml 2009-03-17 17:50:59 UTC (rev 271)
@@ -11,8 +11,9 @@
<release version="1.2.0" date="in SVN" description="Maintenance">
<action dev="benoitx" type="fix" issue="1929838" due-to="Anthony Whitford">Spelling for "PRECEEDING" corrected to PRECEDING, deprecated the mispelt name.</action>
<action dev="benoitx" type="add">Enhanced the KitCalculatorsFactory to be able to get the holidayCalendar names and unregister calendars.</action>
- <action dev="benoitx" type="fix">The deprecated method KitCalculatorsFactory.registerHolidays(Set holidays) has been removed!</action>
- <action dev="marchy" type="fix" issue="2389053" due-to="Didier L.">Fixed negative moves with Forward Unless Moving Back Handler</action>
+ <action dev="benoitx" type="fix">Removed the deprecated method KitCalculatorsFactory.registerHolidays(Set holidays).</action>
+ <action dev="marchy" type="fix" issue="2389053" due-to="Didier L.">Fixed negative moves with Forward Unless Moving Back Handler.</action>
+ <action dev="marchy" type="fix">Removed the deprecated constant MODIFIED_PRECEEDING, and related classes.</action>
</release>
<release version="1.1.0" date="2008-03-25" description="Maintenance">
<action dev="benoitx" type="add">Changed JODA dependency to 1.5</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-03-17 17:54:03
|
Revision: 272
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=272&view=rev
Author: marchy
Date: 2009-03-17 17:53:54 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
removed deprecated MODIFIED_PRECEEDING, and releated classes
Removed Paths:
-------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java
Deleted: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2009-03-17 17:50:59 UTC (rev 271)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2009-03-17 17:53:54 UTC (rev 272)
@@ -1,78 +0,0 @@
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- *
- * $Id$
- *
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */package net.objectlab.kit.datecalc.jdk;
-
-import java.util.Calendar;
-
-import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
-
-/**
- * A Jdk <code>Calendar</code> implementation of the
- * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
- * <strong>Modified Preceeding</strong> algorithm.
- *
- * @author Marcin Jekot
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- *
- */
-@Deprecated
-public class CalendarModifiedPreceedingHandler extends CalendarModifiedPrecedingHandler {
-
- /**
- * Give the type name for this algorithm.
- *
- * @return algorithm name.
- */
- @Override
- public String getType() {
- return HolidayHandlerType.MODIFIED_PRECEEDING;
- }
-}
-
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- */
Deleted: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java 2009-03-17 17:50:59 UTC (rev 271)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java 2009-03-17 17:53:54 UTC (rev 272)
@@ -1,76 +0,0 @@
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- *
- * $Id$
- *
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package net.objectlab.kit.datecalc.joda;
-
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
-
-/**
- * A modified preceeding handler will move the date backward if it falls on a
- * non working day BUT, if the new date falls into another month, it will revert
- * to moving forward until it finds a working day.
- *
- * @author Benoit Xhenseval
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- *
- */
-@Deprecated
-public class LocalDateModifiedPreceedingHandler extends LocalDateModifiedPrecedingHandler {
-
- /**
- * Give the type name for this algorithm.
- *
- * @return algorithm name.
- */
- @Override
- public String getType() {
- return HolidayHandlerType.MODIFIED_PRECEEDING;
- }
-}
-
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-03-31 05:57:44
|
Revision: 273
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=273&view=rev
Author: marchy
Date: 2009-03-31 05:57:31 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
first go at m2 site
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
trunk/datecalc-joda/pom.xml
trunk/pom.xml
trunk/src/site/xdoc/press/index.xml
Added Paths:
-----------
trunk/datecalc-common/src/site/resources/
trunk/datecalc-common/src/site/resources/css/
trunk/datecalc-common/src/site/resources/css/site.css
trunk/datecalc-common/src/site/resources/images/
trunk/datecalc-common/src/site/site.xml
trunk/datecalc-common/src/site/xdoc/
trunk/datecalc-common/src/site/xdoc/index.xml
trunk/datecalc-jdk/src/site/resources/
trunk/datecalc-jdk/src/site/resources/css/
trunk/datecalc-jdk/src/site/resources/css/site.css
trunk/datecalc-jdk/src/site/resources/images/
trunk/datecalc-jdk/src/site/site.xml
trunk/datecalc-jdk/src/site/xdoc/
trunk/datecalc-jdk/src/site/xdoc/index.xml
trunk/datecalc-joda/src/site/resources/
trunk/datecalc-joda/src/site/resources/css/
trunk/datecalc-joda/src/site/resources/css/site.css
trunk/datecalc-joda/src/site/resources/images/
trunk/datecalc-joda/src/site/site.xml
trunk/datecalc-joda/src/site/xdoc/
trunk/datecalc-joda/src/site/xdoc/index.xml
trunk/src/changes/
trunk/src/changes/changes.xml
trunk/src/site/fml/
trunk/src/site/fml/faq.fml
trunk/src/site/resources/
trunk/src/site/resources/1d.png
trunk/src/site/resources/1m.png
trunk/src/site/resources/1w.png
trunk/src/site/resources/1y.png
trunk/src/site/resources/2d.png
trunk/src/site/resources/backward.png
trunk/src/site/resources/css/
trunk/src/site/resources/css/site.css
trunk/src/site/resources/forward.png
trunk/src/site/resources/images/
trunk/src/site/resources/images/appendium_logo.jpg
trunk/src/site/resources/images/objectlab_logo.gif
trunk/src/site/resources/modif-following.png
trunk/src/site/resources/modif-preceding.png
trunk/src/site/resources/press/
trunk/src/site/resources/press/homepage-dzone.pdf
trunk/src/site/resources/press/homepage-dzone.png
trunk/src/site/resources/press/homepage-javalobby.pdf
trunk/src/site/resources/press/homepage-javalobby.png
trunk/src/site/resources/press/homepage-javalobby2.png
trunk/src/site/resources/press/homepage-javarss.pdf
trunk/src/site/resources/press/homepage-javarss.png
trunk/src/site/resources/press/homepage-theserverside.pdf
trunk/src/site/resources/press/homepage-theserverside.png
trunk/src/site/resources/press/javalobby-forum.png
trunk/src/site/resources/press/javalobby-press-release.PNG
trunk/src/site/resources/press/newspage-javanet.pdf
trunk/src/site/resources/press/newspage-javanet.png
trunk/src/site/resources/press/press-release-1.0.1.txt
trunk/src/site/resources/press/visits-map-20061010-12.png
trunk/src/site/resources/spot.png
trunk/src/site/site.xml
trunk/src/site/xdoc/
trunk/src/site/xdoc/algo.xml
trunk/src/site/xdoc/calendar.vsd
trunk/src/site/xdoc/index.xml
trunk/src/site/xdoc/press/
trunk/src/site/xdoc/statsvn/
trunk/src/site/xdoc/tenor.vsd
trunk/src/site/xdoc/tenor.xml
Removed Paths:
-------------
trunk/datecalc-common/src/site/images/
trunk/datecalc-common/src/site/index.xml
trunk/datecalc-common/src/site/navigation.xml
trunk/datecalc-common/src/site/resources/css/maven-objectlabkit.css
trunk/datecalc-common/src/site/resources/css/maven-struts-menu.css
trunk/datecalc-common/src/site/style/
trunk/datecalc-jdk/src/site/images/
trunk/datecalc-jdk/src/site/index.xml
trunk/datecalc-jdk/src/site/navigation.xml
trunk/datecalc-jdk/src/site/style/
trunk/datecalc-joda/src/site/images/
trunk/datecalc-joda/src/site/index.xml
trunk/datecalc-joda/src/site/navigation.xml
trunk/datecalc-joda/src/site/style/
trunk/src/site/1d.png
trunk/src/site/1m.png
trunk/src/site/1w.png
trunk/src/site/1y.png
trunk/src/site/2d.png
trunk/src/site/algo.xml
trunk/src/site/backward.png
trunk/src/site/calendar.vsd
trunk/src/site/changes.xml
trunk/src/site/faq.fml
trunk/src/site/forward.png
trunk/src/site/images/
trunk/src/site/index.xml
trunk/src/site/modif-following.png
trunk/src/site/modif-preceeding.png
trunk/src/site/navigation.xml
trunk/src/site/press/
trunk/src/site/resources/css/maven-objectlabkit.css
trunk/src/site/spot.png
trunk/src/site/statsvn/
trunk/src/site/style/
trunk/src/site/tenor.vsd
trunk/src/site/tenor.xml
trunk/src/site/xdoc/press/homepage-dzone.pdf
trunk/src/site/xdoc/press/homepage-dzone.png
trunk/src/site/xdoc/press/homepage-javalobby.pdf
trunk/src/site/xdoc/press/homepage-javalobby.png
trunk/src/site/xdoc/press/homepage-javalobby2.png
trunk/src/site/xdoc/press/homepage-javarss.pdf
trunk/src/site/xdoc/press/homepage-javarss.png
trunk/src/site/xdoc/press/homepage-theserverside.pdf
trunk/src/site/xdoc/press/homepage-theserverside.png
trunk/src/site/xdoc/press/javalobby-forum.png
trunk/src/site/xdoc/press/javalobby-press-release.PNG
trunk/src/site/xdoc/press/newspage-javanet.pdf
trunk/src/site/xdoc/press/newspage-javanet.png
trunk/src/site/xdoc/press/press-release-1.0.1.txt
trunk/src/site/xdoc/press/visits-map-20061010-12.png
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-common/pom.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,16 +1,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
-
- <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>datecalc-common</artifactId>
<packaging>jar</packaging>
- <name>DateCalc commons</name>
+
+ <name>DateCalc Commons</name>
<description>Common Date Calculator Code</description>
</project>
\ No newline at end of file
Deleted: trunk/datecalc-common/src/site/index.xml
===================================================================
--- trunk/datecalc-common/src/site/index.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-common/src/site/index.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,31 +0,0 @@
-<document>
- <properties>
- <author email="Ki...@ob...">Benoit Xhenseval</author>
- <title>DateCalc Common Intro</title>
- </properties>
- <head>
- <meta name="description"
- content="ObjectLab Kit offers free and open source Date calculators, released under the business-friendly Apache 2.0 license."
- />
-
- <meta name="keywords"
- content="Date calculator, IMM Dates, Period Calculator, Financial Calendar, Business Calendar, java, open source" />
- <meta name="Subject" content="Date Calculators" />
- <meta name="Copyright" content="ObjectLab Financial Ltd" />
- <meta name="Language" content="English" />
- <meta name="Designer" content="ObjectLab Financial Ltd" />
- <meta name="Distribution" content="Global" />
- <meta name="robots" content="ALL"/>
- <meta name="Revisit-After" content="20 Days" />
- </head>
- <body>
- <!-- The body of the document contains a number of sections -->
- <section name="DateCalc Common Introduction">
-
- <p>DateCalc Common defines the common functionalities (implementation using some generics).</p>
- <p>Check out the <a href="apidocs/index.html">UML diagrams here</a></p>
- <p>Also look at the <a href="maven-reports.html">Project Reports</a> menu on the left for project specific items, unit tests, QA etc.</p>
- </section>
-
- </body>
-</document>
\ No newline at end of file
Deleted: trunk/datecalc-common/src/site/navigation.xml
===================================================================
--- trunk/datecalc-common/src/site/navigation.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-common/src/site/navigation.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="ObjectLab-Kit">
- <title>DateCalc Common</title>
- <body>
- <menu name="DateCalc Common">
- <item name="Sitemap" href="sitemap.html" />
- </menu>
- <links>
- <item name="ObjectLab Kit" href="../../index.html" />
- <item name="DateCalc Common" href="../datecalc-common/index.html" />
- <item name="DateCalc JDK" href="../datecalc-jdk/index.html" />
- <item name="DateCalc Joda" href="../datecalc-joda/index.html" />
- </links>
- <sitemap/>
- <search/>
- <menu name="Interesting Projects">
- <item name="QALab" href="http://qalab.sourceforge.net/" />
- <item name="JTreeMap" href="http://jtreemap.sourceforge.net/" />
- <item name="PZFileReader" href="http://pzfilereader.sourceforge.net/" />
- <item name="StatSVN" href="http://www.StatSVN.org/" />
- <item name="ObjectLab" href="http://www.objectlab.co.uk" />
- <item name="Joda-time" href="http://joda-time.sourceforge.net" />
- </menu>
- <footer>
- <a href="http://sourceforge.net/projects/objectlabkit"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=175139&type=13" width="120" height="30" border="0" alt="Get ObjectLab Kit at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
- <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E1%2E0%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming">
- <img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a>
- <script src="http://www.google-analytics.com/urchin.js"
- type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-615747-1"; urchinTracker();
- </script>
- </footer>
- </body>
-</project>
\ No newline at end of file
Deleted: trunk/datecalc-common/src/site/resources/css/maven-objectlabkit.css
===================================================================
--- trunk/datecalc-common/src/site/style/maven-objectlabkit.css 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-common/src/site/resources/css/maven-objectlabkit.css 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,146 +0,0 @@
-body, select, input, li {
- background: #ffffff;
- color: #002070;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-a img {
- border: 0;
-}
-
-a:link, a:visited {
- color: #0020d0;
- text-decoration: underline;
-}
-
-a:hover {
- color: #0000ff !important;
-}
-
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
- background: url(../images/external.png) right center no-repeat;
- padding-right: 15px;
-}
-
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
- background: url(../images/newwindow.png) right center no-repeat;
- padding-right: 18px;
-}
-
-h2 {
- padding: 2px 5px;
- border: 1px solid #c0c0c0;
- color: #002070;
- background-color: #eeeeee;
- font-weight: bold;
- font-size: 16px;
-}
-
-h3 {
- padding: 2px 5px;
- border: 1px solid #aaaaaa;
- color: #002070;
- background-color: #eeeeee;
- font-size: 14px;
-}
-
-p {
- line-height: 1.3em;
- font-size: small;
-}
-
-#breadcrumbs {
- background: url(../images/grayBar.jpg);
- border: 1px solid #c0c0c0;
- height: 17px;
-}
-
-#breadcrumbs a {
- font-size: 11px;
- font-weight: bold;
- margin: 0px 2px;
- text-decoration: none;
-}
-
-#leftColumn {
- border: 1px solid #999999;
- border-top: 0;
- border-left: 0;
- background: #eeeeee;
-}
-
-div#navcolumn {
- font-size: 12px;
-}
-
-div#navcolumn h5 {
- font-size: 12px;
- padding-top: 2px;
-}
-/*
-div#navcolumn li {
- background: #eeeeee !important;
-}
-*/
-div#navcolumn div a {
- color: #002070;
- font-size: 11px;
- text-decoration: none;
-}
-
-table.bodyTable th {
- color: #ffffff;
- background-color: #bbb;
- text-align: left;
- font-weight: bold;
-}
-
-table.bodyTable th {
- color: #ffffff;
- background-color: #bbb;
- text-align: left;
- font-weight: bold;
-}
-
-table.bodyTable a {
- text-decoration : none;
-}
-
-table.bodyTable tr.a {
- background-color: #ddd;
- text-decoration : none;
-}
-
-table.bodyTable tr.b {
- background-color: #eee;
-}
-
-.source {
- background: #ffffdd;
- border: 1px solid #999999;
- color: #000000;
- font-size: 12px !important;
- margin-left: 10px;
- margin-right: 10px;
- padding: 5px 5px 5px 7px;
-}
-
-
-.xright, #projectLogo img, #projectLogo span{
- float:right;
- color: #0020a0;
-}
-
-#footer {
- padding: 10px;
- margin: 20px 0px 20px 0px;
- border-top: solid #ccc 1px;
- color: #333333;
-}
-
-.subsectionTitle {
- font-size: 13px;
- font-weight: bold;
- color: #666;
-}
Deleted: trunk/datecalc-common/src/site/resources/css/maven-struts-menu.css
===================================================================
--- trunk/datecalc-common/src/site/style/maven-struts-menu.css 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-common/src/site/resources/css/maven-struts-menu.css 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,176 +0,0 @@
-body, select, input, li {
- background: #ffffff;
- color: #000080;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-a img {
- border: 0;
-}
-
-a:link, a:visited {
- color: #0000ff;
-}
-
-a:hover {
- color: #006600 !important;
- text-decoration: underline overline;
-}
-
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
- background: url(../images/external.png) right center no-repeat;
- padding-right: 15px;
-}
-
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
- background: url(../images/newwindow.png) right center no-repeat;
- padding-right: 18px;
-}
-
-h2 {
- padding: 2px 5px;
- border: 1px solid #c0c0c0;
- color: #000080;
- background-color: #eeeeee;
- font-weight: bold;
- font-size: 16px;
-}
-
-h3 {
- padding: 2px 5px;
- border: 1px solid #aaaaaa;
- color: #006400;
- background-color: #eeeeee;
- font-size: 14px;
-}
-
-p {
- line-height: 1.3em;
- font-size: small;
-}
-/*
-div#banner {
- background: url(../images/bg.gif);
-}
-
-div#banner img {
- margin-top: 0px;
- float: left;
- margin-bottom: 0px;
-}
-*/
-#breadcrumbs {
- background: url(../images/grayBar.jpg);
- border: 1px solid #c0c0c0;
- height: 17px;
-}
-
-#breadcrumbs a {
- font-size: 11px;
- font-weight: bold;
- margin: 0px 2px;
- text-decoration: none;
-}
-
-#leftColumn {
- border: 1px solid #999999;
- border-top: 0;
- border-left: 0;
- background: #eeeeee;
-}
-
-div#navcolumn {
- font-size: 12px;
-}
-
-div#navcolumn h5 {
- font-size: 12px;
- padding-top: 2px;
-}
-
-/*
-div#navcolumn li {
- background: #eeeeee !important;
-}
-
-*/
-
-div#navcolumn div a {
- font-size: 11px;
- text-decoration: none;
-}
-
-table.bodyTable th {
- color: #ffffff;
- background-color: #bbb;
- text-align: left;
- font-weight: bold;
-}
-
-table.bodyTable th {
- color: #ffffff;
- background-color: #bbb;
- text-align: left;
- font-weight: bold;
-}
-/*
-table.bodyTable th, table.bodyTable td {
- font-size: 1em;
-}*/
-
-table.bodyTable a {
- text-decoration : none;
-}
-
-table.bodyTable tr.a {
- background-color: #ddd;
- text-decoration : none;
-}
-
-table.bodyTable tr.b {
- background-color: #eee;
-}
-
-.source {
- background: #ffffdd;
- border: 1px solid #999999;
- color: #000000;
- font-size: 12px !important;
- margin-left: 10px;
- margin-right: 10px;
- padding: 5px 5px 5px 7px;
-}
-
-/*
-.xright a:link, .xright a:visited, .xright a:active {
- color: #666;
-}
-.xright a:hover {
- color: #EE33FF;
-}
-.xright, #projectLogo img, #projectLogo span{
- float:right;
- text-shadow: #FFFFF;
-}
-
-td, select, input, li{
- font-family: Verdana, Helvetica, Arial, sans-serif;
- font-size: 12px;
- color:#333333;
-}
-*/
-
-#footer {
- padding: 10px;
- margin: 20px 0px 20px 0px;
- border-top: solid #ccc 1px;
- color: #333333;
-}
-
-.subsectionTitle {
- font-size: 13px;
- font-weight: bold;
- color: #666;
-
-}
Added: trunk/datecalc-common/src/site/resources/css/site.css
===================================================================
--- trunk/datecalc-common/src/site/resources/css/site.css (rev 0)
+++ trunk/datecalc-common/src/site/resources/css/site.css 2009-03-31 05:57:31 UTC (rev 273)
@@ -0,0 +1,146 @@
+body, select, input, li {
+ background: #ffffff;
+ color: #002070;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+
+a img {
+ border: 0;
+}
+
+a:link, a:visited {
+ color: #0020d0;
+ text-decoration: underline;
+}
+
+a:hover {
+ color: #0000ff !important;
+}
+
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+ background: url(../images/external.png) right center no-repeat;
+ padding-right: 15px;
+}
+
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+ background: url(../images/newwindow.png) right center no-repeat;
+ padding-right: 18px;
+}
+
+h2 {
+ padding: 2px 5px;
+ border: 1px solid #c0c0c0;
+ color: #002070;
+ background-color: #eeeeee;
+ font-weight: bold;
+ font-size: 16px;
+}
+
+h3 {
+ padding: 2px 5px;
+ border: 1px solid #aaaaaa;
+ color: #002070;
+ background-color: #eeeeee;
+ font-size: 14px;
+}
+
+p {
+ line-height: 1.3em;
+ font-size: small;
+}
+
+#breadcrumbs {
+ background: url(../images/grayBar.jpg);
+ border: 1px solid #c0c0c0;
+ height: 17px;
+}
+
+#breadcrumbs a {
+ font-size: 11px;
+ font-weight: bold;
+ margin: 0px 2px;
+ text-decoration: none;
+}
+
+#leftColumn {
+ border: 1px solid #999999;
+ border-top: 0;
+ border-left: 0;
+ background: #eeeeee;
+}
+
+div#navcolumn {
+ font-size: 12px;
+}
+
+div#navcolumn h5 {
+ font-size: 12px;
+ padding-top: 2px;
+}
+/*
+div#navcolumn li {
+ background: #eeeeee !important;
+}
+*/
+div#navcolumn div a {
+ color: #002070;
+ font-size: 11px;
+ text-decoration: none;
+}
+
+table.bodyTable th {
+ color: #ffffff;
+ background-color: #bbb;
+ text-align: left;
+ font-weight: bold;
+}
+
+table.bodyTable th {
+ color: #ffffff;
+ background-color: #bbb;
+ text-align: left;
+ font-weight: bold;
+}
+
+table.bodyTable a {
+ text-decoration : none;
+}
+
+table.bodyTable tr.a {
+ background-color: #ddd;
+ text-decoration : none;
+}
+
+table.bodyTable tr.b {
+ background-color: #eee;
+}
+
+.source {
+ background: #ffffdd;
+ border: 1px solid #999999;
+ color: #000000;
+ font-size: 12px !important;
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 5px 5px 5px 7px;
+}
+
+
+.xright, #projectLogo img, #projectLogo span{
+ float:right;
+ color: #0020a0;
+}
+
+#footer {
+ padding: 10px;
+ margin: 20px 0px 20px 0px;
+ border-top: solid #ccc 1px;
+ color: #333333;
+}
+
+.subsectionTitle {
+ font-size: 13px;
+ font-weight: bold;
+ color: #666;
+}
Copied: trunk/datecalc-common/src/site/site.xml (from rev 272, trunk/datecalc-common/src/site/navigation.xml)
===================================================================
--- trunk/datecalc-common/src/site/site.xml (rev 0)
+++ trunk/datecalc-common/src/site/site.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="ObjectLab-Kit">
+ <title>DateCalc Common</title>
+ <body>
+ <menu name="DateCalc Common">
+ <item name="Sitemap" href="sitemap.html" />
+ </menu>
+ <menu ref="modules" />
+ <menu ref="reports" />
+ <menu name="Interesting Projects">
+ <item name="QALab" href="http://qalab.sourceforge.net/" />
+ <item name="JTreeMap" href="http://jtreemap.sourceforge.net/" />
+ <item name="PZFileReader" href="http://pzfilereader.sourceforge.net/" />
+ <item name="StatSVN" href="http://www.StatSVN.org/" />
+ <item name="ObjectLab" href="http://www.objectlab.co.uk" />
+ <item name="Joda-time" href="http://joda-time.sourceforge.net" />
+ </menu>
+ </body>
+</project>
\ No newline at end of file
Copied: trunk/datecalc-common/src/site/xdoc/index.xml (from rev 272, trunk/datecalc-common/src/site/index.xml)
===================================================================
--- trunk/datecalc-common/src/site/xdoc/index.xml (rev 0)
+++ trunk/datecalc-common/src/site/xdoc/index.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -0,0 +1,31 @@
+<document>
+ <properties>
+ <author email="Ki...@ob...">Benoit Xhenseval</author>
+ <title>DateCalc Common Intro</title>
+ </properties>
+ <head>
+ <meta name="description"
+ content="ObjectLab Kit offers free and open source Date calculators, released under the business-friendly Apache 2.0 license."
+ />
+
+ <meta name="keywords"
+ content="Date calculator, IMM Dates, Period Calculator, Financial Calendar, Business Calendar, java, open source" />
+ <meta name="Subject" content="Date Calculators" />
+ <meta name="Copyright" content="ObjectLab Financial Ltd" />
+ <meta name="Language" content="English" />
+ <meta name="Designer" content="ObjectLab Financial Ltd" />
+ <meta name="Distribution" content="Global" />
+ <meta name="robots" content="ALL"/>
+ <meta name="Revisit-After" content="20 Days" />
+ </head>
+ <body>
+ <!-- The body of the document contains a number of sections -->
+ <section name="DateCalc Common Introduction">
+
+ <p>DateCalc Common defines the common functionalities (implementation using some generics).</p>
+ <p>Check out the <a href="apidocs/index.html">UML diagrams here</a></p>
+ <p>Also look at the <a href="maven-reports.html">Project Reports</a> menu on the left for project specific items, unit tests, QA etc.</p>
+ </section>
+
+ </body>
+</document>
\ No newline at end of file
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-jdk/pom.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,37 +1,35 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.1.0</version>
- </parent>
+ <artifactId>datecalc-jdk</artifactId>
+ <packaging>jar</packaging>
- <artifactId>datecalc-jdk</artifactId>
- <packaging>jar</packaging>
- <name>Date Calculator for JDK</name>
- <description>Date Calculator methods for JDK</description>
+ <name>Date Calculator for JDK</name>
+ <description>Date Calculator methods for JDK</description>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ </dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>
- ../datecalc-common/target/test-classes
- </directory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </testResource>
- </testResources>
- </build>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>../datecalc-common/target/test-classes</directory>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
</project>
\ No newline at end of file
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2009-03-31 05:57:31 UTC (rev 273)
@@ -42,7 +42,6 @@
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
import net.objectlab.kit.datecalc.common.IMMDateCalculator;
import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
Deleted: trunk/datecalc-jdk/src/site/index.xml
===================================================================
--- trunk/datecalc-jdk/src/site/index.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-jdk/src/site/index.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,31 +0,0 @@
-<document>
- <properties>
- <author email="Ki...@ob...">Benoit Xhenseval</author>
- <title>DateCalc JDK Intro</title>
- </properties>
- <head>
- <meta name="description"
- content="ObjectLab Kit offers free and open source Date calculators, released under the business-friendly Apache 2.0 license."
- />
-
- <meta name="keywords"
- content="Date calculator, IMM Dates, Period Calculator, Financial Calendar, Business Calendar, java, open source" />
- <meta name="Subject" content="Date Calculators" />
- <meta name="Copyright" content="ObjectLab Financial Ltd" />
- <meta name="Language" content="English" />
- <meta name="Designer" content="ObjectLab Financial Ltd" />
- <meta name="Distribution" content="Global" />
- <meta name="robots" content="ALL"/>
- <meta name="Revisit-After" content="20 Days" />
- </head>
- <body>
- <!-- The body of the document contains a number of sections -->
- <section name="DateCalc JDK Introduction">
-
- <p>DateCalc JDK provides an implementation for pure JDK.</p>
- <p>Check out the <a href="apidocs/index.html">UML diagrams here</a></p>
- <p>Also look at the <a href="maven-reports.html">Project Reports</a> menu on the left for project specific items, unit tests, QA etc.</p>
- </section>
-
- </body>
-</document>
\ No newline at end of file
Deleted: trunk/datecalc-jdk/src/site/navigation.xml
===================================================================
--- trunk/datecalc-jdk/src/site/navigation.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-jdk/src/site/navigation.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="ObjectLab-Kit">
- <title>DateCalc JDK</title>
- <body>
- <menu name="DateCalc JDK">
- <item name="Sitemap" href="sitemap.html" />
- </menu>
- <links>
- <item name="ObjectLab Kit" href="../../index.html" />
- <item name="DateCalc Common" href="../datecalc-common/index.html" />
- <item name="DateCalc JDK" href="../datecalc-jdk/index.html" />
- <item name="DateCalc Joda" href="../datecalc-joda/index.html" />
- </links>
- <sitemap/>
- <search/>
- <menu name="Interesting Projects">
- <item name="QALab" href="http://qalab.sourceforge.net/" />
- <item name="JTreeMap" href="http://jtreemap.sourceforge.net/" />
- <item name="PZFileReader" href="http://pzfilereader.sourceforge.net/" />
- <item name="StatSVN" href="http://www.StatSVN.org/" />
- <item name="ObjectLab" href="http://www.objectlab.co.uk" />
- <item name="Joda-time" href="http://joda-time.sourceforge.net" />
- </menu>
- <footer>
- <a href="http://sourceforge.net/projects/objectlabkit"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=175139&type=13" width="120" height="30" border="0" alt="Get ObjectLab Kit at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
- <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E1%2E0%20of%20ObjectLab%20...
[truncated message content] |
|
From: <be...@us...> - 2009-03-31 23:52:13
|
Revision: 276
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=276&view=rev
Author: benoitx
Date: 2009-03-31 23:52:06 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
Ok... Quick changes to show a few possibilities:
1/ included Checkstyle
2/ Included JXR
3/ Checkstyle, PMD, Cobertura, CPD and JXR are only used by the modules (only ones with java source code).
4/ Slapped the Spring rich client skin... just to look at it... there are some issues with icons/images
5/ Added Powered By to match our legal requirement to display a SF logo
6/ Added link to the LICENSE.txt
Give a go with mvn site:stage.
I've disabled the stat-scm just because of a lack of time...
Would be absolutely smashing to have a look similar to www.objectlab.co.uk :-)
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
trunk/src/site/site.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2009-03-31 22:41:45 UTC (rev 275)
+++ trunk/datecalc-common/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
@@ -13,4 +13,78 @@
<name>DateCalc Commons</name>
<description>Common Date Calculator Code</description>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>net.sf</groupId>
+ <artifactId>stat-scm</artifactId>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2009-03-31 22:41:45 UTC (rev 275)
+++ trunk/datecalc-jdk/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
@@ -32,4 +32,78 @@
</testResources>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>net.sf</groupId>
+ <artifactId>stat-scm</artifactId>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2009-03-31 22:41:45 UTC (rev 275)
+++ trunk/datecalc-joda/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
@@ -22,6 +22,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
+ <version>1.6</version>
</dependency>
</dependencies>
@@ -35,5 +36,79 @@
</testResource>
</testResources>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>net.sf</groupId>
+ <artifactId>stat-scm</artifactId>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
+
</project>
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-31 22:41:45 UTC (rev 275)
+++ trunk/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
@@ -55,6 +55,14 @@
</developer>
</developers>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<mailingLists>
<mailingList>
<name>News about ObjectLab's projects (Alerts online)</name>
@@ -118,6 +126,7 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
+ <source>${compileSource}</source>
</configuration>
</plugin>
</plugins>
@@ -151,17 +160,20 @@
<reporting>
<plugins>
+ <!--
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <aggregate>true</aggregate>
+ <configLocation>/common_build/checkstyle_checks.xml</configLocation>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
@@ -177,7 +189,7 @@
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
- <targetjdk>1.5</targetjdk>
+ <targetJdk>1.5</targetJdk>
<rulesets>
<ruleset>/rulesets/basic.xml</ruleset>
<ruleset>/rulesets/controversial.xml</ruleset>
@@ -186,7 +198,19 @@
<minimumTokens>100</minimumTokens>
</configuration>
</plugin>
+-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-changes-plugin</artifactId>
<configuration>
<issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
@@ -199,10 +223,13 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>dashboard-maven-plugin</artifactId>
</plugin>
+
+<!--
<plugin>
<groupId>net.sf</groupId>
<artifactId>stat-scm</artifactId>
</plugin>
+ -->
</plugins>
</reporting>
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2009-03-31 22:41:45 UTC (rev 275)
+++ trunk/src/site/site.xml 2009-03-31 23:52:06 UTC (rev 276)
@@ -12,15 +12,23 @@
<href>http://www.objectlab.co.uk/</href>
</bannerRight>
<poweredBy>
- <logo name="Maven" href="http://maven.apache.org/"
- img="http://maven.apache.org/images/logos/maven-feather.png"/>
+ <logo name="Hosted on SourceForge.net" href="http://sourceforge.net"
+ img="http://sflogo.sourceforge.net/sflogo.php?group_id=175139&type=2"/>
+ <logo name="Build with Maven 2" href="http://maven.apache.org/"
+ img="images/logos/maven-feather.png"/>
</poweredBy>
+ <skin>
+ <groupId>org.springframework.maven.skins</groupId>
+ <artifactId>maven-spring-skin</artifactId>
+ <version>1.0.4</version>
+ </skin>
+<!--
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
<version>1.0</version>
</skin>
-
+-->
<publishDate position="left" format="yyyy-MM-dd HH:mm Z" />
<version position="left" />
<body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://maven.apache.org/images/logos/maven-feather.png"/>](http://maven.apache.org/images/logos/maven-feather.png"/>){kind=link}
|
From: <be...@us...> - 2009-04-01 12:05:03
|
Revision: 277
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=277&view=rev
Author: benoitx
Date: 2009-04-01 12:04:28 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
ObjectLab Kit JARs are now OSGi Bundles. Transparent for all of us... except OSGi containers. Thanks to Neil Bartlett for some guidance.
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
trunk/src/changes/changes.xml
trunk/src/site/site.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
+++ trunk/datecalc-common/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
@@ -8,11 +8,40 @@
</parent>
<artifactId>datecalc-common</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging> <!-- (1) OSGi -->
<name>DateCalc Commons</name>
<description>Common Date Calculator Code</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package/>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+
+ <!--<Private-Package>com.my.company.*</Private-Package>-->
+ <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
+ </instructions>
+ </configuration>
+ </plugin> <!-- (2) END -->
+ </plugins>
+ </build>
+
<reporting>
<plugins>
<plugin>
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
+++ trunk/datecalc-jdk/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
@@ -9,7 +9,7 @@
</parent>
<artifactId>datecalc-jdk</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Date Calculator for JDK</name>
<description>Date Calculator methods for JDK</description>
@@ -19,9 +19,33 @@
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
</dependencies>
<build>
+ <plugins>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package/>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+
+ <!--<Private-Package>com.my.company.*</Private-Package>-->
+ <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
+ </instructions>
+ </configuration>
+ </plugin> <!-- (2) END -->
+ </plugins>
<testResources>
<testResource>
<directory>../datecalc-common/target/test-classes</directory>
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
+++ trunk/datecalc-joda/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
@@ -9,7 +9,7 @@
</parent>
<artifactId>datecalc-joda</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Date Calculator for Joda</name>
<description>Date Calculator methods for Joda</description>
@@ -24,9 +24,33 @@
<artifactId>joda-time</artifactId>
<version>1.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
</dependencies>
<build>
+ <plugins>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package/>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+
+ <!--<Private-Package>com.my.company.*</Private-Package>-->
+ <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
+ </instructions>
+ </configuration>
+ </plugin> <!-- (2) END -->
+ </plugins>
<testResources>
<testResource>
<directory>../datecalc-common/target/test-classes</directory>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-31 23:52:06 UTC (rev 276)
+++ trunk/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
@@ -224,12 +224,12 @@
<artifactId>dashboard-maven-plugin</artifactId>
</plugin>
-<!--
+
<plugin>
<groupId>net.sf</groupId>
<artifactId>stat-scm</artifactId>
</plugin>
- -->
+
</plugins>
</reporting>
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2009-03-31 23:52:06 UTC (rev 276)
+++ trunk/src/changes/changes.xml 2009-04-01 12:04:28 UTC (rev 277)
@@ -7,6 +7,7 @@
</properties>
<body>
<release version="1.2.0" date="in SVN" description="Maintenance">
+ <action dev="benoitx" type="add" due-to="Neil Bartlett">The ObjectLab Kit is now an OSGi Bundle!</action>
<action dev="benoitx" type="fix" issue="atid=872033&aid=1929838" due-to="Anthony Whitford">Spelling for "PRECEEDING" corrected to PRECEDING, deprecated the mispelt name.</action>
<action dev="benoitx" type="add">Enhanced the KitCalculatorsFactory to be able to get the holidayCalendar names and unregister calendars.</action>
<action dev="benoitx" type="fix">Removed the deprecated method KitCalculatorsFactory.registerHolidays(Set holidays).</action>
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2009-03-31 23:52:06 UTC (rev 276)
+++ trunk/src/site/site.xml 2009-04-01 12:04:28 UTC (rev 277)
@@ -2,20 +2,20 @@
<project name="ObjectLab-Kit">
<title>ObjectLab Kit</title>
<bannerLeft>
- <name>Appendium</name>
+ <name>Appendium Ltd</name>
<src>images/appendium_logo.jpg</src>
<href>http://www.appendium.com</href>
</bannerLeft>
<bannerRight>
- <name>ObjectLab Financial Ltd</name>
+ <name>ObjectLab Ltd</name>
<src>images/objectlab_logo.gif</src>
<href>http://www.objectlab.co.uk/</href>
</bannerRight>
<poweredBy>
- <logo name="Hosted on SourceForge.net" href="http://sourceforge.net"
- img="http://sflogo.sourceforge.net/sflogo.php?group_id=175139&type=2"/>
- <logo name="Build with Maven 2" href="http://maven.apache.org/"
- img="images/logos/maven-feather.png"/>
+ <logo name="Hosted on SourceForge.net" href="http://sourceforge.net"
+ img="http://sflogo.sourceforge.net/sflogo.php?group_id=175139&type=2"/>
+ <logo name="Build with Maven 2" href="http://maven.apache.org/"
+ img="http://maven.apache.org/images/logos/maven-feather.png"/>
</poweredBy>
<skin>
<groupId>org.springframework.maven.skins</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2009-04-01 14:47:23
|
Revision: 278
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=278&view=rev
Author: benoitx
Date: 2009-04-01 14:47:18 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
POMs have been simplified and 2 warnings due to deprecation of usage of javadoc/jira removed
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
+++ trunk/datecalc-common/pom.xml 2009-04-01 14:47:18 UTC (rev 278)
@@ -1,119 +1,85 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-common</artifactId>
- <packaging>bundle</packaging> <!-- (1) OSGi -->
-
- <name>DateCalc Commons</name>
- <description>Common Date Calculator Code</description>
+ <artifactId>datecalc-common</artifactId>
+ <packaging>bundle</packaging> <!-- (1) OSGi -->
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin> <!-- (2) OSGi START -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package/>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <name>DateCalc Commons</name>
+ <description>Common Date Calculator Code</description>
- <!--<Private-Package>com.my.company.*</Private-Package>-->
- <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
- </instructions>
- </configuration>
- </plugin> <!-- (2) END -->
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>net.sf</groupId>
- <artifactId>stat-scm</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> <source>1.5</source> </configuration>
+ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configuration> </plugin> <plugin>
+ <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
+++ trunk/datecalc-jdk/pom.xml 2009-04-01 14:47:18 UTC (rev 278)
@@ -1,133 +1,103 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-jdk</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>datecalc-jdk</artifactId>
+ <packaging>bundle</packaging>
- <name>Date Calculator for JDK</name>
- <description>Date Calculator methods for JDK</description>
+ <name>Date Calculator for JDK</name>
+ <description>Date Calculator methods for JDK</description>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin> <!-- (2) OSGi START -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package/>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <build>
+ <plugins>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <!--<Private-Package>com.my.company.*</Private-Package>-->
- <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
- </instructions>
- </configuration>
- </plugin> <!-- (2) END -->
- </plugins>
- <testResources>
- <testResource>
- <directory>../datecalc-common/target/test-classes</directory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </testResource>
- </testResources>
- </build>
+ <!--<Private-Package>com.my.company.*</Private-Package>-->
+ <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
+ </instructions>
+ </configuration>
+ </plugin> <!-- (2) END -->
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>../datecalc-common/target/test-classes</directory>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>net.sf</groupId>
- <artifactId>stat-scm</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> </configuration> </plugin> <plugin>
+ <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configuration> </plugin> <plugin>
+ <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
+++ trunk/datecalc-joda/pom.xml 2009-04-01 14:47:18 UTC (rev 278)
@@ -1,138 +1,108 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-joda</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>datecalc-joda</artifactId>
+ <packaging>bundle</packaging>
- <name>Date Calculator for Joda</name>
- <description>Date Calculator methods for Joda</description>
+ <name>Date Calculator for Joda</name>
+ <description>Date Calculator methods for Joda</description>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin> <!-- (2) OSGi START -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package/>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <build>
+ <plugins>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <!--<Private-Package>com.my.company.*</Private-Package>-->
- <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
- </instructions>
- </configuration>
- </plugin> <!-- (2) END -->
- </plugins>
- <testResources>
- <testResource>
- <directory>../datecalc-common/target/test-classes</directory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </testResource>
- </testResources>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <!--<Private-Package>com.my.company.*</Private-Package>-->
+ <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
+ </instructions>
+ </configuration>
+ </plugin> <!-- (2) END -->
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>../datecalc-common/target/test-classes</directory>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>net.sf</groupId>
- <artifactId>stat-scm</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> </configuration> </plugin> <plugin>
+ <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configuration> </plugin> <plugin>
+ <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-01 12:04:28 UTC (rev 277)
+++ trunk/pom.xml 2009-04-01 14:47:18 UTC (rev 278)
@@ -1,222 +1,195 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <modules>
- <module>datecalc-common</module>
- <module>datecalc-jdk</module>
- <module>datecalc-joda</module>
- </modules>
+ <modules>
+ <module>datecalc-common</module>
+ <module>datecalc-jdk</module>
+ <module>datecalc-joda</module>
+ </modules>
- <name>ObjectLab Kit</name>
+ <name>ObjectLab Kit</name>
- <description>
- ObjectLab Kit provides a generic Business Calendar for calculating dates given set(s) of holidays.
- Why re-invent the wheel?
+ <description>
+ ObjectLab Kit provides a generic Business Calendar for calculating dates given set(s) of holidays.
+ Why re-invent the wheel?
</description>
- <inceptionYear>2006</inceptionYear>
- <url>http://objectlabkit.sourceforge.net/</url>
+ <inceptionYear>2006</inceptionYear>
+ <url>http://objectlabkit.sourceforge.net/</url>
- <organization>
- <name>Appendium - Portfolio Financing Platform</name>
- <url>http://www.appendium.com/</url>
- </organization>
+ <organization>
+ <name>Appendium - Portfolio Financing Platform</name>
+ <url>http://www.appendium.com/</url>
+ </organization>
- <developers>
- <developer>
- <id>benoitx</id>
- <name>Benoit Xhenseval</name>
- <roles>
- <role>Team Leader</role>
- <role>Developer</role>
- </roles>
- <organization>Appendium Ltd</organization>
- <organizationUrl>http://www.appendium.com/</organizationUrl>
- <email>kit AT appendium DOT com</email>
- <timezone>+0</timezone>
- </developer>
- <developer>
- <id>marchy</id>
- <name>Marcin Jekot</name>
- <roles>
- <role>Developer</role>
- </roles>
- <organization>ObjectLab Financial Ltd</organization>
- <organizationUrl>http://www.objectlab.co.uk/</organizationUrl>
- <email>marchy AT users DOT users DOT sourceforge DOT net</email>
- <timezone>+2</timezone>
- </developer>
- </developers>
+ <developers>
+ <developer>
+ <id>benoitx</id>
+ ...
[truncated message content] |
|
From: <ma...@us...> - 2009-04-04 19:31:26
|
Revision: 279
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=279&view=rev
Author: marchy
Date: 2009-04-04 19:31:18 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
added xsd to site.xml files. greetings from the karoo ;-)
Modified Paths:
--------------
trunk/datecalc-common/src/site/site.xml
trunk/datecalc-jdk/src/site/site.xml
trunk/datecalc-joda/src/site/site.xml
trunk/src/site/site.xml
Modified: trunk/datecalc-common/src/site/site.xml
===================================================================
--- trunk/datecalc-common/src/site/site.xml 2009-04-01 14:47:18 UTC (rev 278)
+++ trunk/datecalc-common/src/site/site.xml 2009-04-04 19:31:18 UTC (rev 279)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="ObjectLab-Kit">
+<project name="ObjectLab-Kit" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<title>DateCalc Common</title>
<body>
<menu name="DateCalc Common">
Modified: trunk/datecalc-jdk/src/site/site.xml
===================================================================
--- trunk/datecalc-jdk/src/site/site.xml 2009-04-01 14:47:18 UTC (rev 278)
+++ trunk/datecalc-jdk/src/site/site.xml 2009-04-04 19:31:18 UTC (rev 279)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="ObjectLab-Kit">
+<project name="ObjectLab-Kit" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<title>DateCalc JDK</title>
<body>
<menu name="DateCalc JDK">
Modified: trunk/datecalc-joda/src/site/site.xml
===================================================================
--- trunk/datecalc-joda/src/site/site.xml 2009-04-01 14:47:18 UTC (rev 278)
+++ trunk/datecalc-joda/src/site/site.xml 2009-04-04 19:31:18 UTC (rev 279)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="ObjectLab-Kit">
+<project name="ObjectLab-Kit" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<title>DateCalc JODA</title>
<body>
<menu name="DateCalc JODA">
@@ -15,4 +14,4 @@
<item name="Joda-time" href="http://joda-time.sourceforge.net" />
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
\ No newline at end of file
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2009-04-01 14:47:18 UTC (rev 278)
+++ trunk/src/site/site.xml 2009-04-04 19:31:18 UTC (rev 279)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="ObjectLab-Kit">
+<project name="ObjectLab-Kit" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<title>ObjectLab Kit</title>
<bannerLeft>
<name>Appendium Ltd</name>
@@ -63,6 +63,5 @@
<item name="Joda-time" href="http://joda-time.sourceforge.net" />
</menu>
</body>
- <footer>Hello Marcin</footer>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2009-04-19 16:40:59
|
Revision: 280
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=280&view=rev
Author: benoitx
Date: 2009-04-19 16:40:49 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
Added some performance tests, do check AbstractPerformanceDateCalculatorTest.java
The "basic" scenarios are defined there.
Modified Paths:
--------------
trunk/datecalc-common/.classpath
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-jdk/.classpath
trunk/datecalc-joda/.classpath
trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
trunk/pom.xml
Added Paths:
-----------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPerformanceDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePerformanceCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayPerformanceCalculatorTest.java
Property Changed:
----------------
trunk/src/site/
Modified: trunk/datecalc-common/.classpath
===================================================================
--- trunk/datecalc-common/.classpath 2009-04-04 19:31:18 UTC (rev 279)
+++ trunk/datecalc-common/.classpath 2009-04-19 16:40:49 UTC (rev 280)
@@ -3,6 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-4.5.jar"/>
<classpathentry kind="output" path="targetEclipse/classes"/>
</classpath>
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2009-04-04 19:31:18 UTC (rev 279)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2009-04-19 16:40:49 UTC (rev 280)
@@ -39,6 +39,15 @@
import junit.framework.TestCase;
public abstract class AbstractDateTestCase<E> extends TestCase {
+
+ public AbstractDateTestCase() {
+ super();
+ }
+
+ public AbstractDateTestCase(final java.lang.String name) {
+ super(name);
+ }
+
protected abstract E newDate(final String date);
protected abstract KitCalculatorsFactory<E> getDateCalculatorFactory();
Added: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPerformanceDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPerformanceDateCalculatorTest.java (rev 0)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPerformanceDateCalculatorTest.java 2009-04-19 16:40:49 UTC (rev 280)
@@ -0,0 +1,152 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: AbstractForwardDateCalculatorTest.java 238 2007-01-05 20:45:33Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.common;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import junit.framework.Assert;
+
+public abstract class AbstractPerformanceDateCalculatorTest<E> extends AbstractDateTestCase<E> {
+ private static final int REPEAT = 100000;
+ private static final Map<String, String> RESULTS = new TreeMap<String, String>();
+
+ public void testMoveByBusDate1Cal() {
+ registerHolidays("UK", createUKHolidayCalendar());
+ final DateCalculator<E> cal = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final E startDate = newDate("2006-08-01");
+ cal.setStartDate(startDate);
+ long start = System.currentTimeMillis();
+ for (int i = 0; i < REPEAT; i++) {
+ cal.moveByBusinessDays(1);
+ cal.getCurrentBusinessDate();
+ }
+ long stop = System.currentTimeMillis();
+ keepResults("testMoveByBusDate", start, stop);
+ }
+
+ private void keepResults(String string, long start, long stop) {
+ RESULTS.put(string + " " + getClass().getSimpleName(), REPEAT + " = " + (stop - start) + " ms");
+ System.out.println("\nPERFORMANCE\n");
+ for (String str : RESULTS.keySet()) {
+ System.out.println("+++++++ " + str + " " + RESULTS.get(str));
+ }
+ }
+
+ public void testSetDateThenMoveByBusDate1Cal() {
+ registerHolidays("UK", createUKHolidayCalendar());
+ final DateCalculator<E> cal = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final E startDate = newDate("2006-08-01");
+ long start = System.currentTimeMillis();
+ for (int i = 0; i < REPEAT; i++) {
+ cal.setStartDate(startDate);
+ cal.moveByBusinessDays(10);
+ cal.getCurrentBusinessDate();
+ }
+ long stop = System.currentTimeMillis();
+ keepResults("testSetDateThenMoveByBusDate", start, stop);
+ }
+
+ public void testMoveByBusDate2Calendars() {
+ registerHolidays("UK", createUKHolidayCalendar());
+ registerHolidays("US", createUSHolidayCalendar());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final E startDate = newDate("2006-08-01");
+ final DateCalculator<E> cal = cal1.combine(cal2);
+ cal.setStartDate(startDate);
+ long start = System.currentTimeMillis();
+ for (int i = 0; i < REPEAT; i++) {
+ cal.moveByBusinessDays(1);
+ cal.getCurrentBusinessDate();
+ }
+ long stop = System.currentTimeMillis();
+ keepResults("testMoveByBusDate2Calendars", start, stop);
+ }
+
+ public void testCombineCalThenMoveByBusDate() {
+ registerHolidays("UK", createUKHolidayCalendar());
+ registerHolidays("US", createUSHolidayCalendar());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final E startDate = newDate("2006-08-01");
+ long start = System.currentTimeMillis();
+ for (int i = 0; i < REPEAT; i++) {
+ final DateCalculator<E> cal = cal1.combine(cal2);
+ cal.setStartDate(startDate);
+ cal.moveByBusinessDays(10);
+ cal.getCurrentBusinessDate();
+ }
+ long stop = System.currentTimeMillis();
+ keepResults("testCombineCalThenMoveByBusDate", start, stop);
+ }
+
+ @Override
+ protected HolidayCalendar<E> createUKHolidayCalendar() {
+ HolidayCalendar<E> cal = super.createUKHolidayCalendar();
+ cal.setLateBoundary(newDate("10000-12-31"));
+ return cal;
+ }
+
+ @Override
+ protected HolidayCalendar<E> createUSHolidayCalendar() {
+ HolidayCalendar<E> cal = super.createUSHolidayCalendar();
+ cal.setLateBoundary(newDate("10000-12-31"));
+ return cal;
+ }
+}
+
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
Modified: trunk/datecalc-jdk/.classpath
===================================================================
--- trunk/datecalc-jdk/.classpath 2009-04-04 19:31:18 UTC (rev 279)
+++ trunk/datecalc-jdk/.classpath 2009-04-19 16:40:49 UTC (rev 280)
@@ -4,7 +4,7 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/net.objectlab.kit.datecalc/jars/datecalc-common-1.2.0.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/net.objectlab.kit.datecalc/jars/datecalc-common-1.2.0-SNAPSHOT.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/datecalc-common"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Added: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java (rev 0)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java 2009-04-19 16:40:49 UTC (rev 280)
@@ -0,0 +1,70 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: JdkCalendarForwardDateCalculatorTest.java 203 2006-10-11 12:53:07Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.jdk;
+
+import java.util.Calendar;
+
+import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
+import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
+import net.objectlab.kit.datecalc.common.Utils;
+
+public class JdkCalendarPerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<Calendar> {
+
+ @Override
+ protected Calendar newDate(final String date) {
+ return Utils.createCalendar(date);
+ }
+
+ @Override
+ protected KitCalculatorsFactory<Calendar> getDateCalculatorFactory() {
+ return CalendarKitCalculatorsFactory.getDefaultInstance();
+ }
+
+}
+
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
Added: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java (rev 0)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java 2009-04-19 16:40:49 UTC (rev 280)
@@ -0,0 +1,69 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: JdkDateForwardDateCalculatorTest.java 224 2006-11-24 16:02:47Z marchy $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.jdk;
+
+import java.util.Date;
+
+import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
+import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
+import net.objectlab.kit.datecalc.common.Utils;
+
+public class JdkDatePerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<Date> {
+
+ @Override
+ protected Date newDate(final String date) {
+ return Utils.createDate(date);
+ }
+
+ @Override
+ protected KitCalculatorsFactory getDateCalculatorFactory() {
+ return DateKitCalculatorsFactory.getDefaultInstance();
+ }
+}
+
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
Modified: trunk/datecalc-joda/.classpath
===================================================================
--- trunk/datecalc-joda/.classpath 2009-04-04 19:31:18 UTC (rev 279)
+++ trunk/datecalc-joda/.classpath 2009-04-19 16:40:49 UTC (rev 280)
@@ -3,9 +3,10 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/net.objectlab.kit.datecalc/jars/datecalc-common-1.2.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/joda-time/jars/joda-time-1.5.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-4.5.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/net.objectlab.kit.datecalc/jars/datecalc-common-1.2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/joda-time/jars/joda-time-1.6.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/datecalc-common"/>
+ <classpathentry kind="var" path="MAVEN_REPO/junitperf/jars/junitperf-1.9.1.jar" sourcepath="/JUNITPERF_HOME"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs 2009-04-04 19:31:18 UTC (rev 279)
+++ trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs 2009-04-19 16:40:49 UTC (rev 280)
@@ -1,9 +1,12 @@
-
-
-
-
-
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=5
-org.eclipse.jdt.core.compiler.compliance=5
-org.eclipse.jdt.core.compiler.source=1.5
+#Wed Apr 15 12:26:24 BST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java 2009-04-04 19:31:18 UTC (rev 279)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java 2009-04-19 16:40:49 UTC (rev 280)
@@ -40,6 +40,14 @@
public class LocalDateForwardDateCalculatorTest extends AbstractForwardDateCalculatorTest<LocalDate> {
+// public LocalDateForwardDateCalculatorTest() {
+// super();
+// }
+//
+// public LocalDateForwardDateCalculatorTest(final java.lang.String name) {
+// super(name);
+// }
+
@Override
protected LocalDate newDate(final String date) {
return new LocalDate(date);
Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePerformanceCalculatorTest.java (rev 0)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePerformanceCalculatorTest.java 2009-04-19 16:40:49 UTC (rev 280)
@@ -0,0 +1,82 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: LocalDateForwardDateCalculatorTest.java 203 2006-10-11 12:53:07Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.joda;
+
+import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
+import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
+import net.objectlab.kit.datecalc.common.WorkingWeek;
+
+import org.joda.time.LocalDate;
+
+public class LocalDatePerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<LocalDate> {
+
+// public LocalDateForwardDateCalculatorTest() {
+// super();
+// }
+//
+// public LocalDateForwardDateCalculatorTest(final java.lang.String name) {
+// super(name);
+// }
+
+ @Override
+ protected LocalDate newDate(final String date) {
+ return new LocalDate(date);
+ }
+
+ @Override
+ protected WorkingWeek getWorkingWeek(final WorkingWeek ww) {
+ return new JodaWorkingWeek(ww);
+ }
+
+ @Override
+ protected KitCalculatorsFactory<LocalDate> getDateCalculatorFactory() {
+ return LocalDateKitCalculatorsFactory.getDefaultInstance();
+ }
+}
+
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayPerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayPerformanceCalculatorTest.java (rev 0)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayPerformanceCalculatorTest.java 2009-04-19 16:40:49 UTC (rev 280)
@@ -0,0 +1,80 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: YearMonthDayForwardDateCalculatorTest.java 235 2007-01-04 18:31:58Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.joda;
+
+import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
+import net.objectlab.kit.datecalc.common.HolidayCalendar;
+import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
+import net.objectlab.kit.datecalc.common.WorkingWeek;
+
+import org.joda.time.YearMonthDay;
+
+public class YearMonthDayPerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<YearMonthDay> {
+
+ @Override
+ protected YearMonthDay newDate(final String date) {
+ return new YearMonthDay(date);
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final HolidayCalendar<YearMonthDay> holidays) {
+ YearMonthDayKitCalculatorsFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
+ @Override
+ protected WorkingWeek getWorkingWeek(final WorkingWeek ww) {
+ return new JodaWorkingWeek(ww);
+ }
+
+ @Override
+ protected KitCalculatorsFactory<YearMonthDay> getDateCalculatorFactory() {
+ return YearMonthDayKitCalculatorsFactory.getDefaultInstance();
+ }
+}
+
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-04 19:31:18 UTC (rev 279)
+++ trunk/pom.xml 2009-04-19 16:40:49 UTC (rev 280)
@@ -100,6 +100,12 @@
<version>4.5</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junitperf</groupId>
+ <artifactId>junitperf</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<dependencyManagement>
Property changes on: trunk/src/site
___________________________________________________________________
Added: svn:ignore
+ statsvn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2009-08-27 11:55:35
|
Revision: 281
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=281&view=rev
Author: marchy
Date: 2009-08-27 11:55:22 +0000 (Thu, 27 Aug 2009)
Log Message:
-----------
Adding Excel utility with permission from Rand Merchant Bank (it was originally written there).
Added Paths:
-----------
trunk/utils-excel/
trunk/utils-excel/pom.xml
trunk/utils-excel/src/
trunk/utils-excel/src/main/
trunk/utils-excel/src/main/java/
trunk/utils-excel/src/main/java/net/
trunk/utils-excel/src/main/java/net/objectlab/
trunk/utils-excel/src/main/java/net/objectlab/kit/
trunk/utils-excel/src/main/java/net/objectlab/kit/util/
trunk/utils-excel/src/main/java/net/objectlab/kit/util/excel/
trunk/utils-excel/src/main/java/net/objectlab/kit/util/excel/Excel.java
Added: trunk/utils-excel/pom.xml
===================================================================
--- trunk/utils-excel/pom.xml (rev 0)
+++ trunk/utils-excel/pom.xml 2009-08-27 11:55:22 UTC (rev 281)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>net.objectlab.kit.util</groupId>
+ <artifactId>excel</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>ObjectLab Kit - Excel Utility</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.2-FINAL</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: trunk/utils-excel/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/utils-excel/src/main/java/net/objectlab/kit/util/excel/Excel.java
===================================================================
--- trunk/utils-excel/src/main/java/net/objectlab/kit/util/excel/Excel.java (rev 0)
+++ trunk/utils-excel/src/main/java/net/objectlab/kit/util/excel/Excel.java 2009-08-27 11:55:22 UTC (rev 281)
@@ -0,0 +1,184 @@
+package net.objectlab.kit.util.excel;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFName;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.util.RangeAddress;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+
+public class Excel {
+
+ private HSSFWorkbook workbook;
+
+ private InputStream inputStream;
+
+ public Excel() {
+ }
+
+ public Excel(InputStream in) {
+ setInputStream(in);
+ init();
+ }
+
+ public void init() throws RuntimeException {
+
+ POIFSFileSystem fs;
+ try {
+ fs = new POIFSFileSystem(inputStream);
+ workbook = new HSSFWorkbook(fs);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public <E> E readValue(String cellAddress, Class<E> type) {
+
+ Object[][] result = readBlock(cellAddress, true, type);
+ return (E) result[0][0];
+ }
+
+ /**
+ *
+ * @param range
+ * either the range of the entire block to be read, or just the
+ * top row of the cells, in which case the method will stop when
+ * the first empty cell is reached in the first column
+ * @param colTypes
+ * classes of the result types, per column
+ * @return 2 dimensional array, containing the data read, cast as per
+ * colTypes
+ */
+ public Object[][] readBlock(String range, Class... colTypes) {
+ return readBlock(range, false, colTypes);
+ }
+
+
+ private Object[][] readBlock(String range, boolean oneLiner, Class... colTypes) {
+
+ RangeAddress ra = new RangeAddress(range);
+ HSSFSheet sheet = workbook.getSheet(ra.getSheetName());
+
+ oneLiner = (ra.getHeight() == 1 && oneLiner);
+
+ List<Object> result;
+ if (ra.getHeight() == 1) {
+ result = new LinkedList<Object>();
+ } else {
+ result = new ArrayList<Object>(ra.getHeight());
+ }
+
+ int x = ra.getXPosition(ra.getFromCell());
+ int y = ra.getYPosition(ra.getFromCell());
+
+ Class colType = colTypes[0];
+ for (int i = 0; (isMoreToRead(sheet, oneLiner, x, y, i)); i++) {
+ HSSFRow row = sheet.getRow(y + i - 1);
+ Object[] resultRow = new Object[ra.getWidth()];
+ result.add(resultRow);
+ for (int j = 0; j < ra.getWidth(); j++) {
+ HSSFCell cell = row.getCell((short) (x + j - 1));
+
+ if (colTypes.length > j) {
+ colType = colTypes[j];
+ }
+
+ if (colType == Date.class) {
+ resultRow[j] = cell.getDateCellValue();
+ } else if (colType == Calendar.class) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(cell.getDateCellValue());
+ resultRow[j] = cal;
+ } else if (colType == Integer.class) {
+ resultRow[j] = ((Double) cell.getNumericCellValue()).intValue();
+ } else if (colType == Double.class) {
+ resultRow[j] = (Double) cell.getNumericCellValue();
+ } else if (colType == BigDecimal.class) {
+ resultRow[j] = new BigDecimal(String.valueOf(cell.getNumericCellValue()));
+ } else if (colType == String.class) {
+ resultRow[j] = cell.getRichStringCellValue().getString();
+ }
+ }
+
+ }
+
+ return result.toArray(new Object[][] {});
+ }
+
+ private boolean isMoreToRead(HSSFSheet sheet, boolean oneLiner, int x, int y, int i) {
+
+ if (oneLiner) {
+ return (i < 1);
+ }
+
+ // check if the cell is empty
+ HSSFRow row = sheet.getRow(y + i - 1);
+ if (row == null) {
+ return false;
+ }
+
+ HSSFCell cell = row.getCell((short) (x - 1));
+ if (cell == null) {
+ return false;
+ }
+ String str = cell.toString();
+ return !(str == null || "".equals(str));
+ }
+
+ public <E> List<E> readColumn(String rangeOrStartAddress, Class<E> type) {
+
+ Object[][] arr = readBlock(rangeOrStartAddress, false, type);
+
+ List<E> result = new LinkedList<E>();
+ for (int i = 0; i < arr.length; i++) {
+ result.add((E)arr[i][0]);
+ }
+
+ return result;
+ }
+
+ public String namedRangeToRangeAddress(String namedRange) {
+ int namedCellIndex = getWorkbook().getNameIndex(namedRange);
+ HSSFName namedCell = getWorkbook().getNameAt(namedCellIndex);
+
+ return namedCell.getReference();
+ }
+
+ public HSSFCell getCell(String cellAddr) {
+ RangeAddress ra = new RangeAddress(cellAddr);
+
+ return workbook.getSheet(ra.getSheetName()).getRow(ra.getYPosition(ra.getFromCell()) - 1).getCell(
+ (short) (ra.getXPosition(ra.getFromCell()) - 1));
+ }
+
+ public HSSFWorkbook getWorkbook() {
+ return workbook;
+ }
+
+ public void setWorkbook(HSSFWorkbook workbook) {
+ this.workbook = workbook;
+ }
+
+ public void setInputStream(InputStream inputStream) {
+ this.inputStream = inputStream;
+ }
+
+ public void setFilename(String filename) {
+ try {
+ inputStream = new FileInputStream(filename);
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
Property changes on: trunk/utils-excel/src/main/java/net/objectlab/kit/util/excel/Excel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-03-01 18:15:46
|
Revision: 285
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=285&view=rev
Author: marchy
Date: 2010-03-01 18:15:39 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
cleaning up eclipse files
Removed Paths:
-------------
trunk/datecalc-common/.classpath
trunk/datecalc-common/.project
trunk/datecalc-jdk/.classpath
trunk/datecalc-jdk/.project
trunk/datecalc-jdk/.settings/org.eclipse.jdt.core.prefs
trunk/datecalc-jdk/.settings/org.eclipse.jdt.ui.prefs
trunk/datecalc-joda/.classpath
trunk/datecalc-joda/.project
trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs
trunk/datecalc-joda/.settings/org.eclipse.jdt.ui.prefs
Deleted: trunk/datecalc-common/.classpath
===================================================================
--- trunk/datecalc-common/.classpath 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-common/.classpath 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-4.5.jar"/>
- <classpathentry kind="output" path="targetEclipse/classes"/>
-</classpath>
Deleted: trunk/datecalc-common/.project
===================================================================
--- trunk/datecalc-common/.project 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-common/.project 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<projectDescription>
- <name>datecalc-common</name>
- <comment>DateCalc Common library is the library used by both JDK and JODA libraries.</comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments></arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Deleted: trunk/datecalc-jdk/.classpath
===================================================================
--- trunk/datecalc-jdk/.classpath 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-jdk/.classpath 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/net.objectlab.kit.datecalc/jars/datecalc-common-1.2.0-SNAPSHOT.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/datecalc-common"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: trunk/datecalc-jdk/.project
===================================================================
--- trunk/datecalc-jdk/.project 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-jdk/.project 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<projectDescription>
- <name>datecalc-jdk</name>
- <comment>This library provides pure JDK implementation of the Kit Calculators.</comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments></arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Deleted: trunk/datecalc-jdk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/datecalc-jdk/.settings/org.eclipse.jdt.core.prefs 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-jdk/.settings/org.eclipse.jdt.core.prefs 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,9 +0,0 @@
-
-
-
-
-
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=5
-org.eclipse.jdt.core.compiler.compliance=5
-org.eclipse.jdt.core.compiler.source=1.5
Deleted: trunk/datecalc-jdk/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/datecalc-jdk/.settings/org.eclipse.jdt.ui.prefs 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-jdk/.settings/org.eclipse.jdt.ui.prefs 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,5 +0,0 @@
-#Wed Jan 03 23:20:06 GMT 2007
-eclipse.preferences.version=1
-formatter_profile=_ObjectLabKit
-formatter_settings_version=10
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * $$Id\: org.eclipse.jdt.ui.prefs 138 2006-09-10 12\:29\:15Z marchy $$\r\n * \r\n * Copyright 2006 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the "License"); you may not\r\n * use this file except in compliance with the License. You may obtain a copy of\r\n * the License at\r\n *\r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n * License for the specific language governing permissions and limitations under\r\n * the License.\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @TODO javadoc\r\n *\r\n * @author ${user}\r\n * @author $$LastChangedBy\: marchy $$\r\n * @version $$Revision\: 138 $$ $$Date\: 2006-09-10 13\:29\:15 +0100 (Sun, 10 Sep 2006) $$\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template></templates>
Deleted: trunk/datecalc-joda/.classpath
===================================================================
--- trunk/datecalc-joda/.classpath 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-joda/.classpath 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-4.5.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/net.objectlab.kit.datecalc/jars/datecalc-common-1.2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/joda-time/jars/joda-time-1.6.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/datecalc-common"/>
- <classpathentry kind="var" path="MAVEN_REPO/junitperf/jars/junitperf-1.9.1.jar" sourcepath="/JUNITPERF_HOME"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: trunk/datecalc-joda/.project
===================================================================
--- trunk/datecalc-joda/.project 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-joda/.project 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<projectDescription>
- <name>datecalc-joda</name>
- <comment>This library provides a Joda-Time implementation of the Kit Calculators.</comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments></arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Deleted: trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,12 +0,0 @@
-#Wed Apr 15 12:26:24 BST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
Deleted: trunk/datecalc-joda/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/datecalc-joda/.settings/org.eclipse.jdt.ui.prefs 2010-01-01 11:15:46 UTC (rev 284)
+++ trunk/datecalc-joda/.settings/org.eclipse.jdt.ui.prefs 2010-03-01 18:15:39 UTC (rev 285)
@@ -1,5 +0,0 @@
-#Wed Jan 03 23:24:24 GMT 2007
-eclipse.preferences.version=1
-formatter_profile=_ObjectLabKit
-formatter_settings_version=10
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * $$Id\: org.eclipse.jdt.ui.prefs 138 2006-09-10 12\:29\:15Z marchy $$\r\n * \r\n * Copyright 2006 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the "License"); you may not\r\n * use this file except in compliance with the License. You may obtain a copy of\r\n * the License at\r\n *\r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n * License for the specific language governing permissions and limitations under\r\n * the License.\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @TODO javadoc\r\n *\r\n * @author ${user}\r\n * @author $$LastChangedBy\: marchy $$\r\n * @version $$Revision\: 138 $$ $$Date\: 2006-09-10 13\:29\:15 +0100 (Sun, 10 Sep 2006) $$\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template></templates>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-03-01 18:16:49
|
Revision: 287
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=287&view=rev
Author: marchy
Date: 2010-03-01 18:16:43 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
IMHO a better way to include/share the common test classes
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2010-03-01 18:16:23 UTC (rev 286)
+++ trunk/datecalc-common/pom.xml 2010-03-01 18:16:43 UTC (rev 287)
@@ -29,6 +29,17 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2010-03-01 18:16:23 UTC (rev 286)
+++ trunk/datecalc-jdk/pom.xml 2010-03-01 18:16:43 UTC (rev 287)
@@ -18,6 +18,12 @@
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
</dependencies>
<build>
@@ -40,14 +46,6 @@
</configuration>
</plugin> <!-- (2) END -->
</plugins>
- <testResources>
- <testResource>
- <directory>../datecalc-common/target/test-classes</directory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </testResource>
- </testResources>
</build>
<reporting>
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2010-03-01 18:16:23 UTC (rev 286)
+++ trunk/datecalc-joda/pom.xml 2010-03-01 18:16:43 UTC (rev 287)
@@ -23,6 +23,12 @@
<artifactId>joda-time</artifactId>
<version>1.6</version>
</dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
</dependencies>
<build>
@@ -45,14 +51,6 @@
</configuration>
</plugin> <!-- (2) END -->
</plugins>
- <testResources>
- <testResource>
- <directory>../datecalc-common/target/test-classes</directory>
- <includes>
- <include>**/*.class</include>
- </includes>
- </testResource>
- </testResources>
</build>
<reporting>
<plugins>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-01 18:16:23 UTC (rev 286)
+++ trunk/pom.xml 2010-03-01 18:16:43 UTC (rev 287)
@@ -113,9 +113,16 @@
<dependency>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc-common</artifactId>
- <version>${project.version}</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>1.0.0</version>
@@ -179,7 +186,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
-
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -192,24 +198,21 @@
<configuration>
<issueLinkTemplatePerSystem>
<default>%URL%/?func=detail&group_id=175139&%ISSUE%</default>
- </issueLinkTemplatePerSystem>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId>
- </plugin>
+ </issueLinkTemplatePerSystem>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>net.sf</groupId>
+ <artifactId>stat-scm</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
-
- <plugin>
- <groupId>net.sf</groupId>
- <artifactId>stat-scm</artifactId>
- </plugin>
-
- </plugins>
- </reporting>
-
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-02 20:01:51
|
Revision: 290
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=290&view=rev
Author: benoitx
Date: 2010-03-02 20:01:41 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
Moved to version 1.2.0
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2010-03-02 19:47:21 UTC (rev 289)
+++ trunk/datecalc-common/pom.xml 2010-03-02 20:01:41 UTC (rev 290)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<artifactId>datecalc-common</artifactId>
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2010-03-02 19:47:21 UTC (rev 289)
+++ trunk/datecalc-jdk/pom.xml 2010-03-02 20:01:41 UTC (rev 290)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<artifactId>datecalc-jdk</artifactId>
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2010-03-02 19:47:21 UTC (rev 289)
+++ trunk/datecalc-joda/pom.xml 2010-03-02 20:01:41 UTC (rev 290)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<artifactId>datecalc-joda</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-03 20:51:06
|
Revision: 291
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=291&view=rev
Author: benoitx
Date: 2010-03-03 20:51:00 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
Added capability for signing.
Reverted to SNAPSHOT
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2010-03-02 20:01:41 UTC (rev 290)
+++ trunk/datecalc-common/pom.xml 2010-03-03 20:51:00 UTC (rev 291)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>datecalc-common</artifactId>
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2010-03-02 20:01:41 UTC (rev 290)
+++ trunk/datecalc-jdk/pom.xml 2010-03-03 20:51:00 UTC (rev 291)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>datecalc-jdk</artifactId>
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2010-03-02 20:01:41 UTC (rev 290)
+++ trunk/datecalc-joda/pom.xml 2010-03-03 20:51:00 UTC (rev 291)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>datecalc-joda</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-02 20:01:41 UTC (rev 290)
+++ trunk/pom.xml 2010-03-03 20:51:00 UTC (rev 291)
@@ -4,7 +4,7 @@
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -140,6 +140,23 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-03-03 22:39:28
|
Revision: 292
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=292&view=rev
Author: marchy
Date: 2010-03-03 22:39:21 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
Removing .project and .settings.
These are generated using mvn eclipse:eclipse
Removed Paths:
-------------
trunk/.project
trunk/.settings/
Deleted: trunk/.project
===================================================================
--- trunk/.project 2010-03-03 20:51:00 UTC (rev 291)
+++ trunk/.project 2010-03-03 22:39:21 UTC (rev 292)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<projectDescription>
- <name>objectlabkit</name>
- <comment></comment>
- <projects></projects>
-</projectDescription>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-03-04 19:03:38
|
Revision: 293
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=293&view=rev
Author: marchy
Date: 2010-03-04 19:03:30 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
adding ignores
Removed Paths:
-------------
trunk/datecalc-jdk/.settings/
trunk/datecalc-joda/.settings/
Property Changed:
----------------
trunk/
trunk/datecalc-common/
trunk/datecalc-jdk/
trunk/datecalc-joda/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- target
*.log
*.1
+ target
.project
.classpath
.settings
*.log
*.1
Property changes on: trunk/datecalc-common
___________________________________________________________________
Modified: svn:ignore
- target
.fbwarnings
velocity.log
ydocErr.log
targetEclipse
+ target
.project
.classpath
.settings
.fbwarnings
velocity.log
ydocErr.log
targetEclipse
Property changes on: trunk/datecalc-jdk
___________________________________________________________________
Modified: svn:ignore
- target
.checkstyle
.fbwarnings
+ target
.project
.classpath
.settings
.checkstyle
.fbwarnings
Property changes on: trunk/datecalc-joda
___________________________________________________________________
Modified: svn:ignore
- target
.fbwarnings
+ target
.project
.classpath
.settings
.fbwarnings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-12 20:59:19
|
Revision: 297
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=297&view=rev
Author: benoitx
Date: 2010-03-12 20:59:12 +0000 (Fri, 12 Mar 2010)
Log Message:
-----------
Added a profile "perf-testing" for performance testing.
Can be launched by "mvn install -P perf-testing" which will run all tests, including performance.
Modified Paths:
--------------
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
Added Paths:
-----------
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkCalendarPerformanceCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkDatePerformanceCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/perf/
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/perf/LocalDatePerformanceCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/perf/YearMonthDayPerformanceCalculatorTest.java
Removed Paths:
-------------
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePerformanceCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayPerformanceCalculatorTest.java
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2010-03-11 19:40:51 UTC (rev 296)
+++ trunk/datecalc-jdk/pom.xml 2010-03-12 20:59:12 UTC (rev 297)
@@ -1,101 +1,169 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-jdk</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>datecalc-jdk</artifactId>
+ <packaging>bundle</packaging>
- <name>Date Calculator for JDK</name>
- <description>Date Calculator methods for JDK</description>
+ <name>Date Calculator for JDK</name>
+ <description>Date Calculator methods for JDK</description>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- </dependency>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin> <!-- (2) OSGi START -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package />
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <build>
+ <plugins>
+ <!-- UNIT tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <excludes>
+ <exclude>**/perf/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <!--<Private-Package>com.my.company.*</Private-Package>-->
- <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
- </instructions>
- </configuration>
- </plugin> <!-- (2) END -->
- </plugins>
- </build>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <!--<Private-Package>com.my.company.*</Private-Package>-->
+ <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
+ </instructions>
+ </configuration>
+ </plugin> <!-- (2) END -->
+ </plugins>
+ </build>
- <!--
- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> <plugin>
- <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> </configuration> </plugin> <plugin>
- <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <!--
- <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
- <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configuration> </plugin> <plugin>
- <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <profiles>
+ <profile>
+ <id>perf-testing</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-perf</id>
+ <!-- use it mvn integration-test -P integration-test -->
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <argLine>-Xms256m -Xmx1024m</argLine>
+ <skip>false</skip>
+ <includes>
+ <include>**/perf/*Test.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
+
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId> </plugin>
+ <plugin> <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration> <aggregate>true</aggregate> </configuration>
+ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
+ </configuration> </plugin> <plugin>
+ <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin>
+ <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Deleted: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java 2010-03-11 19:40:51 UTC (rev 296)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPerformanceCalculatorTest.java 2010-03-12 20:59:12 UTC (rev 297)
@@ -1,70 +0,0 @@
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- *
- * $Id: JdkCalendarForwardDateCalculatorTest.java 203 2006-10-11 12:53:07Z benoitx $
- *
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package net.objectlab.kit.datecalc.jdk;
-
-import java.util.Calendar;
-
-import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
-import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
-import net.objectlab.kit.datecalc.common.Utils;
-
-public class JdkCalendarPerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<Calendar> {
-
- @Override
- protected Calendar newDate(final String date) {
- return Utils.createCalendar(date);
- }
-
- @Override
- protected KitCalculatorsFactory<Calendar> getDateCalculatorFactory() {
- return CalendarKitCalculatorsFactory.getDefaultInstance();
- }
-
-}
-
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- */
Deleted: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java 2010-03-11 19:40:51 UTC (rev 296)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePerformanceCalculatorTest.java 2010-03-12 20:59:12 UTC (rev 297)
@@ -1,69 +0,0 @@
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- *
- * $Id: JdkDateForwardDateCalculatorTest.java 224 2006-11-24 16:02:47Z marchy $
- *
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package net.objectlab.kit.datecalc.jdk;
-
-import java.util.Date;
-
-import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
-import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
-import net.objectlab.kit.datecalc.common.Utils;
-
-public class JdkDatePerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<Date> {
-
- @Override
- protected Date newDate(final String date) {
- return Utils.createDate(date);
- }
-
- @Override
- protected KitCalculatorsFactory getDateCalculatorFactory() {
- return DateKitCalculatorsFactory.getDefaultInstance();
- }
-}
-
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- */
Added: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkCalendarPerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkCalendarPerformanceCalculatorTest.java (rev 0)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkCalendarPerformanceCalculatorTest.java 2010-03-12 20:59:12 UTC (rev 297)
@@ -0,0 +1,71 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: JdkCalendarForwardDateCalculatorTest.java 203 2006-10-11 12:53:07Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.jdk.perf;
+
+import java.util.Calendar;
+
+import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
+import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
+import net.objectlab.kit.datecalc.common.Utils;
+import net.objectlab.kit.datecalc.jdk.CalendarKitCalculatorsFactory;
+
+public class JdkCalendarPerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<Calendar> {
+
+ @Override
+ protected Calendar newDate(final String date) {
+ return Utils.createCalendar(date);
+ }
+
+ @Override
+ protected KitCalculatorsFactory<Calendar> getDateCalculatorFactory() {
+ return CalendarKitCalculatorsFactory.getDefaultInstance();
+ }
+
+}
+
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
Added: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkDatePerformanceCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkDatePerformanceCalculatorTest.java (rev 0)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/perf/JdkDatePerformanceCalculatorTest.java 2010-03-12 20:59:12 UTC (rev 297)
@@ -0,0 +1,70 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: JdkDateForwardDateCalculatorTest.java 224 2006-11-24 16:02:47Z marchy $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.jdk.perf;
+
+import java.util.Date;
+
+import net.objectlab.kit.datecalc.common.AbstractPerformanceDateCalculatorTest;
+import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
+import net.objectlab.kit.datecalc.common.Utils;
+import net.objectlab.kit.datecalc.jdk.DateKitCalculatorsFactory;
+
+public class JdkDatePerformanceCalculatorTest extends AbstractPerformanceDateCalculatorTest<Date> {
+
+ @Override
+ protected Date newDate(final String date) {
+ return Utils.createDate(date);
+ }
+
+ @Override
+ protected KitCalculatorsFactory getDateCalculatorFactory() {
+ return DateKitCalculatorsFactory.getDefaultInstance();
+ }
+}
+
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ */
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2010-03-11 19:40:51 UTC (rev 296)
+++ trunk/datecalc-joda/pom.xml 2010-03-12 20:59:12 UTC (rev 297)
@@ -1,106 +1,175 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-joda</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>datecalc-joda</artifactId>
+ <packaging>bundle</packaging>
- <name>Date Calculator for Joda</name>
- <description>Date Calculator methods for Joda</description>
+ <name>Date Calculator for Joda</name>
+ <description>Date Calculator methods for Joda</description>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin> <!-- (2) OSGi START -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package />
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <build>
+ <plugins>
+ <!-- UNIT tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <excludes>
+ <exclude>**/perf/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <!--<Private-Package>com.my.company.*</Private-Package>-->
- <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
- </instructions>
- </configuration>
- </plugin> <!-- (2) END -->
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <!--
- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> <plugin>
- <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> </configuration> </plugin> <plugin>
- <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactI...
[truncated message content] |
|
From: <be...@us...> - 2010-03-13 00:49:48
|
Revision: 298
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=298&view=rev
Author: benoitx
Date: 2010-03-13 00:49:41 +0000 (Sat, 13 Mar 2010)
Log Message:
-----------
A few changes following Sonar's discoveries of assigned parameters and use of static SDF.
Marcin, I have left the JDK package to you... :-)
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Tenor.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -36,6 +36,7 @@
import static java.util.Calendar.MONTH;
import static java.util.Calendar.YEAR;
+import java.io.Serializable;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
@@ -54,32 +55,33 @@
*
*/
public class DefaultHolidayCalendar<E> implements HolidayCalendar<E> {
-
- private Comparator<Calendar> calCmp = new Comparator<Calendar>() {
- public int compare(Calendar cal1, Calendar cal2) {
- return
- (cal1.get(YEAR) - cal2.get(YEAR)) * 10000
- +
- (cal1.get(MONTH) - cal2.get(MONTH)) * 100
- +
- (cal1.get(DAY_OF_MONTH) - cal2.get(DAY_OF_MONTH));
- }
- };
-
- private Comparator<Date> dateCmp = new Comparator<Date>() {
- public int compare(Date date1, Date date2) {
-
- Calendar cal1 = Calendar.getInstance();
+ private static final long serialVersionUID = -8558686840806739645L;
+
+ private static final class DateComp implements Comparator<Date>, Serializable {
+ private static final long serialVersionUID = 9079672835911375957L;
+
+ public int compare(final Date date1, final Date date2) {
+
+ final Calendar cal1 = Calendar.getInstance();
cal1.setTime(date1);
- Calendar cal2 = Calendar.getInstance();
+ final Calendar cal2 = Calendar.getInstance();
cal2.setTime(date2);
-
- return calCmp.compare(cal1, cal2);
+
+ return CALENDAR_COMP.compare(cal1, cal2);
}
- };
-
- private static final long serialVersionUID = -8558686840806739645L;
+ }
+ private static final class CalendarComp implements Comparator<Calendar>, Serializable {
+ private static final long serialVersionUID = 4783236154150397685L;
+
+ public int compare(final Calendar cal1, final Calendar cal2) {
+ return (cal1.get(YEAR) - cal2.get(YEAR)) * 10000 + (cal1.get(MONTH) - cal2.get(MONTH)) * 100 + (cal1.get(DAY_OF_MONTH) - cal2.get(DAY_OF_MONTH));
+ }
+ }
+
+ private static final CalendarComp CALENDAR_COMP = new CalendarComp();
+ private static final DateComp DATE_COMP = new DateComp();
+
private Set<E> holidays;
private E earlyBoundary = null;
@@ -146,32 +148,32 @@
* @see net.objectlab.kit.datecalc.common.HolidayCalendar#setHolidays(java.util.Set)
*/
@SuppressWarnings("unchecked")
- public void setHolidays(final Set<E> holidays) {
-
+ public final void setHolidays(final Set<E> holidays) {
+
if (holidays == null) {
this.holidays = Collections.emptySet();
return;
}
-
+
Set<E> newSet = null;
// this 'hack' is for Date/Calendar objects to be
// 'equal' on the same day even if time fields differ
- Iterator<E> it = holidays.iterator();
+ final Iterator<E> it = holidays.iterator();
if (it.hasNext()) {
- E obj = it.next();
-
+ final E obj = it.next();
+
if (obj instanceof Date) {
- newSet = new TreeSet(dateCmp);
+ newSet = new TreeSet(DATE_COMP);
} else if (obj instanceof Calendar) {
- newSet = new TreeSet(calCmp);
- }
+ newSet = new TreeSet(CALENDAR_COMP);
+ }
}
-
+
if (newSet == null) {
newSet = new HashSet<E>();
}
-
+
newSet.addAll(holidays);
this.holidays = Collections.unmodifiableSet(newSet);
}
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Tenor.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Tenor.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Tenor.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -91,20 +91,8 @@
boolean invalid = false;
final int size = tenor.length();
- for (int i = 0; i < size && !invalid; i++) {
- final char c = tenor.charAt(i);
+ parseCode(tenor, unitsBuf, codeBuf, invalid, size);
- if (c >= '0' && c <= '9') {
- if (codeBuf.length() != 0) {
- throw new IllegalArgumentException("[" + tenor + "] is not a valid tenor");
- } else {
- unitsBuf.append(c);
- }
- } else {
- codeBuf.append(c);
- }
- }
-
int parsedUnits = 0;
if (unitsBuf.length() > 0) {
parsedUnits = Integer.parseInt(unitsBuf.toString());
@@ -125,6 +113,22 @@
return new Tenor(parsedUnits, parsedCode);
}
+ private static void parseCode(final String tenor, final StringBuffer unitsBuf, final StringBuffer codeBuf, boolean invalid, final int size) {
+ for (int i = 0; i < size && !invalid; i++) {
+ final char c = tenor.charAt(i);
+
+ if (c >= '0' && c <= '9') {
+ if (codeBuf.length() != 0) {
+ throw new IllegalArgumentException("[" + tenor + "] is not a valid tenor");
+ } else {
+ unitsBuf.append(c);
+ }
+ } else {
+ codeBuf.append(c);
+ }
+ }
+ }
+
@Override
public int hashCode() {
final int prime = 31;
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -50,11 +50,8 @@
*
*/
public final class Utils {
-
private static final String DATE_PATTERN = "yyyy-MM-dd";
- private static final SimpleDateFormat SDF = new SimpleDateFormat(DATE_PATTERN);
-
private Utils() {
}
@@ -116,11 +113,10 @@
public static Calendar getCal(final String dateStr) {
try {
- final Date date = SDF.parse(dateStr);
- final Calendar cal = getCal(date);
- return cal;
+ final Date date = new SimpleDateFormat(DATE_PATTERN).parse(dateStr);
+ return getCal(date);
} catch (final ParseException e) {
- throw new IllegalArgumentException("\"" + dateStr + "\"" + " is an invalid date, the pattern is : " + DATE_PATTERN);
+ throw new IllegalArgumentException("\"" + dateStr + "\"" + " is an invalid date, the pattern is : " + DATE_PATTERN, e);
}
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -41,7 +41,8 @@
*
* @author Benoit Xhenseval
* @author $LastChangedBy$
- * @version $Revision$ $Date$
+ * @version $Revision$ $Date: 2006-10-11 13:53:07 +0100 (Wed, 11 Oct 2006)
+ * $
*
*/
public class JodaWorkingWeek extends WorkingWeek {
@@ -64,13 +65,13 @@
// -----------------------------------------------------------------------
//
- // ObjectLab, world leaders in the design and development of bespoke
- // applications for the securities financing markets.
- // www.ObjectLab.co.uk
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
//
// -----------------------------------------------------------------------
- public boolean isWorkingDay(final LocalDate date) {
+ public boolean isWorkingDay(final LocalDate date) {
final int dayOfWeek = jodaToCalendarDayConstant(date.getDayOfWeek());
return isWorkingDayFromCalendar(dayOfWeek);
}
@@ -83,8 +84,8 @@
* @param dayOfWeek
* e.g. DateTimeConstants.MONDAY, DateTimeConstants.TUESDAY, etc
*/
- public JodaWorkingWeek withWorkingDayFromDateTimeConstant(final boolean working, int dayOfWeek) {
- dayOfWeek = jodaToCalendarDayConstant(dayOfWeek);
+ public JodaWorkingWeek withWorkingDayFromDateTimeConstant(final boolean working, int givenDayOfWeek) {
+ int dayOfWeek = jodaToCalendarDayConstant(givenDayOfWeek);
return new JodaWorkingWeek(super.withWorkingDayFromCalendar(working, dayOfWeek));
}
@@ -92,8 +93,8 @@
return isWorkingDayFromCalendar(jodaToCalendarDayConstant(dayOfWeek));
}
- public int jodaToCalendarDayConstant(int dayOfWeek) {
- dayOfWeek++;
+ public int jodaToCalendarDayConstant(final int givenDayOfWeek) {
+ int dayOfWeek = givenDayOfWeek + 1;
return (dayOfWeek <= MAX_WEEKDAY_INDEX ? dayOfWeek : dayOfWeek % MAX_WEEKDAY_INDEX);
}
}
@@ -101,16 +102,13 @@
/*
* ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
*
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
+ * Based in London, we are world leaders in the design and development of
+ * bespoke applications for the securities financing markets.
*
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more about
+ * us</a> ___ _ _ _ _ _ / _ \| |__ (_) ___ ___| |_| | __ _| |__ | | | | '_ \| |/
+ * _ \/ __| __| | / _` | '_ \ | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ |__/
+ *
+ * www.ObjectLab.co.uk
*/
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -44,7 +44,6 @@
import net.objectlab.kit.datecalc.common.AbstractIMMDateCalculator;
import net.objectlab.kit.datecalc.common.IMMPeriod;
-import org.joda.time.DateTimeConstants;
import org.joda.time.LocalDate;
/**
@@ -140,9 +139,9 @@
//
// -----------------------------------------------------------------------
- private LocalDate calculateIMMMonth(final boolean requestNextIMM, LocalDate date, final int month) {
+ private LocalDate calculateIMMMonth(final boolean requestNextIMM, final LocalDate startDate, final int month) {
int monthOffset = 0;
-
+ LocalDate date = startDate;
switch (month) {
case MARCH:
case JUNE:
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -70,15 +70,16 @@
//
// -----------------------------------------------------------------------
- protected LocalDate move(final DateCalculator<LocalDate> calculator, int step) {
+ protected LocalDate move(final DateCalculator<LocalDate> calculator, final int step) {
LocalDate date = calculator.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
+ int stepToUse = step;
while (calculator.isNonWorkingDay(date)) {
- date = date.plusDays(step);
+ date = date.plusDays(stepToUse);
if (date.getMonthOfYear() != month) {
// flick to backward
- step *= -1;
- date = date.plusDays(step);
+ stepToUse *= -1;
+ date = date.plusDays(stepToUse);
}
}
return date;
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -52,49 +52,20 @@
public int dayDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
int diff = 0;
- int dayStart;
- int dayEnd;
+ // int dayStart;
+ // int dayEnd;
switch (basis) {
case CONV_30_360:
- dayStart = start.getDayOfMonth();
- dayEnd = end.getDayOfMonth();
- if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
- + dayEnd - dayStart;
+ diff = diffConv30v360(start, end);
break;
case CONV_360E_ISDA:
- dayStart = start.getDayOfMonth();
- dayEnd = end.getDayOfMonth();
- final int monthStart = start.getMonthOfYear();
- if ((monthStart == 2 && start.monthOfYear().getMaximumValue() == dayStart) || dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
-
- diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
- + dayEnd - dayStart;
+ diff = diff360EIsda(start, end);
break;
case CONV_360E_ISMA:
- dayStart = start.getDayOfMonth();
- dayEnd = end.getDayOfMonth();
- if (dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
- + dayEnd - dayStart;
+ diff = diff360EIsma(start, end);
break;
default:
final Period p = new Period(start, end, PeriodType.days());
@@ -104,6 +75,44 @@
return diff;
}
+ private int diff360EIsma(final LocalDate start, final LocalDate end) {
+ int dayStart = start.getDayOfMonth();
+ int dayEnd = end.getDayOfMonth();
+ if (dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ return (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS + dayEnd - dayStart;
+ }
+
+ private int diff360EIsda(final LocalDate start, final LocalDate end) {
+ int dayStart = start.getDayOfMonth();
+ int dayEnd = end.getDayOfMonth();
+ final int monthStart = start.getMonthOfYear();
+ if ((monthStart == 2 && start.monthOfYear().getMaximumValue() == dayStart) || dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+
+ return (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS + dayEnd - dayStart;
+ }
+
+ private int diffConv30v360(final LocalDate start, final LocalDate end) {
+ int dayStart = start.getDayOfMonth();
+ int dayEnd = end.getDayOfMonth();
+ if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ return (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS + dayEnd - dayStart;
+ }
+
// -----------------------------------------------------------------------
//
// ObjectLab, world leaders in the design and development of bespoke
@@ -140,7 +149,7 @@
case ACT_360:
diff = (dayDiff(start, end, basis)) / YEAR_360_0;
break;
-
+
case ACT_365:
case END_365:
diff = (dayDiff(start, end, basis)) / YEAR_365_0;
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2010-03-12 20:59:12 UTC (rev 297)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2010-03-13 00:49:41 UTC (rev 298)
@@ -79,15 +79,16 @@
//
// -----------------------------------------------------------------------
- protected YearMonthDay move(final DateCalculator<YearMonthDay> calculator, int step) {
+ protected YearMonthDay move(final DateCalculator<YearMonthDay> calculator, final int step) {
YearMonthDay date = calculator.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
+ int stepToUse = step;
while (calculator.isNonWorkingDay(date)) {
- date = date.plusDays(step);
+ date = date.plusDays(stepToUse);
if (date.getMonthOfYear() != month) {
// flick to backward
- step *= -1;
- date = date.plusDays(step);
+ stepToUse *= -1;
+ date = date.plusDays(stepToUse);
}
}
return date;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-13 10:14:11
|
Revision: 299
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=299&view=rev
Author: benoitx
Date: 2010-03-13 10:14:05 +0000 (Sat, 13 Mar 2010)
Log Message:
-----------
A few more Sonar fixes...
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2010-03-13 00:49:41 UTC (rev 298)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
@@ -179,8 +179,11 @@
unit *= MONTHS_IN_YEAR;
}
+ return applyTenor(tenorCode, unit);
+ }
+
+ private DateCalculator<E> applyTenor(final TenorCode tenorCode, final int unit) {
DateCalculator<E> calc;
-
// move by tenor
switch (tenorCode) {
case OVERNIGHT:
@@ -205,7 +208,6 @@
default:
throw new UnsupportedOperationException("Sorry not yet...");
}
-
return calc;
}
@@ -241,11 +243,11 @@
* @since 1.1.0
*/
public List<E> calculateTenorDates(final List<Tenor> tenors, final int spotLag) {
- List<E> list = new ArrayList<E>();
+ final List<E> list = new ArrayList<E>();
if (tenors != null) {
final E date = clone(getCurrentBusinessDate());
- for (Tenor tenor : tenors) {
+ for (final Tenor tenor : tenors) {
moveByTenor(tenor, spotLag);
list.add(getCurrentBusinessDate());
setCurrentBusinessDate(date);
@@ -313,12 +315,7 @@
}
public DateCalculator<E> moveByBusinessDays(final int businessDays) {
- if (businessDays > 0 && holidayHandler != null && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEDING))) {
- throw new IllegalArgumentException("A " + MODIFIED_PRECEDING + " or " + BACKWARD + " does not allow positive steps for moveByBusinessDays");
- } else if (businessDays < 0 && holidayHandler != null
- && (holidayHandler.getType().equals(FORWARD) || holidayHandler.getType().equals(MODIFIED_FOLLOWING))) {
- throw new IllegalArgumentException("A " + MODIFIED_FOLLOWING + " or " + FORWARD + " does not allow negative steps for moveByBusinessDays");
- }
+ checkHolidayValidity(businessDays);
final int numberOfStepsLeft = Math.abs(businessDays);
final int step = (businessDays < 0 ? -1 : 1);
@@ -330,6 +327,15 @@
return this;
}
+ private void checkHolidayValidity(final int businessDays) {
+ if (businessDays > 0 && holidayHandler != null && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEDING))) {
+ throw new IllegalArgumentException("A " + MODIFIED_PRECEDING + " or " + BACKWARD + " does not allow positive steps for moveByBusinessDays");
+ } else if (businessDays < 0 && holidayHandler != null
+ && (holidayHandler.getType().equals(FORWARD) || holidayHandler.getType().equals(MODIFIED_FOLLOWING))) {
+ throw new IllegalArgumentException("A " + MODIFIED_FOLLOWING + " or " + FORWARD + " does not allow negative steps for moveByBusinessDays");
+ }
+ }
+
/**
* Allows DateCalculators to be combined into a new one, the startDate and
* currentBusinessDate will be the ones from the existing calendar (not the
@@ -347,10 +353,7 @@
return this;
}
- if (holidayHandler == null && calculator.getHolidayHandlerType() != null || holidayHandler != null
- && !holidayHandler.getType().equals(calculator.getHolidayHandlerType())) {
- throw new IllegalArgumentException("Combined Calendars cannot have different handler types");
- }
+ checkHolidayHandlerValidity(calculator);
final Set<E> newSet = new HashSet<E>();
if (holidayCalendar != null) {
@@ -358,16 +361,8 @@
}
final HolidayCalendar<E> calendarToCombine = calculator.getHolidayCalendar();
- if (calendarToCombine.getEarlyBoundary() != null && holidayCalendar.getEarlyBoundary() == null || calendarToCombine.getEarlyBoundary() == null
- && holidayCalendar.getEarlyBoundary() != null) {
- throw new IllegalArgumentException("Both Calendar to be combined must either have each Early boundaries or None.");
- }
+ checkBoundaries(calendarToCombine);
- if (calendarToCombine.getLateBoundary() != null && holidayCalendar.getLateBoundary() == null || calendarToCombine.getLateBoundary() == null
- && holidayCalendar.getLateBoundary() != null) {
- throw new IllegalArgumentException("Both Calendar to be combined must either have each Late boundaries or None.");
- }
-
if (calendarToCombine.getHolidays() != null) {
newSet.addAll(calendarToCombine.getHolidays());
}
@@ -380,6 +375,25 @@
return cal;
}
+ private void checkHolidayHandlerValidity(final DateCalculator<E> calculator) {
+ if (holidayHandler == null && calculator.getHolidayHandlerType() != null || holidayHandler != null
+ && !holidayHandler.getType().equals(calculator.getHolidayHandlerType())) {
+ throw new IllegalArgumentException("Combined Calendars cannot have different handler types");
+ }
+ }
+
+ private void checkBoundaries(final HolidayCalendar<E> calendarToCombine) {
+ if (calendarToCombine.getEarlyBoundary() != null && holidayCalendar.getEarlyBoundary() == null || calendarToCombine.getEarlyBoundary() == null
+ && holidayCalendar.getEarlyBoundary() != null) {
+ throw new IllegalArgumentException("Both Calendar to be combined must either have each Early boundaries or None.");
+ }
+
+ if (calendarToCombine.getLateBoundary() != null && holidayCalendar.getLateBoundary() == null || calendarToCombine.getLateBoundary() == null
+ && holidayCalendar.getLateBoundary() != null) {
+ throw new IllegalArgumentException("Both Calendar to be combined must either have each Late boundaries or None.");
+ }
+ }
+
protected abstract E getToday();
protected abstract E compareDate(E date1, E date2, boolean returnEarliest);
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2010-03-13 00:49:41 UTC (rev 298)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
@@ -136,7 +136,7 @@
}
@Override
- public void setStartDate(final YearMonthDay startDate) {
+ public final void setStartDate(final YearMonthDay startDate) {
if (delegate != null) {
delegate.setStartDate(startDate != null ? startDate.toLocalDate() : null);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-18 20:09:25
|
Revision: 300
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=300&view=rev
Author: benoitx
Date: 2010-03-18 20:09:14 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Fixing a few Sonar issues as well as physically removing the deprecated methods and constructors...
next release is going to be clean!
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
trunk/src/changes/changes.xml
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -126,27 +126,6 @@
}
/**
- * @deprecated should use getHolidayCalendar
- */
- @Deprecated
- public Set<E> getNonWorkingDays() {
- return Collections.unmodifiableSet(holidayCalendar.getHolidays());
- }
-
- /**
- * @deprecated use the HolidayCalendar
- */
- @Deprecated
- public void setNonWorkingDays(final Set<E> holidays) {
- if (holidays == null) {
- final Set<E> col = Collections.emptySet();
- holidayCalendar = new DefaultHolidayCalendar<E>(col);
- } else {
- holidayCalendar = new DefaultHolidayCalendar<E>(holidays);
- }
- }
-
- /**
* move the current date by a given tenor, this means that if a date is
* either a 'weekend' or holiday, it will be skipped acording to the holiday
* handler and not count towards the number of days to move.
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -118,17 +118,6 @@
/**
* This is typically used at the construction of a DateCalculator to give a
- * reference to a set of holidays.
- *
- * @param holidays
- * the holiday (if null, an empty set will be put in place)
- * @deprecated should use setHolidayCalendar
- */
- @Deprecated
- void setNonWorkingDays(final Set<E> holidays);
-
- /**
- * This is typically used at the construction of a DateCalculator to give a
* reference to a Holiday Calendar, if not the case, the calculator will
* make an immutable copy of the HolidayCalendar.
*
@@ -147,15 +136,6 @@
// -----------------------------------------------------------------------
/**
- * Gives a immutable copy of the set of registered holidays.
- *
- * @return an immutable copy of the holiday set.
- * @deprecated use getHolidayCalendar, likely to be REMOVED next release.
- */
- @Deprecated
- Set<E> getNonWorkingDays();
-
- /**
* Returns an immutable version of the HolidayCalendar.
* @return a copy of the holiday calendar
* @since 1.1.0
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -96,19 +96,7 @@
* the day count fraction is equal to the number of days between the last
* payment date and the next date divided by 365.
*/
- ACT_365,
-
- /**
- * @deprecated this is not a common convention, and won't be included in future releases
- */
- @Deprecated
- ACT_UST,
-
- /**
- * @deprecated this is not a common convention, and won't be included in future releases
- */
- @Deprecated
- END_365
+ ACT_365
}
/*
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -161,18 +161,6 @@
}
}
- public void testSetHol() {
- final DateCalculator<E> cal1 = getDateCalculatorFactory().getDateCalculator("bla", null);
-
- Assert.assertNotNull("No algo", cal1);
- Assert.assertNotNull("No hol", cal1.getHolidayCalendar().getHolidays());
- Assert.assertTrue("empty hol", cal1.getHolidayCalendar().getHolidays().isEmpty());
-
- cal1.setNonWorkingDays(null);
- Assert.assertNotNull("empty", cal1.getHolidayCalendar().getHolidays());
- Assert.assertTrue("empty hol", cal1.getHolidayCalendar().getHolidays().isEmpty());
- }
-
public void testSetHolCal() {
final DateCalculator<E> cal1 = getDateCalculatorFactory().getDateCalculator("bla", null);
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -435,28 +435,6 @@
runtests(ACT_ACT);
}
- public void testUnsupportedType() {
- Assert.assertNotNull(cal);
-
- final PeriodCountBasis pcount = PeriodCountBasis.ACT_UST;
- final E start = getDate();
- final E end = getDate();
-
- try {
- cal.yearDiff(start, end, pcount);
- Assert.fail("Should have refused the algo...");
- } catch (final UnsupportedOperationException e) {
- // ok
- }
-
- try {
- cal.monthDiff(start, end, pcount);
- Assert.fail("Should have refused the algo...");
- } catch (final UnsupportedOperationException e) {
- // ok
- }
- }
-
private void runtests(final String[][] tests) {
for (final String[] test : tests) {
runtest(cal, test);
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -62,19 +62,6 @@
this(null, null, new DefaultHolidayCalendar<Calendar>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public CalendarDateCalculator(final String name, final Calendar startDate, final Set<Calendar> nonWorkingDays,
- final HolidayHandler<Calendar> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<Calendar>(nonWorkingDays), holidayHandler);
- }
-
public CalendarDateCalculator(final String name, final Calendar startDate, final HolidayCalendar<Calendar> holidayCalendar,
final HolidayHandler<Calendar> holidayHandler) {
super(name, holidayCalendar, holidayHandler);
@@ -138,7 +125,7 @@
}
@Override
- protected Calendar getToday() {
+ protected final Calendar getToday() {
return Utils.blastTime(Calendar.getInstance());
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -111,8 +111,14 @@
moveToIMMDay(cal);
+ cal = handlePeriod(requestNextIMM, period, cal);
+
+ return cal;
+ }
+
+ private Calendar handlePeriod(final boolean requestNextIMM, final IMMPeriod period, final Calendar givenCal) {
+ Calendar cal = givenCal;
final int month = cal.get(MONTH);
-
switch (period) {
case BI_ANNUALY_JUN_DEC:
if (month == MARCH || month == SEPTEMBER) {
@@ -139,7 +145,6 @@
cal = getNextIMMDate(requestNextIMM, cal, QUARTERLY);
break;
}
-
return cal;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -69,9 +69,9 @@
//
// -----------------------------------------------------------------------
- protected Calendar move(final DateCalculator<Calendar> calculator, int step) {
+ protected Calendar move(final DateCalculator<Calendar> calculator, final int givenStep) {
final Calendar cal = (Calendar) calculator.getCurrentBusinessDate().clone();
-
+ int step = givenStep;
final int month = cal.get(Calendar.MONTH);
while (calculator.isNonWorkingDay(cal)) {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -53,58 +53,74 @@
public int dayDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
int diff = 0;
- int dayStart;
- int dayEnd;
-
+
switch (basis) {
case CONV_30_360:
- dayStart = start.get(Calendar.DAY_OF_MONTH);
- dayEnd = end.get(Calendar.DAY_OF_MONTH);
- if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
- + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ diff = calculateConv30360(start, end);
break;
case CONV_360E_ISDA:
- dayStart = start.get(Calendar.DAY_OF_MONTH);
- dayEnd = end.get(Calendar.DAY_OF_MONTH);
- final int monthStart = start.get(Calendar.MONTH);
- if ((monthStart == 2 && start.getActualMaximum(Calendar.DAY_OF_MONTH) == dayStart) || dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
-
- diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
- + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ diff = calculateConv360EIsda(start, end);
break;
case CONV_360E_ISMA:
- dayStart = start.get(Calendar.DAY_OF_MONTH);
- dayEnd = end.get(Calendar.DAY_OF_MONTH);
- if (dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
- + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ diff = calculateConv360EIsma(start, end);
break;
-
+
default:
diff = dayDiff(start, end);
}
-
+
return diff;
}
+ private int calculateConv360EIsma(final Calendar start, final Calendar end) {
+ int diff;
+ int dayStart = start.get(Calendar.DAY_OF_MONTH);
+ int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ if (dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360 + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd
+ - dayStart;
+ return diff;
+ }
+
+ private int calculateConv360EIsda(final Calendar start, final Calendar end) {
+ int diff;
+ int dayStart = start.get(Calendar.DAY_OF_MONTH);
+ int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ final int monthStart = start.get(Calendar.MONTH);
+ if ((monthStart == 2 && start.getActualMaximum(Calendar.DAY_OF_MONTH) == dayStart) || dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+
+ diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360 + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd
+ - dayStart;
+ return diff;
+ }
+
+ private int calculateConv30360(final Calendar start, final Calendar end) {
+ int diff;
+ int dayStart = start.get(Calendar.DAY_OF_MONTH);
+ int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360 + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd
+ - dayStart;
+ return diff;
+ }
+
// -----------------------------------------------------------------------
//
// ObjectLab, world leaders in the design and development of bespoke
@@ -113,7 +129,7 @@
//
// -----------------------------------------------------------------------
- private int dayDiff(final Calendar start, final Calendar end) {
+ private int dayDiff(final Calendar start, final Calendar end) {
final long diff = Math.abs(start.getTimeInMillis() - end.getTimeInMillis());
final double dayDiff = ((double) diff) / MILLIS_IN_DAY;
return (int) Math.round(dayDiff);
@@ -125,7 +141,7 @@
public double yearDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
double diff = 0.0;
-
+
switch (basis) {
case ACT_ACT:
final int startYear = start.get(Calendar.YEAR);
@@ -152,14 +168,13 @@
break;
case ACT_365:
- case END_365:
diff = (dayDiff(start, end, basis)) / YEAR_365_0;
break;
-
+
default:
throw new UnsupportedOperationException("Sorry no ACT_UST yet");
}
-
+
return diff;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -63,19 +63,6 @@
this(null, null, new DefaultHolidayCalendar<Date>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public DateDateCalculator(final String name, final Date startDate, final Set<Date> nonWorkingDays,
- final HolidayHandler<Date> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<Date>(nonWorkingDays), holidayHandler);
- }
-
public DateDateCalculator(final String name, final Date startDate, final HolidayCalendar<Date> holidayCalendar,
final HolidayHandler<Date> holidayHandler) {
super(name, holidayCalendar, holidayHandler);
@@ -130,7 +117,7 @@
}
@Override
- public void setStartDate(final Date startDate) {
+ public final void setStartDate(final Date startDate) {
if (delegate != null) {
delegate.setStartDate(startDate != null ? Utils.getCal(startDate) : null);
}
@@ -138,7 +125,7 @@
}
@Override
- protected Date getToday() {
+ protected final Date getToday() {
return Utils.blastTime(Calendar.getInstance()).getTime();
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -72,9 +72,9 @@
//
// -----------------------------------------------------------------------
- protected Date move(final DateCalculator<Date> calculator, int step) {
+ protected Date move(final DateCalculator<Date> calculator, final int givenStep) {
final Calendar cal = (Calendar) Utils.getCal(calculator.getCurrentBusinessDate()).clone();
-
+ int step = givenStep;
final int month = cal.get(Calendar.MONTH);
while (calculator.isNonWorkingDay(cal.getTime())) {
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -63,19 +63,6 @@
this(null, null, new DefaultHolidayCalendar<LocalDate>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public LocalDateCalculator(final String name, final LocalDate startDate, final Set<LocalDate> nonWorkingDays,
- final HolidayHandler<LocalDate> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<LocalDate>(nonWorkingDays), holidayHandler);
- }
-
public LocalDateCalculator(final String name, final LocalDate startDate, final HolidayCalendar<LocalDate> holidayCalendar,
final HolidayHandler<LocalDate> holidayHandler) {
super(name, holidayCalendar, holidayHandler);
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -151,7 +151,6 @@
break;
case ACT_365:
- case END_365:
diff = (dayDiff(start, end, basis)) / YEAR_365_0;
break;
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -65,21 +65,8 @@
this(null, null, new DefaultHolidayCalendar<YearMonthDay>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public YearMonthDayDateCalculator(final String name, final YearMonthDay startDate, final Set<YearMonthDay> nonWorkingDays,
+ public YearMonthDayDateCalculator(final String name, final YearMonthDay startDate, final HolidayCalendar<YearMonthDay> nonWorkingDays,
final HolidayHandler<YearMonthDay> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<YearMonthDay>(nonWorkingDays), holidayHandler);
- }
-
- public YearMonthDayDateCalculator(final String name, final YearMonthDay startDate,
- final HolidayCalendar<YearMonthDay> nonWorkingDays, final HolidayHandler<YearMonthDay> holidayHandler) {
super(name, nonWorkingDays, holidayHandler);
final Set<LocalDate> dates = new HashSet<LocalDate>();
@@ -89,8 +76,8 @@
final YearMonthDay early = nonWorkingDays.getEarlyBoundary();
final YearMonthDay late = nonWorkingDays.getLateBoundary();
- final DefaultHolidayCalendar<LocalDate> cal = new DefaultHolidayCalendar<LocalDate>(dates, early != null ? new LocalDate(
- early) : null, late != null ? new LocalDate(late) : null);
+ final DefaultHolidayCalendar<LocalDate> cal = new DefaultHolidayCalendar<LocalDate>(dates, early != null ? new LocalDate(early) : null,
+ late != null ? new LocalDate(late) : null);
final HolidayHandler<LocalDate> locDate = new HolidayHandlerYearMonthDayWrapper(holidayHandler, this);
@@ -130,8 +117,8 @@
}
@Override
- protected DateCalculator<YearMonthDay> createNewCalculator(final String name, final YearMonthDay startDate,
- final HolidayCalendar<YearMonthDay> holidays, final HolidayHandler<YearMonthDay> handler) {
+ protected DateCalculator<YearMonthDay> createNewCalculator(final String name, final YearMonthDay startDate, final HolidayCalendar<YearMonthDay> holidays,
+ final HolidayHandler<YearMonthDay> handler) {
return new YearMonthDayDateCalculator(name, startDate, holidays, handler);
}
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/src/changes/changes.xml 2010-03-18 20:09:14 UTC (rev 300)
@@ -7,6 +7,8 @@
</properties>
<body>
<release version="1.2.0" date="in SVN" description="Maintenance">
+ <action dev="benoitx" type="fix">Removed the deprecated constructors that used to take Set of "Date", use the HolidayCalendar.</action>
+ <action dev="benoitx" type="fix">Removed the deprecated method DateCalculator.setNonWorkingDays and getNonWorkingDays.</action>
<action dev="benoitx" type="add" due-to="Neil Bartlett">The ObjectLab Kit is now an OSGi Bundle!</action>
<action dev="benoitx" type="fix" issue="atid=872033&aid=1929838" due-to="Anthony Whitford">Spelling for "PRECEEDING" corrected to PRECEDING, deprecated the mispelt name.</action>
<action dev="benoitx" type="add">Enhanced the KitCalculatorsFactory to be able to get the holidayCalendar names and unregister calendars.</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-03-19 18:17:02
|
Revision: 305
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=305&view=rev
Author: marchy
Date: 2010-03-19 18:16:54 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Formatting pom's - using spaces for indentation.
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2010-03-19 18:13:44 UTC (rev 304)
+++ trunk/datecalc-common/pom.xml 2010-03-19 18:16:54 UTC (rev 305)
@@ -1,96 +1,98 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-common</artifactId>
- <packaging>bundle</packaging> <!-- (1) OSGi -->
+ <artifactId>datecalc-common</artifactId>
+ <packaging>bundle</packaging> <!-- (1) OSGi -->
- <name>DateCalc Commons</name>
- <description>Common Date Calculator Code</description>
+ <name>DateCalc Commons</name>
+ <description>Common Date Calculator Code</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package />
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
- <!--
- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin> <plugin>
- <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> <source>1.5</source> </configuration>
- </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <!--
- <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
- <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configuration> </plugin> <plugin>
- <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin> <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin>
+ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> <source>1.5</source>
+ </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId>
+ </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configuration> </plugin>
+ <plugin> <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin> <groupId>net.sf</groupId>
+ <artifactId>stat-scm</artifactId> </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2010-03-19 18:13:44 UTC (rev 304)
+++ trunk/datecalc-jdk/pom.xml 2010-03-19 18:16:54 UTC (rev 305)
@@ -1,166 +1,159 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-jdk</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>datecalc-jdk</artifactId>
+ <packaging>bundle</packaging>
- <name>Date Calculator for JDK</name>
- <description>Date Calculator methods for JDK</description>
+ <name>Date Calculator for JDK</name>
+ <description>Date Calculator methods for JDK</description>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- </dependency>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <!-- UNIT tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <excludes>
- <exclude>**/perf/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <plugins>
+ <!-- UNIT tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <excludes>
+ <exclude>**/perf/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package />
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>perf-testing</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-perf</id>
- <!-- use it mvn integration-test -P integration-test -->
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <argLine>-Xms256m -Xmx1024m</argLine>
- <skip>false</skip>
- <includes>
- <include>**/perf/*Test.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>perf-testing</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-perf</id>
+ <!-- use it mvn integration-test -P integration-test -->
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <argLine>-Xms256m -Xmx1024m</argLine>
+ <skip>false</skip>
+ <includes>
+ <include>**/perf/*Test.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
- <!--
- <plugin> <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId> </plugin>
- <plugin> <artifactId>maven-javadoc-plugin</artifactId>
- <configuration> <aggregate>true</aggregate> </configuration>
- </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId> </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <!--
- <plugin> <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
- </configuration> </plugin> <plugin>
- <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin>
- <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin>
+ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> </configuration>
+ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configuration> </plugin>
+ <plugin> <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin> <groupId>net.sf</groupId>
+ <artifactId>stat-scm</artifactId> </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2010-03-19 18:13:44 UTC (rev 304)
+++ trunk/datecalc-joda/pom.xml 2010-03-19 18:16:54 UTC (rev 305)
@@ -1,175 +1,168 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>datecalc-joda</artifactId>
- <packaging>bundle</packaging>
+ <artifactId>datecalc-joda</artifactId>
+ <packaging>bundle</packaging>
- <name>Date Calculator for Joda</name>
- <description>Date Calculator methods for Joda</description>
+ <name>Date Calculator for Joda</name>
+ <description>Date Calculator methods for Joda</description>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <scope>test</scope>
- <classifier>tests</classifier>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <!-- UNIT tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <excludes>
- <exclude>**/perf/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <plugins>
+ <!-- UNIT tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <excludes>
+ <exclude>**/perf/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin> <!-- (2) OSGi START -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
- <Private-Package />
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${pom.version}</Bundle-Version>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <plugin> <!-- (2) OSGi START -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.objectlab.kit.datecalc.*;version="${pom.version}"</Export-Package>
+ <Private-Package />
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <!--<Private-Package>com.my.company.*</Private-Package>-->
- <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
- </instructions>
- </configuration>
- </plugin> <!-- (2) END -->
- </plugins>
- </build>
+ <!--<Private-Package>com.my.company.*</Private-Package>-->
+ <!--<Bundle-Activator>com.my.company.Activator</Bundle-Activator>-->
+ </instructions>
+ </configuration>
+ </plugin> <!-- (2) END -->
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>perf-testing</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-perf</id>
- <!-- use it mvn integration-test -P integration-test -->
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <argLine>-Xms256m -Xmx1024m</argLine>
- <skip>false</skip>
- <includes>
- <include>**/perf/*Test.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>perf-testing</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-perf</id>
+ <!-- use it mvn integration-test -P integration-test -->
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <argLine>-Xms256m -Xmx1024m</argLine>
+ <skip>false</skip>
+ <includes>
+ <include>**/perf/*Test.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- </configuration>
- </plugin>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ </configuration>
+ </plugin>
- <!--
- <plugin> <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId> </plugin>
- <plugin> <artifactId>maven-javadoc-plugin</artifactId>
- <configuration> <aggregate>true</aggregate> </configuration>
- </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId> </plugin>
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- </configuration>
- </plugin>
- <!--
- <plugin> <artifactId>maven-changes-plugin</artifactId>
- <configuration>
- <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate>
- </configuration> </plugin> <plugin>
- <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId> </plugin> <plugin>
- <groupId>net.sf</groupId> <artifactId>stat-scm</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> </plugin>
+ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> <aggregate>true</aggregate> </configuration>
+ </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jxr-maven-plugin</artifactId> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clover-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/controversial.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <issueLinkTemplate>%URL%/?func=detail&group_id=175139&%ISSUE%</issueLinkTemplate> </configurati...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X