Correct license header mainly for patches folder

Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree.  If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.

build/deploy/production/db/templates-dev.sql

@@ -1,19 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+-- Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
+-- or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
+-- distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
+-- regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
+-- to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
+-- "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
+-- with the License.  You may obtain a copy of the License at
-#
+--
-#   http://www.apache.org/licenses/LICENSE-2.0
+--   http://www.apache.org/licenses/LICENSE-2.0
-#
+--
-# Unless required by applicable law or agreed to in writing,
+-- Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
+-- software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
+-- KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
+-- specific language governing permissions and limitations
-# under the License.
+-- under the License.
 INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)
     VALUES (1, 'routing', 'DomR Template', 0, 'tank/volumes/demo/template/private/u000000/os/routing', now(), 'ext3', 0, 64, 1, 'http://vmopsserver.lab.vmops.com/images/routing/vmi-root-fc8-x86_64-domR.img.bz2', 'd00927f863a23b98cc6df6e377c9d0c6', 0, 'DomR Template', 0);
 INSERT INTO `vmops`.`vm_template` (id, unique_name, name, public, path, created, type, hvm, bits, created_by, url, checksum, ready, display_text, enable_password)

patches/systemvm/debian/config/etc/profile.d/cloud.sh

@@ -1,16 +1,19 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
  
 
 if [ "`id -u`" -eq 0 ]; then

patches/systemvm/debian/config/opt/cloud/bin/get_template_version.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 echo -n `cat /etc/cloudstack-release`'&'
 cat /var/cache/cloud/cloud-scripts-signature

patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh

@@ -1,15 +1,21 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by 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.
-
 #!/usr/bin/env bash
+# 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.
+
 source /root/func.sh
 
 lock="biglock"

patches/systemvm/debian/config/opt/cloud/bin/netusage.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh

@@ -1,18 +1,20 @@
 #/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh

@@ -1,19 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
  
 
 

patches/systemvm/debian/config/opt/cloud/bin/vpc_acl.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 # firewall_rule.sh -- allow some ports / protocols to vm instances
 # @VERSION@
 

patches/systemvm/debian/config/opt/cloud/bin/vpc_func.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 # @VERSION@
 

patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 # guestnw.sh -- create/destroy guest network 
 # @VERSION@

patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/config/opt/cloud/bin/vpc_loadbalancer.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 # @VERSION@
 

patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 source /root/func.sh
 source /opt/cloud/bin/vpc_func.sh

patches/systemvm/debian/config/opt/cloud/bin/vpc_portforwarding.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 # @VERSION@
 
 source /root/func.sh

patches/systemvm/debian/config/opt/cloud/bin/vpc_privateGateway.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 # @VERSION@
 

patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 # @VERSION@
 

patches/systemvm/debian/config/opt/cloud/bin/vpc_staticnat.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 # @VERSION@
 
 source /root/func.sh

patches/systemvm/debian/config/opt/cloud/bin/vpc_staticroute.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 # @VERSION@
 
 source /root/func.sh

patches/systemvm/debian/config/root/bumpup_priority.sh

@@ -1,15 +1,19 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 touch /tmp/rrouter_bumped

patches/systemvm/debian/config/root/clearUsageRules.sh

@@ -1,19 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
  
 
 # clearUsageRules.sh - remove iptable rules for removed public interfaces

patches/systemvm/debian/config/root/edithosts.sh

@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 
  

patches/systemvm/debian/config/root/firewall.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 # $Id: firewall.sh 9947 2010-06-25 19:34:24Z manuel $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/patches/xenserver/root/firewall.sh $
 # firewall.sh -- allow some ports / protocols to vm instances
 # @VERSION@

patches/systemvm/debian/config/root/firewall_rule.sh

@@ -1,16 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 # firewall_rule.sh -- allow some ports / protocols to vm instances
 # @VERSION@
 

patches/systemvm/debian/config/root/func.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 # Only one lock is allowed: biglock
 

patches/systemvm/debian/config/root/loadbalancer.sh

@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/config/root/reconfigLB.sh

@@ -1,18 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 
 ret=0

patches/systemvm/debian/config/root/redundant_router/check_bumpup.sh

@@ -1,15 +1,19 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 cat /tmp/rrouter_bumped

patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 ip link|grep BROADCAST|grep -v eth0|grep -v eth1|cut -d ":" -f 2 > /tmp/iflist
 while read i

patches/systemvm/debian/config/root/redundant_router/primary-backup.sh.templ

@@ -1,13 +1,19 @@
-#Copyright 2012 Citrix Systems, Inc. Licensed under the 
+# Licensed to the Apache Software Foundation (ASF) under one
-#Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-#file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-#reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-#You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-#Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-#distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
-#See the License for the specific language governing permissions and 
+#   http://www.apache.org/licenses/LICENSE-2.0
-#limitations under the License.
+#
+# 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.
 
 CONNTRACKD_BIN=/usr/sbin/conntrackd
 CONNTRACKD_LOCK=/var/lock/conntrack.lock

patches/systemvm/debian/config/root/userdata.py

@@ -1,19 +1,20 @@
 #!/usr/bin/python
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
  
 
 

patches/systemvm/debian/config/root/userdata.sh

@@ -1,18 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh

@@ -1,18 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh

@@ -1,18 +1,20 @@
 #!/bin/bash
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 #
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
  
 

patches/systemvm/debian/xe/xe-daemon

@@ -1,15 +1,21 @@
 #!/bin/bash
 
-#Copyright 2012 Citrix Systems, Inc. Licensed under the 
+# Licensed to the Apache Software Foundation (ASF) under one
-#Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-#file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-#reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-#You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-#Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-#distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
-#See the License for the specific language governing permissions and 
+#   http://www.apache.org/licenses/LICENSE-2.0
-#limitations under the License.
+#
+# 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.
 
 LANG="C"
 export LANG

patches/systemvm/debian/xe/xe-linux-distribution

@@ -1,15 +1,21 @@
 #! /bin/sh
 
-#Copyright 2012 Citrix Systems, Inc. Licensed under the 
+# Licensed to the Apache Software Foundation (ASF) under one
-#Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-#file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-#reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-#You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-#Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-#distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
-#See the License for the specific language governing permissions and 
+#   http://www.apache.org/licenses/LICENSE-2.0
-#limitations under the License.
+#
+# 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.
 
 # Script to write information about the current distribution to stdout or a file.
 # Information collected:

patches/systemvm/debian/xe/xe-update-guest-attrs

@@ -1,15 +1,21 @@
 #!/bin/sh
 
-#Copyright 2012 Citrix Systems, Inc. Licensed under the 
+# Licensed to the Apache Software Foundation (ASF) under one
-#Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-#file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-#reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-#You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-#Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-#distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
-#See the License for the specific language governing permissions and 
+#   http://www.apache.org/licenses/LICENSE-2.0
-#limitations under the License.
+#
+# 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.
 
 # Script to write information about the guest to XenStore.
 #

server/src/com/cloud/upgrade/dao/Upgrade30xBase.java

@@ -1,13 +1,19 @@
-/*Copyright 2012 Citrix Systems, Inc. Licensed under the
+// Licensed to the Apache Software Foundation (ASF) under one
-Apache License, Version 2.0 (the "License"); you may not use this
+// or more contributor license agreements.  See the NOTICE file
-file except in compliance with the License.  Citrix Systems, Inc.
+// distributed with this work for additional information
-reserves all rights not expressly granted by the License.
+// regarding copyright ownership.  The ASF licenses this file
-You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// to you under the Apache License, Version 2.0 (the
-Unless required by applicable law or agreed to in writing, software
+// "License"); you may not use this file except in compliance
-distributed under the License is distributed on an "AS IS" BASIS,
+// with the License.  You may obtain a copy of the License at
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
-See the License for the specific language governing permissions and
+//   http://www.apache.org/licenses/LICENSE-2.0
-limitations under the License.*/
+//
+// 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.
 
 package com.cloud.upgrade.dao;
 

tools/build/addcopyright.py

@@ -1,15 +1,19 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
+# Licensed to the Apache Software Foundation (ASF) under one
-# Apache License, Version 2.0 (the "License"); you may not use this
+# or more contributor license agreements.  See the NOTICE file
-# file except in compliance with the License.  Citrix Systems, Inc.
+# distributed with this work for additional information
-# reserves all rights not expressly granted by the License.
+# regarding copyright ownership.  The ASF licenses this file
-# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+# to you under the Apache License, Version 2.0 (the
-# Unless required by applicable law or agreed to in writing, software
+# "License"); you may not use this file except in compliance
-# distributed under the License is distributed on an "AS IS" BASIS,
+# with the License.  You may obtain a copy of the License at
-# 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.
 # 
-# Automatically generated by addcopyright.py at 04/03/2012
+#   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.
 
 from optparse import OptionParser
 import sys
@@ -79,16 +83,22 @@ class Logger(object):
     
 
 class Adder(object):
-    defaultTxt = '''Copyright 2012 Citrix Systems, Inc. Licensed under the 
+    defaultTxt = '''Licensed to the Apache Software Foundation (ASF) under one
-Apache License, Version 2.0 (the "License"); you may not use this
+or more contributor license agreements.  See the NOTICE file
-file except in compliance with the License.  Citrix Systems, Inc.
+distributed with this work for additional information
-reserves all rights not expressly granted by the License.
+regarding copyright ownership.  The ASF licenses this file
-You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+to you under the Apache License, Version 2.0 (the
-Unless required by applicable law or agreed to in writing, software
+"License"); you may not use this file except in compliance
-distributed under the License is distributed on an "AS IS" BASIS,
+with the License.  You may obtain a copy of the License at
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
-See the License for the specific language governing permissions and 
+  http://www.apache.org/licenses/LICENSE-2.0
-limitations under the License.
+
+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.
 '''
 
     copyRightTxt = None