From 917c72fddbf8abb1b0ba56ddbc7a593757b98ec6 Mon Sep 17 00:00:00 2001 From: Francesc Campoy Date: Thu, 4 May 2017 15:18:34 -0400 Subject: [PATCH] Uniform licenses all around --- example/shirtsize.go | 15 ++++++++++++--- jsonenums.go | 15 ++++++++++++--- parser/parser.go | 15 ++++++++++++--- server/app.yaml | 6 ------ server/main.go | 15 ++++++++++++--- server/server.go | 15 ++++++++++++--- server/static/home.html | 13 ++++++++++--- template.go | 15 ++++++++++++--- 8 files changed, 82 insertions(+), 27 deletions(-) diff --git a/example/shirtsize.go b/example/shirtsize.go index 58bb247..395453c 100644 --- a/example/shirtsize.go +++ b/example/shirtsize.go @@ -1,6 +1,15 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// Copyright 2017 Google Inc. All rights reserved. +// 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 writing, software distributed +// under the License is distributed on a "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. package main diff --git a/jsonenums.go b/jsonenums.go index 60346ee..7d26291 100644 --- a/jsonenums.go +++ b/jsonenums.go @@ -1,6 +1,15 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// Copyright 2017 Google Inc. All rights reserved. +// 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 writing, software distributed +// under the License is distributed on a "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. // JSONenums is a tool to automate the creation of methods that satisfy the // fmt.Stringer, json.Marshaler and json.Unmarshaler interfaces. diff --git a/parser/parser.go b/parser/parser.go index bc1d3eb..5598362 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -1,6 +1,15 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// Copyright 2017 Google Inc. All rights reserved. +// 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 writing, software distributed +// under the License is distributed on a "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. // Package parser parses Go code and keeps track of all the types defined // and provides access to all the constants defined for an int type. diff --git a/server/app.yaml b/server/app.yaml index 530472b..69dda1e 100644 --- a/server/app.yaml +++ b/server/app.yaml @@ -1,9 +1,3 @@ -# Copyright 2015 Google Inc. All rights reserved. -# 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 writing, software distributed # under the License is distributed on a "AS IS" BASIS, WITHOUT WARRANTIES OR # CONDITIONS OF ANY KIND, either express or implied. diff --git a/server/main.go b/server/main.go index 52be792..20223cc 100644 --- a/server/main.go +++ b/server/main.go @@ -1,6 +1,15 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// Copyright 2017 Google Inc. All rights reserved. +// 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 writing, software distributed +// under the License is distributed on a "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. // +build !appengine diff --git a/server/server.go b/server/server.go index b7bb514..58ea4a0 100644 --- a/server/server.go +++ b/server/server.go @@ -1,6 +1,15 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// Copyright 2017 Google Inc. All rights reserved. +// 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 writing, software distributed +// under the License is distributed on a "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. // Server is an http server that provides an alternative way of generating code // based on int types and the constants defined with it. diff --git a/server/static/home.html b/server/static/home.html index d10733b..84ea01d 100644 --- a/server/static/home.html +++ b/server/static/home.html @@ -1,9 +1,16 @@ diff --git a/template.go b/template.go index 7c14f0c..332c2a3 100644 --- a/template.go +++ b/template.go @@ -1,6 +1,15 @@ -// Copyright 2014 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// Copyright 2017 Google Inc. All rights reserved. +// 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 writing, software distributed +// under the License is distributed on a "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. // Added as a .go file to avoid embedding issues of the template.