You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/03/26 20:26:43 UTC
git commit: 1) Remove *-all dependencies in favor explicit dependency
references 2) First attempt at completing LICENSE and NOTICE files in
gateway-release/home
Updated Branches:
refs/heads/master 554c534bd -> b15a65a69
1) Remove *-all dependencies in favor explicit dependency references
2) First attempt at completing LICENSE and NOTICE files in gateway-release/home
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/b15a65a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/b15a65a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/b15a65a6
Branch: refs/heads/master
Commit: b15a65a6965487b4d90774d56a91f9b5eb0cea2b
Parents: 554c534
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Mar 26 15:26:12 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Mar 26 15:26:12 2013 -0400
----------------------------------------------------------------------
KEYS | 71 +++++
build.xml | 10 +-
gateway-provider-rewrite/pom.xml | 12 +-
gateway-release/home/LICENSE | 532 ++++++++++++++++++++++++++++++++-
gateway-release/home/NOTICE | 99 ++++++-
gateway-server/pom.xml | 55 +---
gateway-shell/pom.xml | 75 +-----
gateway-spi/pom.xml | 6 +
gateway-test-ldap/pom.xml | 34 +-
gateway-test-utils/pom.xml | 7 -
gateway-test/pom.xml | 15 -
gateway-util-urltemplate/pom.xml | 7 +
pom.xml | 143 ++++++++--
13 files changed, 875 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
new file mode 100644
index 0000000..f92a033
--- /dev/null
+++ b/KEYS
@@ -0,0 +1,71 @@
+This file contains the PGP keys of various developers.
+
+Users: pgp < KEYS
+ gpg --import KEYS
+Developers:
+ pgp -kxa <your name> and append it to this file.
+ (pgpk -ll <your name> && pgpk -xa <your name>)
+ >> this file.
+ (gpg --list-sigs <your name>
+ && gpg --armor --export <your name>) >>
+ this file.
+
+pub 4096R/EACB2DAE 2013-03-25
+uid Kevin Minder (CODE SIGNING KEY) <km...@gmail.com>
+sig 3 EACB2DAE 2013-03-25 Kevin Minder (CODE SIGNING KEY) <km...@gmail.com>
+sub 4096R/1287FBEA 2013-03-25
+sig EACB2DAE 2013-03-25 Kevin Minder (CODE SIGNING KEY) <km...@gmail.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+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
+vIGfAf/Bg1VX52MMHCtzrZI=
+=Wv1U
+-----END PGP PUBLIC KEY BLOCK-----
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ac3e336..dac9db6 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Hadoop Gateway" default="release" basedir=".">
+<project name="Apache Hadoop Gateway" default="build" basedir=".">
<description>
Release build file for the Hadoop Gateway
@@ -52,7 +52,13 @@
<target name="build" depends="init" description="Build the product.">
<exec executable="${mvn.cmd}">
- <!-- <arg value="-Prelease"/> -->
+ <arg value="clean"/>
+ <arg value="install"/>
+ </exec>
+ </target>
+
+ <target name="package" depends="init" description="Build the product.">
+ <exec executable="${mvn.cmd}">
<arg value="clean"/>
<arg value="package"/>
</exec>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-provider-rewrite/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml
index 11f8d72..56f3acd 100644
--- a/gateway-provider-rewrite/pom.xml
+++ b/gateway-provider-rewrite/pom.xml
@@ -60,15 +60,20 @@
<artifactId>gateway-spi</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
- <classifier>with-deps</classifier>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -95,11 +100,6 @@
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>test-jetty-servlet</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-release/home/LICENSE
----------------------------------------------------------------------
diff --git a/gateway-release/home/LICENSE b/gateway-release/home/LICENSE
index d782ea3..3b317b5 100644
--- a/gateway-release/home/LICENSE
+++ b/gateway-release/home/LICENSE
@@ -755,8 +755,533 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
California, with venue lying in Santa Clara County, California.
-zlib/libpng license
+------------------------------------------------------------------------------
+ANTLR 2 License (from ApacheDS, Groovy)
+------------------------------------------------------------------------------
+We reserve no legal rights to the ANTLR--it is fully in the public domain.
+An individual or company may do whatever they wish with source code
+distributed with ANTLR or the code generated by ANTLR, including the
+incorporation of ANTLR, or its output, into commerical software.
+We encourage users to develop software with ANTLR. However, we do ask that
+credit is given to us for developing ANTLR. By "credit", we mean that if you
+use ANTLR or incorporate any source code into one of your programs
+(commercial product, research project, or otherwise) that you acknowledge
+this fact somewhere in the documentation, research report, etc... If you like
+ANTLR and have developed a nice tool with the output, please mention that you
+developed it using ANTLR. In addition, we ask that the headers remain intact
+in our source code. As long as these guidelines are kept, we expect to
+continue enhancing this system and expect to make other tools available as
+they are completed.
+
+------------------------------------------------------------------------------
+ASM Project License (from CGLib, Groovy)
+------------------------------------------------------------------------------
+Copyright (c) 2000-2011 INRIA, France Telecom
+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. Neither the name of the copyright holders 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.
+
+
+------------------------------------------------------------------------------
+Bouncy Castle License (from ApacheDS)
+------------------------------------------------------------------------------
+Copyright (c) 2000 - 2012 The Legion Of The Bouncy Castle
+(http://www.bouncycastle.org)
+
+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.
+
+
+------------------------------------------------------------------------------
+Eclipse Public License - v1.0 (from Jetty/Jerico)
+------------------------------------------------------------------------------
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+ distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i)changes to the Program, and
+
+ii)additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from
+a Contributor if it was added to the Program by such Contributor itself or
+anyone acting on such Contributor’s behalf. Contributions do not include
+additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license agreement,
+and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free copyright license to
+ reproduce, prepare derivative works of, publicly display, publicly perform,
+ distribute and sublicense the Contribution of such Contributor, if any,
+ and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+ Recipient a non-exclusive, worldwide, royalty-free patent license under
+ Licensed Patents to make, use, sell, offer to sell, import and otherwise
+ transfer the Contribution of such Contributor, if any, in source code and
+ object code form. This patent license shall apply to the combination of the
+ Contribution and the Program if, at the time the Contribution is added by
+ the Contributor, such addition of the Contribution causes such combination
+ to be covered by the Licensed Patents. The patent license shall not apply
+ to any other combinations which include the Contribution. No hardware per
+ se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+ to its Contributions set forth herein, no assurances are provided by any
+ Contributor that the Program does not infringe the patent or other
+ intellectual property rights of any other entity. Each Contributor
+ disclaims any liability to Recipient for claims brought by any other
+ entity based on infringement of intellectual property rights or otherwise.
+ As a condition to exercising the rights and licenses granted hereunder,
+ each Recipient hereby assumes sole responsibility to secure any other
+ intellectual property rights needed, if any. For example, if a third
+ party patent license is required to allow Recipient to distribute the
+ Program, it is Recipient’s responsibility to acquire that license before
+ distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+ copyright rights in its Contribution, if any, to grant the copyright
+ license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+ conditions, express and implied, including warranties or conditions of
+ title and non-infringement, and implied warranties or conditions of
+ merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+ damages, including direct, indirect, special, incidental and consequential
+ damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by
+ that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+ Contributor, and informs licensees how to obtain it in a reasonable manner
+ on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits and
+other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such Commercial
+Contributor in connection with its distribution of the Program in a commercial
+product offering. The obligations in this section do not apply to any claims
+or Losses relating to any actual or alleged intellectual property infringement.
+In order to qualify, an Indemnified Contributor must: a) promptly notify the
+Commercial Contributor in writing of such claim, and b) allow the Commercial
+Contributor to control, and cooperate with the Commercial Contributor in, the
+defense and any related settlement negotiations. The Indemnified Contributor
+may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor’s responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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.
+Each Recipient is solely responsible for determining the appropriateness of
+using and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient’s patent(s), then such Recipient’s rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient’s rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and
+does not cure such failure in a reasonable period of time after becoming
+aware of such noncompliance. If all Recipient’s rights under this Agreement
+terminate, Recipient agrees to cease use and distribution of the Program as
+soon as reasonably practicable. However, Recipient’s obligations under this
+Agreement and any licenses granted by Recipient relating to the Program shall
+continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement
+will be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation.
+
+
+--------------------------------------------------------------------------------------------------
+JDBM LICENSE v1.00 (from ApacheDS)
+--------------------------------------------------------------------------------------------------
+/**
+ * JDBM LICENSE v1.00
+ *
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ * statements and notices. Redistributions must also contain a
+ * copy of this document.
+ *
+ * 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 name "JDBM" must not be used to endorse or promote
+ * products derived from this Software without prior written
+ * permission of Cees de Groot. For written permission,
+ * please contact cg@cdegroot.com.
+ *
+ * 4. Products derived from this Software may not be called "JDBM"
+ * nor may "JDBM" appear in their names without prior written
+ * permission of Cees de Groot.
+ *
+ * 5. Due credit should be given to the JDBM Project
+ * (http://jdbm.sourceforge.net/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE JDBM PROJECT AND CONTRIBUTORS
+ * ``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
+ * CEES DE GROOT OR ANY 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 2000 (C) Cees de Groot. All Rights Reserved.
+ * Contributions are Copyright (C) 2000 by their associated contributors.
+ *
+ * $Id: LICENSE.txt,v 1.1 2000/05/05 23:59:52 boisvert Exp $
+ */
+
+------------------------------------------------------------------------------
+JLine License - BSD (from Groovy)
+------------------------------------------------------------------------------
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
+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 JLine 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.
+
+
+------------------------------------------------------------------------------
+SL4J License - MIT
+------------------------------------------------------------------------------
+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, 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.
+
+------------------------------------------------------------------------------
+Tanuki Software License (from ApacheDS)
+------------------------------------------------------------------------------
+Copyright (c) 1999, 2004 Tanuki Software
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of the Java Service Wrapper 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, sub-license,
+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
+NON-INFRINGEMENT. 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.
+
+
+------------------------------------------------------------------------------
+Silver Egg Technology License (from ApacheDS)
+------------------------------------------------------------------------------
+Portions of the Software have been derived from source code
+developed by Silver Egg Technology under the following license:
+
+Copyright (c) 2001 Silver Egg Technology
+
+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, sub-license, 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.
+
+
+------------------------------------------------------------------------------
+Sun Microsystems, Inc. License (from Groovy)
+------------------------------------------------------------------------------
+The following notice applies to the files:
+
+src/main/org/codehaus/groovy/jsr223/GroovyCompiledScript.java
+src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineFactory.java
+src/main/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * 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 Sun Microsystems nor the names of
+ * is 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.
+ */
+
+------------------------------------------------------------------------------
+European Commission License (from Hadoop)
+------------------------------------------------------------------------------
+For the org.apache.hadoop.util.bloom.* classes:
+
+/**
+ *
+ * Copyright (c) 2005, European Commission project OneLab under contract
+ * 034819 (http://www.one-lab.org)
+ * 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 University Catholique de Louvain - UCL
+ * 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.
+ */
+
+------------------------------------------------------------------------------
+zlib/libpng License
+------------------------------------------------------------------------------
This software is provided 'as-is', without any express or implied warranty. In
no event will the authors be held liable for any damages arising from the use of
this software.
@@ -774,8 +1299,9 @@ the following restrictions:
3. This notice may not be removed or altered from any source distribution.
-bzip2 license
-
+------------------------------------------------------------------------------
+bzip2 License
+------------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-release/home/NOTICE
----------------------------------------------------------------------
diff --git a/gateway-release/home/NOTICE b/gateway-release/home/NOTICE
index 4ff0653..f189d80 100644
--- a/gateway-release/home/NOTICE
+++ b/gateway-release/home/NOTICE
@@ -10,11 +10,98 @@ Copyright 2012-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-This product includes software (Jerico) developed by
-SourceForge (http://sourceforge.net/projects/jerichohtml/ and see http://jericho.htmlparser.net/)
+Language Recognition and parsing support support is provided by the
+ANTLRv2 library package, which is open source software developed at
+GitHub (https://github.com/antlr/antlr). The original software is
+available from http://www.antlr2.org/
-This product includes software (Simple Logging Facade for Java, SL4J) developed by
-GitHub (https://github.com/qos-ch/slf4j/ and see http://www.slf4j.org/)
+Bytecode manipulation and analysis support is provided by the
+ASM library package, which is open source software developed at
+the OW2 Forge (http://forge.ow2.org/projects/asm). The original
+software is available from http://asm.ow2.org/
-This product includes software (Java EE Servlet API) developed by
-? (?).
\ No newline at end of file
+Cryptographic support is provided the Bouncy Castle library package,
+which is open source software developed at BouncyCastle.org
+:pserver:anonymous@cvs.bouncycastle.org:/home/users/bouncy/cvsroot
+The original software is available from http://www.bouncycastle.org/
+
+HTML parsing support is provided by the Jerico library package,
+which is open source software developed at
+SourceForge (http://sourceforge.net/projects/jerichohtml/)
+The original software is available from http://jericho.htmlparser.net/
+
+Console input support is provided by the JLine library package,
+which is open source software developed at
+GitHub (https://github.com/jline). The original software is
+available from http://jline.sourceforge.net/
+
+Logging Facade API support is provided by the Simple Logging Facade for
+Java (SL4J) library package, which is open source software developed at
+GitHub (https://github.com/qos-ch/slf4j/). The original software is
+available from http://www.slf4j.org/
+
+------------------------------------------------------------------------------
+Jetty
+------------------------------------------------------------------------------
+Web server and javax.servlet container support is provided by the
+Jetty library package, which is open source software developed at
+Eclipse http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git
+The original software is available from http://www.eclipse.org/jetty/
+
+The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
+unless otherwise noted. It is dual licensed under the apache 2.0
+license and eclipse 1.0 license. Jetty may be distributed under
+either license.
+
+The UnixCrypt.java code implements the one way cryptography used by
+Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
+modified April 2001 by Iris Van den Broeke, Daniel Deville.
+Permission to use, copy, modify and distribute UnixCrypt
+for non-commercial or commercial purposes and without fee is
+granted provided that the copyright notice appears in all copies.
+
+The javax.servlet package used was sourced from the Apache
+Software Foundation and is distributed under the apache 2.0
+license.
+
+------------------------------------------------------------------------------
+ApacheDS
+------------------------------------------------------------------------------
+Safehaus JUG
+Copyright 2005 Safehaus
+
+This product includes software developed at
+Safehaus (http://docs.safehaus.org/display/HAUS/Home).
+
+OpenSymphony Quartz
+Copyright 2004-2005 OpenSymphony
+
+This product includes software developed at
+OpenSymphony (http://www.opensymphony.com/).
+
+This product also includes software developed by
+Clinton Begin (http://www.ibatis.com).
+
+------------------------------------------------------------------------------
+Groovy
+------------------------------------------------------------------------------
+Groovy Language
+Copyright 2003-2012 The respective authors and developers
+Developers and Contributors are listed in the project POM file
+and Gradle build file
+
+This product includes software developed by
+The Groovy community (http://groovy.codehaus.org/).
+
+------------------------------------------------------------------------------
+Shiro
+------------------------------------------------------------------------------
+The implementation for org.apache.shiro.util.SoftHashMap is based
+on initial ideas from Dr. Heinz Kabutz's publicly posted version
+available at http://www.javaspecialists.eu/archive/Issue015.html,
+with continued modifications.
+
+Certain parts (StringUtils etc.) of the source code for this
+product was copied for simplicity and to reduce dependencies
+from the source code developed by the Spring Framework Project
+(http://www.springframework.org).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-server/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml
index bd81faf..f182daf 100644
--- a/gateway-server/pom.xml
+++ b/gateway-server/pom.xml
@@ -58,10 +58,16 @@
<dependencies>
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
<dependency>
<groupId>${gateway-group}</groupId>
@@ -98,7 +104,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -111,24 +116,12 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaspi</artifactId>
</dependency>
-->
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-jaspi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-osgi-locator</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -152,7 +145,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
- <classifier>with-deps</classifier>
</dependency>
<dependency>
@@ -243,14 +235,6 @@
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>test-jetty-servlet</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
@@ -298,18 +282,6 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<scope>test</scope>
@@ -327,13 +299,6 @@
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- -->
-
<dependency>
<groupId>com.mycila.xmltool</groupId>
<artifactId>xmltool</artifactId>
@@ -347,11 +312,13 @@
<scope>test</scope>
</dependency>
-->
- <!-- dependency>
+ <!--
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>gateway-provider-security-hawk</artifactId>
<scope>test</scope>
- </dependency-->
+ </dependency>
+ -->
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-shell/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-shell/pom.xml b/gateway-shell/pom.xml
index 183e5ae..3ee8493 100644
--- a/gateway-shell/pom.xml
+++ b/gateway-shell/pom.xml
@@ -19,119 +19,58 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!--
+
<parent>
<artifactId>gateway</artifactId>
<groupId>org.apache.hadoop</groupId>
<version>0.2.0-SNAPSHOT</version>
</parent>
- -->
+
<groupId>org.apache.hadoop</groupId>
<artifactId>gateway-shell</artifactId>
<version>0.2.0-SNAPSHOT</version>
- <!--
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <manifestEntries>
- <Main-Class>org.apache.hadoop.gateway.launcher.Launcher</Main-Class>
- </manifestEntries>
- </transformer>
- </transformers>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- -->
-
<dependencies>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>gateway-util-launcher</artifactId>
- <version>0.2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.1.1</version>
+ <groupId>${gateway-group}</groupId>
+ <artifactId>gateway-util-common</artifactId>
</dependency>
- <!--
+
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-groovysh</artifactId>
- <version>2.1.1</version>
+ <artifactId>groovy</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>1.6</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.3</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
- <version>0.8.1</version>
- </dependency>
- <!--
- <dependency>
- <groupId>com.jayway.restassured</groupId>
- <artifactId>rest-assured</artifactId>
- <version>1.7.2</version>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.2.1</version>
- </dependency>
- -->
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-spi/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-spi/pom.xml b/gateway-spi/pom.xml
index e071fd7..24e48c9 100644
--- a/gateway-spi/pom.xml
+++ b/gateway-spi/pom.xml
@@ -55,10 +55,16 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-test-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-ldap/pom.xml b/gateway-test-ldap/pom.xml
index d1e201e..6456b14 100644
--- a/gateway-test-ldap/pom.xml
+++ b/gateway-test-ldap/pom.xml
@@ -37,6 +37,7 @@
</license>
</licenses>
+ <!--
<build>
<plugins>
<plugin>
@@ -52,21 +53,11 @@
</executions>
<configuration>
<mainClass>org.apache.hadoop.gateway.security.EmbeddedApacheDirectoryServer</mainClass>
- <!--
- <arguments>
- <argument>argument1</argument>
- </arguments>
- <systemProperties>
- <systemProperty>
- <key>myproperty</key>
- <value>myvalue</value>
- </systemProperty>
- </systemProperties>
- -->
</configuration>
</plugin>
</plugins>
</build>
+ -->
<!--
<profiles>
@@ -117,6 +108,19 @@
<dependencies>
<dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-integ</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-entry</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -128,14 +132,9 @@
<!--
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- -->
-
- <dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-all</artifactId>
+ <version>1.5.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.directory.shared</groupId>
@@ -143,6 +142,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml
index e85bf00..20a5c96 100644
--- a/gateway-test-utils/pom.xml
+++ b/gateway-test-utils/pom.xml
@@ -66,7 +66,6 @@
<scope>provided</scope>
</dependency>
- <!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -77,12 +76,6 @@
<artifactId>jetty-servlet</artifactId>
<scope>provided</scope>
</dependency>
- -->
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml
index 346b135..60bda95 100644
--- a/gateway-test/pom.xml
+++ b/gateway-test/pom.xml
@@ -46,18 +46,11 @@
<scope>test</scope>
</dependency>
- <!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>test-jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
- -->
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
@@ -137,14 +130,6 @@
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
<dependency>
<groupId>com.mycila.xmltool</groupId>
<artifactId>xmltool</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/gateway-util-urltemplate/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/pom.xml b/gateway-util-urltemplate/pom.xml
index bdf5fa3..d4d1d82 100644
--- a/gateway-util-urltemplate/pom.xml
+++ b/gateway-util-urltemplate/pom.xml
@@ -64,11 +64,18 @@
<scope>test</scope>
</dependency>
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>test</scope>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/b15a65a6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ec0b10..3994339 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,7 +258,6 @@
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>${gateway-group}</groupId>
<artifactId>gateway-util-common</artifactId>
@@ -365,13 +364,14 @@
<version>${gateway-version}</version>
</dependency>
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
+ -->
- <!--
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -388,23 +388,56 @@
<version>8.1.7.v20120910</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>3.0.0.v201112011016</version>
+ </dependency>
+ <!--
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaspi</artifactId>
<version>8.1.7.v20120910</version>
</dependency>
-->
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <version>8.1.7.v20120910</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>test-jetty-servlet</artifactId>
<version>8.1.7.v20120910</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>0.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <!--
+ <dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
<version>2.0.0</version>
@@ -414,6 +447,7 @@
<artifactId>geronimo-osgi-locator</artifactId>
<version>1.1</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -446,6 +480,62 @@
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>ackson-mapper-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.kosmosfs</groupId>
+ <artifactId>kfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlenc</groupId>
+ <artifactId>xmlenc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -485,7 +575,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
<version>3.2</version>
- <classifier>with-deps</classifier>
</dependency>
<dependency>
@@ -526,6 +615,28 @@
</dependency>
<dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-integ</artifactId>
+ <version>1.5.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ldapsdk</groupId>
+ <artifactId>ldapsdk</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-entry</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.shared</groupId>
+ <artifactId>shared-ldap</artifactId>
+ <version>0.9.17</version>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.6</version>
@@ -534,7 +645,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
@@ -544,20 +655,6 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <version>1.5.5</version>
- </dependency>
-
- <!--
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>14.0-rc1</version>
- </dependency>
- -->
-
- <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<version>1.2.1</version>