adding the MIT license (see http://phpcr-license.davidbu.ch/licenses/projects)

Author: dbu

LICENSE.txt

@@ -1,3 +1,26 @@
+phpcr-utils is dual licensed under the MIT license and the Apache License Version 2.0.
+
+    The MIT License (MIT)
+
+    Copyright (c) 2013 Liip and others
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+    the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
                                  Apache License
                            Version 2.0, January 2004
@@ -187,7 +210,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2010-2013 Liip and others
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -200,65 +223,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
-APACHE JACKRABBIT SUBCOMPONENTS
-
-Apache Jackrabbit includes parts with separate copyright notices and license
-terms. Your use of these subcomponents is subject to the terms and conditions
-of the following licenses:
-
-    XPath 2.0/XQuery 1.0 Parser:
-    http://www.w3.org/2002/11/xquery-xpath-applets/xgrammar.zip
-
-    Copyright (C) 2002 World Wide Web Consortium, (Massachusetts Institute of
-    Technology, European Research Consortium for Informatics and Mathematics,
-    Keio University). All Rights Reserved.
-
-    This work is distributed under the W3C(R) Software License in the hope
-    that it will be useful, but WITHOUT ANY WARRANTY; without even the
-    implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    W3C(R) SOFTWARE NOTICE AND LICENSE
-    http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
-    This work (and included software, documentation such as READMEs, or
-    other related items) is being provided by the copyright holders under
-    the following license. By obtaining, using and/or copying this work,
-    you (the licensee) agree that you have read, understood, and will comply
-    with the following terms and conditions.
-
-    Permission to copy, modify, and distribute this software and its
-    documentation, with or without modification, for any purpose and
-    without fee or royalty is hereby granted, provided that you include
-    the following on ALL copies of the software and documentation or
-    portions thereof, including modifications:
-
-       1. The full text of this NOTICE in a location viewable to users
-          of the redistributed or derivative work.
-
-       2. Any pre-existing intellectual property disclaimers, notices,
-          or terms and conditions. If none exist, the W3C Software Short
-          Notice should be included (hypertext is preferred, text is
-          permitted) within the body of any redistributed or derivative code.
-
-       3. Notice of any changes or modifications to the files, including
-          the date changes were made. (We recommend you provide URIs to the
-          location from which the code is derived.)
-
-    THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
-    HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
-    INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
-    FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
-    DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
-    TRADEMARKS OR OTHER RIGHTS.
-
-    COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-    OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-    DOCUMENTATION.
-
-    The name and trademarks of copyright holders may NOT be used in
-    advertising or publicity pertaining to the software without specific,
-    written prior permission. Title to copyright in this software and
-    any associated documentation will at all times remain with
-    copyright holders.

README.md

@@ -6,8 +6,12 @@ If you are using or implementing [PHPCR](https://github.com/phpcr/phpcr) you
 probably want some of the things in here.
 
 PHPCR Users: Note that your PHPCR implementation probably already bundles the
-utils. Jackalope for example depends on them and they are found in its
-lib/phpcr-utils folder.
+utils.
+
+## License
+
+This code is dual licensed under the MIT license and the Apache License Version
+2.0. Please see the file LICENSE in this folder.
 
 
 # Documentation
@@ -18,7 +22,7 @@ classes for common tasks.
 
 ## Commands
 
-There are a couple of useful commands to interact with a phpcr repository.
+There are a couple of useful commands to interact with a PHPCR repository.
 
 To use the console, make sure you have initialized the git submodules of
 phpcr-utils, then copy cli-config.php.dist to cli-config.php and adjust it
@@ -76,4 +80,3 @@ into QOM . ``QomToSql2QueryConverter`` generates SQL2 out of a QOM.
 This ``ItemVisitorInterface`` implementation is a basic implementation of crawling
 a PHPCR tree. You can extend it to define what it should do while crawling the
 tree.
-

composer.json

@@ -4,7 +4,10 @@
     "description": "PHP Content Repository implementation independant utilities",
     "keywords": ["phpcr", "contentrepository", "cli"],
     "homepage": "http://phpcr.github.com",
-    "license": "Apache-2.0",
+    "license": [
+        "MIT",
+        "Apache-2.0"
+    ],
     "authors": [
         {
             "name": "David Buchmann",

src/PHPCR/Util/CND/Exception/ParserException.php

@@ -2,11 +2,15 @@
 
 namespace PHPCR\Util\CND\Exception;
 
-use PHPCR\Util\CND\Scanner\TokenQueue,
-    PHPCR\Util\CND\Scanner\GenericToken;
+use PHPCR\Util\CND\Scanner\TokenQueue;
+use PHPCR\Util\CND\Scanner\GenericToken;
 
 /**
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
+ *
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  */
 class ParserException extends \Exception
 {

src/PHPCR/Util/CND/Exception/ScannerException.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Reader\ReaderInterface;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class ScannerException extends \Exception

src/PHPCR/Util/CND/Parser/AbstractParser.php

@@ -15,6 +15,9 @@
  *      - expectToken           - expect the next token to match
  *      - checkAndExpectToken   - check and then expect the next token to match
  *
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 abstract class AbstractParser

src/PHPCR/Util/CND/Parser/CndParser.php

@@ -27,6 +27,9 @@
  * @see http://www.day.com/specs/jcr/2.0/25_Appendix.html#25.2.3 CND Grammar
  * @see http://jackrabbit.apache.org/node-type-notation.html
  *
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  * @author David Buchmann <david@liip.ch>
  */

src/PHPCR/Util/CND/Reader/BufferReader.php

@@ -3,6 +3,9 @@
 namespace PHPCR\Util\CND\Reader;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  * @author Nikola Petkanski <nikola@petkanski.com>
  */

src/PHPCR/Util/CND/Reader/FileReader.php

@@ -3,6 +3,9 @@
 namespace PHPCR\Util\CND\Reader;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  * @author Nikola Petkanski <nikola@petkanski.com>
  */

src/PHPCR/Util/CND/Reader/ReaderInterface.php

@@ -3,6 +3,9 @@
 namespace PHPCR\Util\CND\Reader;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 interface ReaderInterface

src/PHPCR/Util/CND/Scanner/AbstractScanner.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Reader\ReaderInterface;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 abstract class AbstractScanner

src/PHPCR/Util/CND/Scanner/Context/DefaultScannerContext.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\TokenFilter\TokenFilterInterface;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class DefaultScannerContext extends ScannerContext

src/PHPCR/Util/CND/Scanner/Context/DefaultScannerContextWithoutSpacesAndComments.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\TokenFilter;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class DefaultScannerContextWithoutSpacesAndComments extends DefaultScannerContext
@@ -17,5 +20,5 @@ public function __construct()
         $this->addTokenFilter(new TokenFilter\NoWhitespacesFilter());
         $this->addTokenFilter(new TokenFilter\NoCommentsFilter());
     }
-    
+
 }

src/PHPCR/Util/CND/Scanner/Context/ScannerContext.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\TokenFilter\TokenFilterInterface;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class ScannerContext

src/PHPCR/Util/CND/Scanner/GenericScanner.php

@@ -11,6 +11,9 @@
  * This class can be extended and the class properties redefined in order to adapt
  * the token generation to your needs.
  *
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  * @author Nikola Petkanski <nikola@petkanski.com>
  */

src/PHPCR/Util/CND/Scanner/GenericToken.php

@@ -3,6 +3,9 @@
 namespace PHPCR\Util\CND\Scanner;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class GenericToken extends Token

src/PHPCR/Util/CND/Scanner/Token.php

@@ -7,6 +7,9 @@
  *
  * Unless you want to redefine the token type constants, you should rather use GenericToken.
  *
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class Token

src/PHPCR/Util/CND/Scanner/TokenFilter/NoCommentsFilter.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\GenericToken;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class NoCommentsFilter extends TokenTypeFilter

src/PHPCR/Util/CND/Scanner/TokenFilter/NoNewlinesFilter.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\GenericToken;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class NoNewlinesFilter extends TokenTypeFilter

src/PHPCR/Util/CND/Scanner/TokenFilter/NoWhitespacesFilter.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\GenericToken;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class NoWhitespacesFilter extends TokenTypeFilter

src/PHPCR/Util/CND/Scanner/TokenFilter/TokenFilterChain.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\Token;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class TokenFilterChain implements TokenFilterInterface

src/PHPCR/Util/CND/Scanner/TokenFilter/TokenFilterInterface.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\Token;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 interface TokenFilterInterface

src/PHPCR/Util/CND/Scanner/TokenFilter/TokenTypeFilter.php

@@ -5,6 +5,9 @@
 use PHPCR\Util\CND\Scanner\Token;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class TokenTypeFilter implements TokenFilterInterface

src/PHPCR/Util/CND/Scanner/TokenQueue.php

@@ -3,6 +3,9 @@
 namespace PHPCR\Util\CND\Scanner;
 
 /**
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author Daniel Barsotti <daniel.barsotti@liip.ch>
  */
 class TokenQueue implements \IteratorAggregate

src/PHPCR/Util/CND/Writer/CndWriter.php

@@ -20,6 +20,9 @@
  * @see http://www.day.com/specs/jcr/2.0/25_Appendix.html#25.2.3 CND Grammar
  * @see http://jackrabbit.apache.org/node-type-notation.html
  *
+ * @license http://www.apache.org/licenses Apache License Version 2.0, January 2004
+ * @license http://opensource.org/licenses/MIT MIT License
+ *
  * @author David Buchmann <david@liip.ch>
  */
 class CndWriter