You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/06/20 02:19:17 UTC

[1/4] git commit: Made the class final : we should not be able to extend this class, as we start threads in the constructor.

Updated Branches:
  refs/heads/trunk fad44fe82 -> 90719cf40


Made the class final : we should not be able to extend this class, as we
start threads in the constructor.

Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/b4dbc33d
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/b4dbc33d
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/b4dbc33d

Branch: refs/heads/trunk
Commit: b4dbc33dfba0e1464d4f5ea4c875e6668c0aa946
Parents: 08d2ac7
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Mon Jun 17 14:28:37 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Mon Jun 17 14:28:37 2013 +0200

----------------------------------------------------------------------
 .../org/apache/mina/service/executor/OrderedHandlerExecutor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/b4dbc33d/core/src/main/java/org/apache/mina/service/executor/OrderedHandlerExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/service/executor/OrderedHandlerExecutor.java b/core/src/main/java/org/apache/mina/service/executor/OrderedHandlerExecutor.java
index 4ad329a..48c2f51 100644
--- a/core/src/main/java/org/apache/mina/service/executor/OrderedHandlerExecutor.java
+++ b/core/src/main/java/org/apache/mina/service/executor/OrderedHandlerExecutor.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  * 
  * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
-public class OrderedHandlerExecutor implements IoHandlerExecutor {
+public final class OrderedHandlerExecutor implements IoHandlerExecutor {
 
     private static final Logger LOG = LoggerFactory.getLogger(OrderedHandlerExecutor.class);
 


[3/4] git commit: Updated the NOTICE and LICENSE files

Posted by el...@apache.org.
Updated the NOTICE and LICENSE files


Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/0163b5b1
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/0163b5b1
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/0163b5b1

Branch: refs/heads/trunk
Commit: 0163b5b1b61009bfbfbd4d250fdb38efd01a8cdb
Parents: d8095b1
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jun 20 02:17:48 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jun 20 02:17:48 2013 +0200

----------------------------------------------------------------------
 NOTICE-bin.txt                                  | 37 ++++++++++++++++++--
 NOTICE.slf4j.txt                                | 28 ---------------
 NOTICE.txt                                      | 34 ++++++++++++++++--
 .../mina/transport/nio/AbstractNioSession.java  |  5 ++-
 .../apache/mina/transport/nio/NioTcpServer.java | 12 +++----
 5 files changed, 74 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/0163b5b1/NOTICE-bin.txt
----------------------------------------------------------------------
diff --git a/NOTICE-bin.txt b/NOTICE-bin.txt
index 4a15b77..7827fb7 100644
--- a/NOTICE-bin.txt
+++ b/NOTICE-bin.txt
@@ -4,9 +4,7 @@ Copyright 2007-2013 The Apache Software Foundation.
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-Please refer to each LICENSE.<component>.txt file for the
-license terms of the components that Apache MINA depends on.
-
+----- SLF4J -----
 Message logging is provided by the SLF4J library package,
 which is open source software, written by Ceki Gülcü, and
 copyright by SLF4J.ORG and QOS.ch.  The original software is
@@ -14,4 +12,37 @@ available from
 
    http://www.slf4j.org/
 
+----- ProtocolBuffer -----
+Copyright 2008, Google Inc.
+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 Google 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.
 
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it. This code is not
+standalone and requires a support library to be linked with it. This
+support library is itself covered by the above license.

http://git-wip-us.apache.org/repos/asf/mina/blob/0163b5b1/NOTICE.slf4j.txt
----------------------------------------------------------------------
diff --git a/NOTICE.slf4j.txt b/NOTICE.slf4j.txt
deleted file mode 100644
index 7b00deb..0000000
--- a/NOTICE.slf4j.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2004-2013 QOS.ch
-All rights reserved.
-
-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, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-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
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-

http://git-wip-us.apache.org/repos/asf/mina/blob/0163b5b1/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index c95cd52..6228e08 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,6 +4,36 @@ Copyright 2007-2013 The Apache Software Foundation.
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-Please refer to each LICENSE.<component>.txt file for the
-license terms of the components that Apache MINA depends on.
+----- ProtocolBuffer -----
+Copyright 2008, Google Inc.
+All rights reserved.
+
+----- SLF4j -----
+Copyright (c) 2004-2013 QOS.ch
+All rights reserved.
+
+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, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, provided that the above
+copyright notice(s) and this permission notice appear in all copies of
+the Software and that both the above copyright notice(s) and this
+permission notice appear in supporting documentation.
+
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
+SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
 

http://git-wip-us.apache.org/repos/asf/mina/blob/0163b5b1/core/src/main/java/org/apache/mina/transport/nio/AbstractNioSession.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/transport/nio/AbstractNioSession.java b/core/src/main/java/org/apache/mina/transport/nio/AbstractNioSession.java
index 9a93512..f2bc4c2 100644
--- a/core/src/main/java/org/apache/mina/transport/nio/AbstractNioSession.java
+++ b/core/src/main/java/org/apache/mina/transport/nio/AbstractNioSession.java
@@ -334,10 +334,9 @@ public abstract class AbstractNioSession extends AbstractIoSession {
                         // Reset the flag in IoSession too
                         setNotRegisteredForWrite();
                     }
-                } else {
-                    // We have some more data to write : the channel OP_WRITE interest remains
-                    // as it was.
                 }
+                // if the queue is not empty, that means we have some more data to write : 
+                // the channel OP_WRITE interest remains as it was.
             }
         } catch (final IOException e) {
             LOG.error("Exception while writing : ", e);

http://git-wip-us.apache.org/repos/asf/mina/blob/0163b5b1/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java b/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java
index 2031a08..ef5bf4b 100644
--- a/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java
+++ b/core/src/main/java/org/apache/mina/transport/nio/NioTcpServer.java
@@ -151,7 +151,7 @@ public class NioTcpServer extends AbstractTcpServer implements SelectorListener
      * @return
      */
     public synchronized ServerSocketChannel getServerSocketChannel() {
-        return this.serverChannel;
+        return serverChannel;
     }
 
     public synchronized void setServerSocketChannel(final ServerSocketChannel serverChannel) {
@@ -170,16 +170,16 @@ public class NioTcpServer extends AbstractTcpServer implements SelectorListener
      * {@inheritDoc}
      */
     @Override
-    public synchronized void bind(final SocketAddress localAddress) {
+    public synchronized void bind(SocketAddress localAddress) {
         Assert.assertNotNull(localAddress, "localAddress");
 
         // check if the address is already bound
-        if (this.address != null) {
+        if (address != null) {
             throw new IllegalStateException("address " + address + " already bound");
         }
 
         LOG.info("binding address {}", localAddress);
-        this.address = localAddress;
+        address = localAddress;
 
         try {
             serverChannel = ServerSocketChannel.open();
@@ -196,7 +196,7 @@ public class NioTcpServer extends AbstractTcpServer implements SelectorListener
         idleChecker.start();
 
         // it's the first address bound, let's fire the event
-        this.fireServiceActivated();
+        fireServiceActivated();
     }
 
     /**
@@ -270,7 +270,7 @@ public class NioTcpServer extends AbstractTcpServer implements SelectorListener
         }
     }
 
-    private void createSession(SocketChannel clientSocket) throws IOException {
+    private synchronized void createSession(SocketChannel clientSocket) throws IOException {
         LOG.debug("create session");
         SocketChannel socketChannel = clientSocket;
         TcpSessionConfig config = getSessionConfig();


[2/4] git commit: Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/mina into trunk

Posted by el...@apache.org.
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/mina into trunk


Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/d8095b19
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/d8095b19
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/d8095b19

Branch: refs/heads/trunk
Commit: d8095b1964da6d1057664eee0e30a1774904cd95
Parents: b4dbc33 fad44fe
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jun 20 02:02:14 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jun 20 02:02:14 2013 +0200

----------------------------------------------------------------------
 ImprovedJavaConventions.xml                     | 21 +++++++++++
 NOTICE-bin.txt                                  | 17 +++++++++
 NOTICE.slf4j.txt                                | 28 ++++++++++++++
 NOTICE.txt                                      |  9 +++++
 .../java/org/apache/mina/codec/IoBuffer.java    |  8 ++--
 .../mina/util/ByteBufferInputStreamTest.java    | 20 ++++++++++
 .../mina/util/ByteBufferOutputStreamTest.java   | 20 ++++++++++
 .../apache/mina/filter/query/RequestFilter.java | 37 +++++--------------
 .../apache/mina/filter/query/RequestFuture.java | 30 ++++++++++-----
 .../mina/service/executor/HandlerCaller.java    | 20 ++++++++++
 .../mina/service/executor/package-info.java     | 20 ++++++++++
 .../org/apache/mina/util/ByteBufferDumper.java  | 22 +++++++++--
 core/src/test/resources/log4j2-test.xml         | 22 +++++++++++
 .../apache/mina/examples/coap/CoapClient.java   |  2 +-
 .../apache/mina/examples/coap/CoapServer.java   | 16 ++++----
 .../java/org/apache/mina/http/DateUtilTest.java | 20 ++++++++++
 pom.xml                                         | 39 +++++---------------
 protobuf/prepare.sh                             | 19 ++++++++++
 .../generated/protoc/AddressBookProtos.java     | 20 ++++++++++
 .../org/apache/mina/generated/protoc/Calc.java  | 20 ++++++++++
 protobuf/src/test/protobuf/addressbook.proto    | 19 ++++++++++
 protobuf/src/test/protobuf/calc.proto           | 20 ++++++++++
 thrift/prepare.sh                               | 18 +++++++++
 .../mina/generated/thrift/UserProfile.java      | 20 ++++++++++
 .../mina/generated/thrift/UserStorage.java      | 21 +++++++++++
 25 files changed, 424 insertions(+), 84 deletions(-)
----------------------------------------------------------------------



[4/4] git commit: Added the LICENSE.txt file

Posted by el...@apache.org.
Added the LICENSE.txt file


Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/90719cf4
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/90719cf4
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/90719cf4

Branch: refs/heads/trunk
Commit: 90719cf4048a6bf9de29f3271894e1d5edd73c9c
Parents: 0163b5b
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jun 20 02:18:50 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jun 20 02:18:50 2013 +0200

----------------------------------------------------------------------
 LICENSE.txt | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 203 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/90719cf4/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the 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.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form 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.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the 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 License, 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.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.
+