incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Nalley <da...@gnsa.us>
Subject Re: [PATCH 2/2] Modified license headers in the client directory.
Date Wed, 13 Jun 2012 11:56:13 GMT
Eric this isn't applying with git-am or git apply -

See output below:

Applying: Modified license headers in the client directory.
/home/ke4qqq/Documents/apache/cloudstack/incubator-cloudstack/.git/rebase-apply/patch:143:
trailing whitespace.
#
/home/ke4qqq/Documents/apache/cloudstack/incubator-cloudstack/.git/rebase-apply/patch:173:
trailing whitespace.
#
/home/ke4qqq/Documents/apache/cloudstack/incubator-cloudstack/.git/rebase-apply/patch:196:
trailing whitespace.
#
error: patch failed: client/.project:1
error: client/.project: patch does not apply
error: patch failed: client/WEB-INF/classes/resources/messages_es.properties:1
error: client/WEB-INF/classes/resources/messages_es.properties: patch
does not apply
error: patch failed:
client/WEB-INF/classes/resources/messages_zh_CN.properties:1
error: client/WEB-INF/classes/resources/messages_zh_CN.properties:
patch does not apply
error: patch failed: client/tomcatconf/cisconexusvsm_commands.properties.in:1
error: client/tomcatconf/cisconexusvsm_commands.properties.in: patch
does not apply
Patch failed at 0001 Modified license headers in the client directory.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


On Tue, Jun 12, 2012 at 7:58 PM,  <epretorious@suddenlink.net> wrote:
> From: Eric Pretorious <epretorious@suddenlink.net>
>
> ---
>  client/.classpath                                  |   18 ++++++++++++++
>  client/.project                                    |   18 ++++++++++++++
>  .../WEB-INF/classes/resources/messages.properties  |   15 ++++++++++++
>  .../classes/resources/messages_es.properties       |   17 ++++++++++++-
>  .../classes/resources/messages_ja.properties       |   15 ++++++++++++
>  .../classes/resources/messages_zh_CN.properties    |   15 ++++++++++++
>  client/WEB-INF/web.xml                             |    2 +
>  client/bindir/cloud-setup-management.in            |   16 ++++++++++++
>  client/bindir/cloud-update-xenserver-licenses.in   |   16 ++++++++++++
>  .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   15 ++++++++++++
>  .../SYSCONFDIR/sysconfig/cloud-management.in       |   15 ++++++++++++
>  .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   15 ++++++++++++
>  .../SYSCONFDIR/sysconfig/cloud-management.in       |   15 ++++++++++++
>  .../opensuse/SYSCONFDIR/init.d/cloud-management.in |   25 ++++++++++++--------
>  .../SYSCONFDIR/sysconfig/cloud-management.in       |   15 ++++++++++++
>  .../SYSCONFDIR/rc.d/init.d/cloud-management.in     |   15 ++++++++++++
>  .../rhel/SYSCONFDIR/sysconfig/cloud-management.in  |   15 ++++++++++++
>  .../sles/SYSCONFDIR/init.d/cloud-management.in     |   25 ++++++++++++--------
>  .../sles/SYSCONFDIR/sysconfig/cloud-management.in  |   15 ++++++++++++
>  .../ubuntu/SYSCONFDIR/init.d/cloud-management.in   |   25 ++++++++++++--------
>  .../cisconexusvsm_commands.properties.in           |   15 ++++++++++++
>  client/tomcatconf/classpath.conf.in                |   16 ++++++++++++
>  client/tomcatconf/commands-ext.properties.in       |   15 ++++++++++++
>  client/tomcatconf/commands.properties.in           |   15 ++++++++++++
>  client/tomcatconf/components-cloudzones.xml.in     |   18 ++++++++++++++
>  client/tomcatconf/components.xml.in                |   18 ++++++++++++++
>  client/tomcatconf/context.xml.in                   |    2 +
>  client/tomcatconf/db.properties.in                 |   15 ++++++++++++
>  client/tomcatconf/ehcache.xml.in                   |   17 +++++++++++++
>  client/tomcatconf/environment.properties.in        |   15 ++++++++++++
>  client/tomcatconf/f5bigip_commands.properties.in   |   15 ++++++++++++
>  .../tomcatconf/junipersrx_commands.properties.in   |   15 ++++++++++++
>  client/tomcatconf/log4j-cloud.xml.in               |   17 +++++++++++++
>  .../netscalerloadbalancer_commands.properties.in   |   15 ++++++++++++
>  client/tomcatconf/server-nonssl.xml                |    1 +
>  client/tomcatconf/server-ssl.xml.in                |    2 +
>  client/tomcatconf/server.xml.in                    |    2 +
>  client/tomcatconf/simulator.properties.in          |   17 ++++++++++++-
>  client/tomcatconf/tomcat-users.xml.in              |    2 +
>  client/tomcatconf/tomcat6-nonssl.conf.in           |   15 ++++++++++++
>  client/tomcatconf/tomcat6-ssl.conf.in              |   14 +++++++++++
>  .../virtualrouter_commands.properties.in           |   15 ++++++++++++
>  client/tomcatconf/web.xml.in                       |    2 +
>  43 files changed, 573 insertions(+), 32 deletions(-)
>
> diff --git a/client/.classpath b/client/.classpath
> index 482331d..578e193 100644
> --- a/client/.classpath
> +++ b/client/.classpath
> @@ -1,4 +1,22 @@
>  <?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +  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.
> +-->
> +
> +
>  <classpath>
>        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
>        <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
> diff --git a/client/.project b/client/.project
> index 964f331..1ef223d 100644
> --- a/client/.project
> +++ b/client/.project
> @@ -1,4 +1,22 @@
>  <?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +  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.
> +-->
> +
> +
>  <projectDescription>
>        <name>client</name>
>        <comment>client project</comment>
> diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
> index 7b0f264..dcc4a96 100644
> --- a/client/WEB-INF/classes/resources/messages.properties
> +++ b/client/WEB-INF/classes/resources/messages.properties
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  #new labels (begin) **********************************************************************************************
>  label.action.enable.physical.network=Enable physical network
>  label.action.disable.physical.network=Disable physical network
> diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties
> index 5b4ff32..90720c1 100644
> --- a/client/WEB-INF/classes/resources/messages_es.properties
> +++ b/client/WEB-INF/classes/resources/messages_es.properties
> @@ -1,3 +1,18 @@
> +# 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.
> +#
>  #cloudstack 3.0 (begin) ********************************************************************************************
>  create.template.confirm = Por favor, confirme que desea crear una plantilla
>  create.template.success = Nueva plantilla se está creando
> @@ -863,4 +878,4 @@ error.menu.select = No se puede realizar la acción debido a que no los artícul
>  error.mgmt.server.inaccessible = El Servidor de Gestión es inaccesible. Por favor, inténtelo de nuevo más tarde.
>  error.session.expired = Su sesión ha caducado.
>  error.unresolved.internet.name = El nombre de Internet no se puede resolver.
> -#cloudstack 2.2.Y (end) ********************************************************************************************
> \ No newline at end of file
> +#cloudstack 2.2.Y (end) ********************************************************************************************
> diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
> index ea9c1d1..ee55796 100644
> --- a/client/WEB-INF/classes/resources/messages_ja.properties
> +++ b/client/WEB-INF/classes/resources/messages_ja.properties
> @@ -1,3 +1,18 @@
> +# 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.
> +#
>  #new labels (begin) **********************************************************************************************
>
>
> diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
> index 4640f66..4caf641 100644
> --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
> +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
> @@ -1,3 +1,18 @@
> +# 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.
> +#
>  #new labels (begin) **********************************************************************************************
>
>
> diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
> index 7972024..5ce4bce 100644
> --- a/client/WEB-INF/web.xml
> +++ b/client/WEB-INF/web.xml
> @@ -15,6 +15,8 @@
>   See the License for the specific language governing permissions and
>   limitations under the License.
>  -->
> +
> +
>  <web-app xmlns="http://java.sun.com/xml/ns/javaee"
>     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
> diff --git a/client/bindir/cloud-setup-management.in b/client/bindir/cloud-setup-management.in
> index c82f740..70a9a0e 100755
> --- a/client/bindir/cloud-setup-management.in
> +++ b/client/bindir/cloud-setup-management.in
> @@ -1,4 +1,20 @@
>  #!/usr/bin/python
> +
> +#  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.
> +
>  from cloudutils.syscfg import sysConfigFactory
>  from cloudutils.utilities import initLoging
>  from cloudutils.cloudException import CloudRuntimeException, CloudInternalException
> diff --git a/client/bindir/cloud-update-xenserver-licenses.in b/client/bindir/cloud-update-xenserver-licenses.in
> index 94b8e3e..35b74a8 100755
> --- a/client/bindir/cloud-update-xenserver-licenses.in
> +++ b/client/bindir/cloud-update-xenserver-licenses.in
> @@ -1,4 +1,20 @@
>  #!/usr/bin/python -W ignore::DeprecationWarning
> +
> +#  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.
> +
>  # -*- coding: utf-8 -*-
>
>  import os
> diff --git a/client/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-management.in b/client/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-management.in
> index df57c45..8623a0c 100755
> --- a/client/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-management.in
> +++ b/client/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-management.in
> @@ -4,6 +4,21 @@
>  #
>  # chkconfig: - 80 20
>  #
> +#  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.
> +#
>  ### BEGIN INIT INFO
>  # Provides: tomcat6
>  # Required-Start: $network $syslog
> diff --git a/client/distro/centos/SYSCONFDIR/sysconfig/cloud-management.in b/client/distro/centos/SYSCONFDIR/sysconfig/cloud-management.in
> index 2d4b22f..7952539 100644
> --- a/client/distro/centos/SYSCONFDIR/sysconfig/cloud-management.in
> +++ b/client/distro/centos/SYSCONFDIR/sysconfig/cloud-management.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  # This file is loaded in /etc/init.d/vmopsmanagement
>  # ATM we only do two things here:
>
> diff --git a/client/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-management.in b/client/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-management.in
> index e168a12..b5f1a1f 100755
> --- a/client/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-management.in
> +++ b/client/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-management.in
> @@ -4,6 +4,21 @@
>  #
>  # chkconfig: - 80 20
>  #
> +#  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.
> +#
>  ### BEGIN INIT INFO
>  # Provides: tomcat6
>  # Required-Start: $network $syslog
> diff --git a/client/distro/fedora/SYSCONFDIR/sysconfig/cloud-management.in b/client/distro/fedora/SYSCONFDIR/sysconfig/cloud-management.in
> index 2d4b22f..7952539 100644
> --- a/client/distro/fedora/SYSCONFDIR/sysconfig/cloud-management.in
> +++ b/client/distro/fedora/SYSCONFDIR/sysconfig/cloud-management.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  # This file is loaded in /etc/init.d/vmopsmanagement
>  # ATM we only do two things here:
>
> diff --git a/client/distro/opensuse/SYSCONFDIR/init.d/cloud-management.in b/client/distro/opensuse/SYSCONFDIR/init.d/cloud-management.in
> index 52eb3aa..6190951 100755
> --- a/client/distro/opensuse/SYSCONFDIR/init.d/cloud-management.in
> +++ b/client/distro/opensuse/SYSCONFDIR/init.d/cloud-management.in
> @@ -1,17 +1,22 @@
>  #!/bin/sh
>  #
>  # /etc/init.d/tomcat6 -- startup script for the Tomcat 6 servlet engine
> +#
> +#  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.
>
> -#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.
>
>  ### BEGIN INIT INFO
>  # Provides:          tomcat-vmops
> diff --git a/client/distro/opensuse/SYSCONFDIR/sysconfig/cloud-management.in b/client/distro/opensuse/SYSCONFDIR/sysconfig/cloud-management.in
> index 2d4b22f..7952539 100644
> --- a/client/distro/opensuse/SYSCONFDIR/sysconfig/cloud-management.in
> +++ b/client/distro/opensuse/SYSCONFDIR/sysconfig/cloud-management.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  # This file is loaded in /etc/init.d/vmopsmanagement
>  # ATM we only do two things here:
>
> diff --git a/client/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-management.in b/client/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-management.in
> index aee0e1c..565f298 100644
> --- a/client/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-management.in
> +++ b/client/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-management.in
> @@ -4,6 +4,21 @@
>  #
>  # chkconfig: - 80 20
>  #
> +#  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.
> +#
>  ### BEGIN INIT INFO
>  # Provides: tomcat6
>  # Required-Start: $network $syslog
> diff --git a/client/distro/rhel/SYSCONFDIR/sysconfig/cloud-management.in b/client/distro/rhel/SYSCONFDIR/sysconfig/cloud-management.in
> index 2d4b22f..7952539 100644
> --- a/client/distro/rhel/SYSCONFDIR/sysconfig/cloud-management.in
> +++ b/client/distro/rhel/SYSCONFDIR/sysconfig/cloud-management.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  # This file is loaded in /etc/init.d/vmopsmanagement
>  # ATM we only do two things here:
>
> diff --git a/client/distro/sles/SYSCONFDIR/init.d/cloud-management.in b/client/distro/sles/SYSCONFDIR/init.d/cloud-management.in
> index 52eb3aa..6190951 100755
> --- a/client/distro/sles/SYSCONFDIR/init.d/cloud-management.in
> +++ b/client/distro/sles/SYSCONFDIR/init.d/cloud-management.in
> @@ -1,17 +1,22 @@
>  #!/bin/sh
>  #
>  # /etc/init.d/tomcat6 -- startup script for the Tomcat 6 servlet engine
> +#
> +#  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.
>
> -#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.
>
>  ### BEGIN INIT INFO
>  # Provides:          tomcat-vmops
> diff --git a/client/distro/sles/SYSCONFDIR/sysconfig/cloud-management.in b/client/distro/sles/SYSCONFDIR/sysconfig/cloud-management.in
> index 2d4b22f..7952539 100644
> --- a/client/distro/sles/SYSCONFDIR/sysconfig/cloud-management.in
> +++ b/client/distro/sles/SYSCONFDIR/sysconfig/cloud-management.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  # This file is loaded in /etc/init.d/vmopsmanagement
>  # ATM we only do two things here:
>
> diff --git a/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in b/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
> index 32855a5..5031a2e 100755
> --- a/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
> +++ b/client/distro/ubuntu/SYSCONFDIR/init.d/cloud-management.in
> @@ -1,17 +1,22 @@
>  #!/bin/sh
>  #
>  # /etc/init.d/tomcat6 -- startup script for the Tomcat 6 servlet engine
> +#
> +#  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.
>
> -#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.
>
>  ### BEGIN INIT INFO
>  # Provides:          tomcat-vmops
> diff --git a/client/tomcatconf/cisconexusvsm_commands.properties.in b/client/tomcatconf/cisconexusvsm_commands.properties.in
> index 17b9c79..cee8f83 100644
> --- a/client/tomcatconf/cisconexusvsm_commands.properties.in
> +++ b/client/tomcatconf/cisconexusvsm_commands.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  ### bitmap of permissions at the end of each classname, 1 = ADMIN, 2 = RESOURCE_DOMAIN_ADMIN, 4 = DOMAIN_ADMIN, 8 = USER
>  ### Please standardize naming conventions to camel-case (even for acronyms).
>
> diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
> index ca07103..8d2f88a 100644
> --- a/client/tomcatconf/classpath.conf.in
> +++ b/client/tomcatconf/classpath.conf.in
> @@ -1,5 +1,21 @@
>  #!/bin/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.
> +
> +
>  SYSTEMJARS="@SYSTEMJARS@"
>  SCP=$(build-classpath $SYSTEMJARS 2>/dev/null) ; if [ $? != 0 ] ; then export SCP="@SYSTEMCLASSPATH@" ; fi
>  MCP="@MSCLASSPATH@"
> diff --git a/client/tomcatconf/commands-ext.properties.in b/client/tomcatconf/commands-ext.properties.in
> index 682e088..8d2e69c 100644
> --- a/client/tomcatconf/commands-ext.properties.in
> +++ b/client/tomcatconf/commands-ext.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  #### usage commands
>  generateUsageRecords=com.cloud.api.commands.GenerateUsageRecordsCmd;1
>  listUsageRecords=com.cloud.api.commands.GetUsageRecordsCmd;1
> diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
> index a939eb7..13761d3 100755
> --- a/client/tomcatconf/commands.properties.in
> +++ b/client/tomcatconf/commands.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  ### bitmap of permissions at the end of each classname, 1 = ADMIN, 2 = RESOURCE_DOMAIN_ADMIN, 4 = DOMAIN_ADMIN, 8 = USER
>  ### Please standardize naming conventions to camel-case (even for acronyms).
>
> diff --git a/client/tomcatconf/components-cloudzones.xml.in b/client/tomcatconf/components-cloudzones.xml.in
> index 0ca02e2..89c1752 100755
> --- a/client/tomcatconf/components-cloudzones.xml.in
> +++ b/client/tomcatconf/components-cloudzones.xml.in
> @@ -1,4 +1,22 @@
>  <?xml version="1.0"?>
> +<!--
> +  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.
> +-->
> +
> +
>  <components-cloudzones.xml>
>     <system-integrity-checker class="com.cloud.upgrade.DatabaseUpgradeChecker">
>         <checker name="ManagementServerNode" class="com.cloud.cluster.ManagementServerNode"/>
> diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
> index 48869b5..9f1c3fe 100755
> --- a/client/tomcatconf/components.xml.in
> +++ b/client/tomcatconf/components.xml.in
> @@ -1,5 +1,23 @@
>  <?xml version="1.0"?>
>  <!--
> +  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.
> +-->
> +
> +
> +<!--
>   components.xml is the configuration file for the VM Ops
>   insertion servers.  Someone can quickly pull together an
>   insertion server by selecting the correct adapters to use.
> diff --git a/client/tomcatconf/context.xml.in b/client/tomcatconf/context.xml.in
> index 9913dd1..848097f 100644
> --- a/client/tomcatconf/context.xml.in
> +++ b/client/tomcatconf/context.xml.in
> @@ -15,6 +15,8 @@
>   See the License for the specific language governing permissions and
>   limitations under the License.
>  -->
> +
> +
>  <!-- The contents of this file will be loaded for each web application -->
>  <Context allowLinking="true">
>
> diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in
> index f74a46a..9f6287c 100644
> --- a/client/tomcatconf/db.properties.in
> +++ b/client/tomcatconf/db.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  # management server clustering parameters, change cluster.node.IP to the machine IP address
>  # in which the management server(Tomcat) is running
>  cluster.node.IP=127.0.0.1
> diff --git a/client/tomcatconf/ehcache.xml.in b/client/tomcatconf/ehcache.xml.in
> index c65deea..560e0e0 100755
> --- a/client/tomcatconf/ehcache.xml.in
> +++ b/client/tomcatconf/ehcache.xml.in
> @@ -1,5 +1,22 @@
>  <ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>          xsi:noNamespaceSchemaLocation="ehcache.xsd">
> +<!--
> +  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.
> +-->
> +
>
>     <!--
>     CacheManager Configuration
> diff --git a/client/tomcatconf/environment.properties.in b/client/tomcatconf/environment.properties.in
> index f7b5afd..4a85585 100644
> --- a/client/tomcatconf/environment.properties.in
> +++ b/client/tomcatconf/environment.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  # management server compile-time environment parameters
>
>  paths.script=@AGENTLIBDIR@
> diff --git a/client/tomcatconf/f5bigip_commands.properties.in b/client/tomcatconf/f5bigip_commands.properties.in
> index 69e1694..d26a863 100644
> --- a/client/tomcatconf/f5bigip_commands.properties.in
> +++ b/client/tomcatconf/f5bigip_commands.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  ### bitmap of permissions at the end of each classname, 1 = ADMIN, 2 = RESOURCE_DOMAIN_ADMIN, 4 = DOMAIN_ADMIN, 8 = USER
>  ### Please standardize naming conventions to camel-case (even for acronyms).
>
> diff --git a/client/tomcatconf/junipersrx_commands.properties.in b/client/tomcatconf/junipersrx_commands.properties.in
> index 50c3335..b41f0c6 100644
> --- a/client/tomcatconf/junipersrx_commands.properties.in
> +++ b/client/tomcatconf/junipersrx_commands.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  ### bitmap of permissions at the end of each classname, 1 = ADMIN, 2 = RESOURCE_DOMAIN_ADMIN, 4 = DOMAIN_ADMIN, 8 = USER
>  ### Please standardize naming conventions to camel-case (even for acronyms).
>
> diff --git a/client/tomcatconf/log4j-cloud.xml.in b/client/tomcatconf/log4j-cloud.xml.in
> index 8af7202..408d9f3 100755
> --- a/client/tomcatconf/log4j-cloud.xml.in
> +++ b/client/tomcatconf/log4j-cloud.xml.in
> @@ -1,5 +1,22 @@
>  <?xml version="1.0" encoding="UTF-8"?>
>  <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
> +<!--
> +  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.
> +-->
> +
>
>  <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
>    <throwableRenderer class="com.cloud.utils.log.CglibThrowableRenderer"/>
> diff --git a/client/tomcatconf/netscalerloadbalancer_commands.properties.in b/client/tomcatconf/netscalerloadbalancer_commands.properties.in
> index e841a1a..6240a91 100644
> --- a/client/tomcatconf/netscalerloadbalancer_commands.properties.in
> +++ b/client/tomcatconf/netscalerloadbalancer_commands.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  ### bitmap of permissions at the end of each classname, 1 = ADMIN, 2 = RESOURCE_DOMAIN_ADMIN, 4 = DOMAIN_ADMIN, 8 = USER
>  ### Please standardize naming conventions to camel-case (even for acronyms).
>
> diff --git a/client/tomcatconf/server-nonssl.xml b/client/tomcatconf/server-nonssl.xml
> index 0b627b2..218abef3 100755
> --- a/client/tomcatconf/server-nonssl.xml
> +++ b/client/tomcatconf/server-nonssl.xml
> @@ -15,6 +15,7 @@
>   See the License for the specific language governing permissions and
>   limitations under the License.
>  -->
> +
>  <!-- Note:  A "Server" is not itself a "Container", so you may not
>      define subcomponents such as "Valves" at this level.
>      Documentation at /docs/config/server.html
> diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in
> index 8cba79f..8368b05 100755
> --- a/client/tomcatconf/server-ssl.xml.in
> +++ b/client/tomcatconf/server-ssl.xml.in
> @@ -15,6 +15,8 @@
>   See the License for the specific language governing permissions and
>   limitations under the License.
>  -->
> +
> +
>  <!-- Note:  A "Server" is not itself a "Container", so you may not
>      define subcomponents such as "Valves" at this level.
>      Documentation at /docs/config/server.html
> diff --git a/client/tomcatconf/server.xml.in b/client/tomcatconf/server.xml.in
> index 71b98a9..ca40a2a 100644
> --- a/client/tomcatconf/server.xml.in
> +++ b/client/tomcatconf/server.xml.in
> @@ -15,6 +15,8 @@
>   See the License for the specific language governing permissions and
>   limitations under the License.
>  -->
> +
> +
>  <!-- Note:  A "Server" is not itself a "Container", so you may not
>      define subcomponents such as "Valves" at this level.
>      Documentation at /docs/config/server.html
> diff --git a/client/tomcatconf/simulator.properties.in b/client/tomcatconf/simulator.properties.in
> index e515cac..ea9195f 100644
> --- a/client/tomcatconf/simulator.properties.in
> +++ b/client/tomcatconf/simulator.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  host=127.0.0.1
>  port=8250
>  workers=3
> @@ -11,4 +26,4 @@ latency.start.range=2
>  latency.end.range=2
>  delay.distribution={(5,10); (5,10); (5,10); (5,10); (5,10); (5,10); (5,10); (5,10); (5,10); (10,120)}
>  property.scan.enabled=1
> -property.scan.interval=300
> \ No newline at end of file
> +property.scan.interval=300
> diff --git a/client/tomcatconf/tomcat-users.xml.in b/client/tomcatconf/tomcat-users.xml.in
> index 81422a0..81208b2 100644
> --- a/client/tomcatconf/tomcat-users.xml.in
> +++ b/client/tomcatconf/tomcat-users.xml.in
> @@ -15,6 +15,8 @@
>   See the License for the specific language governing permissions and
>   limitations under the License.
>  -->
> +
> +
>  <tomcat-users>
>  <!--
>   <role rolename="tomcat"/>
> diff --git a/client/tomcatconf/tomcat6-nonssl.conf.in b/client/tomcatconf/tomcat6-nonssl.conf.in
> index f571fc9..150a310 100644
> --- a/client/tomcatconf/tomcat6-nonssl.conf.in
> +++ b/client/tomcatconf/tomcat6-nonssl.conf.in
> @@ -9,6 +9,21 @@
>  # Change the service specific ones to affect only one service
>  # (see, for instance, /etc/sysconfig/tomcat6)
>  #
> +#  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.
> +
>
>  # Where your java installation lives
>  #JAVA_HOME="/usr/lib/jvm/java"
> diff --git a/client/tomcatconf/tomcat6-ssl.conf.in b/client/tomcatconf/tomcat6-ssl.conf.in
> index da03a7d..7c788c7 100644
> --- a/client/tomcatconf/tomcat6-ssl.conf.in
> +++ b/client/tomcatconf/tomcat6-ssl.conf.in
> @@ -9,6 +9,20 @@
>  # Change the service specific ones to affect only one service
>  # (see, for instance, /etc/sysconfig/tomcat6)
>  #
> +#  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.
>
>  # Where your java installation lives
>  #JAVA_HOME="/usr/lib/jvm/java"
> diff --git a/client/tomcatconf/virtualrouter_commands.properties.in b/client/tomcatconf/virtualrouter_commands.properties.in
> index b6a479d..e086b75 100644
> --- a/client/tomcatconf/virtualrouter_commands.properties.in
> +++ b/client/tomcatconf/virtualrouter_commands.properties.in
> @@ -1,3 +1,18 @@
> +# 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.
> +
>  ### bitmap of permissions at the end of each classname, 1 = ADMIN, 2 = RESOURCE_DOMAIN_ADMIN, 4 = DOMAIN_ADMIN, 8 = USER
>  ### Please standardize naming conventions to camel-case (even for acronyms).
>
> diff --git a/client/tomcatconf/web.xml.in b/client/tomcatconf/web.xml.in
> index 44b6eab..42171a4 100644
> --- a/client/tomcatconf/web.xml.in
> +++ b/client/tomcatconf/web.xml.in
> @@ -15,6 +15,8 @@
>   See the License for the specific language governing permissions and
>   limitations under the License.
>  -->
> +
> +
>  <web-app xmlns="http://java.sun.com/xml/ns/javaee"
>     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
> --
> 1.7.4.4
>

Mime
View raw message