Menu
▾
▴
objectlabkit-svn — Shows the SVN Checkins for Dev
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(49) |
Sep
(134) |
Oct
(33) |
Nov
(18) |
Dec
(51) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(50) |
Feb
(32) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(9) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(1) |
Feb
(4) |
Mar
(8) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
(54) |
Apr
(21) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2010-03-11 19:40:58
|
Revision: 296
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=296&view=rev
Author: benoitx
Date: 2010-03-11 19:40:51 +0000 (Thu, 11 Mar 2010)
Log Message:
-----------
adding a profile "code-sign" for gpg signature when doing a release.
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-09 07:07:57 UTC (rev 295)
+++ trunk/pom.xml 2010-03-11 19:40:51 UTC (rev 296)
@@ -1,235 +1,259 @@
<?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>
+ <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 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>
+ <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 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>
- <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>
+ <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>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</unsubscribe>
- <post />
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-news</archive>
- </mailingList>
- <mailingList>
- <name>Kit Announcements</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</unsubscribe>
- <post />
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-announce</archive>
- </mailingList>
- <mailingList>
- <name>Kit User</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</unsubscribe>
- <post>obj...@li...</post>
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-user</archive>
- </mailingList>
- <mailingList>
- <name>Kit Developers (SVN checkins)</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</unsubscribe>
- <post />
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-svn</archive>
- </mailingList>
- </mailingLists>
+ <mailingLists>
+ <mailingList>
+ <name>News about ObjectLab's projects (Alerts online)</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-news</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit Announcements</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-announce</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit User</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</unsubscribe>
+ <post>obj...@li...</post>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit Developers (SVN checkins)</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-svn</archive>
+ </mailingList>
+ </mailingLists>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junitperf</groupId>
- <artifactId>junitperf</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <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>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <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>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <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>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <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>
- <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>
+ <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>
- <scm>
- <connection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</connection>
- <developerConnection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</developerConnection>
- <url>http://objectlabkit.svn.sourceforge.net/viewvc/objectlabkit/</url>
- </scm>
+ <profiles>
+ <profile>
+ <id>code-sign</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <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>
+ </profile>
+ </profiles>
- <issueManagement>
- <system>sourceforge.net</system>
- <url>http://sourceforge.net/tracker/?group_id=175139</url>
- </issueManagement>
- <distributionManagement>
- <repository>
- <id>sourceforge.net</id>
- <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-repo</url>
- </repository>
- <snapshotRepository>
- <id>sourceforge.net</id>
- <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-snapshot-repo</url>
- </snapshotRepository>
- <site>
- <id>objectlabkit.sf.net</id>
- <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/test</url>
- </site>
- </distributionManagement>
+ <scm>
+ <connection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</connection>
+ <developerConnection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</developerConnection>
+ <url>http://objectlabkit.svn.sourceforge.net/viewvc/objectlabkit/</url>
+ </scm>
- <reporting>
- <plugins>
- <!--
- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration>
- <configLocation>/common_build/checkstyle_checks.xml</configLocation> </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>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <code>javadoc:aggregate</code>
- <source>1.5</source>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-changes-plugin</artifactId>
- <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>
- <plugin>
- <groupId>net.sf</groupId>
- <artifactId>stat-scm</artifactId>
- </plugin>
- </plugins>
- </reporting>
+ <issueManagement>
+ <system>sourceforge.net</system>
+ <url>http://sourceforge.net/tracker/?group_id=175139</url>
+ </issueManagement>
+ <distributionManagement>
+ <repository>
+ <id>sourceforge.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-repo</url>
+ </repository>
+ <snapshotRepository>
+ <id>sourceforge.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-snapshot-repo</url>
+ </snapshotRepository>
+ <site>
+ <id>objectlabkit.sf.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/test</url>
+ </site>
+ </distributionManagement>
+
+ <reporting>
+ <plugins>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId> <configuration>
+ <configLocation>/common_build/checkstyle_checks.xml</configLocation>
+ </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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <code>javadoc:aggregate</code>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <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>
+ <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: <ma...@us...> - 2010-03-09 07:08:06
|
Revision: 295
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=295&view=rev
Author: marchy
Date: 2010-03-09 07:07:57 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
Changed back to HashSet as per Benoit's suggestion.
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.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-04 19:07:03 UTC (rev 294)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java 2010-03-09 07:07:57 UTC (rev 295)
@@ -40,6 +40,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
@@ -152,7 +153,7 @@
return;
}
- Set<E> newSet = new TreeSet<E>();
+ Set<E> newSet = null;
// this 'hack' is for Date/Calendar objects to be
// 'equal' on the same day even if time fields differ
@@ -167,6 +168,10 @@
}
}
+ if (newSet == null) {
+ newSet = new HashSet<E>();
+ }
+
newSet.addAll(holidays);
this.holidays = Collections.unmodifiableSet(newSet);
}
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:07:09
|
Revision: 294
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=294&view=rev
Author: marchy
Date: 2010-03-04 19:07:03 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
Fix for bug 2963607.
https://sourceforge.net/tracker/?func=detail&aid=2963607&group_id=175139&atid=872033
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java
Added Paths:
-----------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendarTest.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-04 19:03:30 UTC (rev 293)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java 2010-03-04 19:07:03 UTC (rev 294)
@@ -32,9 +32,17 @@
*/
package net.objectlab.kit.datecalc.common;
+import static java.util.Calendar.DAY_OF_MONTH;
+import static java.util.Calendar.MONTH;
+import static java.util.Calendar.YEAR;
+
+import java.util.Calendar;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
import java.util.Set;
+import java.util.TreeSet;
/**
* @TODO javadoc
@@ -45,6 +53,30 @@
*
*/
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();
+ cal1.setTime(date1);
+ Calendar cal2 = Calendar.getInstance();
+ cal2.setTime(date2);
+
+ return calCmp.compare(cal1, cal2);
+ }
+ };
+
private static final long serialVersionUID = -8558686840806739645L;
private Set<E> holidays;
@@ -60,20 +92,15 @@
public DefaultHolidayCalendar(final Set<E> holidays, final E earlyBoundary, final E lateBoundary) {
super();
- if (holidays != null) {
- final Set<E> newSet = new HashSet<E>();
- newSet.addAll(holidays);
- this.holidays = Collections.unmodifiableSet(newSet);
- } else {
- this.holidays = Collections.emptySet();
- }
+ setHolidays(holidays);
+
this.earlyBoundary = earlyBoundary;
this.lateBoundary = lateBoundary;
}
public DefaultHolidayCalendar(final Set<E> holidays) {
super();
- this.holidays = holidays;
+ setHolidays(holidays);
}
/*
@@ -117,11 +144,31 @@
*
* @see net.objectlab.kit.datecalc.common.HolidayCalendar#setHolidays(java.util.Set)
*/
+ @SuppressWarnings("unchecked")
public void setHolidays(final Set<E> holidays) {
- final Set<E> s = new HashSet<E>();
- s.addAll(holidays);
+
+ if (holidays == null) {
+ this.holidays = Collections.emptySet();
+ return;
+ }
+
+ Set<E> newSet = new TreeSet<E>();
- this.holidays = Collections.unmodifiableSet(s);
+ // this 'hack' is for Date/Calendar objects to be
+ // 'equal' on the same day even if time fields differ
+ Iterator<E> it = holidays.iterator();
+ if (it.hasNext()) {
+ E obj = it.next();
+
+ if (obj instanceof Date) {
+ newSet = new TreeSet(dateCmp);
+ } else if (obj instanceof Calendar) {
+ newSet = new TreeSet(calCmp);
+ }
+ }
+
+ newSet.addAll(holidays);
+ this.holidays = Collections.unmodifiableSet(newSet);
}
/*
Added: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendarTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendarTest.java (rev 0)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendarTest.java 2010-03-04 19:07:03 UTC (rev 294)
@@ -0,0 +1,39 @@
+package net.objectlab.kit.datecalc.common;
+
+import static net.objectlab.kit.datecalc.common.Utils.getCal;
+import static java.util.Calendar.APRIL;
+
+import java.util.Calendar;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+
+public class DefaultHolidayCalendarTest extends TestCase {
+
+ public void testIsHoliday() {
+
+ final Set<Calendar> holidays = new HashSet<Calendar>();
+ Calendar holiday = Utils.getCal("2009-04-22");
+ holidays.add(holiday);
+
+ final HolidayCalendar<Calendar> holidayCalendar = new DefaultHolidayCalendar<Calendar>(holidays, getCal("2009-01-01"), getCal("2009-12-01"));
+
+ Calendar testHoliday = Calendar.getInstance();
+ testHoliday.set(2009, APRIL, 22);
+ assertTrue(holidayCalendar.isHoliday(testHoliday));
+
+ testHoliday.set(2010, APRIL, 21);
+ assertFalse(holidayCalendar.isHoliday(testHoliday));
+
+ testHoliday.set(2010, APRIL, 23);
+ assertFalse(holidayCalendar.isHoliday(testHoliday));
+
+ testHoliday.set(2009, APRIL + 1, 22);
+ assertFalse(holidayCalendar.isHoliday(testHoliday));
+
+ testHoliday.set(2010, APRIL, 22);
+ assertFalse(holidayCalendar.isHoliday(testHoliday));
+ }
+}
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: <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: <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: <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-02 19:47:35
|
Revision: 289
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=289&view=rev
Author: benoitx
Date: 2010-03-02 19:47:21 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
Moving towards 1.2.0
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-03-01 18:17:11 UTC (rev 288)
+++ trunk/pom.xml 2010-03-02 19:47:21 UTC (rev 289)
@@ -4,7 +4,7 @@
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<packaging>pom</packaging>
<modules>
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:17:19
|
Revision: 288
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=288&view=rev
Author: marchy
Date: 2010-03-01 18:17:11 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
refactoring to remove duplicate code in test case, and renaming of field.
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java
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-01 18:16:43 UTC (rev 287)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java 2010-03-01 18:17:11 UTC (rev 288)
@@ -88,13 +88,7 @@
if (dateStr == null) {
return createCalendar(null).getTime();
}
- try {
- final Date date = SDF.parse(dateStr);
- final Calendar cal = getCal(date);
- return cal.getTime();
- } catch (final ParseException e) {
- throw new IllegalArgumentException("\"" + dateStr + "\"" + " is an invalid date, the pattern is : " + DATE_PATTERN);
- }
+ return getCal(dateStr).getTime();
}
// -----------------------------------------------------------------------
@@ -107,25 +101,29 @@
/**
* get a new Calendar based on the string date.
- * @param str
+ * @param dateStr
* the date string
* @return a new Calendar
* @throws IllegalArgumentException
* if the string cannot be parsed.
*/
- public static Calendar createCalendar(final String str) {
- if (str == null) {
+ public static Calendar createCalendar(final String dateStr) {
+ if (dateStr == null) {
return blastTime(Calendar.getInstance());
}
+ return getCal(dateStr);
+ }
+
+ public static Calendar getCal(final String dateStr) {
try {
- final Date date = SDF.parse(str);
+ final Date date = SDF.parse(dateStr);
final Calendar cal = getCal(date);
return cal;
} catch (final ParseException e) {
- throw new IllegalArgumentException("\"" + str + "\"" + " is an invalid date, the pattern is : " + DATE_PATTERN);
- }
+ throw new IllegalArgumentException("\"" + dateStr + "\"" + " is an invalid date, the pattern is : " + DATE_PATTERN);
+ }
}
-
+
/**
* Get a Calendar object for a given Date representation.
*
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: <ma...@us...> - 2010-03-01 18:16:30
|
Revision: 286
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=286&view=rev
Author: marchy
Date: 2010-03-01 18:16:23 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
Fixing compile error
Modified Paths:
--------------
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
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 2010-03-01 18:15:39 UTC (rev 285)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java 2010-03-01 18:16:23 UTC (rev 286)
@@ -44,10 +44,6 @@
super();
}
- public LocalDateForwardDateCalculatorTest(final java.lang.String name) {
- super(name);
- }
-
@Override
protected LocalDate newDate(final String date) {
return new LocalDate(date);
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: <be...@us...> - 2010-01-01 11:15:56
|
Revision: 284
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=284&view=rev
Author: benoitx
Date: 2010-01-01 11:15:46 +0000 (Fri, 01 Jan 2010)
Log Message:
-----------
tidy up
Modified Paths:
--------------
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
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-09-03 14:31:09 UTC (rev 283)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java 2010-01-01 11:15:46 UTC (rev 284)
@@ -40,14 +40,14 @@
public class LocalDateForwardDateCalculatorTest extends AbstractForwardDateCalculatorTest<LocalDate> {
-// public LocalDateForwardDateCalculatorTest() {
-// super();
-// }
-//
-// public LocalDateForwardDateCalculatorTest(final java.lang.String name) {
-// super(name);
-// }
+ public LocalDateForwardDateCalculatorTest() {
+ super();
+ }
+ public LocalDateForwardDateCalculatorTest(final java.lang.String name) {
+ super(name);
+ }
+
@Override
protected LocalDate newDate(final String date) {
return new LocalDate(date);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2009-09-03 14:31:20
|
Revision: 283
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=283&view=rev
Author: benoitx
Date: 2009-09-03 14:31:09 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
Added a couple of Tenors.
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/TenorCode.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 2009-08-27 11:59:11 UTC (rev 282)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2009-09-03 14:31:09 UTC (rev 283)
@@ -164,7 +164,7 @@
}
TenorCode tenorCode = tenor.getCode();
- if (tenorCode != TenorCode.OVERNIGHT && spotLag != 0) {
+ if (tenorCode != TenorCode.OVERNIGHT && tenorCode != TenorCode.TOM_NEXT && spotLag != 0) {
// get to the Spot date first:
moveByBusinessDays(spotLag);
}
@@ -186,6 +186,13 @@
case OVERNIGHT:
calc = moveByDays(1);
break;
+ case TOM_NEXT: // it would have NOT moved by
+ calc = moveByDays(1); // calculate Tomorrow
+ calc = moveByDays(1); // then the next!
+ break;
+ case SPOT_NEXT:
+ calc = moveByDays(1);
+ break;
case SPOT:
calc = this;
break;
@@ -306,9 +313,7 @@
}
public DateCalculator<E> moveByBusinessDays(final int businessDays) {
- if (businessDays > 0
- && holidayHandler != null
- && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEDING))) {
+ 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))) {
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/TenorCode.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/TenorCode.java 2009-08-27 11:59:11 UTC (rev 282)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/TenorCode.java 2009-09-03 14:31:09 UTC (rev 283)
@@ -41,7 +41,7 @@
*
*/
public enum TenorCode {
- OVERNIGHT("ON", false), SPOT("SP", false), DAY("D", true), WEEK("W", true), MONTH("M", true), YEAR("Y", true);
+ OVERNIGHT("ON", false), SPOT("SP", false), TOM_NEXT("TN", false), SPOT_NEXT("SN", false), DAY("D", true), WEEK("W", true), MONTH("M", true), YEAR("Y", true);
private final String code;
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:59:31
|
Revision: 282
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=282&view=rev
Author: marchy
Date: 2009-08-27 11:59:11 +0000 (Thu, 27 Aug 2009)
Log Message:
-----------
adding target to svn:ignore
Property Changed:
----------------
trunk/utils-excel/
Property changes on: trunk/utils-excel
___________________________________________________________________
Added: svn:ignore
+ target
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: <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-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-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>
+ <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 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>
- <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>
+ <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>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</unsubscribe>
- <post />
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-news</archive>
- </mailingList>
- <mailingList>
- <name>Kit Announcements</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</unsubscribe>
- <post />
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-announce</archive>
- </mailingList>
- <mailingList>
- <name>Kit User</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</unsubscribe>
- <post>obj...@li...</post>
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-user</archive>
- </mailingList>
- <mailingList>
- <name>Kit Developers (SVN checkins)</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</unsubscribe>
- <post />
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-svn</archive>
- </mailingList>
- </mailingLists>
+ <mailingLists>
+ <mailingList>
+ <name>News about ObjectLab's projects (Alerts online)</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-news</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit Announcements</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-announce</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit User</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</unsubscribe>
+ <post>obj...@li...</post>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit Developers (SVN checkins)</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-svn</archive>
+ </mailingList>
+ </mailingLists>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
<dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.5</version>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <source>${compileSource}</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <scm>
- <connection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</connection>
- <developerConnection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</developerConnection>
- <url>http://objectlabkit.svn.sourceforge.net/viewvc/objectlabkit/</url>
- </scm>
+ <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>
- <issueManagement>
- <system>sourceforge.net</system>
- <url>http://sourceforge.net/tracker/?group_id=175139</url>
- </issueManagement>
+ <scm>
+ <connection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</connection>
+ <developerConnection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</developerConnection>
+ <url>http://objectlabkit.svn.sourceforge.net/viewvc/objectlabkit/</url>
+ </scm>
- <distributionManagement>
- <repository>
- <id>sourceforge.net</id>
- <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-repo</url>
- </repository>
- <snapshotRepository>
- <id>sourceforge.net</id>
- <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-snapshot-repo</url>
- </snapshotRepository>
- <site>
- <id>objectlabkit.sf.net</id>
- <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/test</url>
- </site>
- </distributionManagement>
+ <issueManagement>
+ <system>sourceforge.net</system>
+ <url>http://sourceforge.net/tracker/?group_id=175139</url>
+ </issueManagement>
- <reporting>
- <plugins>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>/common_build/checkstyle_checks.xml</configLocation>
+ <distributionManagement>
+ <repository>
+ <id>sourceforge.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-repo</url>
+ </repository>
+ <snapshotRepository>
+ <id>sourceforge.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-snapshot-repo</url>
+ </snapshotRepository>
+ <site>
+ <id>objectlabkit.sf.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/test</url>
+ </site>
+ </distributionManagement>
+
+ <reporting>
+ <plugins>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration>
+ <configLocation>/common_build/checkstyle_checks.xml</configLocation> </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>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <code>javadoc:aggregate</code>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplatePerSystem>
+ <default>%URL%/?func=detail&group_id=175139&%ISSUE%</default>
+ </issueLinkTemplatePerSystem>
</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>
- <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>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-changelog-plugin</artifactId>
</plugin>
<plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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-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.
|
|
From: <be...@us...> - 2009-03-31 22:41:47
|
Revision: 275
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=275&view=rev
Author: benoitx
Date: 2009-03-31 22:41:45 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
Fixing PMD report and changing Skin (just to show it). Removing the Stat-SCM for now until we can reduce the reports for modules.
Modified Paths:
--------------
trunk/src/site/site.xml
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2009-03-31 06:05:08 UTC (rev 274)
+++ trunk/src/site/site.xml 2009-03-31 22:41:45 UTC (rev 275)
@@ -11,7 +11,17 @@
<src>images/objectlab_logo.gif</src>
<href>http://www.objectlab.co.uk/</href>
</bannerRight>
- <publishDate position="left" format="yyyy-MM-dd hh:mm Z" />
+ <poweredBy>
+ <logo name="Maven" href="http://maven.apache.org/"
+ img="http://maven.apache.org/images/logos/maven-feather.png"/>
+ </poweredBy>
+ <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>
<links>
@@ -27,9 +37,9 @@
<item name="Tenor Handling" href="tenor.html" />
<item name="JavaDoc" class="newWindow" target="_new"
href="apidocs/index.html" />
- <item name="Stat SVN" href="statsvn/index.html" />
+ <!--<item name="Stat SVN" href="statsvn/index.html" />-->
<item name="In the press" href="press/index.html" />
- <item name="Sitemap" href="sitemap.html" />
+ <!--<item name="Sitemap" href="sitemap.html" />-->
<item name="FAQ" href="faq.html" />
</menu>
@@ -44,7 +54,7 @@
<item name="ObjectLab" href="http://www.objectlab.co.uk" />
<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: <ma...@us...> - 2009-03-31 06:05:22
|
Revision: 274
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=274&view=rev
Author: marchy
Date: 2009-03-31 06:05:08 +0000 (Tue, 31 Mar 2009)
Log Message:
-----------
moving vsd source files off to ref folder - this should probably live in a separate directory, if we're planning to make the DayCountAccrualCalc.pdf accessible on the site, at the moment it's not.
Added Paths:
-----------
trunk/src/site/ref/calendar.vsd
trunk/src/site/ref/tenor.vsd
Removed Paths:
-------------
trunk/src/site/xdoc/calendar.vsd
trunk/src/site/xdoc/tenor.vsd
Copied: trunk/src/site/ref/calendar.vsd (from rev 273, trunk/src/site/xdoc/calendar.vsd)
===================================================================
(Binary files differ)
Copied: trunk/src/site/ref/tenor.vsd (from rev 273, trunk/src/site/xdoc/tenor.vsd)
===================================================================
(Binary files differ)
Deleted: trunk/src/site/xdoc/calendar.vsd
===================================================================
(Binary files differ)
Deleted: trunk/src/site/xdoc/tenor.vsd
===================================================================
(Binary files differ)
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%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
Added: trunk/datecalc-jdk/src/site/resources/css/site.css
===================================================================
--- trunk/datecalc-jdk/src/site/resources/css/site.css (rev 0)
+++ trunk/datecalc-jdk/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-jdk/src/site/site.xml (from rev 272, trunk/datecalc-jdk/src/site/navigation.xml)
===================================================================
--- trunk/datecalc-jdk/src/site/site.xml (rev 0)
+++ trunk/datecalc-jdk/src/site/site.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -0,0 +1,18 @@
+<?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>
+ <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-jdk/src/site/xdoc/index.xml (from rev 272, trunk/datecalc-jdk/src/site/index.xml)
===================================================================
--- trunk/datecalc-jdk/src/site/xdoc/index.xml (rev 0)
+++ trunk/datecalc-jdk/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 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
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-joda/pom.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,44 +1,39 @@
-<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-joda</artifactId>
+ <packaging>jar</packaging>
- <artifactId>datecalc-joda</artifactId>
- <packaging>jar</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>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </dependency>
+ </dependencies>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.5</version>
- </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
Deleted: trunk/datecalc-joda/src/site/index.xml
===================================================================
--- trunk/datecalc-joda/src/site/index.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-joda/src/site/index.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,32 +0,0 @@
-<document>
- <properties>
- <author email="Ki...@ob...">Benoit Xhenseval</author>
- <title>DateCalc JODA 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 JODA Introduction">
-
- <p>DateCalc Joda provides an implementation based on <a href="http://joda-time.sourceforge.net">Joda Time</a>.</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>
- <p>Finally, this jar requires Joda time 1.3+, the website is <a href="http://joda-time.sourceforge.net">here</a>.</p>
- </section>
-
- </body>
-</document>
\ No newline at end of file
Deleted: trunk/datecalc-joda/src/site/navigation.xml
===================================================================
--- trunk/datecalc-joda/src/site/navigation.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/datecalc-joda/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 JODA</title>
- <body>
- <menu name="DateCalc JODA">
- <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
Added: trunk/datecalc-joda/src/site/resources/css/site.css
===================================================================
--- trunk/datecalc-joda/src/site/resources/css/site.css (rev 0)
+++ trunk/datecalc-joda/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-joda/src/site/site.xml (from rev 272, trunk/datecalc-joda/src/site/navigation.xml)
===================================================================
--- trunk/datecalc-joda/src/site/site.xml (rev 0)
+++ trunk/datecalc-joda/src/site/site.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="ObjectLab-Kit">
+ <title>DateCalc JODA</title>
+ <body>
+ <menu name="DateCalc JODA">
+ <item name="Sitemap" href="sitemap.html" />
+ </menu>
+ <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-joda/src/site/xdoc/index.xml (from rev 272, trunk/datecalc-joda/src/site/index.xml)
===================================================================
--- trunk/datecalc-joda/src/site/xdoc/index.xml (rev 0)
+++ trunk/datecalc-joda/src/site/xdoc/index.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -0,0 +1,32 @@
+<document>
+ <properties>
+ <author email="Ki...@ob...">Benoit Xhenseval</author>
+ <title>DateCalc JODA 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 JODA Introduction">
+
+ <p>DateCalc Joda provides an implementation based on <a href="http://joda-time.sourceforge.net">Joda Time</a>.</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>
+ <p>Finally, this jar requires Joda time 1.3+, the website is <a href="http://joda-time.sourceforge.net">here</a>.</p>
+ </section>
+
+ </body>
+</document>
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-03-17 17:53:54 UTC (rev 272)
+++ trunk/pom.xml 2009-03-31 05:57:31 UTC (rev 273)
@@ -1,168 +1,209 @@
<?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">
+<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>
+ <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>
- <packaging>pom</packaging>
- <name>ObjectLab Kit</name>
- <version>1.1.0</version>
- <url>http://objectlabkit.sourceforge.net/</url>
- <description>
- ObjectLab Kit provides a generic Business Calendar for calculating dates given set(s) of holidays. Why
- re-invent the wheel?
+ <modules>
+ <module>datecalc-common</module>
+ <module>datecalc-jdk</module>
+ <module>datecalc-joda</module>
+ </modules>
+
+ <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>
- <modules>
- <module>datecalc-common</module>
- <module>datecalc-jdk</module>
- <module>datecalc-joda</module>
- </modules>
+ <inceptionYear>2006</inceptionYear>
+ <url>http://objectlabkit.sourceforge.net/</url>
- <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>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
+ <organization>
+ <name>Appendium - Portfolio Financing Platform</name>
+ <url>http://www.appendium.com/</url>
+ </organization>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- -->
- </plugins>
- </reporting>
+ <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>
- <dependencies>
+ <mailingLists>
+ <mailingList>
+ <name>News about ObjectLab's projects (Alerts online)</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-news</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-news</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit Announcements</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-announce</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-announce</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit User</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-user</unsubscribe>
+ <post>obj...@li...</post>
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-user</archive>
+ </mailingList>
+ <mailingList>
+ <name>Kit Developers (SVN checkins)</name>
+ <subscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</subscribe>
+ <unsubscribe>http://lists.sourceforge.net/lists/listinfo/objectlabkit-svn</unsubscribe>
+ <post />
+ <archive>http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-svn</archive>
+ </mailingList>
+ </mailingLists>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <version>${project.version}</version>
</dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>site-staging</id>
- <activation>
- <property>
- <name>stage</name>
- </property>
- </activation>
-
- <distributionManagement>
- <site>
- <id>stage-site</id>
- <name>Local Stage Site</name>
- <url>file:///temp/site</url>
- </site>
- </distributionManagement>
- </profile>
-
- <profile>
- <id>site-deploy</id>
- <activation>
- <property>
- <name>deploy</name>
- </property>
- </activation>
-
- <distributionManagement>
- <site>
- <id>sourceforge-site</id>
- <name>Sourceforge Site</name>
- <url>scp:@TODO</url>
- </site>
- </distributionManagement>
- </profile>
- </profiles>
-
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <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>
+
<scm>
- <connection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/tags/1.1.0</connection>
- <developerConnection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/tags/1.1.0</developerConnection>
- <url>http://objectlabkit.svn.sourceforge.net/objectlabkit/tags/1.1.0</url>
+ <connection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</connection>
+ <developerConnection>scm:svn:https://objectlabkit.svn.sourceforge.net/svnroot/objectlabkit/trunk/</developerConnection>
+ <url>http://objectlabkit.svn.sourceforge.net/viewvc/objectlabkit/</url>
</scm>
-
+
+ <issueManagement>
+ <system>sourceforge.net</system>
+ <url>http://sourceforge.net/tracker/?group_id=175139</url>
+ </issueManagement>
+
<distributionManagement>
- <repository>
- <id>sourceforge.net</id>
- <name>SourceForge</name>
- <url>scpexe://ssh.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-repo</url>
- </repository>
- <snapshotRepository>
- <id>sourceforge.net</id>
- <name>SourceForge</name>
- <url>scpexe://ssh.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-repo</url>
- </snapshotRepository>
- <site>
- <id>sourceforge.net</id>
- <name>SourceForge</name>
- <url>scpexe://ssh.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs</url>
- </site>
+ <repository>
+ <id>sourceforge.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-repo</url>
+ </repository>
+ <snapshotRepository>
+ <id>sourceforge.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/m2-snapshot-repo</url>
+ </snapshotRepository>
+ <site>
+ <id>objectlabkit.sf.net</id>
+ <url>scp://shell.sourceforge.net/home/groups/o/ob/objectlabkit/htdocs/test</url>
+ </site>
</distributionManagement>
-
- <!--
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-jdk</artifactId>
- <version>${project.version}</version>
- </depende...
[truncated message content] |
|
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.
|
![http://maven.apache.org/images/logos/maven-feather.png"/>](http://maven.apache.org/images/logos/maven-feather.png"/>){kind=link}
![http://digg.com/img/badges/91x17-digg-button.png"](http://digg.com/img/badges/91x17-digg-button.png"){kind=link}