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

r31 - trunk/choreg-test-webapp/src/main/java/org/chorem/choreg/test
by fdesbois＠users.chorem.org 26 Aug '09

26 Aug '09

Author: fdesbois Date: 2009-08-26 16:00:48 +0200 (Wed, 26 Aug 2009) New Revision: 31 Modified: trunk/choreg-test-webapp/src/main/java/org/chorem/choreg/test/TestBonzoms.java Log: Add memberships gestion from xPIL for testing Bonzoms Modified: trunk/choreg-test-webapp/src/main/java/org/chorem/choreg/test/TestBonzoms.java =================================================================== --- trunk/choreg-test-webapp/src/main/java/org/chorem/choreg/test/TestBonzoms.java 2009-08-24 09:02:47 UTC (rev 30) +++ trunk/choreg-test-webapp/src/main/java/org/chorem/choreg/test/TestBonzoms.java 2009-08-26 14:00:48 UTC (rev 31) @@ -33,10 +33,10 @@ import org.chorem.choreg.ChoremRegistry; import org.chorem.choreg.ChoremRegistryImpl; import org.chorem.choreg.FormatType; -import org.chorem.choreg.Link; import org.chorem.oasis.ciq.api.SimplifiedNameElement; import org.chorem.oasis.ciq.api.XNLHelper; import urn.oasis.names.tc.ciq.xnl.PartyNameType; +import urn.oasis.names.tc.ciq.xpil.MembershipsDocument.Memberships; import urn.oasis.names.tc.ciq.xpil.PartyDocument; /** @@ -160,6 +160,21 @@ out.println("[" + name.getType() + " : " + name.getValue() + "] "); } out.println(""); + Memberships memberships = doc.getParty().getMemberships(); + if (memberships != null) { + for (Memberships.Membership membership : memberships.getMembershipArray()) { + out.println("   --> MEMBERSHIP:: "); + Memberships.Membership.MembershipElement element = membership.getMembershipElementArray(0); + out.println("( " + element.getType() + " ) " + element.getStringValue() + ""); + Memberships.Membership.Organisation organisation = membership.getOrganisation(); + out.println("       IN [ " + organisation.getNameElementArray(0).getStringValue() + " ]"); + for (Memberships.Membership.Organisation.SubDivisionName subDivision : organisation.getSubDivisionNameArray()) { + out.println("[ SUB: " + subDivision.getStringValue() + "] "); + } + out.println(""); + } + } + } if (XNLHelper.hasOrganisationNames(partyName)) { out.println("ORGANISATION:: "); @@ -186,6 +201,8 @@ if (eee.getCause() != null) { out.println("" + eee.getCause().getClass().getSimpleName() + " : " + eee.getCause().getMessage() + ""); } + } catch (Exception eee) { + out.println("OtherException : " + eee.getClass().getName() + " : " + eee.getMessage() + ""); } return out;

1 0

r30 - trunk/src/site
by fdesbois＠users.chorem.org 24 Aug '09

24 Aug '09

Author: fdesbois Date: 2009-08-24 11:02:47 +0200 (Mon, 24 Aug 2009) New Revision: 30 Modified: trunk/src/site/site.xml Log: Change pom dependency and site.xml for mavenpom and jrst Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-24 09:01:28 UTC (rev 29) +++ trunk/src/site/site.xml 2009-08-24 09:02:47 UTC (rev 30) @@ -3,22 +3,11 @@ <publishDate format="dd/MM/yyyy"/> - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> - </skin> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://www.nuiton.org/projects/show/jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/>

1 0

r29 - in trunk: . choreg/src/site chorem-commons/src/site
by fdesbois＠users.chorem.org 24 Aug '09

24 Aug '09

Author: fdesbois Date: 2009-08-24 11:01:28 +0200 (Mon, 24 Aug 2009) New Revision: 29 Modified: trunk/choreg/src/site/site.xml trunk/chorem-commons/src/site/site.xml trunk/pom.xml Log: Change pom dependency and site.xml for mavenpom and jrst Modified: trunk/choreg/src/site/site.xml =================================================================== --- trunk/choreg/src/site/site.xml 2009-08-20 16:10:38 UTC (rev 28) +++ trunk/choreg/src/site/site.xml 2009-08-24 09:01:28 UTC (rev 29) @@ -1,23 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="ChoReg-Lib"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> - </skin> + <publishDate format="dd/MM/yyyy"/> <bannerLeft> <name>${project.name}</name> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - <body> <menu name="Présentation"> Modified: trunk/chorem-commons/src/site/site.xml =================================================================== --- trunk/chorem-commons/src/site/site.xml 2009-08-20 16:10:38 UTC (rev 28) +++ trunk/chorem-commons/src/site/site.xml 2009-08-24 09:01:28 UTC (rev 29) @@ -2,21 +2,10 @@ <project name="Chorem-Commons"> <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${skin.version}</version> - </skin> <bannerLeft> <name>${project.name}</name> </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> <body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-20 16:10:38 UTC (rev 28) +++ trunk/pom.xml 2009-08-24 09:01:28 UTC (rev 29) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.chorem</groupId> @@ -90,8 +90,7 @@  <topia.version>2.2.0-rc-5-SNAPSHOT</topia.version> <generator.version>1.0.0-rc-3</generator.version> - <jrst.version>1.0.0-rc-4-SNAPSHOT</jrst.version> - <skin.version>1.0.0-rc-2-SNAPSHOT</skin.version> + <jrst.version>1.0.0</jrst.version>  <lang.version>2.4</lang.version> @@ -100,6 +99,24 @@ <junit.version>4.6</junit.version> </properties> + <build> + <defaultGoal>install</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> +

1 0

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

20 Aug '09

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 19 Aug '09

19 Aug '09

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 19 Aug '09

19 Aug '09

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 19 Aug '09

19 Aug '09

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