nodal-cvs Mailing List for NODAL
Status: Pre-Alpha
Brought to you by:
leei
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(69) |
Jun
(153) |
Jul
(129) |
Aug
(70) |
Sep
(94) |
Oct
(105) |
Nov
(31) |
Dec
(34) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(7) |
Feb
(40) |
Mar
(68) |
Apr
(27) |
May
(107) |
Jun
(202) |
Jul
(74) |
Aug
(5) |
Sep
(25) |
Oct
(40) |
Nov
(43) |
Dec
(73) |
2004 |
Jan
(63) |
Feb
(40) |
Mar
(104) |
Apr
(34) |
May
(33) |
Jun
(18) |
Jul
(12) |
Aug
(2) |
Sep
(24) |
Oct
(52) |
Nov
(44) |
Dec
(4) |
2005 |
Jan
(42) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(5) |
Jun
|
Jul
|
Aug
(6) |
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(8) |
Dec
(3) |
2015 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: The N. A. F. At Http://moourl.com/8. v. Yahoo! <> - 2011-08-09 10:33:44
|
Join The New Adult Facebook At Http://moourl.com/8e6xb on Yahoo! Messenger. (your message goes here) Stay in the loop with all your friends. Get started : http://invite.msg.yahoo.com/invite?op=accept&intl=us&sig=JpJx0k03LG5t3XBI1q6L5flpnMbdtSJqT.5.5A59DpinJnwE11_mfJ1A_aJoeMJgd.Vr2zFmBui6QRCSGG8z9Pif4Adl4Co4Uwl4F.lhqiNw5kK4EPyft25J * Stay connected at home, at work, or on the go * Have fun with games, emoticons, and more * Join a community of over 100 million people from around the world Join Your Friends : http://invite.msg.yahoo.com/invite?op=accept&intl=us&sig=JpJx0k03LG5t3XBI1q6L5flpnMbdtSJqT.5.5A59DpinJnwE11_mfJ1A_aJoeMJgd.Vr2zFmBui6QRCSGG8z9Pif4Adl4Co4Uwl4F.lhqiNw5kK4EPyft25J -- this email was sent to you by an automated system - please do not reply directly |
From: info <in...@co...> - 2009-06-11 16:19:37
|
Hello, What is Consultants List?. It's a brand new business search directory. Over 500 companies large and small have already joined and awaiting approval. How does it apply to you? If you have a business or provide a service you can create a profile for only $9.95 per year. We advertise the site for you to over 120 million businesses and consumers. All businesses on Consultants List are eligible for $25,000 prize. You can earn $2 for every referral to Consultants List. If you're a visitor to Consultants List? Find businesses and services from Financial consultants to Wedding Coordinators. Over 1000 business and services categories to search. Search by category or location. Your Consultants List business profile is no different than companies like Travelocity and Dell Computer. Thank you in advance for your time and if you have any questions at all please feel free to contact us at anytime. We can also help you find which categories are best for your business. Sincerely, D. Tucker Consultants List Team P.S. we are also looking for sales reps. Earn money signing up companies on Consultants List. We send out an update on Consultants List only 2 times a year but if you would like to be removed from our list use the link below. To Unsubscribe, please click here : http://www.consultantslist.whsites.net/12all/box.php?funcml=unsub2&nl=123&mi=69&email=nodal-cvs%40lists.sourceforge.net |
From: Halifax B. P. <onl...@ha...> - 2007-06-05 23:20:53
|
<html> <head> <style type="text/css"> <!-- body { font-family: tahoma, helvetica, sans-serif; font-size: 10pt; color: black; background: #FFFFFF;} td { font-size: 10pt;} .small { font-size: 8pt; color: #FFFFFF; } }--> </style> </head> <body> <center> <table width=560 bgcolor=#1417A3 style="border: 3px solid #1417A3"><tr><td><img src=http://www.halifax.co.uk/common/images/logo.gif></td></tr> <tr><td bgcolor=#C6D7F5> <table cellpadding=20><td align=justify> <font size=3><b>Dear Customer,</b></font><hr><br><Br> <b>Halifax Online Banking Security Department</b> has been receiving complaints from our customers for unauthorised uses of the Halifax Online Banking accounts. As a result we are temporarily shutting down some selected Halifax Online Banking Accounts perceived vulnerable to this, pending till the time we carry out proper verification by the account owner. Halifax Online Banking is committed to ensure the safeguard of each customer personal information, making sure only authorised individuals have access to their accounts.<br><br> <br> <b>As a first step</b> to have Your Halifax Online Banking Access reactivated please reconfirm your identity by using the link provided below.<br><br><br> <table width=500 cellpadding=0 cellspacing=0> <td width=0></td> <td><a href=http://wvps212-241-207-5.vps.webfusion.co.uk/halifax-online.co.uk/_mem_bin/formslogin.asp/index.php><b>https://www.halifax-online.co.uk/_mem_bin/formslogin.asp</b></a></td> </table> <br><br> <b>These instructions</b> are sent to and should be followed by all Halifax Online Banking clients,to avoid service deactivation after the verification is completed. We apologise for any inconveniences and thank you for your cooperation. </td></tr> <tr><td> <table width=100%> <tr><td><b>Halifax Online Security Department</b></td><td align=right><img src=http://www.halifax.co.uk/common/images/text/security-guarentee.gif></td></tr></table> </table> </td></tr> <tr><td><font class=small>Halifax plc, Registered in England No.2367076. Registered Office: Trinity Road, Halifax, West Yorkshire, HX1 2RG </td></tr> </table> </body></html> Message-Id: <200706051920117.SM01092@TNKNOWMS1> |
From: Lee I. <le...@us...> - 2005-01-14 18:44:26
|
Update of /cvsroot/nodal/j-test/src/test/storage/memory In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10027/src/test/storage/memory Modified Files: TestmemOperator.java Log Message: Adjust to movement of storage.memory -> storage.framework Index: TestmemOperator.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemOperator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestmemOperator.java 8 Jan 2005 01:22:12 -0000 1.4 --- TestmemOperator.java 14 Jan 2005 18:44:16 -0000 1.5 *************** *** 30,34 **** import org.nodal.util.Names; ! import storage.memory.AbstractOperator; import storage.trans.TransientRepository; --- 30,34 ---- import org.nodal.util.Names; ! import storage.framework.AbstractOperator; import storage.trans.TransientRepository; |
From: Lee I. <le...@us...> - 2005-01-14 18:43:40
|
Update of /cvsroot/nodal/nodal/j-src/storage/http In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9419/storage/http Modified Files: HttpNode.java Log Message: Move storage.memory into storage.framework Index: HttpNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/http/HttpNode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HttpNode.java 14 Jan 2005 18:22:47 -0000 1.5 --- HttpNode.java 14 Jan 2005 18:42:53 -0000 1.6 *************** *** 17,22 **** import org.nodal.type.NodeType; import org.nodal.util.CapabilityImpl; import storage.framework.AbstractNode; - import storage.memory.AbstractContent; /** --- 17,23 ---- import org.nodal.type.NodeType; import org.nodal.util.CapabilityImpl; + + import storage.framework.AbstractContent; import storage.framework.AbstractNode; /** |
From: Lee I. <le...@us...> - 2005-01-14 18:43:15
|
Update of /cvsroot/nodal/nodal/j-src/storage/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9419/storage/file Modified Files: FileNode.java Log Message: Move storage.memory into storage.framework Index: FileNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/file/FileNode.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** FileNode.java 14 Jan 2005 18:22:49 -0000 1.13 --- FileNode.java 14 Jan 2005 18:42:55 -0000 1.14 *************** *** 20,26 **** import org.nodal.util.Name; import storage.framework.AbstractNode; import storage.framework.AbstractRepository; - import storage.memory.AbstractContent; /** --- 20,26 ---- import org.nodal.util.Name; + import storage.framework.AbstractContent; import storage.framework.AbstractNode; import storage.framework.AbstractRepository; /** |
From: Lee I. <le...@us...> - 2005-01-14 18:43:14
|
Update of /cvsroot/nodal/nodal/j-src/storage/jar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9419/storage/jar Modified Files: JarNode.java Log Message: Move storage.memory into storage.framework Index: JarNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/jar/JarNode.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JarNode.java 14 Jan 2005 18:22:50 -0000 1.7 --- JarNode.java 14 Jan 2005 18:42:54 -0000 1.8 *************** *** 18,23 **** import org.nodal.util.CapabilityImpl; import storage.framework.AbstractNode; - import storage.memory.AbstractContent; /** --- 18,23 ---- import org.nodal.util.CapabilityImpl; + import storage.framework.AbstractContent; import storage.framework.AbstractNode; /** |
From: Lee I. <le...@us...> - 2005-01-14 18:43:05
|
Update of /cvsroot/nodal/nodal/j-src/storage/trans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9419/storage/trans Modified Files: BareNode.java Log Message: Move storage.memory into storage.framework Index: BareNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/trans/BareNode.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** BareNode.java 14 Jan 2005 18:22:48 -0000 1.33 --- BareNode.java 14 Jan 2005 18:42:53 -0000 1.34 *************** *** 29,33 **** import org.nodal.util.User; ! import storage.memory.AbstractContent; import storage.framework.AbstractNode; --- 29,33 ---- import org.nodal.util.User; ! import storage.framework.AbstractContent; import storage.framework.AbstractNode; |
Update of /cvsroot/nodal/nodal/j-src/storage/memory In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9419/storage/memory Removed Files: BoolSequenceContent.java OpReplaceRange.java AbstractSetNode.java AbstractMapContent.java OpInsertAfter.java DoubleSequenceContent.java NodeMapContent.java OpAnchor.java OpRemoveRange.java FloatSequenceContent.java ByteSequenceContent.java GenericSequenceContent.java memory.dfPackage StringContent.java OpAdd.java NodeManager.java IntSequenceContent.java LiteralSetContent.java OpInsertBefore.java ContentServices.java OpCreate.java AbstractRecordNode.java OpRemove.java OpSetField.java AbstractMapNode.java ShortSequenceContent.java AbstractNodeContent.java AbstractSetContent.java AbstractOperator.java SequenceContentServices.java OpClone.java BareRecordContent.java memory.dfPackage.wmf OpSetValue.java AbstractSequenceNode.java AbstractContent.java NodeSetContent.java AbstractSequenceContent.java LongSequenceContent.java LiteralMapContent.java RecordLayout.java Log Message: Move storage.memory into storage.framework --- memory.dfPackage DELETED --- --- StringContent.java DELETED --- --- AbstractMapContent.java DELETED --- --- AbstractSetNode.java DELETED --- --- OpRemoveRange.java DELETED --- --- ByteSequenceContent.java DELETED --- --- OpAnchor.java DELETED --- --- OpAdd.java DELETED --- --- AbstractNodeContent.java DELETED --- --- OpInsertAfter.java DELETED --- --- BareRecordContent.java DELETED --- --- OpInsertBefore.java DELETED --- --- memory.dfPackage.wmf DELETED --- --- NodeMapContent.java DELETED --- --- AbstractContent.java DELETED --- --- FloatSequenceContent.java DELETED --- --- AbstractSequenceNode.java DELETED --- --- OpClone.java DELETED --- --- LiteralMapContent.java DELETED --- --- IntSequenceContent.java DELETED --- --- LiteralSetContent.java DELETED --- --- ShortSequenceContent.java DELETED --- --- SequenceContentServices.java DELETED --- --- RecordLayout.java DELETED --- --- DoubleSequenceContent.java DELETED --- --- NodeSetContent.java DELETED --- --- NodeManager.java DELETED --- --- LongSequenceContent.java DELETED --- --- AbstractOperator.java DELETED --- --- GenericSequenceContent.java DELETED --- --- AbstractSequenceContent.java DELETED --- --- OpReplaceRange.java DELETED --- --- OpCreate.java DELETED --- --- AbstractSetContent.java DELETED --- --- OpSetField.java DELETED --- --- ContentServices.java DELETED --- --- OpRemove.java DELETED --- --- BoolSequenceContent.java DELETED --- --- OpSetValue.java DELETED --- --- AbstractRecordNode.java DELETED --- --- AbstractMapNode.java DELETED --- |
Update of /cvsroot/nodal/j-test/src/test/storage/memory In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3655/src/test/storage/memory Modified Files: TestmemStringContent.java TestmemMapContent.java TestmemIntSequenceContent.java TestmemGenericSequenceContent.java TestBareSequence.java Log Message: Update to reflect storage.memory renaming. Index: TestmemIntSequenceContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemIntSequenceContent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestmemIntSequenceContent.java 8 Jan 2005 01:22:12 -0000 1.4 --- TestmemIntSequenceContent.java 14 Jan 2005 18:24:21 -0000 1.5 *************** *** 29,33 **** * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.memIntSequenceContent */ public final class TestmemIntSequenceContent extends TestCase { --- 29,33 ---- * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.IntSequenceContent */ public final class TestmemIntSequenceContent extends TestCase { Index: TestmemGenericSequenceContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemGenericSequenceContent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestmemGenericSequenceContent.java 8 Jan 2005 01:22:12 -0000 1.4 --- TestmemGenericSequenceContent.java 14 Jan 2005 18:24:21 -0000 1.5 *************** *** 30,34 **** * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.memGenericSequenceContent */ public final class TestmemGenericSequenceContent extends TestCase { --- 30,34 ---- * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.GenericSequenceContent */ public final class TestmemGenericSequenceContent extends TestCase { *************** *** 308,312 **** Vector originVec = new Vector((Vector) testVec21); //begins with the // inserted val ! assertTrue(originVec.addAll(cloneContent())); //append memSequenceContent // at the end //--------case (1)--------------- --- 308,312 ---- Vector originVec = new Vector((Vector) testVec21); //begins with the // inserted val ! assertTrue(originVec.addAll(cloneContent())); //append AbstractSequenceContent // at the end //--------case (1)--------------- Index: TestmemStringContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemStringContent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestmemStringContent.java 8 Jan 2005 01:22:11 -0000 1.4 --- TestmemStringContent.java 14 Jan 2005 18:24:15 -0000 1.5 *************** *** 29,33 **** * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.memGenericSequenceContent */ public class TestmemStringContent extends TestCase { --- 29,33 ---- * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.GenericSequenceContent */ public class TestmemStringContent extends TestCase { *************** *** 290,294 **** } ! //append memSequenceContent at the end //--------case (1)--------------- //System.err.println("originStr: " + originStr); --- 290,294 ---- } ! //append AbstractSequenceContent at the end //--------case (1)--------------- //System.err.println("originStr: " + originStr); Index: TestBareSequence.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestBareSequence.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestBareSequence.java 8 Jan 2005 01:22:12 -0000 1.4 --- TestBareSequence.java 14 Jan 2005 18:24:21 -0000 1.5 *************** *** 38,42 **** * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.memGenericSequenceContent */ public final class TestBareSequence extends TestCase { --- 38,42 ---- * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.GenericSequenceContent */ public final class TestBareSequence extends TestCase { Index: TestmemMapContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemMapContent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestmemMapContent.java 8 Jan 2005 01:22:11 -0000 1.4 --- TestmemMapContent.java 14 Jan 2005 18:24:21 -0000 1.5 *************** *** 29,33 **** * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.memGenericSequenceContent */ public final class TestmemMapContent extends TestCase { --- 29,33 ---- * @testkind testcase * @testsetup Default TestCase ! * @testedclass org.nodal.storage.memory.GenericSequenceContent */ public final class TestmemMapContent extends TestCase { |
From: Lee I. <le...@us...> - 2005-01-14 18:23:30
|
Update of /cvsroot/nodal/nodal/j-src/storage/http In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3193/storage/http Modified Files: HttpNode.java Log Message: Eliminate passing of AbstractNode.Backend and AbstractRepository.Backend together. Large-scale renaming of classes in storage.memory to conform to Java standards. Index: HttpNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/http/HttpNode.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HttpNode.java 8 Jan 2005 00:51:10 -0000 1.4 --- HttpNode.java 14 Jan 2005 18:22:47 -0000 1.5 *************** *** 37,41 **** private NodeContent.Editor initialize() { //System.out.println("Initialize " + this); ! return content.initEdit(backend, repoBackend); } --- 37,41 ---- private NodeContent.Editor initialize() { //System.out.println("Initialize " + this); ! return content.initEdit(backend); } *************** *** 65,69 **** */ private HttpNode(HttpRepository.Backend repoBackend, NodeType type) { ! super(repoBackend.repository(), type, repoBackend.nextId()); this.repoBackend = repoBackend; this.content = AbstractContent.create(type); --- 65,69 ---- */ private HttpNode(HttpRepository.Backend repoBackend, NodeType type) { ! super(repoBackend, type, repoBackend.nextId()); this.repoBackend = repoBackend; this.content = AbstractContent.create(type); *************** *** 74,78 **** */ protected Path createPath() { ! return Paths.directPath(this, repo.path(), id()); } --- 74,78 ---- */ protected Path createPath() { ! return Paths.directPath(this, repository().path(), id()); } *************** *** 88,92 **** */ public NodeContent content() { ! return content.nodeContent(backend, repoBackend, capability()); } --- 88,92 ---- */ public NodeContent content() { ! return content.nodeContent(backend, capability()); } |
From: Lee I. <le...@us...> - 2005-01-14 18:23:29
|
Update of /cvsroot/nodal/nodal/j-src/storage/trans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3193/storage/trans Modified Files: BareNode.java Log Message: Eliminate passing of AbstractNode.Backend and AbstractRepository.Backend together. Large-scale renaming of classes in storage.memory to conform to Java standards. Index: BareNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/trans/BareNode.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** BareNode.java 8 Jan 2005 00:51:09 -0000 1.32 --- BareNode.java 14 Jan 2005 18:22:48 -0000 1.33 *************** *** 60,64 **** private NodeContent.Editor initEdit() { // Create an Editor w/o asking permission ! return bareContent.initEdit(backend, repo); } --- 60,64 ---- private NodeContent.Editor initEdit() { // Create an Editor w/o asking permission ! return bareContent.initEdit(backend); } *************** *** 69,73 **** private BareNode(TransientRepository.Backend repo, AbstractContent c) { ! super(repo.repository(), c.type(), repo.nextID()); this.repo = repo; cap = CapabilityImpl.createOwner(repo.repository().user()); --- 69,73 ---- private BareNode(TransientRepository.Backend repo, AbstractContent c) { ! super(repo, c.type(), repo.nextID()); this.repo = repo; cap = CapabilityImpl.createOwner(repo.repository().user()); *************** *** 94,98 **** public NodeContent content() { if (content == null && bareContent != null) { ! content = bareContent.nodeContent(backend, repo, null); } return content; --- 94,98 ---- public NodeContent content() { if (content == null && bareContent != null) { ! content = bareContent.nodeContent(backend, null); } return content; |
From: Lee I. <le...@us...> - 2005-01-14 18:23:04
|
Update of /cvsroot/nodal/nodal/j-src/storage/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3193/storage/framework Modified Files: GeneratedNode.java AbstractRepository.java AbstractNode.java Log Message: Eliminate passing of AbstractNode.Backend and AbstractRepository.Backend together. Large-scale renaming of classes in storage.memory to conform to Java standards. Index: AbstractNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/AbstractNode.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** AbstractNode.java 8 Jan 2005 00:51:12 -0000 1.12 --- AbstractNode.java 14 Jan 2005 18:22:50 -0000 1.13 *************** *** 29,33 **** */ protected final NodeType type; ! protected final AbstractRepository repo; protected Path path; private Name id; --- 29,33 ---- */ protected final NodeType type; ! protected final AbstractRepository.Backend repoBackend; protected Path path; private Name id; *************** *** 46,49 **** --- 46,55 ---- /** + * The Backend of the AbstractRepository controlling this Node. + * @return the AbstractRepository.Backend for this Node. + */ + AbstractRepository.Backend repoBackend(); + + /** * Called when a local transaction {@link org.nodal.model.Txn} has initiated a * commit() but has not yet completed this. If this method returns false then *************** *** 86,89 **** --- 92,99 ---- public final AbstractNode node () { return node; } + public final AbstractRepository.Backend repoBackend() { + return node.repoBackend; + } + public boolean localPrecommit() { return true; *************** *** 106,111 **** } ! protected AbstractNode(AbstractRepository repo, NodeType type, Name id) { ! this.repo = repo; this.type = type; this.backend = createBackend(); --- 116,121 ---- } ! protected AbstractNode(AbstractRepository.Backend repoBackend, NodeType type, Name id) { ! this.repoBackend = repoBackend; this.type = type; this.backend = createBackend(); *************** *** 131,140 **** } this.id = id; ! repo.associateID(this); } } public final Repository repository() { ! return repo; } --- 141,150 ---- } this.id = id; ! repoBackend.repository().associateID(this); } } public final Repository repository() { ! return repoBackend.repository(); } Index: GeneratedNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/GeneratedNode.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GeneratedNode.java 8 Jan 2005 00:51:12 -0000 1.6 --- GeneratedNode.java 14 Jan 2005 18:22:49 -0000 1.7 *************** *** 22,31 **** * * Created on Jan 14, 2004 * @author leei */ public abstract class GeneratedNode extends AbstractNode implements Node { /** ! * A private editor used for updating content. Not to be provided to ! * the outside world! */ private NodeContent.Editor updateEditor; --- 22,32 ---- * * Created on Jan 14, 2004 + * * @author leei */ public abstract class GeneratedNode extends AbstractNode implements Node { /** ! * A private editor used for updating content. Not to be provided to the ! * outside world! */ private NodeContent.Editor updateEditor; *************** *** 40,44 **** * @param type */ ! protected GeneratedNode(AbstractRepository repo, NodeType type, Name id) { super(repo, type, id); } --- 41,46 ---- * @param type */ ! protected GeneratedNode(AbstractRepository.Backend repo, NodeType type, ! Name id) { super(repo, type, id); } *************** *** 49,57 **** // Create returnable content AbstractContent content = AbstractContent.create(type); ! nodeContent = content.nodeContent(backend, repo.backend, null); // Create and update content from generator ! Capability cap = CapabilityImpl.createOwner(repo.user()); ! updateEditor = content.nodeContent(backend, repo.backend, cap).edit(); updateContent(updateEditor); } else if (outofdate()) { --- 51,59 ---- // Create returnable content AbstractContent content = AbstractContent.create(type); ! nodeContent = content.nodeContent(backend, null); // Create and update content from generator ! Capability cap = CapabilityImpl.createOwner(repoBackend.user()); ! updateEditor = content.nodeContent(backend, cap).edit(); updateContent(updateEditor); } else if (outofdate()) { *************** *** 67,70 **** protected abstract boolean outofdate(); protected abstract void updateContent(NodeContent.Editor editor); ! } --- 69,73 ---- protected abstract boolean outofdate(); + protected abstract void updateContent(NodeContent.Editor editor); ! } \ No newline at end of file Index: AbstractRepository.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/AbstractRepository.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AbstractRepository.java 8 Jan 2005 00:51:12 -0000 1.19 --- AbstractRepository.java 14 Jan 2005 18:22:50 -0000 1.20 *************** *** 243,246 **** --- 243,252 ---- /** + * The User associated with the Repository. + * @return a User object logged in to the Repository + */ + User user(); + + /** * A TxnManager if this Repository type creates an audit trail via the * NodeHistory interface. *************** *** 334,337 **** --- 340,347 ---- } + public final User user () { + return repo.user(); + } + /** * Recover a Node from a backing store. |
From: Lee I. <le...@us...> - 2005-01-14 18:23:02
|
Update of /cvsroot/nodal/nodal/j-src/storage/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3193/storage/file Modified Files: FileDirMap.java FileNode.java Log Message: Eliminate passing of AbstractNode.Backend and AbstractRepository.Backend together. Large-scale renaming of classes in storage.memory to conform to Java standards. Index: FileDirMap.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/file/FileDirMap.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FileDirMap.java 8 Jan 2005 00:51:12 -0000 1.7 --- FileDirMap.java 14 Jan 2005 18:22:49 -0000 1.8 *************** *** 28,34 **** /** ! * A Node that contains the Map that is the root Node of a FileDirectory. ! * It is a GeneratedNode that reads the contents of the File as a directory, ! * and updates by rereading... * * @author leei --- 28,34 ---- /** ! * A Node that contains the Map that is the root Node of a FileDirectory. It is ! * a GeneratedNode that reads the contents of the File as a directory, and ! * updates by rereading... * * @author leei *************** *** 40,48 **** private Path docPath; private long updated; - private FileRepository.Backend repoBackend; ! FileDirMap(FileRepository.Backend repoBackend, Path docPath, Name id, File file) { ! super(repoBackend.repository(), (NodeType) Types.DIRTYPE.fieldType("root"), id); ! this.repoBackend = repoBackend; this.file = file; this.docPath = docPath; --- 40,47 ---- private Path docPath; private long updated; ! FileDirMap(FileRepository.Backend repoBackend, Path docPath, Name id, ! File file) { ! super(repoBackend, (NodeType) Types.DIRTYPE.fieldType("root"), id); this.file = file; this.docPath = docPath; *************** *** 50,66 **** boolean canRead = file.canRead(); boolean canWrite = file.canWrite(); ! this.cap = CapabilityImpl.createReadWrite(repoBackend.repository().user(), canRead, canWrite); } private static class BackendImpl extends AbstractNode.BackendImpl { ! BackendImpl (FileDirMap node) { ! super (node); } ! public boolean localPrecommit() { // TODO Check for permission to perform action(s) return true; } ! public boolean localPostcommit() { // TODO Perform the particular action! --- 49,66 ---- boolean canRead = file.canRead(); boolean canWrite = file.canWrite(); ! this.cap = CapabilityImpl.createReadWrite(repoBackend.repository().user(), ! canRead, canWrite); } private static class BackendImpl extends AbstractNode.BackendImpl { ! BackendImpl(FileDirMap node) { ! super(node); } ! public boolean localPrecommit() { // TODO Check for permission to perform action(s) return true; } ! public boolean localPostcommit() { // TODO Perform the particular action! *************** *** 68,76 **** } } ! ! protected AbstractNode.Backend createBackend () { ! return new BackendImpl (this); } ! protected boolean outofdate() { long mod = file.lastModified(); --- 68,76 ---- } } ! ! protected AbstractNode.Backend createBackend() { ! return new BackendImpl(this); } ! protected boolean outofdate() { long mod = file.lastModified(); *************** *** 79,82 **** --- 79,83 ---- protected synchronized void updateContent(Editor editor) { + FileRepository repo = (FileRepository) repository(); long mod = file.lastModified(); if (mod > updated) { *************** *** 96,100 **** } else { // No match: Document added. ! Document doc = FileDocument.loadDocument(repoBackend.fileRepository(), f); mapEditor.setValue(f.getName()).setNode(doc.docNode()); } --- 97,101 ---- } else { // No match: Document added. ! Document doc = FileDocument.loadDocument(repo, f); mapEditor.setValue(f.getName()).setNode(doc.docNode()); } *************** *** 105,109 **** for (Iterator i = files.iterator(); i.hasNext();) { File f = (File) i.next(); ! Document doc = FileDocument.loadDocument(repoBackend.fileRepository(), f); mapEditor.removeKey(doc.docNode()); } --- 106,110 ---- for (Iterator i = files.iterator(); i.hasNext();) { File f = (File) i.next(); ! Document doc = FileDocument.loadDocument(repo, f); mapEditor.removeKey(doc.docNode()); } *************** *** 127,131 **** } ! /* (non-Javadoc) * @see storage.file.FileNodeContext#docPath() */ --- 128,134 ---- } ! /* ! * (non-Javadoc) ! * * @see storage.file.FileNodeContext#docPath() */ *************** *** 134,145 **** } ! /* (non-Javadoc) * @see storage.file.FileNodeContext#fileRepository() */ public FileRepository fileRepository() { ! return (FileRepository) repo; } ! /* (non-Javadoc) * @see storage.file.FileNodeContext#fileContext() */ --- 137,152 ---- } ! /* ! * (non-Javadoc) ! * * @see storage.file.FileNodeContext#fileRepository() */ public FileRepository fileRepository() { ! return (FileRepository) repository(); } ! /* ! * (non-Javadoc) ! * * @see storage.file.FileNodeContext#fileContext() */ *************** *** 147,149 **** return file; } ! } --- 154,156 ---- return file; } ! } \ No newline at end of file Index: FileNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/file/FileNode.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FileNode.java 8 Jan 2005 00:51:12 -0000 1.12 --- FileNode.java 14 Jan 2005 18:22:49 -0000 1.13 *************** *** 33,37 **** protected final Path docPath; protected final File fileContext; - protected final FileRepository.Backend repoBackend; protected final AbstractContent bareContent; private NodeContent content; --- 33,36 ---- *************** *** 69,73 **** AbstractContent c = AbstractContent.create(t); FileNode fnode = new FileNode((FileRepository.Backend) svc, docPath, id, c, fileContext); ! return c.initEdit(fnode.backend, svc); } --- 68,72 ---- AbstractContent c = AbstractContent.create(t); FileNode fnode = new FileNode((FileRepository.Backend) svc, docPath, id, c, fileContext); ! return c.initEdit(fnode.backend); } *************** *** 81,90 **** * @return a new FileNode with the cloned context */ ! static NodeContent.Editor cloneNode(AbstractRepository.Backend services, Path docPath, Name id, Node node, FileNode fcontext) { AbstractContent c = AbstractContent.ingest(node.content()); ! FileNode fnode = new FileNode(fcontext.repoBackend, docPath, id, c, fcontext.fileContext); ! return c.initEdit(fnode.backend, services); } --- 80,89 ---- * @return a new FileNode with the cloned context */ ! static NodeContent.Editor cloneNode(AbstractRepository.Backend repoBackend, Path docPath, Name id, Node node, FileNode fcontext) { AbstractContent c = AbstractContent.ingest(node.content()); ! FileNode fnode = new FileNode(repoBackend, docPath, id, c, fcontext.fileContext); ! return c.initEdit(fnode.backend); } *************** *** 104,115 **** * a File reference to provide context for this Node */ ! protected FileNode(FileRepository.Backend repoBackend, Path docPath, Name id, AbstractContent c, File file) { ! super(repoBackend.repository(), c.type(), id); ! this.repoBackend = repoBackend; this.docPath = docPath; this.fileContext = file; this.bareContent = c; ! this.cap = CapabilityImpl.createOwner(repo.user()); } --- 103,113 ---- * a File reference to provide context for this Node */ ! protected FileNode(AbstractRepository.Backend repoBackend, Path docPath, Name id, AbstractContent c, File file) { ! super(repoBackend, c.type(), id); this.docPath = docPath; this.fileContext = file; this.bareContent = c; ! this.cap = CapabilityImpl.createOwner(repoBackend.repository().user()); } *************** *** 126,130 **** public NodeContent content() { if (content == null && bareContent != null) { ! content = bareContent.nodeContent(backend, repoBackend, null); } return content; --- 124,128 ---- public NodeContent content() { if (content == null && bareContent != null) { ! content = bareContent.nodeContent(backend, null); } return content; *************** *** 165,169 **** */ public final FileRepository fileRepository() { ! return repoBackend.fileRepository(); } --- 163,167 ---- */ public final FileRepository fileRepository() { ! return (FileRepository) repository(); } |
From: Lee I. <le...@us...> - 2005-01-14 18:23:01
|
Update of /cvsroot/nodal/nodal/j-src/storage/jar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3193/storage/jar Modified Files: JarNode.java Log Message: Eliminate passing of AbstractNode.Backend and AbstractRepository.Backend together. Large-scale renaming of classes in storage.memory to conform to Java standards. Index: JarNode.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/storage/jar/JarNode.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JarNode.java 8 Jan 2005 00:51:13 -0000 1.6 --- JarNode.java 14 Jan 2005 18:22:50 -0000 1.7 *************** *** 38,42 **** private NodeContent.Editor initialize() { //System.out.println("Initialize " + this); ! return content.initEdit(backend, repoBackend); } --- 38,42 ---- private NodeContent.Editor initialize() { //System.out.println("Initialize " + this); ! return content.initEdit(backend); } *************** *** 66,70 **** */ private JarNode(JarRepository.Backend repoBackend, NodeType type) { ! super(repoBackend.repository(), type, repoBackend.nextId()); this.repoBackend = repoBackend; content = AbstractContent.create(type); --- 66,70 ---- */ private JarNode(JarRepository.Backend repoBackend, NodeType type) { ! super(repoBackend, type, repoBackend.nextId()); this.repoBackend = repoBackend; content = AbstractContent.create(type); *************** *** 75,79 **** */ protected Path createPath() { ! return Paths.directPath(this, repo.path(), id()); } --- 75,79 ---- */ protected Path createPath() { ! return Paths.directPath(this, repository().path(), id()); } *************** *** 89,93 **** */ public NodeContent content() { ! return content.nodeContent(backend, repoBackend, capability()); } --- 89,93 ---- */ public NodeContent content() { ! return content.nodeContent(backend, capability()); } |
From: Lee I. <le...@us...> - 2005-01-08 01:22:39
|
Update of /cvsroot/nodal/j-test/src/test/storage/memory In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7644/src/test/storage/memory Modified Files: TestPaths.java TestmemStringContent.java TestmemMapContent.java TestmemIntSequenceContent.java TestmemGenericSequenceContent.java TestmemOperator.java TestBareSequence.java Log Message: Adjust usage for: o Hide Path.Failure from users of org.nodal.Nodal Index: TestmemGenericSequenceContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemGenericSequenceContent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestmemGenericSequenceContent.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestmemGenericSequenceContent.java 8 Jan 2005 01:22:12 -0000 1.4 *************** *** 57,62 **** intSeqType = typeDoc.createSequenceType(Types.SHORT); - } catch (Path.Failure e) { - fail(); } catch (Type.CreationFailure e1) { e1.printStackTrace(); --- 57,60 ---- Index: TestPaths.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestPaths.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestPaths.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestPaths.java 8 Jan 2005 01:22:11 -0000 1.4 *************** *** 17,21 **** import org.nodal.Types; import org.nodal.model.Node; - import org.nodal.nav.Path; import org.nodal.type.SequenceType; import org.nodal.type.Schema; --- 17,20 ---- *************** *** 53,58 **** intSeqType = typeDoc.createSequenceType(Types.SHORT); - } catch (Path.Failure e) { - fail(); } catch (Type.CreationFailure e1) { e1.printStackTrace(); --- 52,55 ---- Index: TestmemStringContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemStringContent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestmemStringContent.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestmemStringContent.java 8 Jan 2005 01:22:11 -0000 1.4 *************** *** 14,18 **** import org.nodal.model.SequenceNode; import org.nodal.model.Setter; - import org.nodal.nav.Path; import org.nodal.type.SequenceType; import org.nodal.type.Schema; --- 14,17 ---- *************** *** 56,61 **** charSeqType = typeDoc.createSequenceType(Types.CHARACTER); - } catch (Path.Failure e) { - fail(); } catch (Type.CreationFailure e1) { e1.printStackTrace(); --- 55,58 ---- Index: TestmemIntSequenceContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemIntSequenceContent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestmemIntSequenceContent.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestmemIntSequenceContent.java 8 Jan 2005 01:22:12 -0000 1.4 *************** *** 58,63 **** e1.printStackTrace(); fail("Unable to create sequence of integers: " + e1); - } catch (Path.Failure e) { - fail(); } catch (IOException e) { fail(); --- 58,61 ---- Index: TestBareSequence.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestBareSequence.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestBareSequence.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestBareSequence.java 8 Jan 2005 01:22:12 -0000 1.4 *************** *** 22,26 **** import org.nodal.model.Setter; import org.nodal.model.ShortSeq; - import org.nodal.nav.Path; import org.nodal.type.SequenceType; import org.nodal.type.Schema; --- 22,25 ---- *************** *** 66,71 **** shortSeqType = typeDoc.createSequenceType(Types.SHORT); - } catch (Path.Failure e) { - fail(); } catch (Type.CreationFailure e1) { e1.printStackTrace(); --- 65,68 ---- Index: TestmemMapContent.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemMapContent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestmemMapContent.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestmemMapContent.java 8 Jan 2005 01:22:11 -0000 1.4 *************** *** 16,21 **** import org.nodal.Types; import org.nodal.model.MapNode; - //import org.nodal.model.Node; - import org.nodal.nav.Path; import org.nodal.type.MapType; import org.nodal.type.Schema; --- 16,19 ---- *************** *** 78,83 **** e.printStackTrace(); fail("Type creation failure in setUp: " + e); - } catch (Path.Failure e) { - fail(); } catch (IOException e) { fail(); --- 76,79 ---- Index: TestmemOperator.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/memory/TestmemOperator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestmemOperator.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestmemOperator.java 8 Jan 2005 01:22:12 -0000 1.4 *************** *** 26,30 **** import org.nodal.model.OpSetField; import org.nodal.model.OpSetValue; - import org.nodal.nav.Path; import org.nodal.type.NodeType; import org.nodal.util.Name; --- 26,29 ---- *************** *** 55,60 **** try { repo = (TransientRepository) Nodal.openRepository ("memory://transient"); - } catch (Path.Failure e) { - fail (); } catch (IOException e) { fail(); --- 54,57 ---- |
From: Lee I. <le...@us...> - 2005-01-08 01:22:25
|
Update of /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/plain In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7644/src/test/org/nodal/schemata/text/plain Modified Files: TestEncTextPlain.java TestDecTextPlain.java Log Message: Adjust usage for: o Hide Path.Failure from users of org.nodal.Nodal Index: TestDecTextPlain.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/plain/TestDecTextPlain.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestDecTextPlain.java 8 Jan 2005 00:54:49 -0000 1.3 --- TestDecTextPlain.java 8 Jan 2005 01:22:13 -0000 1.4 *************** *** 22,26 **** import org.nodal.model.Node; import org.nodal.model.SequenceNode; - import org.nodal.nav.Path; import org.nodal.type.SequenceType; import org.nodal.type.Schema; --- 22,25 ---- *************** *** 65,70 **** e1.printStackTrace(); fail("Cannot create sequence of strings: " + e1); - } catch (Path.Failure e) { - fail(); } catch (IOException e) { fail(); --- 64,67 ---- Index: TestEncTextPlain.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/plain/TestEncTextPlain.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestEncTextPlain.java 8 Jan 2005 00:54:50 -0000 1.3 --- TestEncTextPlain.java 8 Jan 2005 01:22:13 -0000 1.4 *************** *** 20,24 **** import org.nodal.model.SequenceNode; import org.nodal.model.Setter; - import org.nodal.nav.Path; import org.nodal.format.text.plain.Format; import org.nodal.type.SequenceType; --- 20,23 ---- *************** *** 68,73 **** e1.printStackTrace(); fail("Unable to create sequence of strings: " + e1); - } catch (Path.Failure e) { - fail(); } catch (IOException e) { fail(); --- 67,70 ---- |
From: Lee I. <le...@us...> - 2005-01-08 01:22:24
|
Update of /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/x_nodal_schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7644/src/test/org/nodal/schemata/text/x_nodal_schema Modified Files: TestParser.java Log Message: Adjust usage for: o Hide Path.Failure from users of org.nodal.Nodal Index: TestParser.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/x_nodal_schema/TestParser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestParser.java 8 Jan 2005 00:54:51 -0000 1.2 --- TestParser.java 8 Jan 2005 01:22:13 -0000 1.3 *************** *** 10,15 **** import org.nodal.format.text.x_nodal_schema.Format; import org.nodal.model.NodeFactory; - import org.nodal.nav.Path; - import storage.trans.TransientRepository; import test.org.nodal.schemata.SchemataTestCase; --- 10,13 ---- *************** *** 28,33 **** try { repo = (TransientRepository) Nodal.openRepository("memory://audited"); - } catch (Path.Failure e) { - fail(); } catch (IOException e) { fail(); --- 26,29 ---- |
From: Lee I. <le...@us...> - 2005-01-08 01:22:23
|
Update of /cvsroot/nodal/j-test/src/test/storage/jar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7644/src/test/storage/jar Modified Files: TestJarRepository.java Log Message: Adjust usage for: o Hide Path.Failure from users of org.nodal.Nodal Index: TestJarRepository.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/jar/TestJarRepository.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestJarRepository.java 8 Jan 2005 00:54:50 -0000 1.2 --- TestJarRepository.java 8 Jan 2005 01:22:13 -0000 1.3 *************** *** 44,50 **** e.printStackTrace(System.err); fail("Unable to load org.jdom.Document"); - } catch (Path.Failure e) { - e.printStackTrace(System.err); - fail(); } catch (IOException e) { fail(); --- 44,47 ---- |
From: Lee I. <le...@us...> - 2005-01-08 01:21:22
|
Update of /cvsroot/nodal/nodal/j-src/org/nodal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7342/org/nodal Modified Files: Nodal.java Log Message: Hide Path.Failure from users of org.nodal.Nodal Index: Nodal.java =================================================================== RCS file: /cvsroot/nodal/nodal/j-src/org/nodal/Nodal.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Nodal.java 8 Jan 2005 00:51:13 -0000 1.24 --- Nodal.java 8 Jan 2005 01:21:04 -0000 1.25 *************** *** 24,27 **** --- 24,28 ---- import org.nodal.nav.Path; import org.nodal.nav.Paths; + import org.nodal.nav.Path.Failure; import org.nodal.util.Name; import org.nodal.util.Namespace; *************** *** 40,44 **** /* Avoid bootstrap problems? -- leei */ //TypeDocument d = Types.BASEDOC; - // Load fundamental Storage drivers Class.forName("storage.trans.TransientDriver"); --- 41,44 ---- *************** *** 53,59 **** /** ! * Open a URL for access by the NODAL interfaces. Parses and binds ! * the URL, returning a bound Path or signalling failure. ! * @param uri a String representing the URI to be parsed * @return a getter for the Path that has the given URI */ --- 53,61 ---- /** ! * Open a URL for access by the NODAL interfaces. Parses and binds the URL, ! * returning a bound Path or signalling failure. ! * ! * @param uri ! * a String representing the URI to be parsed * @return a getter for the Path that has the given URI */ *************** *** 64,72 **** /** ! * Access a Node defined by the Name as a Node id. The id will exist in ! * a Namespace that identifies the Document context. If a Document cannot be * associated with the Namespace, or the Document cannot be accessed, then * this method fails and return null. ! * @param nm a Name to identify the Node * @return a Node if there is one accessible from this Name or null * @throws IOException --- 66,76 ---- /** ! * Access a Node defined by the Name as a Node id. The id will exist in a ! * Namespace that identifies the Document context. If a Document cannot be * associated with the Namespace, or the Document cannot be accessed, then * this method fails and return null. ! * ! * @param nm ! * a Name to identify the Node * @return a Node if there is one accessible from this Name or null * @throws IOException *************** *** 84,90 **** /** ! * Open a Document given a Path. If the Path is not absolute or the Document * does not exist then we return null. ! * @param docPath an absolute Path defining a Document * @return a Document containing the Path requested or null * @throws IOException --- 88,96 ---- /** ! * Open a Document given a Path. If the Path is not absolute or the Document * does not exist then we return null. ! * ! * @param docPath ! * an absolute Path defining a Document * @return a Document containing the Path requested or null * @throws IOException *************** *** 104,126 **** /** ! * Open a Document named by a given URI. If the URI is not absolute ! * or the Document ! * does not exist then we return null. ! * @param uri an absolute URI defining a Document * @return a Document containing the Path requested or null - * @throws Path.Failure if the uri is an invalid Path * @throws IOException */ ! public static Document openDocument(String uri) throws Path.Failure, IOException { ! Path path = Paths.parse(uri); ! return openDocument(path); } /** * Create a new Document that can be accessed with the given Path. ! * @param path a Path to attach this Document to. * @return a new Document object with this Path * @throws IOException ! * @throws RuntimeException if a Document already ex */ public static Document createDocument(Path path, DocumentFormat format) --- 110,140 ---- /** ! * Open a Document named by a given URI. If the URI is not absolute or the ! * Document does not exist then we return null. ! * ! * @param uri ! * an absolute URI defining a Document * @return a Document containing the Path requested or null * @throws IOException */ ! public static Document openDocument(String uri) throws IOException { ! try { ! Path path = Paths.parse(uri); ! return openDocument(path); ! } catch (Path.Failure e) { ! throw new IOException("Path parse: " + e); ! } ! } /** * Create a new Document that can be accessed with the given Path. ! * ! * @param path ! * a Path to attach this Document to. * @return a new Document object with this Path * @throws IOException ! * @throws RuntimeException ! * if a Document already ex */ public static Document createDocument(Path path, DocumentFormat format) *************** *** 140,168 **** /** ! * Open a Repository named by the given URI. If the URI references a ! * file or object <i>inside</i> a Repository, then this should successfully ! * return the containing Repository. * ! * @param uri a String naming a Repository * @return the Repository containing the named resource * @throws Failure * @throws IOException */ ! public static Repository openRepository(String uri) throws Path.Failure, IOException { ! Path path = Paths.parse(uri); ! return openRepository(path); } /** ! * Open a Repository named by the given URI. If the URI references a ! * file or object <i>inside</i> a Repository, then this should successfully ! * return the containing Repository. * ! * @param path an absolute Path naming a Repository * @return the Repository containing the named resource ! * @throws Path.Failure if the Path given is invalid * @throws IOException */ ! public static Repository openRepository(Path path) throws Path.Failure, IOException { // First, check the cache of Repositories Repository r = AbstractRepository.existingRepository(path); --- 154,190 ---- /** ! * Open a Repository named by the given URI. If the URI references a file or ! * object <i>inside </i> a Repository, then this should successfully return ! * the containing Repository. * ! * @param uri ! * a String naming a Repository * @return the Repository containing the named resource * @throws Failure * @throws IOException */ ! public static Repository openRepository(String uri) throws IOException { ! try { ! Path path = Paths.parse(uri); ! return openRepository(path); ! } catch (Path.Failure e) { ! throw new IOException("Path parse: " + e); ! } } /** ! * Open a Repository named by the given URI. If the URI references a file or ! * object <i>inside </i> a Repository, then this should successfully return ! * the containing Repository. * ! * @param path ! * an absolute Path naming a Repository * @return the Repository containing the named resource ! * @throws Path.Failure ! * if the Path given is invalid * @throws IOException */ ! public static Repository openRepository(Path path) throws Path.Failure, ! IOException { // First, check the cache of Repositories Repository r = AbstractRepository.existingRepository(path); *************** *** 183,190 **** /** ! * Register a given RepositoryDriver with the repository manager. ! * This should be called when the singleton instance of a ! * RepositoryDriver is created. ! * @param dr the RepositoryDriver to be registered */ private static void registerRepository(RepositoryDriver dr) { --- 205,213 ---- /** ! * Register a given RepositoryDriver with the repository manager. This should ! * be called when the singleton instance of a RepositoryDriver is created. ! * ! * @param dr ! * the RepositoryDriver to be registered */ private static void registerRepository(RepositoryDriver dr) { *************** *** 196,204 **** /** ! * All RepositoryDriver implementations should extend this class in order ! * to be properly registered with the top-level and available to * openRepository(). * * Created on Oct 8, 2003 * @author leei */ --- 219,228 ---- /** ! * All RepositoryDriver implementations should extend this class in order to ! * be properly registered with the top-level and available to * openRepository(). * * Created on Oct 8, 2003 + * * @author leei */ *************** *** 210,263 **** } ! /* ==================================================================== ! * The Apache Software License, Version 1.1 ! * ! * Copyright (c) 2001 SRI International. All rights reserved. ! * * Redistribution and use in source and binary forms, with or without ! * modification, are permitted provided that the following conditions ! * are met: ! * ! * 1. Redistributions of source code must retain the above copyright ! * notice, this list of conditions and the following disclaimer. ! * ! * 2. Redistributions in binary form must reproduce the above copyright ! * notice, this list of conditions and the following disclaimer in ! * the documentation and/or other materials provided with the ! * distribution. ! * ! * 3. The end-user documentation included with the redistribution, ! * if any, must include the following acknowledgment: ! * "This product includes software developed by ! * SRI International (http://www.sri.com/)." ! * Alternately, this acknowledgment may appear in the software itself, ! * if and wherever such third-party acknowledgments normally appear. ! * ! * 4. The names "SRI" and "SRI International" must not be used to ! * endorse or promote products derived from this ! * software without prior written permission. For written ! * permission, please contact SRI International. ! * ! * 5. Products derived from this software may not be called "NODAL", ! * nor may "NODAL" appear in their name, without prior written ! * permission of SRI International. ! * ! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED ! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ! * DISCLAIMED. IN NO EVENT SHALL SRI INTERNATIONAL OR ! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ! * SUCH DAMAGE. * ==================================================================== ! * ! * This software consists of voluntary contributions made by many ! * individuals on behalf of SRI International. For more ! * information on the SRI International, please see ! * <http://www.sri.com/>. */ --- 234,281 ---- } ! /* ! * ==================================================================== The ! * Apache Software License, Version 1.1 ! * ! * Copyright (c) 2001 SRI International. All rights reserved. ! * * Redistribution and use in source and binary forms, with or without ! * modification, are permitted provided that the following conditions are met: ! * ! * 1. Redistributions of source code must retain the above copyright notice, ! * this list of conditions and the following disclaimer. ! * ! * 2. Redistributions in binary form must reproduce the above copyright notice, ! * this list of conditions and the following disclaimer in the documentation ! * and/or other materials provided with the distribution. ! * ! * 3. The end-user documentation included with the redistribution, if any, must ! * include the following acknowledgment: "This product includes software ! * developed by SRI International (http://www.sri.com/)." Alternately, this ! * acknowledgment may appear in the software itself, if and wherever such ! * third-party acknowledgments normally appear. ! * ! * 4. The names "SRI" and "SRI International" must not be used to endorse or ! * promote products derived from this software without prior written permission. ! * For written permission, please contact SRI International. ! * ! * 5. Products derived from this software may not be called "NODAL", nor may ! * "NODAL" appear in their name, without prior written permission of SRI ! * International. ! * ! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, ! * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND ! * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SRI ! * INTERNATIONAL OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ! * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ! * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ! * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== ! * ! * This software consists of voluntary contributions made by many individuals on ! * behalf of SRI International. For more information on the SRI International, ! * please see <http://www.sri.com/>. */ |
From: Lee I. <le...@us...> - 2005-01-08 00:55:03
|
Update of /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/x_nodal_schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1818/src/test/org/nodal/schemata/text/x_nodal_schema Modified Files: TestParser.java Log Message: Reflect IOException throws from Repository and Document access. Index: TestParser.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/x_nodal_schema/TestParser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestParser.java 3 Oct 2004 19:42:26 -0000 1.1 --- TestParser.java 8 Jan 2005 00:54:51 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- package test.org.nodal.schemata.text.x_nodal_schema; + import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; *************** *** 29,32 **** --- 30,35 ---- } catch (Path.Failure e) { fail(); + } catch (IOException e) { + fail(); } |
From: Lee I. <le...@us...> - 2005-01-08 00:55:03
|
Update of /cvsroot/nodal/j-test/src/test/storage/file In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1818/src/test/storage/file Modified Files: TestFileRepository.java Log Message: Reflect IOException throws from Repository and Document access. Index: TestFileRepository.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/file/TestFileRepository.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestFileRepository.java 3 Oct 2004 19:42:25 -0000 1.1 --- TestFileRepository.java 8 Jan 2005 00:54:50 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- import java.io.IOException; import java.net.JarURLConnection; + import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; *************** *** 21,25 **** import org.nodal.nav.Path; import org.nodal.nav.Paths; - import org.nodal.nav.Path.Failure; import org.nodal.util.Name; --- 22,25 ---- *************** *** 31,36 **** public class TestFileRepository extends TestCase { /** ! * */ public TestFileRepository(String name) { --- 31,39 ---- public class TestFileRepository extends TestCase { + private URL url; + private URL dirUrl; + /** ! * */ public TestFileRepository(String name) { *************** *** 39,42 **** --- 42,51 ---- protected void setUp() { + url = Nodal.class.getClassLoader().getResource("baseTypes.nls"); + try { + dirUrl = new URL(url, "."); + } catch (MalformedURLException e) { + fail("Accessing directory of baseTypes.nls"); + } } *************** *** 45,50 **** public void testFiles() { - URL url = Nodal.class.getClassLoader().getResource("baseTypes.nls"); - if (url.getProtocol().equals("jar")) { try { --- 54,57 ---- *************** *** 83,94 **** Iterator e = dir.entries(); while (e.hasNext()) { ! Name nm = (Name) e.next(); ! Document d1 = dir.get(nm.string()); ! System.out.println("Document: "+d1); } ! } catch (Failure e) { fail(); } } ! } --- 90,119 ---- Iterator e = dir.entries(); while (e.hasNext()) { ! Name nm = (Name) e.next(); ! Document d1 = dir.get(nm.string()); ! System.out.println("Document: " + d1); } ! } catch (Path.Failure e) { ! fail(); ! } catch (IOException e) { fail(); } } ! public void testWrite() { ! Directory.Editor dir = null; ! try { ! String dirString = dirUrl.toExternalForm(); ! Repository r = Nodal.openRepository(dirString); ! dir = r.document(dirString).asDirectory().edit(); ! Document newText = dir.createDocument("test.txt", "text/plain"); ! System.out.println("Created " + newText.path().toURLString()); ! } catch (Path.Failure e) { ! fail(); ! } catch (IOException e) { ! fail(); ! } finally { ! dir.unlink("test.txt"); ! } ! } ! } \ No newline at end of file |
From: Lee I. <le...@us...> - 2005-01-08 00:55:03
|
Update of /cvsroot/nodal/j-test/src/test/storage/jar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1818/src/test/storage/jar Modified Files: TestJarRepository.java Log Message: Reflect IOException throws from Repository and Document access. Index: TestJarRepository.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/jar/TestJarRepository.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestJarRepository.java 3 Oct 2004 19:42:11 -0000 1.1 --- TestJarRepository.java 8 Jan 2005 00:54:50 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- package test.storage.jar; + import java.io.IOException; import java.net.URL; import org.nodal.Nodal; *************** *** 46,49 **** --- 47,52 ---- e.printStackTrace(System.err); fail(); + } catch (IOException e) { + fail(); } } |
From: Lee I. <le...@us...> - 2005-01-08 00:54:59
|
Update of /cvsroot/nodal/j-test/src/test/storage/http In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1818/src/test/storage/http Modified Files: TestHttpRepository.java Log Message: Reflect IOException throws from Repository and Document access. Index: TestHttpRepository.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/storage/http/TestHttpRepository.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestHttpRepository.java 3 Oct 2004 19:42:26 -0000 1.1 --- TestHttpRepository.java 8 Jan 2005 00:54:50 -0000 1.2 *************** *** 9,12 **** --- 9,14 ---- package test.storage.http; + import java.io.IOException; + import org.nodal.Nodal; import org.nodal.Repository; *************** *** 14,18 **** import org.nodal.model.Node; import org.nodal.model.NodeContent; ! import org.nodal.nav.Path.Failure; import junit.framework.TestCase; --- 16,20 ---- import org.nodal.model.Node; import org.nodal.model.NodeContent; ! import org.nodal.nav.Path; import junit.framework.TestCase; *************** *** 54,58 **** NodeContent content2 = doc2Root.content(); assertTrue (content2 != null); ! } catch (Failure e) { fail(); } --- 56,62 ---- NodeContent content2 = doc2Root.content(); assertTrue (content2 != null); ! } catch (Path.Failure e) { ! fail(); ! } catch (IOException e) { fail(); } |
From: Lee I. <le...@us...> - 2005-01-08 00:54:59
|
Update of /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/plain In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1818/src/test/org/nodal/schemata/text/plain Modified Files: TestDecTextPlain.java TestEncTextPlain.java Log Message: Reflect IOException throws from Repository and Document access. Index: TestDecTextPlain.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/plain/TestDecTextPlain.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestDecTextPlain.java 12 Nov 2004 19:24:51 -0000 1.2 --- TestDecTextPlain.java 8 Jan 2005 00:54:49 -0000 1.3 *************** *** 22,26 **** import org.nodal.model.Node; import org.nodal.model.SequenceNode; ! import org.nodal.nav.Path.Failure; import org.nodal.type.SequenceType; import org.nodal.type.Schema; --- 22,26 ---- import org.nodal.model.Node; import org.nodal.model.SequenceNode; ! import org.nodal.nav.Path; import org.nodal.type.SequenceType; import org.nodal.type.Schema; *************** *** 32,36 **** /** ! * * @author Nelson Siu */ --- 32,36 ---- /** ! * * @author Nelson Siu */ *************** *** 51,72 **** } ! /** Sets up the repository and context node ! *This method is called before a test is executed. */ protected void setUp() { //Create a new repository try { repo = (TransientRepository) Nodal.openRepository("memory://audited"); ! } catch (Failure e) { ! fail(); ! } ! typeDoc = Types.createSchema("memory://audited/testme.nls"); ! try { sSeqType = typeDoc.createSequenceType(Types.STRING); } catch (Type.CreationFailure e1) { e1.printStackTrace(); ! fail ("Cannot create sequence of strings: "+e1); } ! //Special mode created by Lee to allow for node creation straight from the repo // o This node is used to create the factory for the decoder in the test n = repo.createNode(sSeqType.asSequenceType()); --- 51,76 ---- } ! /** ! * Sets up the repository and context node This method is called before a test ! * is executed. ! */ protected void setUp() { //Create a new repository try { repo = (TransientRepository) Nodal.openRepository("memory://audited"); ! ! typeDoc = Types.createSchema("memory://audited/testme.nls"); sSeqType = typeDoc.createSequenceType(Types.STRING); } catch (Type.CreationFailure e1) { e1.printStackTrace(); ! fail("Cannot create sequence of strings: " + e1); ! } catch (Path.Failure e) { ! fail(); ! } catch (IOException e) { ! fail(); } ! //Special mode created by Lee to allow for node creation straight from the ! // repo // o This node is used to create the factory for the decoder in the test n = repo.createNode(sSeqType.asSequenceType()); *************** *** 81,86 **** } ! //========================================================================== ! /**Test Decoder open text file and encode into a sequence of nodes*/ public void testDecode() { //Open a stream from text file --- 85,90 ---- } ! //========================================================================== ! /** Test Decoder open text file and encode into a sequence of nodes */ public void testDecode() { //Open a stream from text file *************** *** 120,122 **** } ! } --- 124,126 ---- } ! } \ No newline at end of file Index: TestEncTextPlain.java =================================================================== RCS file: /cvsroot/nodal/j-test/src/test/org/nodal/schemata/text/plain/TestEncTextPlain.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TestEncTextPlain.java 12 Nov 2004 19:24:51 -0000 1.2 --- TestEncTextPlain.java 8 Jan 2005 00:54:50 -0000 1.3 *************** *** 20,24 **** import org.nodal.model.SequenceNode; import org.nodal.model.Setter; ! import org.nodal.nav.Path.Failure; import org.nodal.format.text.plain.Format; import org.nodal.type.SequenceType; --- 20,24 ---- import org.nodal.model.SequenceNode; import org.nodal.model.Setter; ! import org.nodal.nav.Path; import org.nodal.format.text.plain.Format; import org.nodal.type.SequenceType; *************** *** 29,35 **** import storage.trans.TransientRepository; /** ! * ! * @author Maryam */ public class TestEncTextPlain extends TestCase { --- 29,36 ---- import storage.trans.TransientRepository; + /** ! * ! * @author Maryam */ public class TestEncTextPlain extends TestCase { *************** *** 48,74 **** } ! /** Sets up the repository and the test node tree ! *This method is called before a test is executed. */ protected void setUp() { //Create a new repository try { repo = (TransientRepository) Nodal.openRepository("memory://transient"); - } catch (Failure e) { - fail(); - } ! //Create a new encoder ! testTextSchema = Format.documentFormat(); ! testEncoder = testTextSchema.encoder(); - typeDoc = Types.createSchema("testme.nls"); - try { sSeqType = typeDoc.createSequenceType(Types.STRING); } catch (Type.CreationFailure e1) { e1.printStackTrace(); ! fail ("Unable to create sequence of strings: "+e1); } ! //Special mode created by Lee to allow for node creation straight from the repo myTestNode = repo.createNode(sSeqType); --- 49,79 ---- } ! /** ! * Sets up the repository and the test node tree This method is called before ! * a test is executed. ! */ protected void setUp() { //Create a new repository try { repo = (TransientRepository) Nodal.openRepository("memory://transient"); ! //Create a new encoder ! testTextSchema = Format.documentFormat(); ! testEncoder = testTextSchema.encoder(); ! ! typeDoc = Types.createSchema("testme.nls"); sSeqType = typeDoc.createSequenceType(Types.STRING); } catch (Type.CreationFailure e1) { e1.printStackTrace(); ! fail("Unable to create sequence of strings: " + e1); ! } catch (Path.Failure e) { ! fail(); ! } catch (IOException e) { ! fail(); } ! //Special mode created by Lee to allow for node creation straight from the ! // repo myTestNode = repo.createNode(sSeqType); *************** *** 77,97 **** try { ! // Create a node tree with 2 nodes sSeqSetter = sSeqEd.insertAfter(-1); ! SequenceNode.Editor newNode1 = ! sSeqEd.createNode(Types.STRING).editSequence(); newNode1.insertAfter(-1).set("line 1"); sSeqSetter.set(newNode1.bareNode()); ! SequenceNode.Editor newNode2 = ! sSeqEd.createNode(Types.STRING).editSequence(); newNode2.insertAfter(-1).set("line 2"); sSeqSetter.set(newNode2.bareNode()); /* ! System.err.println ("Get [-2] = "+sSeqEd.item(-2).get()); ! System.err.println ("Get [-1] = "+sSeqEd.item(-1).get()); ! System.err.println ("Get [ 0] = "+sSeqEd.item(0).get()); ! System.err.println ("Get [ 1] = "+sSeqEd.item(1).get()); ! */ } catch (ConstraintFailure f) { System.out.println("Constraint Failure in TestEncTextPlain"); --- 82,102 ---- try { ! // Create a node tree with 2 nodes sSeqSetter = sSeqEd.insertAfter(-1); ! SequenceNode.Editor newNode1 = sSeqEd.createNode(Types.STRING) ! .editSequence(); newNode1.insertAfter(-1).set("line 1"); sSeqSetter.set(newNode1.bareNode()); ! SequenceNode.Editor newNode2 = sSeqEd.createNode(Types.STRING) ! .editSequence(); newNode2.insertAfter(-1).set("line 2"); sSeqSetter.set(newNode2.bareNode()); /* ! * System.err.println ("Get [-2] = "+sSeqEd.item(-2).get()); ! * System.err.println ("Get [-1] = "+sSeqEd.item(-1).get()); ! * System.err.println ("Get [ 0] = "+sSeqEd.item(0).get()); ! * System.err.println ("Get [ 1] = "+sSeqEd.item(1).get()); ! */ } catch (ConstraintFailure f) { System.out.println("Constraint Failure in TestEncTextPlain"); *************** *** 111,115 **** fail(); } ! //Examine that the nodes were indeed encoded into the output stream String lineEnd = System.getProperty("line.separator"); --- 116,120 ---- fail(); } ! //Examine that the nodes were indeed encoded into the output stream String lineEnd = System.getProperty("line.separator"); *************** *** 117,119 **** } ! } --- 122,124 ---- } ! } \ No newline at end of file |