update Apache licenses to the current version

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473568 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 83 insertions, 52 deletions

diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server
index 353b2a2077..0080209479 100644
--- a/java/broker/bin/qpid-server
+++ b/java/broker/bin/qpid-server
@@ -1,18 +1,21 @@
 #!/bin/bash
 #
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# 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 in writing, software
-# distributed under the License is distributed on an "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.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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 in writing,
+# software distributed under the License is distributed on an
+# "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.
 #
 
 . qpid-run org.apache.qpid.server.Main "$@"
diff --git a/java/broker/bin/qpid-server.bat b/java/broker/bin/qpid-server.bat
index 7b901f50b6..4c93005ad6 100644
--- a/java/broker/bin/qpid-server.bat
+++ b/java/broker/bin/qpid-server.bat
@@ -1,17 +1,20 @@
 @REM

-@REM Copyright (c) 2006 The Apache Software Foundation

-@REM

-@REM Licensed under the Apache License, Version 2.0 (the "License");

-@REM you may not use this file except in compliance with the License.

-@REM You may obtain a copy of the License at

-@REM

-@REM    http://www.apache.org/licenses/LICENSE-2.0

-@REM

-@REM Unless required by applicable law or agreed to in writing, software

-@REM distributed under the License is distributed on an "AS IS" BASIS,

-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-@REM See the License for the specific language governing permissions and

-@REM limitations under the License.

+@REM Licensed to the Apache Software Foundation (ASF) under one

+@REM or more contributor license agreements.  See the NOTICE file

+@REM distributed with this work for additional information

+@REM regarding copyright ownership.  The ASF licenses this file

+@REM to you under the Apache License, Version 2.0 (the

+@REM "License"); you may not use this file except in compliance

+@REM with the License.  You may obtain a copy of the License at

+@REM 

+@REM   http://www.apache.org/licenses/LICENSE-2.0

+@REM 

+@REM Unless required by applicable law or agreed to in writing,

+@REM software distributed under the License is distributed on an

+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+@REM KIND, either express or implied.  See the License for the

+@REM specific language governing permissions and limitations

+@REM under the License.

 @REM

 

 @echo off

diff --git a/java/broker/bin/run.bat b/java/broker/bin/run.bat
index fde68364fd..5b0aa0f23b 100755
--- a/java/broker/bin/run.bat
+++ b/java/broker/bin/run.bat
@@ -1,17 +1,20 @@
 @REM

-@REM Copyright (c) 2006 The Apache Software Foundation

-@REM

-@REM Licensed under the Apache License, Version 2.0 (the "License");

-@REM you may not use this file except in compliance with the License.

-@REM You may obtain a copy of the License at

-@REM

-@REM    http://www.apache.org/licenses/LICENSE-2.0

-@REM

-@REM Unless required by applicable law or agreed to in writing, software

-@REM distributed under the License is distributed on an "AS IS" BASIS,

-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-@REM See the License for the specific language governing permissions and

-@REM limitations under the License.

+@REM Licensed to the Apache Software Foundation (ASF) under one

+@REM or more contributor license agreements.  See the NOTICE file

+@REM distributed with this work for additional information

+@REM regarding copyright ownership.  The ASF licenses this file

+@REM to you under the Apache License, Version 2.0 (the

+@REM "License"); you may not use this file except in compliance

+@REM with the License.  You may obtain a copy of the License at

+@REM 

+@REM   http://www.apache.org/licenses/LICENSE-2.0

+@REM 

+@REM Unless required by applicable law or agreed to in writing,

+@REM software distributed under the License is distributed on an

+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+@REM KIND, either express or implied.  See the License for the

+@REM specific language governing permissions and limitations

+@REM under the License.

 @REM

 

 @echo off

diff --git a/java/broker/bin/run.sh b/java/broker/bin/run.sh
index 06ad56b61c..6b62049e94 100755
--- a/java/broker/bin/run.sh
+++ b/java/broker/bin/run.sh
@@ -1,18 +1,21 @@
 #!/bin/bash
 #
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# 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 in writing, software
-# distributed under the License is distributed on an "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.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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 in writing,
+# software distributed under the License is distributed on an
+# "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.
 #
 
 
diff --git a/java/broker/bin/runAll b/java/broker/bin/runAll
index 0d6c6068e6..4ced1d263b 100644
--- a/java/broker/bin/runAll
+++ b/java/broker/bin/runAll
@@ -1,5 +1,24 @@
 #!/bin/sh
 
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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 in writing,
+# software distributed under the License is distributed on an
+# "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.
+#
+
 doRun()
 {
     class=$1