From cca0d5016a02765baac768134ec7e724ba05fba6 Mon Sep 17 00:00:00 2001 From: Kyle Lemons Date: Wed, 2 Oct 2013 22:09:26 +0000 Subject: [PATCH] LICENSE conformance --- LICENSE | 48 +++++++++++++++++--------------- codec/codec.go | 6 ++++ codec/codec_test.go | 6 ++++ doc.go | 6 ++++ example_ae/app/server.go | 6 ++++ example_ae/client/client.go | 6 ++++ example_ae/whoami/whoami.ae.go | 8 +++--- examples/add/add.go | 10 +++++-- examples/add/client/client.go | 19 ++++++++----- examples/echo/client/client.go | 6 ++++ examples/echo/echo.go | 6 ++++ examples/echo/echo_test.go | 6 ++++ examples/remote/client/client.go | 6 ++++ examples/remote/remote.go | 6 ++++ examples/remote/remote_test.go | 6 ++++ plugin/common.go | 6 ++++ plugin/common_test.go | 6 ++++ plugin/plugin.go | 6 ++++ plugin/plugin_test.go | 6 ++++ plugin/rpc.go | 6 ++++ plugin/rpc_test.go | 6 ++++ plugin/web.go | 6 ++++ plugin/web_test.go | 6 ++++ webrpc/gob.go | 6 ++++ webrpc/json.go | 6 ++++ webrpc/proto.go | 6 ++++ webrpc/webrpc.go | 6 ++++ 27 files changed, 187 insertions(+), 36 deletions(-) diff --git a/LICENSE b/LICENSE index e57c49d..5ee681c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,26 +1,28 @@ -Copyright (c) 2012, Kyle Lemons -All rights reserved. +Copyright 2013, 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: +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 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. + * 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. +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. diff --git a/codec/codec.go b/codec/codec.go index 1514fc0..d1d8b93 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package codec import ( diff --git a/codec/codec_test.go b/codec/codec_test.go index 8893822..1ce9a4e 100644 --- a/codec/codec_test.go +++ b/codec/codec_test.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package codec import ( diff --git a/doc.go b/doc.go index e292587..ba61a18 100644 --- a/doc.go +++ b/doc.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + // The go-rpcgen project is an attempt to create an easy-to-use, open source // protobuf service binding for the standard Go RPC package. It provides a // protoc-gen-go (based on the standard "main" from goprotobuf and leveraging diff --git a/example_ae/app/server.go b/example_ae/app/server.go index 4d5db4d..8982a5d 100644 --- a/example_ae/app/server.go +++ b/example_ae/app/server.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + // +build appengine package server diff --git a/example_ae/client/client.go b/example_ae/client/client.go index 71617d0..b5cce82 100644 --- a/example_ae/client/client.go +++ b/example_ae/client/client.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + // +build !appengine package main diff --git a/example_ae/whoami/whoami.ae.go b/example_ae/whoami/whoami.ae.go index d8d80e9..cf6b3e2 100644 --- a/example_ae/whoami/whoami.ae.go +++ b/example_ae/whoami/whoami.ae.go @@ -21,16 +21,16 @@ type Empty struct { XXX_unrecognized []byte `json:"-"` } -func (this *Empty) Reset() { *this = Empty{} } -func (*Empty) ProtoMessage() {} +func (this *Empty) Reset() { *this = Empty{} } +func (*Empty) ProtoMessage() {} type YouAre struct { IpAddr *string `protobuf:"bytes,1,req,name=ip_addr" json:"ip_addr,omitempty"` XXX_unrecognized []byte `json:"-"` } -func (this *YouAre) Reset() { *this = YouAre{} } -func (*YouAre) ProtoMessage() {} +func (this *YouAre) Reset() { *this = YouAre{} } +func (*YouAre) ProtoMessage() {} func (this *YouAre) GetIpAddr() string { if this != nil && this.IpAddr != nil { diff --git a/examples/add/add.go b/examples/add/add.go index d0aa58a..ec094dc 100644 --- a/examples/add/add.go +++ b/examples/add/add.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( @@ -41,12 +47,12 @@ func handleClient(conn net.Conn) { log.Print("server: conn: Handshake completed") } state := tlscon.ConnectionState() - // Note we could reject clients if we don't like their public key. + // Note we could reject clients if we don't like their public key. for _, v := range state.PeerCertificates { log.Printf("Client: Server public key is:\n%x\n", v.PublicKey.(*rsa.PublicKey).N) // log.Printf("Server: client cert chain %s", v.Subject.ToRDNSequence()) } - // Now that we have completed SSL/TLS + // Now that we have completed SSL/TLS addservice.ServeAddService(tlscon, Add{}) } } diff --git a/examples/add/client/client.go b/examples/add/client/client.go index af1d720..dca4161 100644 --- a/examples/add/client/client.go +++ b/examples/add/client/client.go @@ -1,26 +1,31 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( - "crypto/tls" "crypto/rsa" + "crypto/tls" + "flag" "fmt" "log" - "flag" "github.com/kylelemons/go-rpcgen/examples/add/addservice" ) -var ( - certDir = flag.String("certdir","certs","The directory to load the X509 certificates from") +var ( + certDir = flag.String("certdir", "certs", "The directory to load the X509 certificates from") ) - func openTLSClient(ipPort string) (*tls.Conn, error) { // Note this loads standard x509 certificates, test keys can be // generated with makecert.sh - log.Printf("Loading certificates from directory: %s\n",*certDir) + log.Printf("Loading certificates from directory: %s\n", *certDir) cert, err := tls.LoadX509KeyPair(*certDir+"/server.pem", *certDir+"/server.key") if err != nil { log.Fatalf("server: loadkeys: %s", err) @@ -36,7 +41,7 @@ func openTLSClient(ipPort string) (*tls.Conn, error) { // we could terminate the connection based on the public key if desired. state := conn.ConnectionState() for _, v := range state.PeerCertificates { - log.Printf("Client: Server public key is:\n%x\n",v.PublicKey.(*rsa.PublicKey).N) + log.Printf("Client: Server public key is:\n%x\n", v.PublicKey.(*rsa.PublicKey).N) } // Lets verify behind the doubt that both ends of the connection diff --git a/examples/echo/client/client.go b/examples/echo/client/client.go index b9a197f..59ea035 100644 --- a/examples/echo/client/client.go +++ b/examples/echo/client/client.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( diff --git a/examples/echo/echo.go b/examples/echo/echo.go index 93df256..85e63d0 100644 --- a/examples/echo/echo.go +++ b/examples/echo/echo.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( diff --git a/examples/echo/echo_test.go b/examples/echo/echo_test.go index 32a8ab6..71ba1c3 100644 --- a/examples/echo/echo_test.go +++ b/examples/echo/echo_test.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( diff --git a/examples/remote/client/client.go b/examples/remote/client/client.go index f1215b4..a731b6c 100644 --- a/examples/remote/client/client.go +++ b/examples/remote/client/client.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( diff --git a/examples/remote/remote.go b/examples/remote/remote.go index d9b06df..c1257fc 100644 --- a/examples/remote/remote.go +++ b/examples/remote/remote.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( diff --git a/examples/remote/remote_test.go b/examples/remote/remote_test.go index ca84c9b..09381b0 100644 --- a/examples/remote/remote_test.go +++ b/examples/remote/remote_test.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package main import ( diff --git a/plugin/common.go b/plugin/common.go index ab2f11f..98799f7 100644 --- a/plugin/common.go +++ b/plugin/common.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package plugin import ( diff --git a/plugin/common_test.go b/plugin/common_test.go index cfbb216..585cf6d 100644 --- a/plugin/common_test.go +++ b/plugin/common_test.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package plugin import ( diff --git a/plugin/plugin.go b/plugin/plugin.go index 2c4056f..903e188 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + // Package plugin implements a plugin for protoc-gen-go that generates // RPC stubs for use with the the net/rpc package. // diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go index e7f0422..1ab5de3 100644 --- a/plugin/plugin_test.go +++ b/plugin/plugin_test.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package plugin import ( diff --git a/plugin/rpc.go b/plugin/rpc.go index eecfbc6..a747291 100644 --- a/plugin/rpc.go +++ b/plugin/rpc.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package plugin import ( diff --git a/plugin/rpc_test.go b/plugin/rpc_test.go index 349e5fe..5ba80a0 100644 --- a/plugin/rpc_test.go +++ b/plugin/rpc_test.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package plugin import ( diff --git a/plugin/web.go b/plugin/web.go index 6846af7..d9eb56e 100644 --- a/plugin/web.go +++ b/plugin/web.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package plugin import ( diff --git a/plugin/web_test.go b/plugin/web_test.go index 9bf7b0f..cc1ca98 100644 --- a/plugin/web_test.go +++ b/plugin/web_test.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package plugin import ( diff --git a/webrpc/gob.go b/webrpc/gob.go index c3e7b3b..fced75b 100644 --- a/webrpc/gob.go +++ b/webrpc/gob.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package webrpc import ( diff --git a/webrpc/json.go b/webrpc/json.go index c61577b..ab12597 100644 --- a/webrpc/json.go +++ b/webrpc/json.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + package webrpc import ( diff --git a/webrpc/proto.go b/webrpc/proto.go index e529f92..9a35ddd 100644 --- a/webrpc/proto.go +++ b/webrpc/proto.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + // +build !appengine package webrpc diff --git a/webrpc/webrpc.go b/webrpc/webrpc.go index d86c99e..a6d593e 100644 --- a/webrpc/webrpc.go +++ b/webrpc/webrpc.go @@ -1,3 +1,9 @@ +// Copyright 2013 Google. All rights reserved. +// +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file or at +// https://developers.google.com/open-source/licenses/bsd + // Package webrpc implements a web-based JSON, Gob and ProtoBuf RPC protocol // roughly compatible with google-protorpc. It works in tandem with the // go-rpcgen protoc-gen-go plugin, which generates the bindings.