You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ne...@apache.org on 2011/12/15 19:44:05 UTC
svn commit: r1214909 - in /incubator/kafka/branches/0.7: LICENSE NOTICE
config/server.properties
Author: nehanarkhede
Date: Thu Dec 15 18:44:05 2011
New Revision: 1214909
URL: http://svn.apache.org/viewvc?rev=1214909&view=rev
Log:
KAFKA-221 LICENSE and NOTICE file problems in KAFKA 0.7
Modified:
incubator/kafka/branches/0.7/LICENSE
incubator/kafka/branches/0.7/NOTICE
incubator/kafka/branches/0.7/config/server.properties
Modified: incubator/kafka/branches/0.7/LICENSE
URL: http://svn.apache.org/viewvc/incubator/kafka/branches/0.7/LICENSE?rev=1214909&r1=1214908&r2=1214909&view=diff
==============================================================================
--- incubator/kafka/branches/0.7/LICENSE (original)
+++ incubator/kafka/branches/0.7/LICENSE Thu Dec 15 18:44:05 2011
@@ -203,94 +203,60 @@
-----------------------------------------------------------------------
-SCALA LICENSE
+SBT LICENSE
-Copyright (c) 2002-2010 EPFL, Lausanne, unless otherwise specified.
+Copyright (c) 2008, 2009, 2010 Mark Harrah, Jason Zaugg
All rights reserved.
-This software was developed by the Programming Methods Laboratory of the
-Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
-
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-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 EPFL 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 REGENTS 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 REGENTS 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.
+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 name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-----------------------------------------------------------------------
- The MIT License
-
- Copyright (c) 2004-2011 Paul R. Holser, Jr.
-
- 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.
-
-------------------------------------------------------------------------
-
For Nunit, used in clients/csharp: zlib/libpng license
-Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov,
+Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov,
Charlie Poole
Copyright (c) 2000-2004 Philip A. Craig
-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
+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.
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
the following restrictions:
-1. The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software. If you use this software in a product, an
+1. The origin of this software must not be misrepresented; you must not claim
+that you wrote the original software. If you use this software in a product, an
acknowledgment (see the following) in the product documentation is required.
Portions Copyright © 2002 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
or Copyright © 2000-2002 Philip A. Craig
-2. Altered source versions must be plainly marked as such, and must not be
+2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-------------------------------------------------------------------------
+
Modified: incubator/kafka/branches/0.7/NOTICE
URL: http://svn.apache.org/viewvc/incubator/kafka/branches/0.7/NOTICE?rev=1214909&r1=1214908&r2=1214909&view=diff
==============================================================================
--- incubator/kafka/branches/0.7/NOTICE (original)
+++ incubator/kafka/branches/0.7/NOTICE Thu Dec 15 18:44:05 2011
@@ -1,40 +1,8 @@
-===
Apache Kafka
Copyright 2011 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-===
-
-This product includes jopt-simple, a library for parsing command line
-options (http://jopt-simple.sourceforge.net/).
-
-This product includes junit, developed by junit.org.
-
-This product includes zkclient, developed by Stefan Groschupf,
-http://github.com/sgroschupf/zkclient
-
-This produce includes joda-time, developed by joda.org
-(joda-time.sourceforge.net)
-
-This product includes the scala runtime and compiler
-(www.scala-lang.org) developed by EPFL, which includes the following
-license:
-
-This product includes easymock, developed by easymock.org
-(http://easymock.org)
-
-This product includes objenesis, developed by Joe Walnes, Henri
-Tremblay, Leonardo Mesquita (http://code.google.com/p/objenesis)
-
-This product includes cglib, developed by sourceforge.net
-(http://cglib.sourceforge.net)
-
-This product includes asm, developed by OW2 consortium
-(http://asm.ow2.org)
-
-This product includes sbt, developed by Mark Harrah
-(https://github.com/harrah/xsbt/wiki)
This product includes Nunit, developed by Charlie Pool, James W.
Newkirk, Michael C. Two, Alexei A. Vorontsov and Philip A. Craig.
Modified: incubator/kafka/branches/0.7/config/server.properties
URL: http://svn.apache.org/viewvc/incubator/kafka/branches/0.7/config/server.properties?rev=1214909&r1=1214908&r2=1214909&view=diff
==============================================================================
--- incubator/kafka/branches/0.7/config/server.properties (original)
+++ incubator/kafka/branches/0.7/config/server.properties Thu Dec 15 18:44:05 2011
@@ -28,7 +28,7 @@ brokerid=0
############################# Socket Server Settings #############################
# The port the socket server listens on
-port=9093
+port=9092
# The number of processor threads the socket server uses for receiving and answering requests.
# Defaults to the number of cores on the machine