Author: gnodet
Date: Mon Sep 5 08:19:24 2011
New Revision: 1165199
URL: http://svn.apache.org/viewvc?rev=1165199&view=rev
Log:
Fix license / notice and remove empty dirs
Modified:
mina/sshd/trunk/LICENSE.txt
mina/sshd/trunk/NOTICE.txt
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/pam/
mina/sshd/trunk/sshd-core/src/main/resources/
mina/sshd/trunk/sshd-core/src/test/resources/org/apache/sshd/util/
Modified: mina/sshd/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/mina/sshd/trunk/LICENSE.txt?rev=1165199&r1=1165198&r2=1165199&view=diff
==============================================================================
--- mina/sshd/trunk/LICENSE.txt (original)
+++ mina/sshd/trunk/LICENSE.txt Mon Sep 5 08:19:24 2011
@@ -201,3 +201,45 @@
See the License for the specific language governing permissions and
limitations under the License.
+--------------------------------------------------------------------------------
+Copyright (c) 2000 - 2006 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.
+
+--------------------------------------------------------------------------------
+Copyright (c) 2004-2008 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.
Modified: mina/sshd/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/mina/sshd/trunk/NOTICE.txt?rev=1165199&r1=1165198&r2=1165199&view=diff
==============================================================================
--- mina/sshd/trunk/NOTICE.txt (original)
+++ mina/sshd/trunk/NOTICE.txt Mon Sep 5 08:19:24 2011
@@ -1,54 +1,11 @@
- =========================================================================
- == NOTICE file for use with the Apache License, Version 2.0, ==
- == in this case for the SSHD distribution. ==
- =========================================================================
+Apache MINA SSHD
+Copyright 2008-2011 The Apache Software Foundation
- This product contains software developped by JCraft,Inc. and subject to
- the following license:
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
-Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
+This product includes software SLF4J (www.slf4j.org)
+Copyright (c) 2004-2008 QOS.ch 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. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``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 JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE 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.
---------------------------------------------------------------------------------
+This product includes software The Legion Of The Bouncy Castle
(http://www.bouncycastle.org)
Copyright (c) 2000 - 2006 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.
-
