Menu
▾
▴
melati-cvs — CVS commits and comments upon them
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(17) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1) |
Feb
(9) |
Mar
(1) |
Apr
(31) |
May
(105) |
Jun
(81) |
Jul
(159) |
Aug
(21) |
Sep
(12) |
Oct
(26) |
Nov
(73) |
Dec
(1) |
| 2004 |
Jan
|
Feb
(36) |
Mar
(20) |
Apr
(34) |
May
(2) |
Jun
(14) |
Jul
(2) |
Aug
(6) |
Sep
(34) |
Oct
(5) |
Nov
(68) |
Dec
(62) |
| 2005 |
Jan
(171) |
Feb
(192) |
Mar
(29) |
Apr
(5) |
May
(4) |
Jun
(23) |
Jul
|
Aug
(3) |
Sep
(4) |
Oct
(4) |
Nov
(73) |
Dec
(36) |
| 2006 |
Jan
(36) |
Feb
(41) |
Mar
(121) |
Apr
(99) |
May
(549) |
Jun
(111) |
Jul
(10) |
Aug
(18) |
Sep
(76) |
Oct
(144) |
Nov
(124) |
Dec
(304) |
| 2007 |
Jan
(408) |
Feb
(397) |
Mar
|
Apr
|
May
(213) |
Jun
(384) |
Jul
(96) |
Aug
(220) |
Sep
(44) |
Oct
(4) |
Nov
(21) |
Dec
(47) |
| 2008 |
Jan
(324) |
Feb
(283) |
Mar
(196) |
Apr
(124) |
May
(4) |
Jun
(18) |
Jul
(60) |
Aug
|
Sep
(26) |
Oct
(75) |
Nov
(86) |
Dec
(15) |
| 2009 |
Jan
(34) |
Feb
(134) |
Mar
(60) |
Apr
(2) |
May
|
Jun
(2) |
Jul
(56) |
Aug
(1) |
Sep
(193) |
Oct
|
Nov
|
Dec
(26) |
| 2010 |
Jan
(42) |
Feb
(179) |
Mar
(26) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(16) |
Oct
(36) |
Nov
(1) |
Dec
|
| 2011 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
(6) |
May
(4) |
Jun
(88) |
Jul
(78) |
Aug
(61) |
Sep
(2) |
Oct
|
Nov
(1) |
Dec
(1) |
| 2012 |
Jan
|
Feb
(5) |
Mar
(155) |
Apr
(53) |
May
(88) |
Jun
(18) |
Jul
(8) |
Aug
(16) |
Sep
|
Oct
(37) |
Nov
(74) |
Dec
(3) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(49) |
Aug
(1) |
Sep
|
Oct
(3) |
Nov
|
Dec
|
|
From: Tim P. <ti...@pa...> - 2013-10-11 10:05:38
|
Update of /usr/cvsroot/melati/melati/src/test/java/org/melati/admin/test/generated In directory hanuman.paneris.org:/tmp/cvs-serv19315/src/test/java/org/melati/admin/test/generated Modified Files: SpecialisedTableBase.java Log Message: Regenerated: typo Index: SpecialisedTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/test/java/org/melati/admin/test/generated/SpecialisedTableBase.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- SpecialisedTableBase.java 13 Jul 2013 23:16:59 -0000 1.8 +++ SpecialisedTableBase.java 11 Oct 2013 09:48:48 -0000 1.9 @@ -223,7 +223,7 @@ * Retrieve the <code>Specialised</code> as a <code>Specialised</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Specialised getSpecialisedObject(Integer troid) { |
Update of /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated In directory hanuman.paneris.org:/tmp/cvs-serv18043 Modified Files: AccountTableBase.java BigdecimalFieldTableBase.java BinaryFieldTableBase.java BooleanFieldTableBase.java DateFieldTableBase.java DoubleFieldTableBase.java DynamicTableBase.java EAExtendedTableBase.java ENExtendedTableBase.java EmptyAbstractTableTableBase.java EverythingAbstractTableBase.java EverythingNormalTableBase.java IntegerFieldTableBase.java LongFieldTableBase.java PasswordFieldTableBase.java ProtectedTableBase.java StringFieldTableBase.java TimestampFieldTableBase.java UserBase.java UserTableBase.java Log Message: Regenerated: typo Index: DateFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/DateFieldTableBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- DateFieldTableBase.java 23 May 2012 23:13:12 -0000 1.12 +++ DateFieldTableBase.java 11 Oct 2013 09:06:09 -0000 1.13 @@ -240,7 +240,7 @@ * Retrieve the <code>DateField</code> as a <code>DateField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public DateField getDateFieldObject(Integer troid) { Index: IntegerFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/IntegerFieldTableBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IntegerFieldTableBase.java 23 May 2012 23:13:12 -0000 1.12 +++ IntegerFieldTableBase.java 11 Oct 2013 09:06:10 -0000 1.13 @@ -239,7 +239,7 @@ * Retrieve the <code>IntegerField</code> as a <code>IntegerField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public IntegerField getIntegerFieldObject(Integer troid) { Index: ENExtendedTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/ENExtendedTableBase.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ENExtendedTableBase.java 23 May 2012 23:13:12 -0000 1.13 +++ ENExtendedTableBase.java 11 Oct 2013 09:06:09 -0000 1.14 @@ -894,7 +894,7 @@ * Retrieve the <code>ENExtended</code> as a <code>ENExtended</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public ENExtended getENExtendedObject(Integer troid) { Index: EverythingNormalTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/EverythingNormalTableBase.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- EverythingNormalTableBase.java 23 May 2012 23:13:12 -0000 1.19 +++ EverythingNormalTableBase.java 11 Oct 2013 09:06:10 -0000 1.20 @@ -1012,7 +1012,7 @@ * Retrieve the <code>EverythingNormal</code> as a <code>EverythingNormal</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public EverythingNormal getEverythingNormalObject(Integer troid) { Index: EverythingAbstractTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/EverythingAbstractTableBase.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- EverythingAbstractTableBase.java 23 May 2012 23:13:12 -0000 1.16 +++ EverythingAbstractTableBase.java 11 Oct 2013 09:06:09 -0000 1.17 @@ -849,7 +849,7 @@ * Retrieve the <code>EverythingAbstract</code> as a <code>EverythingAbstract</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public EverythingAbstract getEverythingAbstractObject(Integer troid) { Index: BinaryFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/BinaryFieldTableBase.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- BinaryFieldTableBase.java 23 May 2012 23:13:12 -0000 1.13 +++ BinaryFieldTableBase.java 11 Oct 2013 09:06:09 -0000 1.14 @@ -331,7 +331,7 @@ * Retrieve the <code>BinaryField</code> as a <code>BinaryField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public BinaryField getBinaryFieldObject(Integer troid) { Index: DynamicTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/DynamicTableBase.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- DynamicTableBase.java 23 May 2012 23:13:12 -0000 1.11 +++ DynamicTableBase.java 11 Oct 2013 09:06:09 -0000 1.12 @@ -219,7 +219,7 @@ * Retrieve the <code>Dynamic</code> as a <code>Dynamic</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Dynamic getDynamicObject(Integer troid) { Index: UserBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/UserBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- UserBase.java 22 May 2012 22:22:13 -0000 1.2 +++ UserBase.java 11 Oct 2013 09:06:10 -0000 1.3 @@ -11,13 +11,16 @@ import org.melati.poem.Column; import org.melati.poem.Field; import org.melati.poem.GroupMembership; -// import org.melati.poem.User; +// base extension +import org.melati.poem.User; import org.melati.poem.ValidationPoemException; import org.melati.poem.test.Account; import org.melati.poem.test.EverythingDatabaseTables; import org.melati.poem.test.Protected; -// import org.melati.poem.test.User; -// import org.melati.poem.test.UserTable; +// ours +//import org.melati.poem.test.User; +// ours +//import org.melati.poem.test.UserTable; import org.melati.poem.util.EmptyEnumeration; Index: StringFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/StringFieldTableBase.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- StringFieldTableBase.java 23 May 2012 23:13:12 -0000 1.13 +++ StringFieldTableBase.java 11 Oct 2013 09:06:10 -0000 1.14 @@ -315,7 +315,7 @@ * Retrieve the <code>StringField</code> as a <code>StringField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public StringField getStringFieldObject(Integer troid) { Index: DoubleFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/DoubleFieldTableBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- DoubleFieldTableBase.java 23 May 2012 23:13:12 -0000 1.12 +++ DoubleFieldTableBase.java 11 Oct 2013 09:06:09 -0000 1.13 @@ -239,7 +239,7 @@ * Retrieve the <code>DoubleField</code> as a <code>DoubleField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public DoubleField getDoubleFieldObject(Integer troid) { Index: UserTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/UserTableBase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- UserTableBase.java 23 May 2012 23:13:12 -0000 1.2 +++ UserTableBase.java 11 Oct 2013 09:06:10 -0000 1.3 @@ -14,11 +14,11 @@ import org.melati.poem.PoemException; import org.melati.poem.Searchability; import org.melati.poem.StringPoemType; -// FIXME extended table +// Extended table import org.melati.poem.UserTable; import org.melati.poem.ValidationPoemException; import org.melati.poem.test.EverythingDatabaseTables; -// FIXME extended table +// Extended table import org.melati.poem.test.User; @@ -144,7 +144,7 @@ * Retrieve the <code>User</code> as a <code>org.melati.poem.User</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public org.melati.poem.User getUserObject(Integer troid) { Index: BooleanFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/BooleanFieldTableBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- BooleanFieldTableBase.java 23 May 2012 23:13:12 -0000 1.12 +++ BooleanFieldTableBase.java 11 Oct 2013 09:06:09 -0000 1.13 @@ -239,7 +239,7 @@ * Retrieve the <code>BooleanField</code> as a <code>BooleanField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public BooleanField getBooleanFieldObject(Integer troid) { Index: BigdecimalFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/BigdecimalFieldTableBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- BigdecimalFieldTableBase.java 23 May 2012 23:13:12 -0000 1.12 +++ BigdecimalFieldTableBase.java 11 Oct 2013 09:06:09 -0000 1.13 @@ -240,7 +240,7 @@ * Retrieve the <code>BigdecimalField</code> as a <code>BigdecimalField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public BigdecimalField getBigdecimalFieldObject(Integer troid) { Index: EmptyAbstractTableTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/EmptyAbstractTableTableBase.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- EmptyAbstractTableTableBase.java 23 May 2012 23:13:12 -0000 1.15 +++ EmptyAbstractTableTableBase.java 11 Oct 2013 09:06:09 -0000 1.16 @@ -62,7 +62,7 @@ * Retrieve the <code>EmptyAbstractTable</code> as a <code>EmptyAbstractTable</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public EmptyAbstractTable getEmptyAbstractTableObject(Integer troid) { Index: EAExtendedTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/EAExtendedTableBase.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- EAExtendedTableBase.java 23 May 2012 23:13:12 -0000 1.14 +++ EAExtendedTableBase.java 11 Oct 2013 09:06:09 -0000 1.15 @@ -991,7 +991,7 @@ * Retrieve the <code>EAExtended</code> as a <code>EAExtended</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public EAExtended getEAExtendedObject(Integer troid) { Index: LongFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/LongFieldTableBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- LongFieldTableBase.java 23 May 2012 23:13:12 -0000 1.12 +++ LongFieldTableBase.java 11 Oct 2013 09:06:10 -0000 1.13 @@ -239,7 +239,7 @@ * Retrieve the <code>LongField</code> as a <code>LongField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public LongField getLongFieldObject(Integer troid) { Index: AccountTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/AccountTableBase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- AccountTableBase.java 17 Jun 2012 22:23:31 -0000 1.4 +++ AccountTableBase.java 11 Oct 2013 09:06:09 -0000 1.5 @@ -21,7 +21,7 @@ import org.melati.poem.test.Account; import org.melati.poem.test.EverythingDatabaseTables; import org.melati.poem.test.EverythingTable; -// FIXME extended table +// Extended table import org.melati.poem.test.User; @@ -361,7 +361,7 @@ * Retrieve the <code>Account</code> as a <code>Account</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Account getAccountObject(Integer troid) { Index: PasswordFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/PasswordFieldTableBase.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- PasswordFieldTableBase.java 16 Nov 2012 10:46:49 -0000 1.19 +++ PasswordFieldTableBase.java 11 Oct 2013 09:06:10 -0000 1.20 @@ -14,6 +14,7 @@ import org.melati.poem.Persistent; import org.melati.poem.PoemException; import org.melati.poem.Searchability; +import org.melati.poem.StringPoemType; import org.melati.poem.TroidPoemType; import org.melati.poem.ValidationPoemException; import org.melati.poem.test.EverythingDatabaseTables; @@ -239,7 +240,7 @@ * Retrieve the <code>PasswordField</code> as a <code>PasswordField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public PasswordField getPasswordFieldObject(Integer troid) { Index: ProtectedTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/ProtectedTableBase.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ProtectedTableBase.java 23 May 2012 23:13:12 -0000 1.15 +++ ProtectedTableBase.java 11 Oct 2013 09:06:10 -0000 1.16 @@ -22,7 +22,7 @@ import org.melati.poem.test.EverythingDatabaseTables; import org.melati.poem.test.EverythingTable; import org.melati.poem.test.Protected; -// FIXME extended table +// Extended table import org.melati.poem.test.User; @@ -621,7 +621,7 @@ * Retrieve the <code>Protected</code> as a <code>Protected</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Protected getProtectedObject(Integer troid) { Index: TimestampFieldTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/test/generated/TimestampFieldTableBase.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TimestampFieldTableBase.java 23 May 2012 23:13:12 -0000 1.12 +++ TimestampFieldTableBase.java 11 Oct 2013 09:06:10 -0000 1.13 @@ -240,7 +240,7 @@ * Retrieve the <code>TimestampField</code> as a <code>TimestampField</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public TimestampField getTimestampFieldObject(Integer troid) { |
|
From: Tim P. <ti...@pa...> - 2013-10-11 09:41:55
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated In directory hanuman.paneris.org:/tmp/cvs-serv18148 Modified Files: CapabilityTableBase.java ColumnInfoTableBase.java GroupCapabilityTableBase.java GroupMembershipTableBase.java GroupTableBase.java SettingTableBase.java TableCategoryTableBase.java TableInfoTableBase.java UserTableBase.java ValueInfoTableBase.java Log Message: Regenerated: typo Index: TableInfoTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/TableInfoTableBase.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- TableInfoTableBase.java 23 May 2012 23:13:11 -0000 1.28 +++ TableInfoTableBase.java 11 Oct 2013 09:07:12 -0000 1.29 @@ -962,7 +962,7 @@ * Retrieve the <code>TableInfo</code> as a <code>TableInfo</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public TableInfo getTableInfoObject(Integer troid) { @@ -1007,5 +1007,21 @@ public int defaultDisplayOrder() { return 3010; } + + /** + * @return a newly created or existing TableInfo + **/ + public TableInfo ensure(String name, String displayname, Integer displayorder, Boolean seqcached, TableCategory category) { + TableInfo p = (TableInfo)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (TableInfo)newPersistent(); + p.setName(name); + p.setDisplayname(displayname); + p.setDisplayorder(displayorder); + p.setSeqcached(seqcached); + p.setCategory(category); + } + return (TableInfo)getNameColumn().ensure(p); + } } Index: GroupCapabilityTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/GroupCapabilityTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- GroupCapabilityTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ GroupCapabilityTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -279,7 +279,7 @@ * Retrieve the <code>GroupCapability</code> as a <code>GroupCapability</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public GroupCapability getGroupCapabilityObject(Integer troid) { Index: GroupMembershipTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/GroupMembershipTableBase.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- GroupMembershipTableBase.java 23 May 2012 23:13:11 -0000 1.24 +++ GroupMembershipTableBase.java 11 Oct 2013 09:07:12 -0000 1.25 @@ -304,7 +304,7 @@ * Retrieve the <code>GroupMembership</code> as a <code>GroupMembership</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public GroupMembership getGroupMembershipObject(Integer troid) { Index: GroupTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/GroupTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- GroupTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ GroupTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -219,7 +219,7 @@ * Retrieve the <code>Group</code> as a <code>Group</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Group getGroupObject(Integer troid) { @@ -256,5 +256,17 @@ public int defaultDisplayOrder() { return 2020; } + + /** + * @return a newly created or existing Group + **/ + public Group ensure(String name) { + Group p = (Group)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (Group)newPersistent(); + p.setName(name); + } + return (Group)getNameColumn().ensure(p); + } } Index: TableCategoryTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/TableCategoryTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- TableCategoryTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ TableCategoryTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -215,7 +215,7 @@ * Retrieve the <code>TableCategory</code> as a <code>TableCategory</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public TableCategory getTableCategoryObject(Integer troid) { @@ -260,5 +260,17 @@ public int defaultDisplayOrder() { return 3030; } + + /** + * @return a newly created or existing TableCategory + **/ + public TableCategory ensure(String name) { + TableCategory p = (TableCategory)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (TableCategory)newPersistent(); + p.setName(name); + } + return (TableCategory)getNameColumn().ensure(p); + } } Index: ColumnInfoTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/ColumnInfoTableBase.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- ColumnInfoTableBase.java 23 May 2012 23:13:11 -0000 1.29 +++ ColumnInfoTableBase.java 11 Oct 2013 09:07:12 -0000 1.30 @@ -944,7 +944,7 @@ * Retrieve the <code>ColumnInfo</code> as a <code>ColumnInfo</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public ColumnInfo getColumnInfoObject(Integer troid) { Index: CapabilityTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/CapabilityTableBase.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- CapabilityTableBase.java 23 May 2012 23:13:11 -0000 1.22 +++ CapabilityTableBase.java 11 Oct 2013 09:07:12 -0000 1.23 @@ -219,7 +219,7 @@ * Retrieve the <code>Capability</code> as a <code>Capability</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Capability getCapabilityObject(Integer troid) { @@ -256,5 +256,17 @@ public int defaultDisplayOrder() { return 2030; } + + /** + * @return a newly created or existing Capability + **/ + public Capability ensure(String name) { + Capability p = (Capability)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (Capability)newPersistent(); + p.setName(name); + } + return (Capability)getNameColumn().ensure(p); + } } Index: UserTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/UserTableBase.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- UserTableBase.java 23 May 2012 23:13:11 -0000 1.25 +++ UserTableBase.java 11 Oct 2013 09:07:12 -0000 1.26 @@ -364,7 +364,7 @@ * Retrieve the <code>User</code> as a <code>User</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public User getUserObject(Integer troid) { @@ -401,5 +401,19 @@ public int defaultDisplayOrder() { return 2010; } + + /** + * @return a newly created or existing User + **/ + public User ensure(String name, String login, String password) { + User p = (User)getLoginColumn().firstWhereEq(login); + if (p == null) { + p = (User)newPersistent(); + p.setName(name); + p.setLogin(login); + p.setPassword(password); + } + return (User)getLoginColumn().ensure(p); + } } Index: SettingTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/SettingTableBase.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- SettingTableBase.java 16 Nov 2012 10:47:35 -0000 1.28 +++ SettingTableBase.java 11 Oct 2013 09:07:12 -0000 1.29 @@ -191,7 +191,6 @@ ((Setting)g).setValue((String)cooked); } - @SuppressWarnings("unchecked") public Field<String> asField(Persistent g) { return ((Setting)g).getValueField(); } @@ -267,7 +266,7 @@ * Retrieve the <code>Setting</code> as a <code>Setting</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public Setting getSettingObject(Integer troid) { @@ -308,5 +307,17 @@ public int defaultDisplayOrder() { return 3040; } + + /** + * @return a newly created or existing Setting + **/ + public Setting ensure(String name) { + Setting p = (Setting)getNameColumn().firstWhereEq(name); + if (p == null) { + p = (Setting)newPersistent(); + p.setName(name); + } + return (Setting)getNameColumn().ensure(p); + } } Index: ValueInfoTableBase.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/generated/ValueInfoTableBase.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ValueInfoTableBase.java 23 May 2012 23:13:11 -0000 1.24 +++ ValueInfoTableBase.java 11 Oct 2013 09:07:12 -0000 1.25 @@ -1021,7 +1021,7 @@ * Retrieve the <code>ValueInfo</code> as a <code>ValueInfo</code>. * * see org.melati.poem.prepro.TableDef#generateTableBaseJava - * @param troid a Table Row Oject ID + * @param troid a Table Row Object ID * @return the <code>Persistent</code> identified by the <code>troid</code> */ public ValueInfo getValueInfoObject(Integer troid) { |
|
From: Tim P. <ti...@pa...> - 2013-08-12 22:35:02
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem In directory hanuman.paneris.org:/tmp/cvs-serv13545/src/main/java/org/melati/poem Modified Files: ResultSetEnumeration.java Log Message: Handle the fact we now close resultsets Index: ResultSetEnumeration.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/ResultSetEnumeration.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ResultSetEnumeration.java 22 Dec 2009 10:19:44 -0000 1.21 +++ ResultSetEnumeration.java 12 Aug 2013 22:18:43 -0000 1.22 @@ -70,7 +70,14 @@ } private int resultSetNext() throws SQLException { - if (resultSet.next()) + boolean hasNext; + try { + hasNext = resultSet.next(); + } catch (SQLException e) { + // Assumed to be closed resultset + return 0; + } + if (hasNext) return 1; else { try { |
|
From: Tim P. <ti...@pa...> - 2013-07-23 12:24:12
|
Update of /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro In directory hanuman.paneris.org:/tmp/cvs-serv15123/src/main/java/org/melati/poem/prepro Modified Files: TableDef.java Log Message: Add javadoc to ensure Index: TableDef.java =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro/TableDef.java,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- TableDef.java 23 Jul 2013 09:27:44 -0000 1.85 +++ TableDef.java 23 Jul 2013 12:08:03 -0000 1.86 @@ -654,6 +654,11 @@ } } if (uniqueNonNullableField != null) { + w.write("\n"); + w.write(" /**\n"); + w.write(" * @return a newly created or existing " + + tableNamingInfo.mainClassShortName() + "\n"); + w.write(" **/\n"); w.write(" public " + tableNamingInfo.mainClassShortName() + " ensure("); boolean seenOne = false; for (FieldDef f : requiredFields){ |
|
From: Tim P. <ti...@pa...> - 2013-07-23 09:43:50
|
Update of /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro In directory hanuman.paneris.org:/tmp/cvs-serv12752/src/main/java/org/melati/poem/prepro Modified Files: TableDef.java Log Message: Add ensure (and previous commit) Index: TableDef.java =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro/TableDef.java,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- TableDef.java 23 Jul 2013 09:06:13 -0000 1.84 +++ TableDef.java 23 Jul 2013 09:27:44 -0000 1.85 @@ -54,8 +54,6 @@ import java.io.Writer; import java.io.IOException; -import org.paneris.bibliomania.Book; - /** * A Table Definition holding information from a DSD. * @@ -661,12 +659,14 @@ for (FieldDef f : requiredFields){ if (seenOne) w.write(", "); - w.write(f.rawType); + w.write(f.typeShortName); + w.write(" "); w.write(f.name); + seenOne = true; } w.write(") {\n"); //Book p = (Book)getTitleColumn().firstWhereEq(title); - w.write(" " + w.write(" " + tableNamingInfo.mainClassShortName() + " p = (" + tableNamingInfo.mainClassShortName() +")get" + uniqueNonNullableField.capitalisedName + "Column().firstWhereEq(" @@ -677,12 +677,13 @@ + " p = (" + tableNamingInfo.mainClassShortName() + ")newPersistent();\n"); // p.setTitle(title); for (FieldDef f : requiredFields){ - w.write(" p.set"); + w.write(" p.set"); w.write(f.capitalisedName); w.write("("); w.write(f.name); w.write(");\n"); } + w.write(" }\n"); // return (Book)getTitleColumn().ensure(p); w.write(" return (" + tableNamingInfo.mainClassShortName() + ")get" + uniqueNonNullableField.capitalisedName + "Column().ensure(p);\n"); |
|
From: Tim P. <ti...@pa...> - 2013-07-23 09:22:21
|
Update of /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro In directory hanuman.paneris.org:/tmp/cvs-serv12381/src/main/java/org/melati/poem/prepro Modified Files: TableDef.java Log Message: Hack on imports, still not perfect Index: TableDef.java =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro/TableDef.java,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- TableDef.java 23 Jul 2013 00:00:38 -0000 1.83 +++ TableDef.java 23 Jul 2013 09:06:13 -0000 1.84 @@ -45,6 +45,7 @@ package org.melati.poem.prepro; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Vector; import java.util.Hashtable; @@ -53,6 +54,7 @@ import java.io.Writer; import java.io.IOException; +import org.paneris.bibliomania.Book; /** * A Table Definition holding information from a DSD. @@ -559,7 +561,7 @@ " return (" + dsd.databaseTablesClassName + ")getDatabase();\n" + " }\n" + "\n"); - Enumeration<FieldDef> fs = fields.elements(); + w.write("\n /**\n" + " * Initialise this table by defining its columns.\n" + " *\n" @@ -569,7 +571,7 @@ " public void init() throws PoemException {\n" + " super.init();\n"); - for (; fs.hasMoreElements();) { + for (Enumeration<FieldDef> fs = fields.elements(); fs.hasMoreElements();) { (fs.nextElement()).generateColDefinition(w); if (fs.hasMoreElements()) w.write('\n'); @@ -577,8 +579,8 @@ w.write(" }\n" + "\n"); - for (Enumeration<FieldDef> f = fields.elements(); f.hasMoreElements();) { - (f.nextElement()).generateColAccessor(w); + for (Enumeration<FieldDef> fs = fields.elements(); fs.hasMoreElements();) { + (fs.nextElement()).generateColAccessor(w); w.write('\n'); } @@ -641,6 +643,55 @@ w.write(" public int defaultDisplayOrder() {\n" + " return " + displayOrder + ";\n" + " }\n"); + FieldDef uniqueNonNullableField = null; + ArrayList<FieldDef> requiredFields = new ArrayList<FieldDef>(); + for (Enumeration<FieldDef> fs = fields.elements(); fs.hasMoreElements();) { + FieldDef f = fs.nextElement(); + if (!f.isNullable() && f.isUnique() && !f.isTroidColumn() + && uniqueNonNullableField == null){ + uniqueNonNullableField = f; + } + if (!f.isNullable() && !f.isTroidColumn()){ + requiredFields.add(f); + } + } + if (uniqueNonNullableField != null) { + w.write(" public " + tableNamingInfo.mainClassShortName() + " ensure("); + boolean seenOne = false; + for (FieldDef f : requiredFields){ + if (seenOne) + w.write(", "); + w.write(f.rawType); + w.write(f.name); + } + w.write(") {\n"); + //Book p = (Book)getTitleColumn().firstWhereEq(title); + w.write(" " + + tableNamingInfo.mainClassShortName() + " p = (" + + tableNamingInfo.mainClassShortName() +")get" + + uniqueNonNullableField.capitalisedName + "Column().firstWhereEq(" + + uniqueNonNullableField.name + ");\n"); + // if (p == null) { + // p = (Book)newPersistent(); + w.write(" if (p == null) {\n" + + " p = (" + tableNamingInfo.mainClassShortName() + ")newPersistent();\n"); + // p.setTitle(title); + for (FieldDef f : requiredFields){ + w.write(" p.set"); + w.write(f.capitalisedName); + w.write("("); + w.write(f.name); + w.write(");\n"); + } + // return (Book)getTitleColumn().ensure(p); + w.write(" return (" + tableNamingInfo.mainClassShortName() + + ")get" + uniqueNonNullableField.capitalisedName + "Column().ensure(p);\n"); + + + w.write(" }\n"); + } + + w.write("}\n"); } |
|
From: Tim P. <ti...@pa...> - 2013-07-23 00:16:44
|
Update of /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro In directory hanuman.paneris.org:/tmp/cvs-serv5104/src/main/java/org/melati/poem/prepro Modified Files: TableDef.java Log Message: Hack on imports, still not perfect Index: TableDef.java =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro/TableDef.java,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- TableDef.java 23 May 2012 16:20:55 -0000 1.82 +++ TableDef.java 23 Jul 2013 00:00:38 -0000 1.83 @@ -313,20 +313,26 @@ */ public void generatePersistentBaseJava(Writer w) throws IOException { - for (Enumeration<String> e = persistentBaseImports.elements(); e.hasMoreElements();) { - String packageName = e.nextElement(); - TableNamingInfo tni = dsd.tableNamingStore.tableInfoByTableOrPersistentFQName.get(packageName); - //if (tni != null) w.write("// tni " + tni.objectFQName + ";\n"); + for (Enumeration<String> e = persistentBaseImports.elements(); + e.hasMoreElements();) { + String importedClassName = e.nextElement(); + TableNamingInfo tni = dsd.tableNamingStore.tableInfoByTableOrPersistentFQName.get(importedClassName); if (tableNamingInfo.extended != null) { - if (tni!=null) - if (tni.equals(tableNamingInfo) || tni.equals(tableNamingInfo.extended)) - w.write("// import " + packageName + ";\n"); + if (tni != null) + if (tni.equals(tableNamingInfo)) + w.write("// ours\n//import " + importedClassName + ";\n"); else - w.write("import " + packageName + ";\n"); + if (tni.equals(tableNamingInfo.extended)) + if (tableNamingInfo.extended.extended != null) + w.write("// extends extended\n//import " + importedClassName + ";\n"); + else + w.write("// base extension\nimport " + importedClassName + ";\n"); + else + w.write("import " + importedClassName + ";\n"); else - w.write("import " + packageName + ";\n"); + w.write("import " + importedClassName + ";\n"); } else - w.write("import " + packageName + ";\n"); + w.write("import " + importedClassName + ";\n"); } w.write("\n"); @@ -495,7 +501,7 @@ for (Enumeration<String> e = tableBaseImports.elements(); e.hasMoreElements();) { String packageName = e.nextElement(); if (ambiguous(packageName)) - w.write("// FIXME extended table \nimport " + packageName + ";\n"); + w.write("// Extended table \nimport " + packageName + ";\n"); else w.write("import " + packageName + ";\n"); } @@ -585,7 +591,7 @@ + requiredReturnClass + "</code>.\n" + " *\n" + " * see org.melati.poem.prepro.TableDef" + "#generateTableBaseJava \n" - + " * @param troid a Table Row Oject ID\n" + + " * @param troid a Table Row Object ID\n" + " * @return the <code>Persistent</code> identified " + "by the <code>troid</code>\n" + " */\n"); w.write(" public " + requiredReturnClass + " get" @@ -773,7 +779,7 @@ addImport("org.melati.poem.DefinitionSource", "table"); addImport("org.melati.poem.PoemException", "table"); - if (!isAbstract) + if (!isAbstract && definesColumns) addImport("org.melati.poem.Persistent", "table"); if (tableNamingInfo.superclassTableUnambiguous().equals("Table")) { |
|
From: Tim P. <ti...@pa...> - 2013-07-22 23:53:02
|
Update of /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro In directory hanuman.paneris.org:/tmp/cvs-serv4419/src/main/java/org/melati/poem/prepro Modified Files: ParsingDSDException.java Log Message: Add serialVersionId to shut eclipse up Index: ParsingDSDException.java =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/src/main/java/org/melati/poem/prepro/ParsingDSDException.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ParsingDSDException.java 7 Jul 2011 10:19:57 -0000 1.14 +++ ParsingDSDException.java 22 Jul 2013 23:36:55 -0000 1.15 @@ -61,6 +61,7 @@ */ class ParsingDSDException extends RuntimeException { + private static final long serialVersionUID = 8913017013506544549L; String expected, got; int lineNumber; String message; |
|
From: Tim P. <ti...@pa...> - 2013-07-21 23:08:55
|
Update of /usr/cvsroot/MelatiBoards/MelatiBoards/src/main/java/org/paneris/melati/boards In directory hanuman.paneris.org:/tmp/cvs-serv16343/MelatiBoards/src/main/java/org/paneris/melati/boards Modified Files: BoardAdmin.java Log Message: Table names are no longer case insensitive Index: BoardAdmin.java =================================================================== RCS file: /usr/cvsroot/MelatiBoards/MelatiBoards/src/main/java/org/paneris/melati/boards/BoardAdmin.java,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- BoardAdmin.java 5 Dec 2012 21:16:12 -0000 1.44 +++ BoardAdmin.java 21 Jul 2013 22:52:48 -0000 1.45 @@ -606,11 +606,11 @@ Board board = null; if (melati.getTable() != null && melati.getObject() != null) { - if (melati.getTable().getName().equals("board")) + if (melati.getTable().getName().equals("Board")) board = (Board)melati.getObject(); - else if (melati.getTable().getName().equals("subscription")) + else if (melati.getTable().getName().equals("Subscription")) board = ((Subscription)melati.getObject()).getBoard(); - else if (melati.getTable().getName().equals("message")) + else if (melati.getTable().getName().equals("Message")) board = ((Message)melati.getObject()).getBoard(); } @@ -626,7 +626,7 @@ return searchForBoardTemplate(); } } - else if (melati.getTable().getName().equals("board") && + else if (melati.getTable().getName().equals("Board") && melati.getObject() != null) { if (melati.getMethod().equals("Board")) return boardTemplate(context, melati); @@ -665,19 +665,19 @@ if (melati.getMethod().equals("ApproveSubscriptions")) return approveSubscriptionsTemplate(context, melati); } - else if (melati.getTable().getName().equals("message") && + else if (melati.getTable().getName().equals("Message") && melati.getObject() != null) { if (melati.getMethod().equals("Message")) return messageTemplate(context, true); if (melati.getMethod().equals("MessageNoThread")) return messageTemplate(context, false); } - else if (melati.getTable().getName().equals("boardtype") && + else if (melati.getTable().getName().equals("BoardType") && melati.getObject() != null) { if (melati.getMethod().equals("ListBoards")) return listBoardsTemplate(); } - else if (melati.getTable().getName().equals("subscription") && + else if (melati.getTable().getName().equals("Subscription") && melati.getObject() != null) { if (melati.getMethod().equals("SubscriptionEdit")) return subscriptionEditTemplate(melati, board); |
|
From: Tim P. <ti...@pa...> - 2013-07-19 21:49:17
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem In directory hanuman.paneris.org:/tmp/cvs-serv7839/src/main/java/org/melati/poem Modified Files: Database.java Log Message: Remove debug logging Index: Database.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/Database.java,v retrieving revision 1.180 retrieving revision 1.181 diff -u -d -r1.180 -r1.181 --- Database.java 2 Jul 2012 13:52:53 -0000 1.180 +++ Database.java 19 Jul 2013 21:33:12 -0000 1.181 @@ -1609,8 +1609,6 @@ PoemThread.commit(); try { - log("Modifying structure:" + sql); - Statement updateStatement = getCommittedConnection().createStatement(); updateStatement.executeUpdate(sql); updateStatement.close(); |
|
From: Tim P. <ti...@pa...> - 2013-07-19 14:46:52
|
Update of /usr/cvsroot/melati/melati In directory hanuman.paneris.org:/tmp/cvs-serv806/melati Modified Files: pom.xml Log Message: Update cobertura version Index: pom.xml =================================================================== RCS file: /usr/cvsroot/melati/melati/pom.xml,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- pom.xml 19 Nov 2012 14:07:00 -0000 1.98 +++ pom.xml 19 Jul 2013 14:30:48 -0000 1.99 @@ -268,7 +268,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <!--version>2.0</version--> + <version>2.5.2</version> <configuration> <instrumentation> <ignores> @@ -291,27 +291,13 @@ </instrumentation> </configuration> <executions> - <execution> - <id>c</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - <execution> - <id>t</id> - <phase>test</phase> - <goals> - <goal>cobertura</goal> - </goals> - </execution> - <execution> - <id>p</id> - <phase>prepare-package</phase> - <goals> - <goal>dump-datafile</goal> - </goals> - </execution> + <execution> + <id>clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> </executions> </plugin> <plugin> @@ -393,6 +379,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> + <version>2.5.2</version> </plugin> </plugins> </reporting> |
|
From: Tim P. <ti...@pa...> - 2013-07-19 14:43:52
|
Update of /usr/cvsroot/melati/dsd-maven-plugin In directory hanuman.paneris.org:/tmp/cvs-serv648 Modified Files: .classpath .project Log Message: Latest Index: .project =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .project 11 Oct 2012 11:01:04 -0000 1.1 +++ .project 19 Jul 2013 14:27:49 -0000 1.2 @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>dsd-maven-plugin</name> - <comment>A processor of the Data Structure Definition (DSD) language which can run as an application or as a + <name>dsd-maven-plugin</name> + <comment>A processor of the Data Structure Definition (DSD) language which can run as an application or as a Maven plugin. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects/> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value> - </dictionary> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> \ No newline at end of file + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Index: .classpath =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .classpath 11 Oct 2012 11:01:15 -0000 1.1 +++ .classpath 19 Jul 2013 14:27:49 -0000 1.2 @@ -1,17 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="." including="NOTICE.txt" excluding="**/*.java"/> - <classpathentry kind="src" path="src/main/resources/m2e" including="lifecycle-mapping-metadata.xml" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/3.0.3/maven-plugin-api-3.0.3.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/3.0.3/maven-plugin-api-3.0.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/3.0.3/maven-model-3.0.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/3.0.3/maven-artifact-3.0.3.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/3.0.3/maven-artifact-3.0.3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/sonatype/sisu/sisu-inject-plexus/2.1.1/sisu-inject-plexus-2.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1.jar" sourcepath="M2_REPO/org/sonatype/sisu/sisu-inject-bean/2.1.1/sisu-inject-bean-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4-no_aop.jar"/> -</classpath> \ No newline at end of file + <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources/m2e"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> |
|
From: Tim P. <ti...@pa...> - 2013-07-19 14:43:41
|
Update of /usr/cvsroot/melati/dsd-maven-plugin/src/site/xdoc In directory hanuman.paneris.org:/tmp/cvs-serv622/src/site/xdoc Modified Files: Usage.xml Log Message: Udate version (Should be filtered) Index: Usage.xml =================================================================== RCS file: /usr/cvsroot/melati/dsd-maven-plugin/src/site/xdoc/Usage.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Usage.xml 3 Jun 2008 12:24:35 -0000 1.7 +++ Usage.xml 19 Jul 2013 14:27:34 -0000 1.8 @@ -125,7 +125,7 @@ <p> At the command line type: <pre> -mvn org.melati:maven-dsd-plugin:1.0-SNAPSHOT:generate +mvn org.melati:dsd-maven-plugin:0.7.9-SNAPSHOT:generate </pre> </p> </subsection> |
|
From: Tim P. <ti...@pa...> - 2013-07-19 14:42:24
|
Update of /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/dbms/test In directory hanuman.paneris.org:/tmp/cvs-serv568/poem/src/test/java/org/melati/poem/dbms/test Modified Files: DbmsSpec.java Log Message: Remove empty comment Index: DbmsSpec.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/test/java/org/melati/poem/dbms/test/DbmsSpec.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- DbmsSpec.java 9 Mar 2012 18:24:42 -0000 1.26 +++ DbmsSpec.java 19 Jul 2013 14:26:20 -0000 1.27 @@ -1,6 +1,3 @@ -/** - * - */ package org.melati.poem.dbms.test; import java.sql.Connection; |
|
From: Tim P. <ti...@pa...> - 2013-07-19 14:30:53
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms In directory hanuman.paneris.org:/tmp/cvs-serv32743/src/main/java/org/melati/poem/dbms Modified Files: AnsiStandard.java Log Message: Ensure comment is on uneserved name Index: AnsiStandard.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms/AnsiStandard.java,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- AnsiStandard.java 25 May 2012 18:47:00 -0000 1.78 +++ AnsiStandard.java 19 Jul 2013 14:14:47 -0000 1.79 @@ -88,6 +88,8 @@ import org.melati.poem.UnexpectedExceptionPoemException; import org.melati.poem.util.StringUtils; +import sun.reflect.ReflectionFactory.GetReflectionFactoryAction; + /** * An SQL 92 compliant Database Management System. * <p> @@ -742,9 +744,9 @@ public String alterColumnAddCommentSQL(Column<?> column, String comment) { // FIREBIRD, ORACLE, postgresql return "COMMENT ON COLUMN " - + getQuotedName(column.getTable().getName()) + + getQuotedName(unreservedName(column.getTable().getName())) +"." - + getQuotedName(column.getName()) + + getQuotedName(unreservedName(column.getName())) + " IS '" + comment + "'"; |
|
From: Tim P. <ti...@pa...> - 2013-07-19 11:55:42
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms In directory hanuman.paneris.org:/tmp/cvs-serv30701/src/main/java/org/melati/poem/dbms Modified Files: Dbms.java Log Message: Spelling in javadocs Index: Dbms.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms/Dbms.java,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- Dbms.java 19 Jul 2013 11:38:30 -0000 1.59 +++ Dbms.java 19 Jul 2013 11:39:38 -0000 1.60 @@ -95,7 +95,7 @@ void shutdown(Connection connection) throws SQLException; /** - * Accomodate different quoting strategies. + * Accommodate different quoting strategies. * * @param name the unquoted name * @return the name quoted (or not) appropriate for this Dbms |
|
From: Tim P. <ti...@pa...> - 2013-07-19 11:54:38
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms In directory hanuman.paneris.org:/tmp/cvs-serv30686/src/main/java/org/melati/poem/dbms Modified Files: Dbms.java Log Message: Spelling in javadocs Index: Dbms.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms/Dbms.java,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- Dbms.java 19 Jul 2013 10:40:51 -0000 1.58 +++ Dbms.java 19 Jul 2013 11:38:30 -0000 1.59 @@ -103,7 +103,7 @@ String getQuotedName(String name); /** - * Accomodate different quoting strategies for values. + * Accommodate different quoting strategies for values. * * @param sqlType the SQLType of the value * @param value the value |
|
From: Tim P. <ti...@pa...> - 2013-07-19 10:56:59
|
Update of /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms In directory hanuman.paneris.org:/tmp/cvs-serv29842/src/main/java/org/melati/poem/dbms Modified Files: Dbms.java Log Message: Spelling in javadocs Index: Dbms.java =================================================================== RCS file: /usr/cvsroot/melati/poem/src/main/java/org/melati/poem/dbms/Dbms.java,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- Dbms.java 22 May 2012 17:35:17 -0000 1.57 +++ Dbms.java 19 Jul 2013 10:40:51 -0000 1.58 @@ -167,7 +167,7 @@ String getSqlDefinition(String sqlTypeName); /** - * Accomodate String / Text distinction. + * Accommodate String / Text distinction. * * @param size the string length (-1 means no limit) * @return the SQL definition for a string of this size @@ -176,20 +176,20 @@ String getStringSqlDefinition(int size) throws SQLException; /** - * Accomodate Long / Bigint deviants. + * Accommodate Long / Bigint deviants. * @return the keyword to use. */ String getLongSqlDefinition(); /** - * Accomodate different true and false values. + * Accommodate different true and false values. * * @return the DBMS specific truth and false values */ String sqlBooleanValueOfRaw(Object raw); /** - * Accomodate different treatment of different sized binary data. + * Accommodate different treatment of different sized binary data. * * @param size how big the field is * @return the keyword to use @@ -198,7 +198,7 @@ String getBinarySqlDefinition(int size) throws SQLException; /** - * Accomodate differing Fixed Point notations. + * Accommodate differing Fixed Point notations. * * @param scale the number of places to right of decimal point * @param precision how many digits in total @@ -297,12 +297,12 @@ * Reverse the mapping in <tt>unreservedName</tt>. * * @param name an SQL name - * @return the coresponding name to use within Melati + * @return the corresponding name to use within Melati */ String melatiName(String name); /** - * Accomodate DBMS which require a length for BLOBS. + * Accommodate DBMS which require a length for BLOBS. * * @param column the POEM Column we are dealing with * @return SQL length string @@ -327,7 +327,7 @@ String givesCapabilitySQL(Integer userTroid, String capabilityExpr); /** - * Accomodate the variety of ways of ignoring case. + * Accommodate the variety of ways of ignoring case. * * @param term1 the term to find in * @param term2 the quoted term to find @@ -390,7 +390,7 @@ String alterTableAddCommentSQL(Table<?> table, String comment); /** - * Accomodate different limiting syntax. + * Accommodate different limiting syntax. * * @param querySelection main body of query * @param limit number to limit to @@ -399,9 +399,9 @@ String selectLimit(String querySelection, int limit); /** - * Accomodate lack of boolean types. + * Accommodate lack of boolean types. * @param booleanColumn - * @return an expresion that evaluates to True ie the column name or column name = 1 + * @return an expression that evaluates to True ie the column name or column name = 1 */ String booleanTrueExpression(Column<Boolean> booleanColumn); |
|
From: Tim P. <ti...@pa...> - 2013-07-14 00:12:47
|
Update of /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test In directory hanuman.paneris.org:/tmp/cvs-serv8826/src/test/java/org/melati/app/test Modified Files: ConfigAppTest.java ProtectedPoemApp.java Log Message: Throwing wrong exception, with wrong parameters Index: ConfigAppTest.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test/ConfigAppTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ConfigAppTest.java 6 Dec 2007 20:46:30 -0000 1.1 +++ ConfigAppTest.java 13 Jul 2013 23:56:47 -0000 1.2 @@ -1,6 +1,3 @@ -/** - * - */ package org.melati.app.test; import java.io.BufferedReader; @@ -14,7 +11,7 @@ /** * @author timp - * + * @since 2007-12-06 */ public class ConfigAppTest extends TestCase { Index: ProtectedPoemApp.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test/ProtectedPoemApp.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ProtectedPoemApp.java 8 Jan 2008 09:12:40 -0000 1.4 +++ ProtectedPoemApp.java 13 Jul 2013 23:56:47 -0000 1.5 @@ -1,6 +1,3 @@ -/** - * - */ package org.melati.app.test; import java.io.InputStream; @@ -15,17 +12,16 @@ import org.melati.login.OpenAccessHandler; import org.melati.util.InstantiationPropertyException; import org.melati.util.MelatiException; +import org.melati.util.MelatiRuntimeException; /** * @author timp + * @since 2007-12-06 * */ public class ProtectedPoemApp extends PoemApp { InputStream in = null; - /** - * - */ public ProtectedPoemApp() { super(); in = null; @@ -40,8 +36,7 @@ config.setAccessHandler((AccessHandler)CommandLineAccessHandler.class .newInstance()); } catch (Exception e) { - throw new InstantiationPropertyException(OpenAccessHandler.class - .getName(), e); + throw new RuntimeException(e); } return config; |
|
From: Tim P. <ti...@pa...> - 2013-07-14 00:12:16
|
Update of /usr/cvsroot/melati/melati/src/main/java/org/melati/util In directory hanuman.paneris.org:/tmp/cvs-serv8805/src/main/java/org/melati/util Modified Files: PropertiesUtils.java Log Message: Refactor to remove duplicate code Index: PropertiesUtils.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/main/java/org/melati/util/PropertiesUtils.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- PropertiesUtils.java 13 Jul 2013 23:21:49 -0000 1.26 +++ PropertiesUtils.java 13 Jul 2013 23:56:15 -0000 1.27 @@ -203,11 +203,13 @@ if (cached != null) return cached; try { - Class<?> interfaceClass = Class.forName(interfaceClassName); Class<?> clazz = Class.forName(className); - if (!interfaceClass.isAssignableFrom(clazz)) - throw new ClassCastException( + if (interfaceClassName != null) { + Class<?> interfaceClass = Class.forName(interfaceClassName); + if (!interfaceClass.isAssignableFrom(clazz)) + throw new ClassCastException( clazz + " is not descended from " + interfaceClass); + } Object it = clazz.newInstance(); instantiatedClassesCache.put(className, it); return it; @@ -232,18 +234,6 @@ String defaultName) throws InstantiationPropertyException { String className = (String)properties.get(propertyName); - if (className == null) - try { - Class<?> defaultClass = Class.forName(defaultName); - return defaultClass.newInstance(); - } catch (Exception e) { - throw new RuntimeException("Problem creating new instance of " + - defaultName + " :" + e.toString()); - } catch (Error e) { - throw new RuntimeException("Problem creating new instance of " + - defaultName + " :" + e.toString()); - } - - return instanceOfNamedClass(className, interfaceClassName); + return instanceOfNamedClass(className == null ? defaultName : className, interfaceClassName); } } |
|
From: Tim P. <ti...@pa...> - 2013-07-13 23:54:12
|
Update of /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test In directory hanuman.paneris.org:/tmp/cvs-serv8447/src/test/java/org/melati/app/test Modified Files: MisConfiguredTemplateApp.java ConfiguredTemplateApp.java Log Message: Throwing inappropriate exception, with incorrect parameters! Index: MisConfiguredTemplateApp.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test/MisConfiguredTemplateApp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MisConfiguredTemplateApp.java 21 Feb 2008 09:22:43 -0000 1.2 +++ MisConfiguredTemplateApp.java 13 Jul 2013 23:38:11 -0000 1.3 @@ -1,24 +1,17 @@ -/** - * - */ package org.melati.app.test; import org.melati.MelatiConfig; import org.melati.app.TemplateApp; -import org.melati.login.OpenAccessHandler; import org.melati.template.NoTemplateEngine; -import org.melati.util.InstantiationPropertyException; import org.melati.util.MelatiException; /** * @author timp + * @since 2007-12-06 * */ public class MisConfiguredTemplateApp extends TemplateApp { - /** - * - */ public MisConfiguredTemplateApp() { super(); } @@ -33,8 +26,7 @@ try { config.setTemplateEngine(new NoTemplateEngine()); } catch (Exception e) { - throw new InstantiationPropertyException(OpenAccessHandler.class - .getName(), e); + throw new RuntimeException(e); } Index: ConfiguredTemplateApp.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test/ConfiguredTemplateApp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ConfiguredTemplateApp.java 13 Jul 2013 23:29:06 -0000 1.2 +++ ConfiguredTemplateApp.java 13 Jul 2013 23:38:11 -0000 1.3 @@ -9,8 +9,6 @@ import org.melati.app.TemplateApp; import org.melati.login.AccessHandler; import org.melati.login.CommandLineAccessHandler; -import org.melati.login.OpenAccessHandler; -import org.melati.util.InstantiationPropertyException; import org.melati.util.MelatiException; /** @@ -38,8 +36,7 @@ (AccessHandler)CommandLineAccessHandler.class .newInstance()); } catch (Exception e) { - throw new InstantiationPropertyException(CommandLineAccessHandler.class - .getName(), e); + throw new RuntimeException(e); } |
|
From: Tim P. <ti...@pa...> - 2013-07-13 23:45:08
|
Update of /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test In directory hanuman.paneris.org:/tmp/cvs-serv8342/src/test/java/org/melati/app/test Modified Files: ConfiguredTemplateApp.java Log Message: Cut'n'paste error Index: ConfiguredTemplateApp.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/test/java/org/melati/app/test/ConfiguredTemplateApp.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ConfiguredTemplateApp.java 6 Dec 2007 20:46:30 -0000 1.1 +++ ConfiguredTemplateApp.java 13 Jul 2013 23:29:06 -0000 1.2 @@ -34,10 +34,11 @@ MelatiConfig config = super.melatiConfig(); try { - config.setAccessHandler((AccessHandler)CommandLineAccessHandler.class + config.setAccessHandler( + (AccessHandler)CommandLineAccessHandler.class .newInstance()); } catch (Exception e) { - throw new InstantiationPropertyException(OpenAccessHandler.class + throw new InstantiationPropertyException(CommandLineAccessHandler.class .getName(), e); } |
|
From: Tim P. <ti...@pa...> - 2013-07-13 23:37:50
|
Update of /usr/cvsroot/melati/melati/src/test/java/org/melati/util/test In directory hanuman.paneris.org:/tmp/cvs-serv8128/src/test/java/org/melati/util/test Added Files: PropertiesUtilsTest.java Log Message: Add fromClass(class) and test it --- NEW FILE: PropertiesUtilsTest.java --- package org.melati.util.test; import org.melati.util.PropertiesUtils; /** * @author timp * @since 2013-07-14 */ import junit.framework.TestCase; public class PropertiesUtilsTest extends TestCase { public final void testFromFile() { } public final void testFromResourceClassOfQ() throws Exception { assertEquals("{org.melati.MelatiConfig.staticURL=/melatitest/melati-static/admin/static, org.melati.MelatiConfig.templateEngine=org.melati.template.webmacro.WebmacroServletTemplateEngine, org.melati.MelatiConfig.accessHandler=org.melati.login.HttpSessionAccessHandler, org.melati.MelatiConfig.preferredCharsets=UTF-8, UTF-16, ISO-8859-1, org.melati.MelatiConfig.javascriptLibraryURL=/melatitest/melati-static/admin/static, org.melati.MelatiConfig.formDataAdaptorFactory=org.melati.servlet.PoemFileFormDataAdaptorFactory, org.melati.MelatiConfig.locale=en-gb}", PropertiesUtils.fromResource(org.melati.MelatiConfig.class).toString()); } public final void testFromResourceClassOfQString() { } public final void testGetOrDie() { } public final void testGetOrDefault() { } public final void testGetOrDie_int() { } public final void testGetOrDefault_int() { } public final void testInstanceOfNamedClassStringString() { } public final void testInstanceOfNamedClassPropertiesStringStringString() { } } |
|
From: Tim P. <ti...@pa...> - 2013-07-13 23:37:50
|
Update of /usr/cvsroot/melati/melati/src/main/java/org/melati/util In directory hanuman.paneris.org:/tmp/cvs-serv8128/src/main/java/org/melati/util Modified Files: PropertiesUtils.java Log Message: Add fromClass(class) and test it Index: PropertiesUtils.java =================================================================== RCS file: /usr/cvsroot/melati/melati/src/main/java/org/melati/util/PropertiesUtils.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- PropertiesUtils.java 4 Jan 2010 09:31:23 -0000 1.25 +++ PropertiesUtils.java 13 Jul 2013 23:21:49 -0000 1.26 @@ -79,6 +79,12 @@ return them; } + + public static Properties fromResource(Class<?> clazz) + throws IOException { + String name = clazz.getCanonicalName() + ".properties"; + return fromResource(clazz, name); + } /** * Get a {@link Properties} object from a {@link Class}. |
