August 2009 - Choreg-commits - mailman.cloud.codelutin.com

r28 - trunk/chorem-commons/src/main/java/org/chorem/utils
by fdesbois＠users.chorem.org Aug. 20, 2009

Aug. 20, 2009

Author: fdesbois Date: 2009-08-20 18:10:38 +0200 (Thu, 20 Aug 2009) New Revision: 28 Modified: trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java Log: Add methods for comparison Modified: trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java =================================================================== --- trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java 2009-08-19 10:12:27 UTC (rev 27) +++ trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java 2009-08-20 16:10:38 UTC (rev 28) @@ -157,6 +157,23 @@ return results; } + public boolean beforeEnd(Calendar calendar) { + return calendar.before(thruCalendar) || calendar.equals(thruCalendar); + } + + public boolean afterEnd(Calendar calendar) { + return calendar.after(thruCalendar); + } + + public boolean afterBegin(Calendar calendar) { + return calendar.after(fromCalendar) || calendar.equals(fromCalendar); + } + + public boolean between(Calendar calendar) { + return beforeEnd(calendar) && afterBegin(calendar); + } + + @Override public String toString() { String fromStr = DateUtils.formatDate(fromDate, pattern);

1 0

r27 - trunk
by fdesbois＠users.chorem.org Aug. 19, 2009

Aug. 19, 2009

Author: fdesbois Date: 2009-08-19 12:12:27 +0200 (Wed, 19 Aug 2009) New Revision: 27 Modified: trunk/pom.xml Log: Change url for mailing lists Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-19 08:07:44 UTC (rev 26) +++ trunk/pom.xml 2009-08-19 10:12:27 UTC (rev 27) @@ -124,24 +124,24 @@ <mailingLists> <mailingList> <name>choreg-commits</name> - <subscribe>http://list.chorem.org/mailman/listinfo/choreg-commits</subscribe> - <unsubscribe>http://list.chorem.org/mailman/listinfo/choreg-commits</unsubscribe> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/choreg-commits</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/choreg-commits</unsubscribe> <post>choreg-commits(a)$list.chorem.org</post> <archive>http://list.chorem.org/pipermail/choreg-commits/</archive> </mailingList> <mailingList> <name>choreg-devel</name> - <subscribe>http://list.chorem.org/mailman/listinfo/choreg-devel</subscribe> - <unsubscribe>http://list.chorem.org/mailman/listinfo/choreg-devel</unsubscribe> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/choreg-devel</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/choreg-devel</unsubscribe> <post>choreg-devel(a)list.chorem.org</post> <archive>http://list.chorem.org/pipermail/choreg-devel/</archive> </mailingList> <mailingList> <name>choreg-users</name> - <subscribe>http://list.chorem.org/mailman/listinfo/choreg-users</subscribe> - <unsubscribe>http://list.chorem.org/mailman/listinfo/choreg-users</unsubscribe> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/choreg-users</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/choreg-users</unsubscribe> <post>choreg-users(a)list.chorem.org</post> <archive>http://list.chorem.org/pipermail/choreg-users/</archive> </mailingList>

1 0

r26 - in trunk: . choreg-admin-webapp choreg-admin-webapp/src/main/webapp/META-INF choreg-test-webapp choreg-test-webapp/src/main/webapp/META-INF
by fdesbois＠users.chorem.org Aug. 19, 2009

Aug. 19, 2009

Author: fdesbois Date: 2009-08-19 10:07:44 +0200 (Wed, 19 Aug 2009) New Revision: 26 Modified: trunk/choreg-admin-webapp/ trunk/choreg-admin-webapp/pom.xml trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml trunk/choreg-test-webapp/ trunk/choreg-test-webapp/pom.xml trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml trunk/pom.xml Log: - Change scope for OASIS CIQ Api and XMLBeans - Add server configuration for NetBeans Property changes on: trunk/choreg-admin-webapp ___________________________________________________________________ Modified: svn:ignore - target + target profiles.xml Modified: trunk/choreg-admin-webapp/pom.xml =================================================================== --- trunk/choreg-admin-webapp/pom.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-admin-webapp/pom.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -67,8 +67,10 @@  <packaging>war</packaging> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + </properties> +</project> -</project> - Modified: trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-admin-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/choreg-admin-webapp-1.0.0-alpha-2-SNAPSHOT"/> +<Context antiJARLocking="true" path="/choreg-admin"/> Property changes on: trunk/choreg-test-webapp ___________________________________________________________________ Modified: svn:ignore - target + target profiles.xml Modified: trunk/choreg-test-webapp/pom.xml =================================================================== --- trunk/choreg-test-webapp/pom.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-test-webapp/pom.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -26,7 +26,6 @@ <groupId>org.chorem</groupId> <artifactId>oasis-ciq-api</artifactId> <version>${project.version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.xmlbeans</groupId> @@ -67,8 +66,10 @@  <packaging>war</packaging> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + </properties> +</project> -</project> - Modified: trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml =================================================================== --- trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/choreg-test-webapp/src/main/webapp/META-INF/context.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/choreg-test-webapp-1.0.0-alpha-2-SNAPSHOT"/> +<Context antiJARLocking="true" path="/choreg-test"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-19 08:06:23 UTC (rev 25) +++ trunk/pom.xml 2009-08-19 08:07:44 UTC (rev 26) @@ -40,7 +40,6 @@ <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> <version>2.4.0</version> - <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId>

1 0

r25 - trunk/chorem-commons/src/main/java/org/chorem/utils
by fdesbois＠users.chorem.org Aug. 19, 2009

Aug. 19, 2009

Author: fdesbois Date: 2009-08-19 10:06:23 +0200 (Wed, 19 Aug 2009) New Revision: 25 Modified: trunk/chorem-commons/src/main/java/org/chorem/utils/DateUtils.java trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java Log: Add getMonth method Modified: trunk/chorem-commons/src/main/java/org/chorem/utils/DateUtils.java =================================================================== --- trunk/chorem-commons/src/main/java/org/chorem/utils/DateUtils.java 2009-08-17 13:11:56 UTC (rev 24) +++ trunk/chorem-commons/src/main/java/org/chorem/utils/DateUtils.java 2009-08-19 08:06:23 UTC (rev 25) @@ -100,4 +100,10 @@ public static boolean currentPeriod(Date beforeDate, Date afterDate) { return between(new Date(), beforeDate, afterDate); } + + public static int getMonth(Date date) { + Calendar calendar = new GregorianCalendar(); + calendar.setTime(date); + return calendar.get(Calendar.MONTH); + } } Modified: trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java =================================================================== --- trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java 2009-08-17 13:11:56 UTC (rev 24) +++ trunk/chorem-commons/src/main/java/org/chorem/utils/PeriodDates.java 2009-08-19 08:06:23 UTC (rev 25) @@ -112,6 +112,10 @@ return this.fromDate; } + public int getFromMonth() { + return this.fromCalendar.get(Calendar.MONTH); + } + public void setThruDate(Date thruDate) { this.thruDate = thruDate; this.thruCalendar.setTime(thruDate);

1 0