perfsonar development work

Author: dante.delvaux
Date: 2012-04-04 16:16:31 +0100 (Wed, 04 Apr 2012)
New Revision: 5914

Modified:
   trunk/perfsonar-java-xml-ls/doc/License.txt
   trunk/perfsonar-java-xml-ls/doc/changelog.txt
Log:
Using GEANT Standard Open Source Software Outward Licence, refs SWDSD-357.

Modified: trunk/perfsonar-java-xml-ls/doc/License.txt
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/License.txt 2012-04-03 17:48:30 UTC (rev 
5913)
+++ trunk/perfsonar-java-xml-ls/doc/License.txt 2012-04-04 15:16:31 UTC (rev 
5914)
@@ -1,24 +1,207 @@
-* Copyright (c) 2008, DANTE on behalf of the GEANT2 NRENs
-* 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 DANTE or GEANT2 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 DANTE ``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 DANTE or the GEANT2 NRENS 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) 2008-2012, DANTE on behalf of the GEANT NRENs
+                              All rights reserved
+
+              GÉANT Standard Open Source Software Outward Licence
+              ===================================================
+
+A.1 Grant of Copyright Licence
+A.1.1 Licensor hereby grants  You  a  world-wide,  royalty-free,  
non-exclusive,
+perpetual, sub-licensable licence to:
+A.1.1.1 Reproduce the Original Work in copies.
+A.1.1.2 Prepare Derivative Works.
+A.1.1.3 Distribute copies of the Original  Work  and  Derivative  Works  to  
the
+public, with the proviso that copies of Original Work or Derivative  Works  
that
+You distribute shall be Licensed under the terms of this Licence.
+A.1.1.4 Display the Original Work publicly.
+
+A.2 Grant of Patent Licence
+Licensor  hereby  grants  You   a   world-wide,   royalty-free,   
non-exclusive,
+perpetual, sub-licensable licence, under patent claims owned  or  controlled 
 by
+the Licensor that are  embodied  in  the  Original  Work  as  furnished  by  
the
+Licensor to use and modify the Original Work and Derivative Works.
+
+A.3 Grant of Licence
+A.3.1 Licensor hereby agrees to provide a machine-readable copy  of  the  
Source
+Code of the Original Work along  with  each  copy  of  the  Original  Work  
that
+Licensor distributes.
+A.3.2 Licensor reserves the right  to  satisfy this  obligation  by  placing 
 a
+machine-readable  copy  of  the  Source  Code  in  an   information   
repository
+reasonably calculated to permit inexpensive and convenient access by You for 
 as
+long as Licensor continues to distribute the Original Work,  and  by  
publishing
+the address of that information repository in  a  notice  immediately  
following
+the copyright notice that applies to the Original Work.
+
+A.4 Exclusions from Licence Grant 
+A.4.1 Neither the names of Licensor, nor the names of any  contributors  to  
the
+Original Work, nor any of their trade marks or service marks,  may  be  used 
 to
+endorse or promote products derived from  this  Original  Work  without  
express
+prior written permission of the Licensor.
+A.4.2 Nothing in this Licence shall be deemed  to  grant  any  rights  to  
trade
+marks, copyrights, patents, trade secrets or any other intellectual property 
 of
+Licensor except as expressly stated herein.
+A.4.3 No patent licence  is  granted  to  make,  use,  sell  or  offer  to  
sell
+embodiments of any patent claims other  than  the  Licensed  claims  defined 
 in
+clause A.2.
+A.4.4 Nothing in this Licence shall be interpreted  to  prohibit  Licensor  
from
+licensing under different  terms  from  this  Licence  any  Original  Work  
that
+Licensor otherwise would have a right to license.
+
+A.5 Other Terms
+To the extent that the Original Work contains  any  work  which  is  subject 
 to
+licence terms which conflict with these terms, the terms of  the  other  
licence
+shall take precedence over the terms of this Licence, to the extent required 
 to
+give effect to them.
+
+A.6 Third Party Provision
+As an express condition for the grants of licence hereunder, You agree that  
any
+Third  Party  Provision  by  You  of  a  Derivative  Work  shall  be  deemed 
  a
+distribution and shall be Licensed to all under the terms of  this  Licence, 
 as
+prescribed in clause A.1.1.3 herein.
+
+A.7 Attribution Rights 
+A.7.1 You must retain, in the Source Code  of  any  Derivative  Works  that  
You
+create, all copyright, patent or trade mark notices from the Source Code of  
the
+Original Work, as well as any notices of  licensing  and  any  descriptive  
text
+identified therein as an “Attribution Notice”, including the  following  
notice:
+
+        “on behalf of the GÉANT project, DANTE is the holder  of  the  
copyright
+        in  all  material  which  was  developed  by  a  member  of  the   
GÉANT
+        project.   DANTE  is  Delivery  of  Advanced   Network   Technology  
 to
+        Europe  Limited  (also  known  as  DANTE),  a   not-for-profit   
limited
+        liability company  registered  in  England  and  Wales  (company  
number
+        02806796) and with its registered company  address  at  9400  
Garsington
+        Road, Oxford Business Park, Oxford,  OX42HN”  The  research  leading 
 to
+        these  results  has  received  funding  from  the  European  
Community’s
+        Seventh Framework Programme (FP7/2007-2013)  under  grant  agreement 
 nº
+        238875  (GÉANT).
+
+A.7.2 You must cause the Source Code for any Derivative Works  that  You  
create
+to  carry  a  prominent  Attribution  Notice  reasonably  calculated  to  
inform
+recipients that You have modified the Original Work.
+
+A.8 Warranty of Provenance and Disclaimer of Warranty
+A.8.1 The Licensor warrants that the copyright  in  and  to  the  Original  
Work
+and the patent rights granted herein by Licensor are held  by  the  Licensor 
 or
+are sublicensed to You under the terms of this Licence with  the  permission 
 of
+the contributor(s) of those copyrights and patent rights.
+A.8.2 Except  as  expressly  stated  in  clause  A.8.1,  the  Original  Work 
 is
+provided under this Licence on an “as  is”  basis  and  this  Licence  
expressly
+excludes all implied terms, conditions  and  warranties  to  the  maximum  
limit
+permitted by the applicable law.  The entire risk  as  to  the  quality  of  
the
+Original Work is with you.  This disclaimer of warranty constitutes an 
essential
+part of this Licence.  No licence to Original Work is granted  hereunder  
except
+under this disclaimer.
+
+A.9 Limitation of Liability
+A.9.1 This limitation of liability shall not apply to  liability  for  death 
 or
+personal injury resulting from Licensor’s negligence to  the  extent  
applicable
+law prohibits such limitation.
+A.9.2 Subject to clause A.9.1 and any applicable  law,  under  no  
circumstances
+and under no legal theory, whether in tort (including negligence), contract, 
 or
+otherwise, shall the Licensor be liable to any person for any direct,  
indirect,
+special, incidental, or consequential damages of  any  character  arising  
as  a
+result of this Licence or the  use  of  the  Original  Work  including,  
without
+limitation, damages for loss of goodwill, work  stoppage,  computer  failure 
 or
+malfunction, or any and all other commercial damages or losses.
+
+A.10    Acceptance and Termination
+A.10.1 If You distribute copies of the Original Work or a Derivative  Work,  
You
+must make a reasonable effort under the  circumstances  to  obtain  the  
express
+consent (which, for  the  avoidance  of  doubt,  need  not  be  in  writing) 
 of
+recipients to the terms of this Licence.
+A.10.2 Nothing else but this  Licence  (or  another  written  agreement  
between
+Licensor and You) grants  You  permission  to  create  Derivative  Works  or 
 to
+exercise any of the rights granted in clause A.1,  and  any  attempt  to  do 
 so
+except under the terms of this Licence (or  another  written  agreement  
between
+Licensor and  You)  is  expressly  prohibited  by  English  copyright  law,  
the
+equivalent laws of other countries, and by international treaty.  Therefore, 
 by
+exercising any of the rights granted to  You  in  clause  A.1,  You  
irrevocably
+indicate Your acceptance of this Licence and all of its terms and conditions.
+A.10.3 Any failure by you to comply with your obligations under  clause  
A.1.1.3
+shall automatically terminate this Licence as well as any rights granted to  
You
+under this Licence.
+
+A.11    Legal Fees
+A.11.1 In any action to enforce the terms of this  Licence  or  seeking  
damages
+relating thereto, the prevailing party shall be entitled to  recover  its  
costs
+and expenses, including, without  limitation,  reasonable  attorneys’  fees  
and
+costs incurred in connection with such action,  including  any  appeal  of  
such
+action.
+A.11.2 This clause shall survive the termination of this Licence.
+
+A.12    Termination for Patent Action
+A.12.1 This  Licence  shall  terminate  automatically  and  You  may  no  
longer
+exercise any of the rights granted to You by this Licence as  of  the  date  
You
+commence an action, including a cross-claim or  counterclaim,  against  
Licensor
+or any Licensee alleging that the Original Work infringes a patent.
+A.12.2 This termination  provision  shall  not  apply  for  an  action  
alleging
+patent infringement by combinations of the Original Work with other software 
 or
+hardware.
+
+A.13    Jurisdiction, Venue and Governing Law
+A.13.1 Any action or suit relating to this Licence may be brought  only  in  
the
+courts of a jurisdiction wherein the  Licensor  resides  or  in  which  
Licensor
+conducts  its  primary  business,  and  under  the  laws  of  that  
jurisdiction
+excluding its conflict-of-law provisions.
+A.13.2 Any use of the Original Work outside the scope of this Licence  or  
after
+its termination shall be subject to the requirements and  penalties  of  
English
+copyright law, the equivalent laws of other countries and international  
treaty.
+A.13.3 This clause shall survive the termination of this Licence.
+
+A.14    Miscellaneous
+A.14.1 This Licence represents  the  entire  agreement  concerning  the  
subject
+matter hereof and the  parties  have  not  relied  on  any  representations  
not
+included in this Licence when entering into it.
+A.14.2 If any provision of this  Licence  is  held  to  be  unenforceable,  
such
+provision  shall  be  reformed  only  to  the  extent  necessary  to   make  
 it
+enforceable.
+
+A.15    Right to Use
+You may  use  the  Original  Work  in  all  ways  not  otherwise  restricted 
 or
+conditioned by this Licence or by law, and Licensor promises  not  to  
interfere
+with or be responsible for such uses by You.
+
+A.16    Definitions
+A.16.1 Derivative Works means any work, whether in Source Code or  Object  
Code,
+that is based on  (or  derived  from)  the  Original  Work  and  for  which  
the
+editorial  revisions,  annotations,   elaborations,   or   other   
modifications
+represent, as a whole, an original work of authorship.  For the purposes of 
this
+Licence, Derivative Works shall not include works that  remain  separable  
from,
+or merely link (or bind by name) to the interfaces of, the Work  and  
Derivative
+Works thereof.
+A.16.2 Licensor means the  individual,  individuals,  entity  or  entities  
that
+offer(s) the Original Work under the terms of this Licence.
+A.16.3  Object  Code  means  the  form  of  the  Original  Work  resulting  
from
+mechanical transformation or translation of a Source  form,  including  but  
not
+limited to compiled object code, generated  documentation,  and  conversions 
 to
+other media types.
+A.16.4 Original Work means the work of authorship, whether in Source  or  
Object
+form, made available under the Licence, as indicated by  an  Attribution  
Notice
+that is included in or attached to the work.
+A.16.5 Source Code means the preferred form of  the  Original  Work  for  
making
+modifications to it and all available documentation  describing  how  to  
modify
+the Original Work.
+A.16.6 Third Party Provision means the  use  or  distribution  of  the  
Original
+Work or Derivative Works in any way such that the Original  Work  or  
Derivative
+Works may be used by anyone  other  than  You,  whether  the  Original  Work 
 or
+Derivative Works are distributed to  those  persons  or  made  available  as 
 an
+application intended for use over a computer network.
+A.16.7 You means an individual or entity exercising rights  under  this  
Licence
+who has not previously violated the terms of this Licence with  respect  to  
the
+Work, or who has received express  permission  from  the  Licensor  to  
exercise
+rights under this Licence despite a previous  violation.   For  legal  
entities,
+“You” includes any entity that controls, is controlled by, or  is  under  
common
+control with you.
+
+For purposes of this  definition  “control”  means  (i)  the  power,  direct 
 or
+indirect, to cause the direction  or  management  of  such  entity,  whether 
 by
+contract or otherwise; or (ii) ownership of fifty percent (50%) or more  of  
the
+outstanding shares; or (iii) beneficial ownership of such entity.
+
+
+eXist DB
+Part of this software comes from the eXist DB (Open Source Native XML  
Database)
+project.  The eXist DB software library provided  here  is  unmodified.   
Source
+code for the eXist  DB  software  can  be  downloaded  at  the  following  
link:
+http://exist.svn.sourceforge.net/viewvc/exist/
+

Modified: trunk/perfsonar-java-xml-ls/doc/changelog.txt
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/changelog.txt       2012-04-03 17:48:30 
UTC (rev 5913)
+++ trunk/perfsonar-java-xml-ls/doc/changelog.txt       2012-04-04 15:16:31 
UTC (rev 5914)
@@ -1,6 +1,12 @@
 Lookup Service changelog 
 ============================
 
+XML LS 1.6
+- Fixes: DB collections are owned by lookupservice user, fixes PSSERVICES-563
+- New: eXist DB is now embedded, fixes PSSERVICES-613
+- Change: some xQuery speed improvements, fixes PSSERVICES-558
+- Change: Moving to GEANT Standard Open Source Software Outward Licence
+
 XML LS 1.5  
 - Fixes: bugs fixes PSSERVICES-503
 - New: old naming policy supported geant2-java-xml-ls - improved