From 05db46f7aad82e9708609bb0aecfb6bdf7b83e24 Mon Sep 17 00:00:00 2001 From: Timothy Washington Date: Fri, 4 Sep 2009 21:58:27 -0400 Subject: [PATCH] adding BSD license file --- LICENSE | 21 ++++++++++----------- src/com/interrupt/bob/base/Bob.java | 10 ++++++---- 2 files changed, 16 insertions(+), 15 deletions(-) mode change 100755 => 100644 LICENSE diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 index c36c8e2..3cc106a --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,10 @@ -Copyright (c) 2004, Timothy Washington -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * 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. - * Neither the name of the Interrupt Software Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT OWNER OR 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. - +Copyright (c) 2009, Timothy Washington +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * 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. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 THE COPYRIGHT HOLDER OR 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. + diff --git a/src/com/interrupt/bob/base/Bob.java b/src/com/interrupt/bob/base/Bob.java index ff48247..c244b24 100755 --- a/src/com/interrupt/bob/base/Bob.java +++ b/src/com/interrupt/bob/base/Bob.java @@ -1030,7 +1030,9 @@ public class Bob implements IBob { IBob bobby = new Bob(); com.interrupt.bookkeeping.GBookkeeping bkeeping = (com.interrupt.bookkeeping.GBookkeeping)bobby.load(new File("test/xml/bookkeeping.2.system.xml"),"test/xml/bookkeeping.2.system.xml"); - bkeeping.setProperty(IBob.XML_DEPTH, "-1"); + bkeeping.setProperty(IBob.XML_DEPTH, "1"); + + System.out.println("bkeeping["+ bkeeping.toXML(false) +"]"); class XOutput implements IVisitor { @@ -1052,7 +1054,7 @@ public class Bob implements IBob { //** multiple predicates (implicit 'and') //[ok] List result = bkeeping.find("/bookkeeping[ @id='' ]/journals[ @id='' ]/journal[ @zzz='timmy' ] [ @id='j1' or @name='generalledger' or @type='' or @balance='' ]"); - List result = bkeeping.find("/bookkeeping[ @id='' ]/journals[ @id='' ]/journal[ @id='j1' or @name='generalledger' or @type='' ] [ @balance='' ]"); + //** List result = bkeeping.find("/bookkeeping[ @id='' ]/journals[ @id='' ]/journal[ @id='j1' or @name='generalledger' or @type='' ] [ @balance='' ]"); //** predicates with and/or conditions @@ -1061,8 +1063,8 @@ public class Bob implements IBob { //[ok] List result = bkeeping.find("/bookkeeping[ @id='' ]/journals[ @id='' ]/journal[ @id='j1' or @name='generalledger' and @type='' or @balance='' ]"); - System.out.println("\n\n\nFind RESULTS..."); - System.out.println(result); + //** System.out.println("\n\n\nFind RESULTS..."); + //** System.out.println(result); // needs to return an XDM 1. Bob, text, sequence, etc -- 2.11.4.GIT