Menu
▾
▴
neuclear-develop — Support requests, cvs etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(119) |
Oct
(111) |
Nov
(238) |
Dec
(395) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(239) |
Feb
(59) |
Mar
(354) |
Apr
(489) |
May
(23) |
Jun
(2) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(5) |
Jun
(2) |
Jul
|
Aug
|
Sep
(3) |
Oct
(14) |
Nov
(17) |
Dec
(9) |
| 2007 |
Jan
(4) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(7) |
May
(3) |
Jun
(6) |
Jul
(4) |
Aug
(3) |
Sep
(15) |
Oct
(13) |
Nov
(35) |
Dec
(40) |
| 2009 |
Jan
(19) |
Feb
(21) |
Mar
(16) |
Apr
(18) |
May
(36) |
Jun
(20) |
Jul
(32) |
Aug
(11) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
(13) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(4) |
Nov
|
Dec
(3) |
| 2012 |
Jan
(3) |
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(8) |
Jun
(4) |
Jul
(9) |
Aug
(2) |
Sep
(8) |
Oct
(3) |
Nov
(8) |
Dec
(4) |
| 2013 |
Jan
(2) |
Feb
(1) |
Mar
(5) |
Apr
(6) |
May
(10) |
Jun
(5) |
Jul
(6) |
Aug
(7) |
Sep
(5) |
Oct
(2) |
Nov
(4) |
Dec
(4) |
| 2014 |
Jan
(13) |
Feb
(4) |
Mar
(7) |
Apr
(9) |
May
(20) |
Jun
(13) |
Jul
(10) |
Aug
(3) |
Sep
(5) |
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2015 |
Jan
(3) |
Feb
(3) |
Mar
(5) |
Apr
(4) |
May
(3) |
Jun
(2) |
Jul
(4) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2016 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
(4) |
Sep
(3) |
Oct
(3) |
Nov
(4) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pe...@us...> - 2003-12-03 23:21:46
|
Update of /cvsroot/neuclear/neuclear-ledger/src/java In directory sc8-pr-cvs1:/tmp/cvs-serv23579/src/java Modified Files: log4j.properties Log Message: Got rid of ofbiz support. Way over the top for our use. Index: log4j.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/log4j.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** log4j.properties 1 Dec 2003 17:11:01 -0000 1.1 --- log4j.properties 3 Dec 2003 23:21:43 -0000 1.2 *************** *** 10,15 **** # To turn more verbose logging on - change "WARN" to "DEBUG" ! log4j.rootLogger=DEBUG, console ! #log4j.rootCategory=WARN, console ##################################################### --- 10,15 ---- # To turn more verbose logging on - change "WARN" to "DEBUG" ! # log4j.rootLogger=DEBUG, console ! log4j.rootCategory=WARN, console ##################################################### |
Update of /cvsroot/neuclear/neuclear-ledger/src/java/entitydefs In directory sc8-pr-cvs1:/tmp/cvs-serv9746/entitydefs Added Files: entitygroup.xml entitymodel.xml fieldtype-cloudscape.xml fieldtype-firebird.xml fieldtype-hsql.xml fieldtype-mckoidb.xml fieldtype-mssql.xml fieldtype-mysql.xml fieldtype-oracle.xml fieldtype-postgres.xml fieldtype-postgres72.xml fieldtype-sapdb.xml fieldtype-sybase.xml Log Message: Added initial Support for entityengine (OFBiz) --- NEW FILE: entitygroup.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE entitygroup PUBLIC "-//OFBiz//DTD Entity Group//EN" "http://www.ofbiz.org/dtds/entitygroup.dtd"> <entitygroup> <!-- sequence entity --> <entity-group group="default" entity="Ledger"/> </entitygroup> --- NEW FILE: entitymodel.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE entitymodel PUBLIC "-//OFBiz//DTD Entity Model//EN" "http://www.ofbiz.org/dtds/entitymodel.dtd"> <entitymodel> <title>Entity Model for NeuClear Ledger</title> <description>None</description> <copyright>Copyright (c) 2003 Antilles Software Ventures SA</copyright> <author>Pelle Braendgaard</author> <version>1.0</version> <entity entity-name="Ledger" package-name="" > <field name="id" type="id-long"></field> <field name="title" type="description"></field> <field name="date_created" type="date-time"/> <prim-key field="id"/> </entity> </entitymodel> --- NEW FILE: fieldtype-cloudscape.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-cloudscape.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2001 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author D. Todd White *@created February 15, 2002 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="LONG VARBINARY" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="DATE" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATE" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="NUMERIC(18,6)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMERIC(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="NUMERIC(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="VARCHAR(4000)" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-firebird.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-firebird.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author Mateu Batle *@created December 11, 2002 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="BLOB" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMERIC(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="BLOB SUB_TYPE TEXT" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-hsql.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-hsql.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author Andy Zeneski (ja...@of...) *@created Augest 26, 2001 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="OBJECT" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="DOUBLE" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="DOUBLE" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="BIGINT" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="INTEGER" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-mckoidb.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-mckoidb.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author Adapted from posgresql definition by Joel Rosi-Schwartz *@created July 11, 2003 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="BLOB" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="FLOAT" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMERIC(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="NUMERIC(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="LONGVARCHAR" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-mssql.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-mssql.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author Andy Zeneski (ja...@zs...) *@created Augest 26, 2001 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="bytes" sql-type="IMAGE" java-type="byte[]"></field-type-def> <field-type-def type="blob" sql-type="IMAGE" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="DATETIME" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="datetime" sql-type="DATETIME" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATETIME" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATETIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="NUMERIC" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMERIC" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="long" sql-type="integer" java-type="Long"></field-type-def> <field-type-def type="integer" sql-type="int" java-type="Integer"></field-type-def> <field-type-def type="nid" sql-type="INT*" java-type="Long"></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(40)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(250)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> <field-type-def type="text" sql-type="TEXT" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="string" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="boolean" sql-type="bit" java-type="java.lang.Boolean"></field-type-def> <field-type-def type="currency" sql-type="money" java-type="Double"><validate name="isSignedDouble" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-mysql.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-mysql.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author David E. Jones *@created June 5, 2001 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="BLOB" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="DATETIME" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="DECIMAL(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="DECIMAL(18,6)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="DECIMAL(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="DECIMAL(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(250)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(250)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-oracle.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-oracle.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author David E. Jones *@created June 5, 2001 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="LONG RAW" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="DATE" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATE" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMBER(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="NUMBER(18,6)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMBER(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="NUMBER(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR2(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR2(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR2(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR2(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="VARCHAR2(4000)" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR2(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR2(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR2(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR2(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR2(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR2(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR2(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR2(255)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR2(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-postgres.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-postgres.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author David E. Jones *@created June 5, 2001 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="OID" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="FLOAT8" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMERIC(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="NUMERIC(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="BPCHAR" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-postgres72.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-postgres72.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2002 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author David E. Jones *@created June 5, 2001 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="OID" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="TIMESTAMPTZ" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="FLOAT8" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMERIC(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="NUMERIC(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" sql-type-alias="BPCHAR" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-sapdb.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-sapdb.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2001 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author Britton Wesley LaRoche *@created October 23, 2001 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="LONG" sql-type-alias="LONG ASCII" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="TIMESTAMP" java-type="java.sql.Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATE" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="TIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="FIXED(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="FIXED(18,6)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="FIXED(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="FIXED(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" sql-type-alias="CHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="LONG" sql-type-alias="LONG ASCII" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" sql-type-alias="VARCHAR() ASCII" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" sql-type-alias="VARCHAR() ASCII" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" sql-type-alias="VARCHAR() ASCII" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" sql-type-alias="VARCHAR() ASCII" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" sql-type-alias="VARCHAR() ASCII" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" sql-type-alias="VARCHAR() ASCII" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> --- NEW FILE: fieldtype-sybase.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE fieldtypemodel PUBLIC "-//OFBiz//DTD Field Type Model//EN" "http://www.ofbiz.org/dtds/fieldtypemodel.dtd"> <!-- /** * $Id: fieldtype-sybase.xml,v 1.1 2003/12/01 17:11:01 pelle Exp $ * Title: Entity Generator Definitions for the General Data Model * Description: None * Copyright (c) 2001 The Open For Business Project - www.ofbiz.org * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * *@author Grant Gardner, via Mike Cannon-Brookes. *@created December 18, 2002 *@version 1.0 */ --> <fieldtypemodel> <!-- ===================== field-type-def ==================== --> <!-- General Types --> <field-type-def type="blob" sql-type="IMAGE" java-type="java.lang.Object"></field-type-def> <field-type-def type="date-time" sql-type="DATETIME" java-type="Timestamp"></field-type-def> <field-type-def type="date" sql-type="DATETIME" java-type="java.sql.Date"></field-type-def> <field-type-def type="time" sql-type="DATETIME" java-type="java.sql.Time"></field-type-def> <field-type-def type="currency-amount" sql-type="NUMERIC(18,2)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="floating-point" sql-type="NUMERIC(18,6)" java-type="Double"><validate name="isSignedDouble" /></field-type-def> <field-type-def type="numeric" sql-type="NUMERIC(18,0)" java-type="Long"><validate name="isSignedLong" /></field-type-def> <field-type-def type="integer" sql-type="NUMERIC(9,0)" java-type="Integer"><validate name="isSignedLong" /></field-type-def> <field-type-def type="id" sql-type="VARCHAR(20)" java-type="String"></field-type-def> <field-type-def type="id-long" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="id-vlong" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="indicator" sql-type="CHAR(1)" java-type="String"></field-type-def> <field-type-def type="very-short" sql-type="VARCHAR(10)" java-type="String"></field-type-def> <field-type-def type="short-varchar" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="long-varchar" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="very-long" sql-type="TEXT" java-type="String"></field-type-def> <field-type-def type="comment" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="description" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="name" sql-type="VARCHAR(60)" java-type="String"></field-type-def> <field-type-def type="value" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <!-- Specialized Types --> <field-type-def type="credit-card-number" sql-type="VARCHAR(40)" java-type="String"><validate name="isAnyCard" /></field-type-def> <field-type-def type="credit-card-date" sql-type="VARCHAR(20)" java-type="String"><validate name="isDateAfterToday" /></field-type-def> <field-type-def type="email" sql-type="VARCHAR(255)" java-type="String"><validate name="isEmail" /></field-type-def> <field-type-def type="url" sql-type="VARCHAR(255)" java-type="String"></field-type-def> <field-type-def type="id-ne" sql-type="VARCHAR(20)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-long-ne" sql-type="VARCHAR(60)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="id-vlong-ne" sql-type="VARCHAR(255)" java-type="String"><validate name="isNotEmpty" /></field-type-def> <field-type-def type="tel-number" sql-type="VARCHAR(60)" java-type="String"><validate name="isInternationalPhoneNumber" /></field-type-def> </fieldtypemodel> |
|
From: <pe...@us...> - 2003-12-01 17:11:04
|
Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/implementations
In directory sc8-pr-cvs1:/tmp/cvs-serv9746/org/neuclear/ledger/implementations
Modified Files:
SQLLedger.java
Log Message:
Added initial Support for entityengine (OFBiz)
Index: SQLLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/implementations/SQLLedger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SQLLedger.java 21 Nov 2003 04:43:20 -0000 1.3
--- SQLLedger.java 1 Dec 2003 17:11:01 -0000 1.4
***************
*** 9,14 ****
--- 9,19 ----
import org.neuclear.commons.sql.ConnectionSource;
import org.neuclear.commons.sql.SQLTools;
+ import org.neuclear.commons.sql.SQLContext;
+ import org.neuclear.commons.NeuClearException;
import org.neuclear.ledger.*;
+ import org.neuclear.ledger.InvalidTransactionException;
+ import javax.transaction.*;
+ import javax.naming.NamingException;
import java.io.IOException;
import java.sql.*;
***************
*** 38,42 ****
public SQLLedger(final ConnectionSource con, final String id) throws LowlevelLedgerException, UnknownLedgerException {
super(id, getLedgerName(con, id));
! this.con = con;
}
--- 43,47 ----
public SQLLedger(final ConnectionSource con, final String id) throws LowlevelLedgerException, UnknownLedgerException {
super(id, getLedgerName(con, id));
! this.con = new SQLContext(con);
}
***************
*** 80,95 ****
if (bookExists(bookID))
throw new BookExistsException(this, bookID);
! try {
! getConnection().setAutoCommit(false);
final PreparedStatement stmt = prepQuery("insert into account values (?,?,3)");
stmt.setString(1, bookID);
stmt.setString(2, title);
stmt.execute();
! getConnection().commit();
} catch (SQLException e) {
throw new LowlevelLedgerException(this, e);
}
- return createBookInstance(bookID, title);
}
--- 85,99 ----
if (bookExists(bookID))
throw new BookExistsException(this, bookID);
! try {
final PreparedStatement stmt = prepQuery("insert into account values (?,?,3)");
stmt.setString(1, bookID);
stmt.setString(2, title);
stmt.execute();
! return createBookInstance(bookID, title);
} catch (SQLException e) {
+ rollbackUT();
throw new LowlevelLedgerException(this, e);
}
}
***************
*** 103,108 ****
}
try {
- getConnection().setAutoCommit(false);
-
final long xid = insertTransaction(transaction);
final Iterator items = transaction.getItems();
--- 107,110 ----
***************
*** 111,125 ****
insertTransactionItem(xid, item);
}
- getConnection().commit();
newid = Long.toString(xid);
} catch (SQLException e) {
! try {
! getConnection().rollback();
! } catch (SQLException e1) {
! throw new LowlevelLedgerException(this, e1);
! }
throw new LowlevelLedgerException(this, e);
}
-
return this.createTransaction(transaction, newid);
}
--- 113,121 ----
insertTransactionItem(xid, item);
}
newid = Long.toString(xid);
} catch (SQLException e) {
! rollbackUT();
throw new LowlevelLedgerException(this, e);
}
return this.createTransaction(transaction, newid);
}
***************
*** 139,144 ****
}
try {
- getConnection().setAutoCommit(false);
-
final long xid = insertHeldTransaction(transaction);
final Iterator items = transaction.getItems();
--- 135,138 ----
***************
*** 147,163 ****
insertHeldTransactionItem(xid, item);
}
- getConnection().commit();
newid = Long.toString(xid);
} catch (SQLException e) {
! try {
! getConnection().rollback();
! } catch (SQLException e1) {
! throw new LowlevelLedgerException(this, e1);
! }
System.err.println(e.getSQLState());
e.printStackTrace(System.err);
throw new LowlevelLedgerException(this, e);
}
-
return this.createHeldTransaction(transaction, newid);
}
--- 141,151 ----
insertHeldTransactionItem(xid, item);
}
newid = Long.toString(xid);
} catch (SQLException e) {
! rollbackUT();
System.err.println(e.getSQLState());
e.printStackTrace(System.err);
throw new LowlevelLedgerException(this, e);
}
return this.createHeldTransaction(transaction, newid);
}
***************
*** 176,187 ****
update.setString(2, getId());
final int affected = update.executeUpdate();
! if (affected == 0)
throw new UnknownTransactionException(this, hold.getXid());
if (affected > 1) {
! getConnection().rollback();
throw new LowlevelLedgerException(this, "performCancelHold: For some reason multiple rows were updated. Transaction Rolled Back.");
}
- getConnection().commit();
} catch (SQLException e) {
throw new LowlevelLedgerException(this, e);
}
--- 164,177 ----
update.setString(2, getId());
final int affected = update.executeUpdate();
! if (affected == 0) {
! rollbackUT();
throw new UnknownTransactionException(this, hold.getXid());
+ }
if (affected > 1) {
! rollbackUT();
throw new LowlevelLedgerException(this, "performCancelHold: For some reason multiple rows were updated. Transaction Rolled Back.");
}
} catch (SQLException e) {
+ rollbackUT();
throw new LowlevelLedgerException(this, e);
}
***************
*** 203,219 ****
update.setString(3, getId());
final int affected = update.executeUpdate();
! if (affected == 0)
throw new UnknownTransactionException(this, hold.getXid());
if (affected > 1) {
! getConnection().rollback();
throw new LowlevelLedgerException(this, "performCompleteHold: For some reason multiple rows were updated. Transaction Rolled Back.");
}
- getConnection().commit();
-
return tran;
} catch (SQLException e) {
throw new LowlevelLedgerException(this, e);
} catch (UnknownTransactionException e) {
throw new LowlevelLedgerException(this, e);
}
--- 193,211 ----
update.setString(3, getId());
final int affected = update.executeUpdate();
! if (affected == 0) {
! rollbackUT();
throw new UnknownTransactionException(this, hold.getXid());
+ }
if (affected > 1) {
! rollbackUT();
throw new LowlevelLedgerException(this, "performCompleteHold: For some reason multiple rows were updated. Transaction Rolled Back.");
}
return tran;
} catch (SQLException e) {
+ rollbackUT();
throw new LowlevelLedgerException(this, e);
} catch (UnknownTransactionException e) {
+ rollbackUT();
throw new LowlevelLedgerException(this, e);
}
***************
*** 222,228 ****
private long insertTransaction(final UnPostedTransaction transaction) throws SQLException, LowlevelLedgerException {
!
! final PreparedStatement tranInsert;
! tranInsert = prepQuery("insert into transaction (value_date,comment,ledgerid) values (?,?,?)");
tranInsert.setTimestamp(1, SQLTools.toTimestamp(transaction.getTransactionTime()));
tranInsert.setString(2, transaction.getComment());
--- 214,218 ----
private long insertTransaction(final UnPostedTransaction transaction) throws SQLException, LowlevelLedgerException {
! final PreparedStatement tranInsert = prepQuery("insert into transaction (value_date,comment,ledgerid) values (?,?,?)");
tranInsert.setTimestamp(1, SQLTools.toTimestamp(transaction.getTransactionTime()));
tranInsert.setString(2, transaction.getComment());
***************
*** 233,238 ****
if (rs.next())
return rs.getLong(1);
! else {
! getConnection().rollback();
throw new LowlevelLedgerException(this, "We couldnt get the id of the transaction. Safer to Rollback.");
}
--- 223,228 ----
if (rs.next())
return rs.getLong(1);
! else {
! rollbackUT();
throw new LowlevelLedgerException(this, "We couldnt get the id of the transaction. Safer to Rollback.");
}
***************
*** 240,246 ****
private long insertHeldTransaction(final UnPostedHeldTransaction transaction) throws SQLException, LowlevelLedgerException {
!
! final PreparedStatement tranInsert;
! tranInsert = prepQuery("insert into held_transaction (value_date,comment,held_until,ledgerid) values (?,?,?,?)");
tranInsert.setTimestamp(3, SQLTools.toTimestamp(transaction.getExpiryTime()));
--- 230,234 ----
private long insertHeldTransaction(final UnPostedHeldTransaction transaction) throws SQLException, LowlevelLedgerException {
! final PreparedStatement tranInsert = prepQuery("insert into held_transaction (value_date,comment,held_until,ledgerid) values (?,?,?,?)");
tranInsert.setTimestamp(3, SQLTools.toTimestamp(transaction.getExpiryTime()));
***************
*** 253,258 ****
if (rs.next())
return rs.getLong(1);
! else {
! getConnection().rollback();
throw new LowlevelLedgerException(this, "We couldnt get the id of the transaction. Safer to Rollback.");
}
--- 241,246 ----
if (rs.next())
return rs.getLong(1);
! else {
! rollbackUT();
throw new LowlevelLedgerException(this, "We couldnt get the id of the transaction. Safer to Rollback.");
}
***************
*** 426,444 ****
}
- /* (non-Javadoc)
- * @see org.neuclear.ledger.Ledger#beginLinkedTransaction()
- */
- public final void beginLinkedTransaction() {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.neuclear.ledger.Ledger#endLinkedTransactions()
- */
- public final void endLinkedTransactions() {
- // TODO Auto-generated method stub
-
- }
public final String toString() {
--- 414,417 ----
***************
*** 456,460 ****
}
- private final ConnectionSource con;
public final Book getBook(final String bookID) throws UnknownBookException, LowlevelLedgerException {
--- 429,432 ----
***************
*** 470,472 ****
--- 442,460 ----
throw new UnknownBookException(this, bookID);
}
+
+ /**
+ * Rolls back a JTA UserTransaction on the ledger. Not to be confused with a Ledger Transaction.
+ * @param ut
+ * @throws LowlevelLedgerException
+ */
+ public void rollbackUT(UserTransaction ut) throws LowlevelLedgerException {
+ super.rollbackUT(ut);
+ try {
+ con.close();
+ } catch (SQLException e) {
+ throw new LowlevelLedgerException(this,e);
+ }
+ }
+
+ private final SQLContext con;
}
|
|
From: <pe...@us...> - 2003-12-01 17:11:04
|
Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger
In directory sc8-pr-cvs1:/tmp/cvs-serv9746/org/neuclear/ledger
Modified Files:
Ledger.java PostedTransaction.java UnPostedTransaction.java
Log Message:
Added initial Support for entityengine (OFBiz)
Index: Ledger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/Ledger.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Ledger.java 21 Nov 2003 04:43:20 -0000 1.7
--- Ledger.java 1 Dec 2003 17:11:01 -0000 1.8
***************
*** 4,7 ****
--- 4,10 ----
* $Id$
* $Log$
+ * Revision 1.8 2003/12/01 17:11:01 pelle
+ * Added initial Support for entityengine (OFBiz)
+ *
* Revision 1.7 2003/11/21 04:43:20 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 102,106 ****
--- 105,112 ----
import org.neuclear.commons.configuration.Configuration;
import org.neuclear.commons.configuration.ConfigurationException;
+ import org.neuclear.commons.sql.SQLTools;
+ import javax.transaction.*;
+ import javax.naming.NamingException;
import java.util.Date;
import java.util.Iterator;
***************
*** 226,255 ****
/**
- * Use this to indicate to the underlying system that we want to start a database transaction.
- * If implementing ledger supports Transactions in the database layer this implements it.
- */
- public abstract void beginLinkedTransaction();
-
- /**
- * Use this to indicate to the underlying system that we want to end a database transaction.
- * If implementing ledger supports Transactions in the database layer this implements it.
- */
- public abstract void endLinkedTransactions();
-
- /**
- * Ledger Implementations use this to create Transactions.
- * The reason for this kind of round the way contructions is that we dont want dodgy Implementations to cause security problems for
- * other implementations.
- * @param comment
- * @param transactionTime
- * @param expiryTime
- * @param xid
- * @return PostedTransaction
- */
- /* protected final PostedTransaction createTransaction(String comment,Date transactionTime, Date expiryTime,String xid) throws TransactionException {
- return new PostedTransaction(this,comment,transactionTime,expiryTime,xid);
- }
- */
- /**
* Ledger Implementations use this to create Transactions.
* The reason for this kind of round the way contructions is that we dont want dodgy Implementations to cause security problems for
--- 232,235 ----
***************
*** 285,289 ****
try {
- beginLinkedTransaction();
//PostedTransaction rev=hold.reverse(comment); // We dont need to reverse this
final UnPostedTransaction tran = new UnPostedTransaction(this, comment, time);
--- 265,268 ----
***************
*** 296,302 ****
tran.addItem(item.getBook(), -amount);
}
! endLinkedTransactions();
! return tran.post();
} catch (UnBalancedTransactionException e) {
throw new LowlevelLedgerException(this, e);
}
--- 275,282 ----
tran.addItem(item.getBook(), -amount);
}
! final PostedTransaction postedTransaction = tran.post();
! return postedTransaction;
} catch (UnBalancedTransactionException e) {
+ rollbackUT();
throw new LowlevelLedgerException(this, e);
}
***************
*** 341,344 ****
--- 321,389 ----
public static Ledger getInstance() throws ConfigurationException {
return (Ledger) Configuration.getComponent(Ledger.class, "neuclear-ledger");
+ }
+
+ /**
+ * Begins a JTA UserTransaction on the ledger. Not to be confused with a Ledger Transaction.
+ *
+ * @throws LowlevelLedgerException
+ */
+
+ public UserTransaction beginUT() throws LowlevelLedgerException {
+ try {
+ UserTransaction ut=SQLTools.getUserTransaction();
+ if (ut.getStatus()==Status.STATUS_NO_TRANSACTION)
+ ut.begin();
+ return ut;
+ } catch (NamingException e) {
+ throw new LowlevelLedgerException(this, e);
+ } catch (SystemException e) {
+ throw new LowlevelLedgerException(this, e);
+ } catch (NotSupportedException e) {
+ throw new LowlevelLedgerException(this, e);
+ }
+ }
+
+ /**
+ * Commits a JTA UserTransaction on the ledger. Not to be confused with a Ledger Transaction.
+ *
+ * @param ut
+ * @throws LowlevelLedgerException
+ */
+ public void commitUT(UserTransaction ut) throws LowlevelLedgerException {
+ try {
+ ut.commit();
+ } catch (RollbackException e) {
+ throw new LowlevelLedgerException(this, e);
+ } catch (HeuristicMixedException e) {
+ throw new LowlevelLedgerException(this, e);
+ } catch (HeuristicRollbackException e) {
+ throw new LowlevelLedgerException(this, e);
+ } catch (SystemException e) {
+ throw new LowlevelLedgerException(this, e);
+ }
+ }
+
+ /**
+ * Rolls back a JTA UserTransaction on the ledger. Not to be confused with a Ledger Transaction.
+ *
+ * @param ut
+ * @throws LowlevelLedgerException
+ */
+ public void rollbackUT(UserTransaction ut) throws LowlevelLedgerException {
+ try {
+ ut.rollback();
+ } catch (SystemException e) {
+ throw new LowlevelLedgerException(this, e);
+ }
+ }
+
+ public void rollbackUT() throws LowlevelLedgerException {
+ try {
+ rollbackUT(SQLTools.getUserTransaction());
+ } catch (NamingException e) {
+ throw new LowlevelLedgerException(this, e);
+ } catch (SystemException e) {
+ throw new LowlevelLedgerException(this, e);
+ }
}
}
Index: PostedTransaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/PostedTransaction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PostedTransaction.java 21 Nov 2003 04:43:20 -0000 1.4
--- PostedTransaction.java 1 Dec 2003 17:11:01 -0000 1.5
***************
*** 7,10 ****
--- 7,13 ----
* $Id$
* $Log$
+ * Revision 1.5 2003/12/01 17:11:01 pelle
+ * Added initial Support for entityengine (OFBiz)
+ *
* Revision 1.4 2003/11/21 04:43:20 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 49,52 ****
--- 52,56 ----
*/
+ import javax.transaction.UserTransaction;
import java.util.Date;
import java.util.Iterator;
***************
*** 114,118 ****
*/
final PostedTransaction revise(final Date transactionTime, final String comment) throws InvalidTransactionException, UnBalancedTransactionException, LowlevelLedgerException {
- getLedger().beginLinkedTransaction();
final PostedTransaction rev=reverse(comment);
final UnPostedTransaction tran=new UnPostedTransaction(getLedger(),comment,transactionTime,false);
--- 118,121 ----
***************
*** 122,126 ****
tran.addItem(item.getBook(),item.getAmount());
}
- getLedger().endLinkedTransactions();
return tran.post();
}
--- 125,128 ----
***************
*** 132,139 ****
*/
final PostedTransaction revise(final UnPostedTransaction revised) throws InvalidTransactionException, UnBalancedTransactionException, LowlevelLedgerException {
- getLedger().beginLinkedTransaction();
reverse("REVERSE"+revised.getComment());
final PostedTransaction tran=revised.post();
- getLedger().endLinkedTransactions();
return tran;
}
--- 134,139 ----
Index: UnPostedTransaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/UnPostedTransaction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** UnPostedTransaction.java 21 Nov 2003 04:43:20 -0000 1.6
--- UnPostedTransaction.java 1 Dec 2003 17:11:01 -0000 1.7
***************
*** 8,11 ****
--- 8,14 ----
* $Id$
* $Log$
+ * Revision 1.7 2003/12/01 17:11:01 pelle
+ * Added initial Support for entityengine (OFBiz)
+ *
* Revision 1.6 2003/11/21 04:43:20 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 106,112 ****
PostedTransaction postTransaction = null;
if (isBalanced()) {
- getLedger().beginLinkedTransaction();
postTransaction = postTransaction();
- getLedger().endLinkedTransactions();
} else
throw new UnBalancedTransactionException(getLedger(), this);
--- 109,113 ----
|
|
From: <pe...@us...> - 2003-12-01 17:11:03
|
Update of /cvsroot/neuclear/neuclear-ledger/src/java In directory sc8-pr-cvs1:/tmp/cvs-serv9746 Added Files: entityengine.xml log4j.properties Log Message: Added initial Support for entityengine (OFBiz) --- NEW FILE: entityengine.xml --- <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE entity-config PUBLIC "-//OFBiz//DTD Entity Engine Config//EN" "http://www.ofbiz.org/dtds/entity-config.dtd"> <entity-config> <resource-loader name="maincp" class="org.ofbiz.core.config.ClasspathLoader"/> <transaction-factory class="org.ofbiz.core.entity.transaction.JNDIFactory"> <user-transaction-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/> <transaction-manager-jndi jndi-server-name="default" jndi-name="java:comp/UserTransaction"/> </transaction-factory> <delegator name="default" entity-model-reader="main" entity-group-reader="main"> <group-map group-name="default" datasource-name="defaultDS"/> </delegator> <entity-model-reader name="main"> <resource loader="maincp" location="entitydefs/entitymodel.xml"/> </entity-model-reader> <entity-group-reader name="main" loader="maincp" location="entitydefs/entitygroup.xml"/> <field-type name="cloudscape" loader="maincp" location="entitydefs/fieldtype-cloudscape.xml"/> <field-type name="firebird" loader="maincp" location="entitydefs/fieldtype-firebird.xml"/> <field-type name="hsql" loader="maincp" location="entitydefs/fieldtype-hsql.xml"/> <field-type name="mckoidb" loader="maincp" location="entitydefs/fieldtype-mckoidb.xml"/> <field-type name="mysql" loader="maincp" location="entitydefs/fieldtype-mysql.xml"/> <field-type name="mssql" loader="maincp" location="entitydefs/fieldtype-mssql.xml"/> <field-type name="oracle" loader="maincp" location="entitydefs/fieldtype-oracle.xml"/> <field-type name="postgres" loader="maincp" location="entitydefs/fieldtype-postgres.xml"/> <field-type name="postgres72" loader="maincp" location="entitydefs/fieldtype-postgres72.xml"/> <!-- use for postgres 7.2 and above --> <field-type name="sapdb" loader="maincp" location="entitydefs/fieldtype-sapdb.xml"/> <field-type name="sybase" loader="maincp" location="entitydefs/fieldtype-sybase.xml"/> <datasource name="defaultDS" field-type-name="hsql" helper-class="org.ofbiz.core.entity.GenericHelperDAO" check-on-start="true" use-foreign-keys="false" use-foreign-key-indices="false" check-fks-on-start="false" check-fk-indices-on-start="false" add-missing-on-start="true"> <!--<jndi-jdbc jndi-server-name="default" jndi-name="jdbc/DefaultDS"/>--> <inline-jdbc jdbc-driver="org.hsqldb.jdbcDriver" jdbc-uri="jdbc:hsqldb:target/testdata/db" jdbc-username="sa" jdbc-password="" isolation-level="ReadUncommitted"/> </datasource> </entity-config> --- NEW FILE: log4j.properties --- # Note that if you have another properties file higher in # the application classloader, that this file will be ignored. ##################################################### # LOGGING LEVELS ##################################################### # To turn more verbose logging on - change "WARN" to "DEBUG" log4j.rootLogger=DEBUG, console #log4j.rootCategory=WARN, console ##################################################### # LOG FILE LOCATIONS ##################################################### log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.Threshold=DEBUG log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern= %d %p [%c{4}] %m%n |
|
From: <pe...@us...> - 2003-12-01 16:32:55
|
Update of /cvsroot/neuclear/neuclear-ledger/src/java/entitydefs In directory sc8-pr-cvs1:/tmp/cvs-serv1893/entitydefs Log Message: Directory /cvsroot/neuclear/neuclear-ledger/src/java/entitydefs added to the repository |
|
From: <pe...@us...> - 2003-12-01 15:44:58
|
Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv24187/src/java/org/neuclear/commons/sql
Modified Files:
DefaultConnectionSource.java JNDIConnectionSource.java
SQLTools.java
Added Files:
SQLContext.java XAConnectionSource.java
Removed Files:
SimpleConnectionSource.java ThreadMappedConnectionSource.java
Log Message:
Added XAConnectionSources and Transaction capability through jotm.
--- NEW FILE: SQLContext.java ---
package org.neuclear.commons.sql;
import java.sql.Connection;
import java.sql.SQLException;
import java.io.IOException;
import java.util.Map;
import java.util.HashMap;
/*
NeuClear Distributed Transaction Clearing Platform
(C) 2003 Pelle Braendgaard
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
$Id: SQLContext.java,v 1.1 2003/12/01 15:44:53 pelle Exp $
$Log: SQLContext.java,v $
Revision 1.1 2003/12/01 15:44:53 pelle
Added XAConnectionSources and Transaction capability through jotm.
*/
/**
* A thread mapped wrapper around a ConnectionSource. The same thread will always
* receive the same connection source. A new Connection is created if none exist.
* The threads connection can be specifically closed with close()
*/
public class SQLContext implements ConnectionSource{
public SQLContext(ConnectionSource source) {
this.source = source;
this.map=new HashMap();
}
/**
* Gets the threads Connection or creates a new one if one doesnt exist.
* @return
* @throws SQLException
* @throws IOException
*/
public Connection getConnection() throws SQLException, IOException {
Connection con= (Connection)map.get(Thread.currentThread());
if (con==null||con.isClosed()){
con=source.getConnection();
map.put(Thread.currentThread(),con);
}
return con;
}
/**
* if the thread has an open connection it closes it.
* @throws SQLException
*/
public void close() throws SQLException {
Connection con= (Connection)map.get(Thread.currentThread());
if (con!=null||!con.isClosed())
map.remove(Thread.currentThread());
con.close();
}
private final ConnectionSource source;
private final Map map;
}
--- NEW FILE: XAConnectionSource.java ---
package org.neuclear.commons.sql;
import org.enhydra.jdbc.standard.StandardXADataSource;
import org.neuclear.commons.NeuClearException;
import javax.sql.XADataSource;
import javax.sql.XAConnection;
import javax.naming.NamingException;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.DriverManager;
import java.io.IOException;
import java.util.Map;
import java.util.HashMap;
/**
*
* User: pelleb
* Date: Aug 6, 2003
* Time: 3:38:50 PM
*/
public final class XAConnectionSource implements ConnectionSource {
public XAConnectionSource(final String driver, final String url, final String user, final String password) throws SQLException, NeuClearException, NamingException{
SQLTools.loadDefaultContext();
try {
Class.forName(driver).newInstance();
} catch (InstantiationException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
} catch (IllegalAccessException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
} catch (ClassNotFoundException e) {
e.printStackTrace(); //To change body of catch statement use Options | File Templates.
}
this.user=user;
this.password=password;
xads = new StandardXADataSource();
((StandardXADataSource) xads).setDriverName(driver);
((StandardXADataSource) xads).setUrl(url);
((StandardXADataSource) xads).setTransactionManager(SQLTools.getTransactionManager());
}
public Connection getConnection() throws SQLException, IOException {
return xads.getXAConnection(user,password).getConnection();
}
private final String user;
private final String password;
private final XADataSource xads;
// private XAConnection xaConnection;
}
Index: DefaultConnectionSource.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql/DefaultConnectionSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DefaultConnectionSource.java 21 Nov 2003 04:43:42 -0000 1.2
--- DefaultConnectionSource.java 1 Dec 2003 15:44:53 -0000 1.3
***************
*** 1,4 ****
--- 1,7 ----
package org.neuclear.commons.sql;
+ import org.neuclear.commons.NeuClearException;
+
+ import javax.naming.NamingException;
import java.sql.Connection;
import java.sql.SQLException;
***************
*** 7,10 ****
--- 10,14 ----
import java.util.Map;
import java.util.HashMap;
+ import java.util.Properties;
/**
***************
*** 14,23 ****
* Time: 3:38:50 PM
*/
! public final class DefaultConnectionSource extends ThreadMappedConnectionSource {
! public final Connection createConnection() throws SQLException, IOException {
! return SQLTools.getConnection();
}
}
--- 18,37 ----
* Time: 3:38:50 PM
*/
! public final class DefaultConnectionSource implements ConnectionSource {
! public DefaultConnectionSource() throws SQLException, NeuClearException, IOException, NamingException {
! final Properties props=SQLTools.loadProperties();
! cs = new XAConnectionSource(
! props.getProperty("jdbc.class"),
! props.getProperty("jdbc.url"),
! props.getProperty("jdbc.username"),
! props.getProperty("jdbc.password")
! );
! }
! public Connection getConnection() throws SQLException, IOException {
! return cs.getConnection();
}
+ private final ConnectionSource cs;
}
Index: JNDIConnectionSource.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql/JNDIConnectionSource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JNDIConnectionSource.java 28 Nov 2003 00:12:13 -0000 1.3
--- JNDIConnectionSource.java 1 Dec 2003 15:44:53 -0000 1.4
***************
*** 28,31 ****
--- 28,34 ----
$Id$
$Log$
+ Revision 1.4 2003/12/01 15:44:53 pelle
+ Added XAConnectionSources and Transaction capability through jotm.
+
Revision 1.3 2003/11/28 00:12:13 pelle
Getting the NeuClear web transactions working.
***************
*** 43,49 ****
/**
! * User: pelleb
! * Date: Nov 18, 2003
! * Time: 6:09:37 PM
*/
public final class JNDIConnectionSource implements ConnectionSource {
--- 46,52 ----
/**
! * The JNDIConnectionSource takes as a constructer the name of a JNDI connection source.
! * While not required, for most applications this should implement XA and there should also be
! * a JTA UserTransaction available via JNDI
*/
public final class JNDIConnectionSource implements ConnectionSource {
Index: SQLTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql/SQLTools.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SQLTools.java 21 Nov 2003 04:43:42 -0000 1.2
--- SQLTools.java 1 Dec 2003 15:44:54 -0000 1.3
***************
*** 1,4 ****
--- 1,15 ----
package org.neuclear.commons.sql;
+ import org.neuclear.commons.NeuClearException;
+ import org.objectweb.jotm.Jotm;
+ import org.objectweb.carol.util.configuration.CarolConfiguration;
+ import org.objectweb.carol.util.configuration.RMIConfigurationException;
+
+ import javax.transaction.UserTransaction;
+ import javax.transaction.TransactionManager;
+ import javax.transaction.SystemException;
+ import javax.naming.InitialContext;
+ import javax.naming.Context;
+ import javax.naming.NamingException;
import java.sql.SQLException;
import java.sql.DriverManager;
***************
*** 42,46 ****
! private static Properties loadProperties() throws IOException {
final Properties props=new Properties();
final File propsFile= new File(
--- 53,57 ----
! static Properties loadProperties() throws IOException {
final Properties props=new Properties();
final File propsFile= new File(
***************
*** 63,65 ****
--- 74,121 ----
return new Timestamp(date.getTime());
}
+ public final static UserTransaction getUserTransaction() throws NamingException,SystemException {
+ Context ctx = new InitialContext();
+ UserTransaction ut = null;
+ try {
+ ut = (UserTransaction)ctx.lookup(USERXACT);
+ } catch (NamingException e) {
+ getTransactionManager().getTransaction();
+ return jotm.getUserTransaction();
+
+ }
+ return ut;
+
+ }
+
+ public final static synchronized TransactionManager getTransactionManager() throws NamingException {
+ if (jotm==null){
+ Context ctx = new InitialContext();
+ jotm=new Jotm(true,false);
+ ctx.rebind(USERXACT,jotm.getUserTransaction());
+ }
+ return jotm.getTransactionManager();
+
+ }
+ final static void loadDefaultContext(){
+ try{
+ System.setProperty("java.naming.factory.initial","org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory");
+ Context ctx=new InitialContext();
+ } catch (Exception ex){
+
+ try {
+ CarolConfiguration.init();
+ getTransactionManager();
+ } catch (RMIConfigurationException e) {
+ throw new RuntimeException(e);
+ } catch (NamingException e) {
+ throw new RuntimeException(e) ;
+
+ }
+ }
+ }
+
+
+ private static Jotm jotm;
+ public static final String USERXACT = "java:comp/UserTransaction";
+
}
--- SimpleConnectionSource.java DELETED ---
--- ThreadMappedConnectionSource.java DELETED ---
|
|
From: <pe...@us...> - 2003-12-01 15:44:57
|
Update of /cvsroot/neuclear/neuclear-commons/src/java In directory sc8-pr-cvs1:/tmp/cvs-serv24187/src/java Added Files: carol.properties Log Message: Added XAConnectionSources and Transaction capability through jotm. --- NEW FILE: carol.properties --- # carol properties # (note that for this configuration only this # property is needed) carol.protocols=lmi # start or not all non started name services carol.start.ns=true # use carol rmi (Multi PORD) carol.start.rmi=false # use carol naming (Multi JNDI) carol.start.jndi=true |
|
From: <pe...@us...> - 2003-12-01 15:42:59
|
Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv24009/src/test/org/neuclear/asset/receiver
Modified Files:
PaymentReceiverTest.java
Log Message:
Index: PaymentReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PaymentReceiverTest.java 28 Nov 2003 00:11:51 -0000 1.8
--- PaymentReceiverTest.java 1 Dec 2003 15:42:55 -0000 1.9
***************
*** 22,28 ****
--- 22,30 ----
import org.neuclear.xml.XMLException;
+ import javax.naming.NamingException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
+ import java.sql.SQLException;
/*
***************
*** 46,49 ****
--- 48,54 ----
$Id$
$Log$
+ Revision 1.9 2003/12/01 15:42:55 pelle
+ *** empty log message ***
+
Revision 1.8 2003/11/28 00:11:51 pelle
Getting the NeuClear web transactions working.
***************
*** 130,134 ****
*/
public final class PaymentReceiverTest extends AbstractSigningTest {
! public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException {
super(string);
AssetGlobals.registerReaders();
--- 135,139 ----
*/
public final class PaymentReceiverTest extends AbstractSigningTest {
! public PaymentReceiverTest(final String string) throws NeuClearException, GeneralSecurityException, UnknownLedgerException, LowlevelLedgerException, BookExistsException, IOException, InvalidTransferException, XMLException, SQLException, NamingException {
super(string);
AssetGlobals.registerReaders();
|
|
From: <pe...@us...> - 2003-11-28 00:13:02
|
Update of /cvsroot/neuclear/neuclear-id In directory sc8-pr-cvs1:/tmp/cvs-serv18673 Modified Files: project.properties project.xml Log Message: Getting the NeuClear web transactions working. Index: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/project.properties,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** project.properties 24 Nov 2003 23:33:38 -0000 1.15 --- project.properties 28 Nov 2003 00:12:59 -0000 1.16 *************** *** 18,22 **** maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/ ! #maven.test.skip=true maven.uberjar.main = org.neuclear.signers.commandline.CommandLineSigner maven.repo.central = neuclear.org --- 18,22 ---- maven.repo.remote = http://neuclear.org/maven/,http://www.ibiblio.org/maven/,http://dist.codehaus.org/ ! maven.test.skip=true maven.uberjar.main = org.neuclear.signers.commandline.CommandLineSigner maven.repo.central = neuclear.org Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-id/project.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** project.xml 24 Nov 2003 23:33:38 -0000 1.18 --- project.xml 28 Nov 2003 00:12:59 -0000 1.19 *************** *** 2,188 **** <project> ! <name>NeuClear Identity Framework</name> ! <id>neuclear-id</id> ! <currentVersion>0.8-SNAPSHOT</currentVersion> ! <inceptionYear>2002</inceptionYear> ! <package>org.neuclear</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuClear Identity Framework</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://talk.org/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Java framework for NeuClear Distributed PKI Authentication Framework ! </description> ! <url>http://neuclear.org/id/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-id ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-id/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/id/</siteDirectory> ! <issueTrackingUrl>http://jira.neuclear.org:8080/</issueTrackingUrl> <mailingLists> - <mailingList> - <name>NeuClear Announce</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> - </mailingList> - <mailingList> - <name>NeuClear General</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> - </mailingList> <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> </mailingList> </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>neuclear-xmlsig</id> ! <name>neuclear-xmlsig</name> ! <version>0.11-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>neuclear-commons</id> ! <name>neuclear-commons</name> ! <version>0.5-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>cactus</id> ! <version>13-1.5-rc1</version> ! </dependency> ! <dependency> ! <id>commons-collections</id> ! <name>commons-collections</name> ! <version>2.1</version> ! <jar>commons-collections-2.1.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>dom4j</id> ! <version>1.4</version> ! <jar>dom4j-1.4.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <jar>bouncycastle-jce-jdk13-112.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8.1</version> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> ! </dependency> ! <dependency> ! <id>commons-cli</id> ! <name>commons-cli</name> ! <version>1.0-beta-2</version> </dependency> ! <dependency> ! <id>waterken-adt</id> ! <version>2.0-beta13</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>javamail</id> ! <version>1.3</version> ! <jar>mail.jar</jar> ! <url>http://java.sun.com/products/javamail/</url> ! </dependency> ! <dependency> ! <id>activation</id> ! <version>1.0.2</version> ! <jar>activation.jar</jar> ! <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url> ! </dependency> ! <dependency> ! <id>picocontainer</id> ! <version>1.0-beta-1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>nanocontainer</id> ! <version>1.0-alpha-PRESPLIT-1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! </dependencies> ! <build> ! <!-- <sourceDirectories>--> ! <sourceDirectory>src/java</sourceDirectory> ! <!-- </sourceDirectories>--> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <aspectSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <!--<include>**/*Test.java</include>--> ! </includes> ! <excludes> ! <exclude>**/Abstract*Test.java</exclude> ! </excludes> ! </unitTest> ! </build> </project> --- 2,189 ---- <project> ! <name>NeuClear Identity Framework</name> ! <id>neuclear-id</id> ! <currentVersion>0.8-SNAPSHOT</currentVersion> ! <inceptionYear>2002</inceptionYear> ! <package>org.neuclear</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuClear Identity Framework</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://talk.org/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Java framework for NeuClear Distributed PKI Authentication Framework ! </description> ! <url>http://neuclear.org/id/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-id ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-id/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/id/</siteDirectory> ! <issueTrackingUrl>http://jira.neuclear.org:8080/</issueTrackingUrl> <mailingLists> <mailingList> ! <name>NeuClear Announce</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear General</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> </mailingList> </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>neuclear-xmlsig</id> ! <name>neuclear-xmlsig</name> ! <version>0.11-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>neuclear-commons</id> ! <name>neuclear-commons</name> ! <version>0.5-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>cactus</id> ! <version>13-1.5-rc1</version> ! </dependency> ! <dependency> ! <id>commons-collections</id> ! <name>commons-collections</name> ! <version>2.1</version> ! <jar>commons-collections-2.1.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> ! <dependency> ! <id>dom4j</id> ! <version>1.4</version> ! <jar>dom4j-1.4.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <version>120</version> ! <jar>bcprov-jdk14-120.jar</jar> ! <properties> ! <war.bundle>false</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8.1</version> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> ! </dependency> ! <dependency> ! <id>commons-cli</id> ! <name>commons-cli</name> ! <version>1.0-beta-2</version> ! </dependency> ! <dependency> ! <id>waterken-adt</id> ! <version>2.0-beta13</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>javamail</id> ! <version>1.3</version> ! <jar>mail.jar</jar> ! <url>http://java.sun.com/products/javamail/</url> ! </dependency> ! <dependency> ! <id>activation</id> ! <version>1.0.2</version> ! <jar>activation.jar</jar> ! <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url> ! </dependency> ! <dependency> ! <id>picocontainer</id> ! <version>1.0-beta-1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>nanocontainer</id> ! <version>1.0-alpha-PRESPLIT-1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! </dependencies> ! <build> ! <!-- <sourceDirectories>--> ! <sourceDirectory>src/java</sourceDirectory> ! <!-- </sourceDirectories>--> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <aspectSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <!--<include>**/*Test.java</include>--> ! </includes> ! <excludes> ! <exclude>**/Abstract*Test.java</exclude> ! </excludes> ! </unitTest> ! </build> </project> |
|
From: <pe...@us...> - 2003-11-28 00:13:02
|
Update of /cvsroot/neuclear/neuclear-id/src/webapp/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv18673/src/webapp/WEB-INF
Modified Files:
web.xml
Log Message:
Getting the NeuClear web transactions working.
Index: web.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** web.xml 15 Nov 2003 01:58:22 -0000 1.4
--- web.xml 28 Nov 2003 00:12:59 -0000 1.5
***************
*** 9,80 ****
Storage System for Named Objects in Neubia
</description>
- <!--
- <servlet>
- <servlet-name>storage</servlet-name>
- <servlet-class>org.neuclear.store.servlet.StorageServlet</servlet-class>
- <init-param>
- <param-name>type</param-name>
- <param-value>clear</param-value>
- </init-param>
- <init-param>
- <param-name>basedir</param-name>
- <param-value>/WEB-INF/store</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>rootstorage</servlet-name>
- <servlet-class>org.neuclear.store.servlet.StorageServlet</servlet-class>
- <init-param>
- <param-name>type</param-name>
- <param-value>clear</param-value>
- </init-param>
- <init-param>
- <param-name>basedir</param-name>
- <param-value>/WEB-INF/root</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>demosigner</servlet-name>
- <servlet-class>org.neuclear.signers.servlet.DemoSigningServlet</servlet-class>
- <init-param>
- <param-name>keystore</param-name>
- <param-value>/WEB-INF/signer/signerstore.ser</param-value>
- </init-param>
- <init-param>
- <param-name>keystore.password</param-name>
- <param-value></param-value>
- </init-param>
- <init-param>
- <param-name>title</param-name>
- <param-value>NeuDist Demo Signer</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- -->
<filter>
<filter-name>authfilter</filter-name>
<filter-class>org.neuclear.auth.AuthenticationFilter</filter-class>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test</param-value>
</init-param>
-
</filter>
<servlet>
<servlet-name>jcesigner</servlet-name>
<servlet-class>org.neuclear.signers.servlet.SigningServlet</servlet-class>
<init-param>
! <param-name>keystore</param-name>
! <param-value>/WEB-INF/testkeys.ks</param-value>
</init-param>
<init-param>
! <param-name>keystore.password</param-name>
! <param-value>neuclear</param-value>
</init-param>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Remote Signer</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
--- 9,38 ----
Storage System for Named Objects in Neubia
</description>
<filter>
<filter-name>authfilter</filter-name>
<filter-class>org.neuclear.auth.AuthenticationFilter</filter-class>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test</param-value>
</init-param>
</filter>
+ <filter-mapping>
+ <filter-name>authfilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<servlet>
<servlet-name>jcesigner</servlet-name>
<servlet-class>org.neuclear.signers.servlet.SigningServlet</servlet-class>
<init-param>
! <param-name>keystore</param-name>
! <param-value>/WEB-INF/testkeys.ks</param-value>
</init-param>
<init-param>
! <param-name>keystore.password</param-name>
! <param-value>neuclear</param-value>
</init-param>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Remote Signer</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
***************
*** 84,115 ****
<servlet-class>org.neuclear.auth.AuthenticationServlet</servlet-class>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Example Application</param-value>
</init-param>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
- <filter-mapping>
- <filter-name>authfilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
- <!--
- <servlet-mapping>
- <servlet-name>storage</servlet-name>
- <url-pattern>/Store</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>rootstorage</servlet-name>
- <url-pattern>/root/Store</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>demosigner</servlet-name>
- <url-pattern>/demo/Signer</url-pattern>
- </servlet-mapping>-->
<servlet-mapping>
<servlet-name>jcesigner</servlet-name>
--- 42,54 ----
<servlet-class>org.neuclear.auth.AuthenticationServlet</servlet-class>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Example Application</param-value>
</init-param>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>jcesigner</servlet-name>
***************
*** 120,138 ****
<url-pattern>/Authorize</url-pattern>
</servlet-mapping>
!
! <!--
! <servlet>
! <servlet-name>webauth</servlet-name>
! <servlet-class>org.neuclear.store.servlet.StorageServlet</servlet-class>
! <load-on-startup>1</load-on-startup>
! </servlet>
! <servlet-mapping>
! <servlet-name>storage</servlet-name>
! <url-pattern>soap/Storage</url-pattern>
! </servlet-mapping>
! -->
! <welcome-file-list>
! <welcome-file>index.jsp</welcome-file>
! </welcome-file-list>
!
</web-app>
--- 59,64 ----
<url-pattern>/Authorize</url-pattern>
</servlet-mapping>
! <welcome-file-list>
! <welcome-file>index.jsp</welcome-file>
! </welcome-file-list>
</web-app>
|
|
From: <pe...@us...> - 2003-11-28 00:13:01
|
Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv18673/src/test-cactus/org/neuclear/receiver
Modified Files:
ReceiverServletTest.java
Log Message:
Getting the NeuClear web transactions working.
Index: ReceiverServletTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/receiver/ReceiverServletTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReceiverServletTest.java 24 Nov 2003 23:33:38 -0000 1.1
--- ReceiverServletTest.java 28 Nov 2003 00:12:59 -0000 1.2
***************
*** 35,38 ****
--- 35,41 ----
$Id$
$Log$
+ Revision 1.2 2003/11/28 00:12:59 pelle
+ Getting the NeuClear web transactions working.
+
Revision 1.1 2003/11/24 23:33:38 pelle
More Cactus unit testing going on.
***************
*** 52,56 ****
AuthenticationTicket ticket = (AuthenticationTicket) builder.sign(signer);
String b64 = XMLSecTools.encodeElementBase64(builder.getElement());
! theRequest.addParameter("base64xml", b64, WebRequest.POST_METHOD);
}
--- 55,59 ----
AuthenticationTicket ticket = (AuthenticationTicket) builder.sign(signer);
String b64 = XMLSecTools.encodeElementBase64(builder.getElement());
! theRequest.addParameter("neuclear-request", b64, WebRequest.POST_METHOD);
}
|
|
From: <pe...@us...> - 2003-11-28 00:13:01
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv18673/src/java/org/neuclear/receiver
Modified Files:
ReceiverServlet.java
Log Message:
Getting the NeuClear web transactions working.
Index: ReceiverServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/ReceiverServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ReceiverServlet.java 24 Nov 2003 23:33:37 -0000 1.9
--- ReceiverServlet.java 28 Nov 2003 00:12:58 -0000 1.10
***************
*** 2,5 ****
--- 2,8 ----
* $Id$
* $Log$
+ * Revision 1.10 2003/11/28 00:12:58 pelle
+ * Getting the NeuClear web transactions working.
+ *
* Revision 1.9 2003/11/24 23:33:37 pelle
* More Cactus unit testing going on.
***************
*** 94,100 ****
import org.dom4j.Element;
import org.neuclear.commons.NeuClearException;
import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.xml.ElementProxy;
- import org.neuclear.xml.XMLException;
import org.neuclear.xml.soap.XMLInputStreamServlet;
--- 97,103 ----
import org.dom4j.Element;
import org.neuclear.commons.NeuClearException;
+ import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.verifier.VerifyingReader;
import org.neuclear.xml.ElementProxy;
import org.neuclear.xml.soap.XMLInputStreamServlet;
***************
*** 122,126 ****
}
try {
! ElementProxy receipt = receiver.receive(VerifyingReader.getInstance().read(is));
if (isXML)
writer.print(receipt.canonicalize());
--- 125,135 ----
}
try {
!
! final SignedNamedObject obj = VerifyingReader.getInstance().read(is);
! if (obj == null)
! throw new NeuClearException("Missing Request");
! ctx.log("NeuClear: Got Request " + obj.getName());
! ctx.log(obj.getEncoded());
! ElementProxy receipt = receiver.receive(obj);
if (isXML)
writer.print(receipt.canonicalize());
***************
*** 128,135 ****
writer.print(receipt.getTagName());
! } catch (NeuClearException e) {
! e.printStackTrace(writer);
! } catch (XMLException e) {
e.printStackTrace(writer);
}
writer.close();
--- 137,146 ----
writer.print(receipt.getTagName());
! } catch (Exception e) {
! writer.println("<h1>Error</h1><h3>");
! writer.println(e.getLocalizedMessage());
! writer.println("</h3><pre>");
e.printStackTrace(writer);
+ writer.println("</pre>");
}
writer.close();
|
|
From: <pe...@us...> - 2003-11-28 00:12:39
|
Update of /cvsroot/neuclear/neuclear-xmlsig In directory sc8-pr-cvs1:/tmp/cvs-serv18623 Modified Files: project.properties project.xml Log Message: Getting the NeuClear web transactions working. Index: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/project.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.properties 20 Nov 2003 23:41:58 -0000 1.4 --- project.properties 28 Nov 2003 00:12:36 -0000 1.5 *************** *** 20,22 **** #maven.ui.property.file = ui.properties maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/ ! #maven.test.skip=true --- 20,22 ---- #maven.ui.property.file = ui.properties maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/ ! maven.test.skip=true Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-xmlsig/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** project.xml 24 Nov 2003 23:33:15 -0000 1.5 --- project.xml 28 Nov 2003 00:12:36 -0000 1.6 *************** *** 2,170 **** <project> ! <name>NeuDist XML Signature API</name> ! <id>neuclear-xmlsig</id> ! <currentVersion>0.11-SNAPSHOT</currentVersion> ! <inceptionYear>2002</inceptionYear> ! <package>org.neuclear</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuDist XML Signature API</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://neubia.com/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Implementation of XML Signature API ! </description> ! <url>http://neuclear.org/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-xmlsig ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-xmlsig/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/xmlsig/</siteDirectory> ! <issueTrackingUrl>http://neuclear.org:8080/jira/secure/BrowseProject.jspa</issueTrackingUrl> <mailingLists> - <mailingList> - <name>NeuClear Announce</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> - </mailingList> - <mailingList> - <name>NeuClear General</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> - </mailingList> <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> </mailingList> </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! <developer> ! <name>Ramses Morales</name> ! <id>ramses</id> ! <email>ra...@co...</email> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>neuclear-commons</id> ! <name>neuclear-commons</name> ! <version>0.5-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>dom4j</id> ! <version>1.4</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <jar>bouncycastle-jce-jdk13-112.jar</jar> ! <!-- <jar>bcprov-jdk14-118.jar</jar>--> ! <properties> ! <war.bundle>false</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8.1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> ! </dependency> ! <dependency> ! <id>cactus</id> ! <version>13-1.5-rc1</version> ! </dependency> ! <!-- ! <dependency> ! <id>xmlpull</id> ! <name>xmlpull</name> ! <version>1.1.2.1</version> ! <properties> ! <war.bundle.jar>true</war.bundle.jar> ! </properties> ! </dependency> ! <dependency> ! <id>kxml2</id> ! <name>kxml2</name> ! <version>2.1.8</version> ! <properties> ! <war.bundle.jar>true</war.bundle.jar> ! </properties> ! </dependency> ! --> ! </dependencies> ! <build> ! <!-- <sourceDirectories>--> ! <sourceDirectory>src/java</sourceDirectory> ! <!-- </sourceDirectories>--> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <aspectSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <include>**/*Test*.java</include> ! </includes> ! <excludes> ! <exclude>**/Abstract*Test.java</exclude> ! </excludes> ! </unitTest> ! <!-- J A R R E S O U R C E S --> ! <!-- Resources that are packaged up inside the JAR file --> ! <jarResources> ! </jarResources> ! <jars> ! <!-- <jar>lib/jce-jdk13-115.jar</jar> ! <jar>lib/dom4j-1.3.jar</jar>--> ! </jars> ! </build> </project> --- 2,170 ---- <project> ! <name>NeuDist XML Signature API</name> ! <id>neuclear-xmlsig</id> ! <currentVersion>0.11-SNAPSHOT</currentVersion> ! <inceptionYear>2002</inceptionYear> ! <package>org.neuclear</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuDist XML Signature API</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://neubia.com/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Implementation of XML Signature API ! </description> ! <url>http://neuclear.org/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-xmlsig ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-xmlsig/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/xmlsig/</siteDirectory> ! <issueTrackingUrl>http://neuclear.org:8080/jira/secure/BrowseProject.jspa</issueTrackingUrl> <mailingLists> <mailingList> ! <name>NeuClear Announce</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear General</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> </mailingList> </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! <developer> ! <name>Ramses Morales</name> ! <id>ramses</id> ! <email>ra...@co...</email> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>neuclear-commons</id> ! <name>neuclear-commons</name> ! <version>0.5-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>dom4j</id> ! <version>1.4</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <version>120</version> ! <jar>bcprov-jdk14-120.jar</jar> ! <properties> ! <war.bundle>false</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8.1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> ! </dependency> ! <dependency> ! <id>cactus</id> ! <version>13-1.5-rc1</version> ! </dependency> ! <!-- ! <dependency> ! <id>xmlpull</id> ! <name>xmlpull</name> ! <version>1.1.2.1</version> ! <properties> ! <war.bundle.jar>true</war.bundle.jar> ! </properties> ! </dependency> ! <dependency> ! <id>kxml2</id> ! <name>kxml2</name> ! <version>2.1.8</version> ! <properties> ! <war.bundle.jar>true</war.bundle.jar> ! </properties> ! </dependency> ! --> ! </dependencies> ! <build> ! <!-- <sourceDirectories>--> ! <sourceDirectory>src/java</sourceDirectory> ! <!-- </sourceDirectories>--> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <aspectSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <include>**/*Test*.java</include> ! </includes> ! <excludes> ! <exclude>**/Abstract*Test.java</exclude> ! </excludes> ! </unitTest> ! <!-- J A R R E S O U R C E S --> ! <!-- Resources that are packaged up inside the JAR file --> ! <jarResources> ! </jarResources> ! <jars> ! <!-- <jar>lib/jce-jdk13-115.jar</jar> ! <jar>lib/dom4j-1.3.jar</jar>--> ! </jars> ! </build> </project> |
|
From: <pe...@us...> - 2003-11-28 00:12:39
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/test-cactus/org/neuclear/xml/soap
In directory sc8-pr-cvs1:/tmp/cvs-serv18623/src/test-cactus/org/neuclear/xml/soap
Modified Files:
XMLInputStreamServletTest.java
Log Message:
Getting the NeuClear web transactions working.
Index: XMLInputStreamServletTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test-cactus/org/neuclear/xml/soap/XMLInputStreamServletTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XMLInputStreamServletTest.java 24 Nov 2003 16:49:25 -0000 1.1
--- XMLInputStreamServletTest.java 28 Nov 2003 00:12:36 -0000 1.2
***************
*** 5,15 ****
import org.neuclear.commons.crypto.Base64;
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
- import java.io.InputStream;
import java.io.IOException;
- import java.io.BufferedReader;
- import java.io.InputStreamReader;
/*
--- 5,10 ----
***************
*** 33,36 ****
--- 28,34 ----
$Id$
$Log$
+ Revision 1.2 2003/11/28 00:12:36 pelle
+ Getting the NeuClear web transactions working.
+
Revision 1.1 2003/11/24 16:49:25 pelle
Added Cactus testing structure.
***************
*** 39,58 ****
*/
! public class XMLInputStreamServletTest extends ServletTestCase{
public static final String TESTSTRING = "test one two three";
! public void beginBase64(final WebRequest theRequest){
! theRequest.addParameter("base64xml",Base64.encode(TESTSTRING.getBytes()),"POST");
theRequest.setContentType("application/x-www-form-urlencoded");
theRequest.setURL("http://users.neuclear.org", "/test", "/Service",
! null, null);
}
public void testBase64() throws IOException, ServletException {
! assertEquals(request.getContentType(),"application/x-www-form-urlencoded");
! final MockXMLInputStreamServlet servlet=new MockXMLInputStreamServlet();
servlet.init(config);
! servlet.service(request,response);
! assertEquals(TESTSTRING,servlet.getLastInput());
}
--- 37,57 ----
*/
! public class XMLInputStreamServletTest extends ServletTestCase {
public static final String TESTSTRING = "test one two three";
! public void beginBase64(final WebRequest theRequest) {
! theRequest.addParameter("neuclear-request", Base64.encode(TESTSTRING.getBytes()), "POST");
theRequest.setContentType("application/x-www-form-urlencoded");
theRequest.setURL("http://users.neuclear.org", "/test", "/Service",
! null, null);
}
+
public void testBase64() throws IOException, ServletException {
! assertEquals(request.getContentType(), "application/x-www-form-urlencoded");
! final MockXMLInputStreamServlet servlet = new MockXMLInputStreamServlet();
servlet.init(config);
! servlet.service(request, response);
! assertEquals(TESTSTRING, servlet.getLastInput());
}
|
|
From: <pe...@us...> - 2003-11-28 00:12:38
|
Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap
In directory sc8-pr-cvs1:/tmp/cvs-serv18623/src/java/org/neuclear/xml/soap
Modified Files:
XMLInputStreamServlet.java
Log Message:
Getting the NeuClear web transactions working.
Index: XMLInputStreamServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap/XMLInputStreamServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLInputStreamServlet.java 22 Nov 2003 00:23:18 -0000 1.3
--- XMLInputStreamServlet.java 28 Nov 2003 00:12:36 -0000 1.4
***************
*** 3,8 ****
import org.neuclear.commons.Utility;
import org.neuclear.commons.crypto.Base64;
- import org.neuclear.commons.crypto.CryptoException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
--- 3,9 ----
import org.neuclear.commons.Utility;
import org.neuclear.commons.crypto.Base64;
+ import javax.servlet.ServletConfig;
+ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
***************
*** 34,37 ****
--- 35,41 ----
$Id$
$Log$
+ Revision 1.4 2003/11/28 00:12:36 pelle
+ Getting the NeuClear web transactions working.
+
Revision 1.3 2003/11/22 00:23:18 pelle
All unit tests in commons, id and xmlsec now work.
***************
*** 65,68 ****
--- 69,76 ----
*/
public abstract class XMLInputStreamServlet extends HttpServlet {
+ public void init(ServletConfig servletConfig) throws ServletException {
+ ctx = servletConfig.getServletContext();
+ }
+
protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html");
***************
*** 84,99 ****
if (request.getContentType().equals("text/xml")) {
is = request.getInputStream();
}
! if (!Utility.isEmpty(request.getParameter("base64xml"))) {
! is = new ByteArrayInputStream(Base64.decode(request.getParameter("base64xml")));
}
! handleInputStream(is, request, response);
! } catch (CryptoException e) {
! throw new ServletException(e);
}
}
protected abstract void handleInputStream(InputStream is, HttpServletRequest request, HttpServletResponse response) throws IOException;
}
--- 92,140 ----
if (request.getContentType().equals("text/xml")) {
+ ctx.log("XMLSIG: Got xml encoded neuclear-request");
is = request.getInputStream();
}
! if (!Utility.isEmpty(request.getParameter("neuclear-request"))) {
! ctx.log("XMLSIG: Got form encoded neuclear-request");
! is = new ByteArrayInputStream(Base64.decode(request.getParameter("neuclear-request")));
}
! if (is != null)
! handleInputStream(is, request, response);
! else {
! PrintWriter writer = response.getWriter();
! final boolean isXML = request.getContentType().equals("text/xml");
! if (isXML) {
! response.setContentType("text/xml");
! } else {
! response.setContentType("text/html");
! writer.print("<html><head><title>XMLInputStreamServlet Error</title></head><body>");
! }
! writer.println("<h1>Error: Empty Request</h1><h3>");
! writer.println("</h3><pre>");
!
!
! }
! } catch (Exception e) {
! PrintWriter writer = response.getWriter();
! final boolean isXML = request.getContentType().equals("text/xml");
! if (isXML) {
! response.setContentType("text/xml");
! } else {
! response.setContentType("text/html");
! writer.print("<html><head><title>XMLInputStreamServlet Error</title></head><body>");
! }
! writer.println("<h1>Error</h1><h3>");
! writer.println(e.getLocalizedMessage());
! writer.println("</h3><pre>");
! e.printStackTrace(writer);
! writer.println("</pre>");
}
}
+
protected abstract void handleInputStream(InputStream is, HttpServletRequest request, HttpServletResponse response) throws IOException;
+
+ protected ServletContext ctx;
+
}
|
|
From: <pe...@us...> - 2003-11-28 00:12:16
|
Update of /cvsroot/neuclear/neuclear-commons In directory sc8-pr-cvs1:/tmp/cvs-serv18551 Modified Files: project.properties project.xml Log Message: Getting the NeuClear web transactions working. Index: project.properties =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/project.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** project.properties 22 Nov 2003 00:22:52 -0000 1.8 --- project.properties 28 Nov 2003 00:12:13 -0000 1.9 *************** *** 20,23 **** #maven.ui.property.file = ui.properties maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/ ! #maven.test.skip=true maven.uberjar.main = org.neuclear.commons.crypto.passphraseagents.CommandLineAgent --- 20,23 ---- #maven.ui.property.file = ui.properties maven.repo.remote = http://www.ibiblio.org/maven/,http://dist.codehaus.org/,http://neuclear.org/maven/ ! maven.test.skip=true maven.uberjar.main = org.neuclear.commons.crypto.passphraseagents.CommandLineAgent Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-commons/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** project.xml 20 Nov 2003 23:41:36 -0000 1.12 --- project.xml 28 Nov 2003 00:12:13 -0000 1.13 *************** *** 2,88 **** <project> ! <name>NeuClear Commons</name> ! <id>neuclear-commons</id> ! <currentVersion>0.5-SNAPSHOT</currentVersion> ! <inceptionYear>2003</inceptionYear> ! <package>org.neuclear.commons</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuClear Common Tools API</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://neubia.com/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Tools used throughout NeuClear ! </description> ! <url>http://neuclear.org/commons/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-commons ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-commons/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/commons/</siteDirectory> <issueTrackingUrl>http://jira.neuclear.org:8080/</issueTrackingUrl> <mailingLists> - <mailingList> - <name>NeuClear Announce</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> - </mailingList> - <mailingList> - <name>NeuClear General</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> - </mailingList> <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> </mailingList> </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>mysql</id> ! <jar>mysql-connector-java-3.0.8-stable-bin.jar</jar> ! </dependency> ! <dependency> ! <id>picocontainer</id> ! <version>1.0-beta-1</version> ! </dependency> ! <dependency> ! <id>nanocontainer</id> ! <version>1.0-alpha-PRESPLIT-1</version> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.2</version> </dependency> <dependency> --- 2,88 ---- <project> ! <name>NeuClear Commons</name> ! <id>neuclear-commons</id> ! <currentVersion>0.5-SNAPSHOT</currentVersion> ! <inceptionYear>2003</inceptionYear> ! <package>org.neuclear.commons</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuClear Common Tools API</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://neubia.com/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Tools used throughout NeuClear ! </description> ! <url>http://neuclear.org/commons/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-commons ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-commons/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/commons/</siteDirectory> <issueTrackingUrl>http://jira.neuclear.org:8080/</issueTrackingUrl> <mailingLists> <mailingList> ! <name>NeuClear Announce</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear General</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> </mailingList> </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>mysql</id> ! <jar>mysql-connector-java-3.0.8-stable-bin.jar</jar> ! </dependency> ! <dependency> ! <id>picocontainer</id> ! <version>1.0-beta-1</version> ! </dependency> ! <dependency> ! <id>nanocontainer</id> ! <version>1.0-alpha-PRESPLIT-1</version> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> </dependency> <dependency> *************** *** 91,139 **** </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8.1</version> ! </dependency> ! <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <jar>bouncycastle-jce-jdk13-112.jar</jar> ! <!-- <jar>bcprov-jdk14-118.jar</jar>--> ! <properties> <war.bundle.jar>false</war.bundle.jar> ! </properties> </dependency> ! </dependencies> ! <build> ! <sourceDirectory>src/java</sourceDirectory> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <aspectSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <include>**/*Test.java</include> ! </includes> ! <excludes> ! <exclude>**/Abstract*Test.java</exclude> ! </excludes> ! </unitTest> ! <resources> ! <resource> ! <directory> src/java ! </directory> ! <includes>*.jks</includes> ! <includes>*.xml</includes> ! <!-- <targetPath>org/neuclear/commons/crypto/signers</targetPath>--> ! </resource> ! </resources> ! </build> </project> --- 91,137 ---- </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8.1</version> ! </dependency> ! <dependency> ! <id>bouncycastle</id> ! <version>120</version> ! <jar>bcprov-jdk14-120.jar</jar> ! <properties> <war.bundle.jar>false</war.bundle.jar> ! </properties> </dependency> ! </dependencies> ! <build> ! <sourceDirectory>src/java</sourceDirectory> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <aspectSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <include>**/*Test.java</include> ! </includes> ! <excludes> ! <exclude>**/Abstract*Test.java</exclude> ! </excludes> ! </unitTest> ! <resources> ! <resource> ! <directory> src/java ! </directory> ! <includes>*.jks</includes> ! <includes>*.xml</includes> ! </resource> ! </resources> ! </build> </project> |
|
From: <pe...@us...> - 2003-11-28 00:12:16
|
Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv18551/src/java/org/neuclear/commons/sql
Modified Files:
JNDIConnectionSource.java
Log Message:
Getting the NeuClear web transactions working.
Index: JNDIConnectionSource.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/sql/JNDIConnectionSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JNDIConnectionSource.java 21 Nov 2003 04:43:42 -0000 1.2
--- JNDIConnectionSource.java 28 Nov 2003 00:12:13 -0000 1.3
***************
*** 28,31 ****
--- 28,34 ----
$Id$
$Log$
+ Revision 1.3 2003/11/28 00:12:13 pelle
+ Getting the NeuClear web transactions working.
+
Revision 1.2 2003/11/21 04:43:42 pelle
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 47,51 ****
public JNDIConnectionSource(final String name) throws NamingException {
final InitialContext ctx = new InitialContext();
! this.ds = (DataSource) ctx.lookup(name);
}
--- 50,54 ----
public JNDIConnectionSource(final String name) throws NamingException {
final InitialContext ctx = new InitialContext();
! this.ds = (DataSource) ctx.lookup("java:comp/env/" + name);
}
|
|
From: <pe...@us...> - 2003-11-28 00:11:54
|
Update of /cvsroot/neuclear/neuclear-pay In directory sc8-pr-cvs1:/tmp/cvs-serv18411 Modified Files: project.xml Log Message: Getting the NeuClear web transactions working. Index: project.xml =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/project.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** project.xml 22 Nov 2003 00:22:29 -0000 1.14 --- project.xml 28 Nov 2003 00:11:51 -0000 1.15 *************** *** 2,205 **** <project> ! <name>NeuClear Pay</name> ! <id>neuclear-pay</id> ! <currentVersion>0.3-SNAPSHOT</currentVersion> ! <inceptionYear>2003</inceptionYear> ! <package>org.neuclear.asset</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuClear Payment API</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://neubia.com/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Generalised Java API for pay like Applications. ! </description> ! <url>http://neuclear.org/pay/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-pay ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-pay/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/pay/</siteDirectory> ! <issueTrackingUrl>http://devone.veraxpay.com:9090/</issueTrackingUrl> ! <mailingLists> ! <mailingList> ! <name>NeuClear Announce</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear General</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> ! </mailingList> ! </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>neuclear-ledger</id> ! <name>neuclear-ledger</name> ! <version>0.3</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>neuclear-commons</id> ! <name>neuclear-commons</name> ! <version>0.5-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>picocontainer</id> ! <version>1.0-beta-1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>nanocontainer</id> ! <version>1.0-alpha-PRESPLIT-1</version> ! </dependency> ! <dependency> ! <id>neuclear-id</id> ! <name>neuclear-id</name> ! <version>0.8-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>neuclear-xmlsig</id> ! <name>neuclear-xmlsig</name> ! <version>0.10</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>commons-collections</id> ! <name>commons-collections</name> ! <version>2.1</version> ! <jar>commons-collections-2.1.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>dom4j</id> ! <version>1.4</version> ! <jar>dom4j-1.4.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>commons-cli</id> ! <name>commons-cli</name> ! <version>1.0-beta-2</version> </dependency> ! <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <version>115</version> ! <jar>jce-jdk13-115.jar</jar> ! <properties> ! <war.bundle>false</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8</version> ! </dependency> ! <dependency> ! <id>waterken-adt</id> ! <version>2.0-beta13</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>javamail</id> ! <version>1.3</version> ! <jar>mail.jar</jar> ! <url>http://java.sun.com/products/javamail/</url> ! </dependency> ! <dependency> ! <id>activation</id> ! <version>1.0.2</version> ! <jar>activation.jar</jar> ! <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url> ! </dependency> ! <dependency> ! <id>jstl</id> ! <version>1.0.2</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> </dependency> ! </dependencies> ! <build> ! <!-- <sourceDirectories>--> ! <sourceDirectory>src/java</sourceDirectory> ! <!-- </sourceDirectories>--> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <include>**/*Test.java</include> ! </includes> ! <excludes> ! <exclude>**/Abstract*.java</exclude> ! </excludes> ! </unitTest> ! <!-- J A R R E S O U R C E S --> ! </build> </project> --- 2,205 ---- <project> ! <name>NeuClear Pay</name> ! <id>neuclear-pay</id> ! <currentVersion>0.3-SNAPSHOT</currentVersion> ! <inceptionYear>2003</inceptionYear> ! <package>org.neuclear.asset</package> ! <logo>/images/logo.gif</logo> ! <shortDescription>NeuClear Payment API</shortDescription> ! <organization> ! <name>Antilles Software Ventures SA</name> ! <url>http://neubia.com/</url> ! <!-- <logo>/images/neubiasmallnotext.png</logo>--> ! </organization> ! <description> Generalised Java API for pay like Applications. ! </description> ! <url>http://neuclear.org/pay/</url> <repository> ! <connection> scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-pay ! </connection> ! <url> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-pay/ ! </url> ! </repository> ! <siteAddress>neuclear.org</siteAddress> ! <siteDirectory>/home/sites/neuclear.org/public_html/pay/</siteDirectory> ! <issueTrackingUrl>http://devone.veraxpay.com:9090/</issueTrackingUrl> ! <mailingLists> ! <mailingList> ! <name>NeuClear Announce</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-announce</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-announce</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear General</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-general</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-general</archive> ! </mailingList> ! <mailingList> ! <name>NeuClear Develop</name> ! <subscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</subscribe> ! <unsubscribe>http://lists.sourceforge.net/lists/listinfo/neuclear-develop</unsubscribe> ! <archive>http://sourceforge.net/mailarchive/forum.php?forum=neuclear-develop</archive> ! </mailingList> ! </mailingLists> ! <developers> ! <developer> ! <name>Pelle Braendgaard</name> ! <id>pelle</id> ! <email>pe...@ne...</email> ! <organization>Antilles Software Ventures SA</organization> ! </developer> ! </developers> ! <!-- Need to mark these as compile-time/run-time --> ! <dependencies> ! <dependency> ! <id>neuclear-ledger</id> ! <name>neuclear-ledger</name> ! <version>0.3</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> </dependency> ! <dependency> ! <id>neuclear-commons</id> ! <name>neuclear-commons</name> ! <version>0.5-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>picocontainer</id> ! <version>1.0-beta-1</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>nanocontainer</id> ! <version>1.0-alpha-PRESPLIT-1</version> ! </dependency> ! <dependency> ! <id>neuclear-id</id> ! <name>neuclear-id</name> ! <version>0.8-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>neuclear-xmlsig</id> ! <name>neuclear-xmlsig</name> ! <version>0.11-SNAPSHOT</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>commons-collections</id> ! <name>commons-collections</name> ! <version>2.1</version> ! <jar>commons-collections-2.1.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>dom4j</id> ! <version>1.4</version> ! <jar>dom4j-1.4.jar</jar> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>commons-cli</id> ! <name>commons-cli</name> ! <version>1.0-beta-2</version> ! </dependency> ! <dependency> ! <id>bouncycastle</id> ! <name>bouncycastle</name> ! <version>120</version> ! <jar>bcprov-jdk14-120.jar</jar> ! <properties> ! <war.bundle>false</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>junit</id> ! <name>junit</name> ! <version>3.8</version> ! </dependency> ! <dependency> ! <id>waterken-adt</id> ! <version>2.0-beta13</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>javamail</id> ! <version>1.3</version> ! <jar>mail.jar</jar> ! <url>http://java.sun.com/products/javamail/</url> ! </dependency> ! <dependency> ! <id>activation</id> ! <version>1.0.2</version> ! <jar>activation.jar</jar> ! <url>http://java.sun.com/products/javabeans/glasgow/jaf.html</url> ! </dependency> ! <dependency> ! <id>jstl</id> ! <version>1.0.2</version> ! <properties> ! <war.bundle>true</war.bundle> ! </properties> ! </dependency> ! <dependency> ! <id>servletapi</id> ! <name>servletapi</name> ! <version>2.3</version> </dependency> ! </dependencies> ! <build> ! <!-- <sourceDirectories>--> ! <sourceDirectory>src/java</sourceDirectory> ! <!-- </sourceDirectories>--> ! <unitTestSourceDirectory>src/test</unitTestSourceDirectory> ! <integrationUnitTestSourceDirectory/> ! <!-- Unit test cases --> ! <unitTest> ! <includes> ! <include>**/*Test.java</include> ! </includes> ! <excludes> ! <exclude>**/Abstract*.java</exclude> ! </excludes> ! </unitTest> ! <!-- J A R R E S O U R C E S --> ! </build> </project> |
|
From: <pe...@us...> - 2003-11-28 00:11:54
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv18411/src/webapp/WEB-INF
Modified Files:
web.xml
Log Message:
Getting the NeuClear web transactions working.
Index: web.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** web.xml 22 Nov 2003 00:22:29 -0000 1.2
--- web.xml 28 Nov 2003 00:11:51 -0000 1.3
***************
*** 2,8 ****
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
<web-app>
-
<display-name>NeuClear Pay WebApp</display-name>
<description>
--- 2,6 ----
***************
*** 13,31 ****
<filter-class>org.neuclear.auth.AuthenticationFilter</filter-class>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test/bux</param-value>
</init-param>
-
</filter>
<servlet>
<servlet-name>assetcontroller</servlet-name>
<servlet-class>org.neuclear.asset.receiver.servlet.AssetControllerServlet</servlet-class>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Example Application</param-value>
</init-param>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test/bux</param-value>
</init-param>
<init-param>
--- 11,32 ----
<filter-class>org.neuclear.auth.AuthenticationFilter</filter-class>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test/bux</param-value>
</init-param>
</filter>
+ <filter-mapping>
+ <filter-name>authfilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<servlet>
<servlet-name>assetcontroller</servlet-name>
<servlet-class>org.neuclear.asset.receiver.servlet.AssetControllerServlet</servlet-class>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Example Application</param-value>
</init-param>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test/bux</param-value>
</init-param>
<init-param>
***************
*** 39,57 ****
<servlet-class>org.neuclear.auth.AuthenticationServlet</servlet-class>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Example Application</param-value>
</init-param>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test/bux</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
- <filter-mapping>
- <filter-name>authfilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
<servlet-mapping>
<servlet-name>assetcontroller</servlet-name>
--- 40,52 ----
<servlet-class>org.neuclear.auth.AuthenticationServlet</servlet-class>
<init-param>
! <param-name>title</param-name>
! <param-value>NeuClear Example Application</param-value>
</init-param>
<init-param>
! <param-name>serviceid</param-name>
! <param-value>neu://test/bux</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>assetcontroller</servlet-name>
***************
*** 62,69 ****
<url-pattern>/Authorize</url-pattern>
</servlet-mapping>
!
! <welcome-file-list>
! <welcome-file>index.jsp</welcome-file>
! </welcome-file-list>
!
</web-app>
--- 57,62 ----
<url-pattern>/Authorize</url-pattern>
</servlet-mapping>
! <welcome-file-list>
! <welcome-file>index.jsp</welcome-file>
! </welcome-file-list>
</web-app>
|
|
From: <pe...@us...> - 2003-11-28 00:11:54
|
Update of /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE
In directory sc8-pr-cvs1:/tmp/cvs-serv18411/src/webapp/SECURE
Modified Files:
transfer.jsp
Log Message:
Getting the NeuClear web transactions working.
Index: transfer.jsp
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/webapp/SECURE/transfer.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** transfer.jsp 22 Nov 2003 00:22:29 -0000 1.2
--- transfer.jsp 28 Nov 2003 00:11:51 -0000 1.3
***************
*** 39,43 ****
<input type="text" name="recipient" value="<%=recipient%>"/></p>
<p>Amount:
! <input type="text" name="recipient" value="<%=amount%>"/></p>
<p>Comment:
<input type="text" name="comment" value="<%=comment%>"/></p>
--- 39,43 ----
<input type="text" name="recipient" value="<%=recipient%>"/></p>
<p>Amount:
! <input type="text" name="amount" value="<%=amount%>"/></p>
<p>Comment:
<input type="text" name="comment" value="<%=comment%>"/></p>
|
|
From: <pe...@us...> - 2003-11-28 00:11:53
|
Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv18411/src/test/org/neuclear/asset/receiver
Modified Files:
PaymentReceiverTest.java
Log Message:
Getting the NeuClear web transactions working.
Index: PaymentReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/receiver/PaymentReceiverTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PaymentReceiverTest.java 22 Nov 2003 00:22:29 -0000 1.7
--- PaymentReceiverTest.java 28 Nov 2003 00:11:51 -0000 1.8
***************
*** 46,49 ****
--- 46,52 ----
$Id$
$Log$
+ Revision 1.8 2003/11/28 00:11:51 pelle
+ Getting the NeuClear web transactions working.
+
Revision 1.7 2003/11/22 00:22:29 pelle
All unit tests in commons, id and xmlsec now work.
***************
*** 157,162 ****
public final void testTransactions() throws Exception, IOException, InvalidTransferException, NeuClearException {
! performTransaction(createPayments(getAlice(), getBob(), 100));
! performTransaction(createPayments(getBob(), getAlice(), 100));
}
--- 160,165 ----
public final void testTransactions() throws Exception, IOException, InvalidTransferException, NeuClearException {
! performTransaction(createPayments(getAlice(), getBob(), 0));
! performTransaction(createPayments(getBob(), getAlice(), 0));
}
|
|
From: <pe...@us...> - 2003-11-28 00:11:53
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts
In directory sc8-pr-cvs1:/tmp/cvs-serv18411/src/java/org/neuclear/asset/contracts
Modified Files:
AssetTransactionContract.java TransferGlobals.java
Log Message:
Getting the NeuClear web transactions working.
Index: AssetTransactionContract.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/AssetTransactionContract.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssetTransactionContract.java 22 Nov 2003 00:22:28 -0000 1.7
--- AssetTransactionContract.java 28 Nov 2003 00:11:50 -0000 1.8
***************
*** 21,24 ****
--- 21,27 ----
* $Id$
* $Log$
+ * Revision 1.8 2003/11/28 00:11:50 pelle
+ * Getting the NeuClear web transactions working.
+ *
* Revision 1.7 2003/11/22 00:22:28 pelle
* All unit tests in commons, id and xmlsec now work.
***************
*** 26,30 ****
* Payment Web App has working form that creates a TransferRequest presents it to the signer
* and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
! *
* Revision 1.6 2003/11/21 04:43:04 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
--- 29,33 ----
* Payment Web App has working form that creates a TransferRequest presents it to the signer
* and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
! * <p/>
* Revision 1.6 2003/11/21 04:43:04 pelle
* EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 85,88 ****
--- 88,92 ----
final Asset asset = (Asset) NSResolver.resolveIdentity(elem.attributeValue("assetName"));
+
final String holdid = elem.attributeValue("holdid");
if (elem.getName().equals(TransferGlobals.CANCEL_TAGNAME))
***************
*** 94,98 ****
final Date valuetime = TimeTools.parseTimeStamp(elem.attributeValue("valuetime"));
final Identity to = NSResolver.resolveIdentity(elem.attributeValue("recipient"));
! final String comment = elem.attributeValue("comment");
if (elem.getName().equals(TransferGlobals.XFER_TAGNAME))
return new TransferRequest(core, asset, to, amount, valuetime, comment);
--- 98,104 ----
final Date valuetime = TimeTools.parseTimeStamp(elem.attributeValue("valuetime"));
final Identity to = NSResolver.resolveIdentity(elem.attributeValue("recipient"));
! final Element commentElement = elem.element(TransferGlobals.createQName("comment"));
!
! final String comment = (commentElement != null) ? commentElement.getText() : "";
if (elem.getName().equals(TransferGlobals.XFER_TAGNAME))
return new TransferRequest(core, asset, to, amount, valuetime, comment);
Index: TransferGlobals.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/TransferGlobals.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferGlobals.java 22 Nov 2003 00:22:28 -0000 1.4
--- TransferGlobals.java 28 Nov 2003 00:11:50 -0000 1.5
***************
*** 24,27 ****
--- 24,30 ----
$Id$
$Log$
+ Revision 1.5 2003/11/28 00:11:50 pelle
+ Getting the NeuClear web transactions working.
+
Revision 1.4 2003/11/22 00:22:28 pelle
All unit tests in commons, id and xmlsec now work.
***************
*** 91,94 ****
--- 94,103 ----
public static Element createElement(final String name, final String value) {
+ Element elem = createElement(name);
+ elem.setText(value);
+ return elem;
+ }
+
+ public static Element createElement(final String name) {
return DocumentHelper.createElement(createQName(name));
}
|
|
From: <pe...@us...> - 2003-11-28 00:11:53
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver
In directory sc8-pr-cvs1:/tmp/cvs-serv18411/src/java/org/neuclear/asset/receiver
Modified Files:
AssetControllerReceiver.java
Log Message:
Getting the NeuClear web transactions working.
Index: AssetControllerReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/AssetControllerReceiver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssetControllerReceiver.java 22 Nov 2003 00:22:29 -0000 1.6
--- AssetControllerReceiver.java 28 Nov 2003 00:11:50 -0000 1.7
***************
*** 55,58 ****
--- 55,60 ----
if (obj instanceof AssetTransactionContract) {
final TransferContract transfer = (TransferContract) obj;
+ if (obj == null)
+ throw new NeuClearException("Missing Request");
if (!proc.canProcess(transfer.getAsset()))
throw new UnsupportedTransaction(obj);
***************
*** 62,66 ****
sigReceipt.sign(transfer.getAsset().getName(), signer);
return sigReceipt;
- //TODO do something with receipt
} catch (XMLSecurityException e) {
--- 64,67 ----
|
|
From: <pe...@us...> - 2003-11-28 00:11:53
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency
In directory sc8-pr-cvs1:/tmp/cvs-serv18411/src/java/org/neuclear/asset/controllers/currency
Modified Files:
CurrencyController.java
Log Message:
Getting the NeuClear web transactions working.
Index: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CurrencyController.java 22 Nov 2003 00:22:28 -0000 1.7
--- CurrencyController.java 28 Nov 2003 00:11:50 -0000 1.8
***************
*** 43,46 ****
--- 43,47 ----
public final TransferReceiptBuilder process(final TransferRequest req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
+
try {
if (!req.getSignatory().equals(req.getFrom()))
|
570 messages has been excluded from this view by a project administrator.
