From: eric pretorious <epretori...@yahoo.com> --- build/build-aws-api.properties | 1 - build/build-aws-api.xml | 18 ++++++++++ build/build-cloud.properties | 1 - build/build-cloud.xml | 18 +++++++++- build/build-common.xml | 18 +++++++++- build/build-docs.xml | 18 +++++++++- build/build-marvin.xml | 20 +++++++++-- build/build-tests.xml | 18 +++++++++- build/build-usage.xml | 19 ++++++++++- build/cloud.properties | 4 +- build/deploy/db/deploy-db.sh | 34 +++++++++--------- build/deploy/deploy-agent.sh | 34 +++++++++--------- build/deploy/deploy-console-proxy.sh | 33 +++++++++--------- build/deploy/deploy-server.sh | 34 +++++++++--------- build/deploy/deploy-simulator.sh | 34 +++++++++--------- build/deploy/install-storage-server.sh | 34 +++++++++--------- build/deploy/install.sh | 35 +++++++++---------- .../storagehdpatch/etc/vmops/disks.properties | 1 - .../storagehdpatch/etc/vmops/network.properties | 1 - .../agent/storagehdpatch/lib/svc/method/vmops | 17 +++++++++- .../agent/storagehdpatch/usr/sbin/vsetup | 15 ++++++++ .../var/svc/manifest/application/cloud.xml | 17 +++++++++ build/deploy/production/db/server-setup-dev.xml | 18 ++++++++++ .../production/premium/conf/log4j-cloud_usage.xml | 17 +++++++++ .../premium/conf/log4j-cloud_usage.xml.template | 17 +++++++++ .../production/premium/conf/usage-components.xml | 18 ++++++++++ build/deploy/production/server/conf/ehcache.xml | 17 +++++++++ .../deploy/production/server/conf/log4j-cloud.xml | 17 +++++++++ .../server/conf/log4j-cloud.xml.template | 17 +++++++++ build/deploy/production/server/conf/server.xml | 2 + build/developer.xml | 16 +++++++++ build/package.xml | 17 +++++++++ 32 files changed, 446 insertions(+), 134 deletions(-)
diff --git a/build/build-aws-api.properties b/build/build-aws-api.properties index 3836266..a45f137 100644 --- a/build/build-aws-api.properties +++ b/build/build-aws-api.properties @@ -9,4 +9,3 @@ debug=true build.type=developer debuglevel=lines,source,vars deprecation=off - diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml index bee02ce..5f11997 100644 --- a/build/build-aws-api.xml +++ b/build/build-aws-api.xml @@ -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. +--> + + <project name="awsapi" default="help" basedir="."> <target name="help"> <echo level="info" message="Ant Build File for awsapi" /> diff --git a/build/build-cloud.properties b/build/build-cloud.properties index 258c22e..f5a5baf 100755 --- a/build/build-cloud.properties +++ b/build/build-cloud.properties @@ -6,4 +6,3 @@ build.type=developer target.compat.version=1.6 source.compat.version=1.6 branding.name=default - diff --git a/build/build-cloud.xml b/build/build-cloud.xml index 60953a7..76d2bc8 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -1,5 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2008 Cloud, Inc. All Rights Reserved --> +<!-- + 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. +--> + <project name="Cloud Stack" default="help" basedir="."> <description> diff --git a/build/build-common.xml b/build/build-common.xml index 64be0fe..1d1aa87 100755 --- a/build/build-common.xml +++ b/build/build-common.xml @@ -1,5 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2008 VMOps, Inc. All Rights Reserved --> +<!-- + 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. +--> + <project name="VMOps-Common" default="help" basedir="."> <!-- diff --git a/build/build-docs.xml b/build/build-docs.xml index db450a3..c38b986 100755 --- a/build/build-docs.xml +++ b/build/build-docs.xml @@ -1,5 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2008 Cloud, Inc. All Rights Reserved --> +<!-- + 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. +--> + <project name="Cloud Stack Document Tasks" default="help" basedir="."> <description> diff --git a/build/build-marvin.xml b/build/build-marvin.xml index ed5cf56..687eb5c 100644 --- a/build/build-marvin.xml +++ b/build/build-marvin.xml @@ -1,7 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- 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. --> +<!-- + 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. +--> + <project name="Marvin TestClient" default="help" basedir="."> <description> diff --git a/build/build-tests.xml b/build/build-tests.xml index 544a496..fdffe32 100755 --- a/build/build-tests.xml +++ b/build/build-tests.xml @@ -1,5 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2008 Cloud, Inc. All Rights Reserved --> +<!-- + 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. +--> + <project name="Cloud Stack Tests" default="help" basedir="."> <description> diff --git a/build/build-usage.xml b/build/build-usage.xml index eaba1d7..61b6a31 100644 --- a/build/build-usage.xml +++ b/build/build-usage.xml @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2008 Cloud, Inc. All Rights Reserved --> +<!-- + 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. +--> + + <project name="Cloud Stack Usage Server" default="help" basedir="."> <description> Cloud Stack Usage server build diff --git a/build/cloud.properties b/build/cloud.properties index 57bfaab..a50a9f1 100755 --- a/build/cloud.properties +++ b/build/cloud.properties @@ -6,7 +6,7 @@ company.patch.version=3 svn.revision=2 # copyright year -company.copyright.year=2008-2011 +company.copyright.year=2012 company.url=http://cloudstack.org -company.license.name=GPL +company.license.name=Apache License, Version 2.0 company.name=CloudStack diff --git a/build/deploy/db/deploy-db.sh b/build/deploy/db/deploy-db.sh index 29a4d4f..bf0db63 100755 --- a/build/deploy/db/deploy-db.sh +++ b/build/deploy/db/deploy-db.sh @@ -1,22 +1,22 @@ #!/usr/bin/env bash -# 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. -# -# Automatically generated by addcopyright.py at 04/03/2012 - - - - - +# # deploy-db.sh -- deploys the database configuration. +# +# 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. + # set -x diff --git a/build/deploy/deploy-agent.sh b/build/deploy/deploy-agent.sh index f61ff8c..ff4fd3c 100755 --- a/build/deploy/deploy-agent.sh +++ b/build/deploy/deploy-agent.sh @@ -1,22 +1,22 @@ #!/usr/bin/env bash -# 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. -# -# Automatically generated by addcopyright.py at 04/03/2012 - - - - - +# # install.sh -- installs an agent +# +# 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() { printf "Usage: %s: -d [directory to deploy to] -t [routing|storage|computing] -z [zip file] -h [host] -p [pod] -c [data center] -m [expert|novice|setup]\n" $(basename $0) >&2 diff --git a/build/deploy/deploy-console-proxy.sh b/build/deploy/deploy-console-proxy.sh index 342ce16..662520f 100644 --- a/build/deploy/deploy-console-proxy.sh +++ b/build/deploy/deploy-console-proxy.sh @@ -1,22 +1,23 @@ #!/usr/bin/env bash -# 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. -# -# Automatically generated by addcopyright.py at 04/03/2012 - - +# +# Deploy console proxy package to an existing VM template +# +# 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. - -# Deploy console proxy package to an existing VM template usage() { printf "Usage: %s: -d [work directory to deploy to] -z [zip file]" $(basename $0) >&2 } diff --git a/build/deploy/deploy-server.sh b/build/deploy/deploy-server.sh index 4d50e42..fe77174 100755 --- a/build/deploy/deploy-server.sh +++ b/build/deploy/deploy-server.sh @@ -1,22 +1,22 @@ #!/usr/bin/env bash -# 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. -# -# Automatically generated by addcopyright.py at 04/03/2012 - - - - - +# # deploy.sh -- deploys a management server +# +# 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() { printf "Usage: %s: -d [tomcat directory to deploy to] -z [zip file to use]\n" $(basename $0) >&2 diff --git a/build/deploy/deploy-simulator.sh b/build/deploy/deploy-simulator.sh index 347a2cc..b2bfecd 100644 --- a/build/deploy/deploy-simulator.sh +++ b/build/deploy/deploy-simulator.sh @@ -1,22 +1,22 @@ #!/usr/bin/env bash -# 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. -# -# Automatically generated by addcopyright.py at 04/03/2012 - - - - - +# # install.sh -- installs an agent +# +# 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() { printf "Usage: %s: -d [directory to deploy to] -z [zip file] -h [host] -p [pod] -c [data center] -m [expert|novice|setup]\n" $(basename $0) >&2 diff --git a/build/deploy/install-storage-server.sh b/build/deploy/install-storage-server.sh index e351f08..5d1ed05 100755 --- a/build/deploy/install-storage-server.sh +++ b/build/deploy/install-storage-server.sh @@ -1,22 +1,22 @@ #!/usr/bin/env bash -# 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. -# -# Automatically generated by addcopyright.py at 04/03/2012 - - - - - +# # install-storage-server.sh: Installs a VMOps Storage Server +# +# 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. + choose_correct_filename() { local default_filename=$1 diff --git a/build/deploy/install.sh b/build/deploy/install.sh index 9ff66ab..26f9970 100644 --- a/build/deploy/install.sh +++ b/build/deploy/install.sh @@ -1,23 +1,22 @@ #!/bin/bash -# 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. -# -# Automatically generated by addcopyright.py at 04/03/2012 - - - - - - +# # install.sh -- installs MySQL, Java, Tomcat, and the VMOps server +# +# 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. + #set -x set -e diff --git a/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.properties b/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.properties index a7f77b3..0baf045 100644 --- a/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.properties +++ b/build/deploy/production/agent/storagehdpatch/etc/vmops/disks.properties @@ -4,4 +4,3 @@ # L: Intent Log # S: Spare # U: Unused - diff --git a/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties b/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties index 8e61bdc..68485fb 100644 --- a/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties +++ b/build/deploy/production/agent/storagehdpatch/etc/vmops/network.properties @@ -32,4 +32,3 @@ vmops.iqn= # MTU (optional) mtu= - diff --git a/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops b/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops index db9fba1..6ffde74 100755 --- a/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops +++ b/build/deploy/production/agent/storagehdpatch/lib/svc/method/vmops @@ -1,6 +1,21 @@ #!/bin/bash # -# vmops Script to start and stop the VMOps Agent. +# vmops - Script to start and stop the VMOps Agent. +# +# 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. # # Author: Chiradeep Vittal <chirad...@vmops.com> # chkconfig: 2345 99 01 diff --git a/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup b/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup index dbe8a4b..44bacf8 100755 --- a/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup +++ b/build/deploy/production/agent/storagehdpatch/usr/sbin/vsetup @@ -1,4 +1,19 @@ #! /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. stage=$1 option=$2 diff --git a/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml b/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml index 858bb16..dc85bb2 100644 --- a/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml +++ b/build/deploy/production/agent/storagehdpatch/var/svc/manifest/application/cloud.xml @@ -1,5 +1,22 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> +<!-- + 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. +--> + <service_bundle type='manifest' name='cloud'> diff --git a/build/deploy/production/db/server-setup-dev.xml b/build/deploy/production/db/server-setup-dev.xml index 19a67ff..85553d7 100644 --- a/build/deploy/production/db/server-setup-dev.xml +++ b/build/deploy/production/db/server-setup-dev.xml @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + 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. +--> + + <data> <version>2.0</version> <zones> diff --git a/build/deploy/production/premium/conf/log4j-cloud_usage.xml b/build/deploy/production/premium/conf/log4j-cloud_usage.xml index 46500fa..f7e1c2e 100644 --- a/build/deploy/production/premium/conf/log4j-cloud_usage.xml +++ b/build/deploy/production/premium/conf/log4j-cloud_usage.xml @@ -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"> diff --git a/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template b/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template index 7c94e59..64d4261 100644 --- a/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template +++ b/build/deploy/production/premium/conf/log4j-cloud_usage.xml.template @@ -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"> diff --git a/build/deploy/production/premium/conf/usage-components.xml b/build/deploy/production/premium/conf/usage-components.xml index 37d66ab..02c9d1b 100644 --- a/build/deploy/production/premium/conf/usage-components.xml +++ b/build/deploy/production/premium/conf/usage-components.xml @@ -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. +--> + + +<!-- usage-components.xml is the configuration file for the VM Ops usage servers. diff --git a/build/deploy/production/server/conf/ehcache.xml b/build/deploy/production/server/conf/ehcache.xml index c65deea..560e0e0 100755 --- a/build/deploy/production/server/conf/ehcache.xml +++ b/build/deploy/production/server/conf/ehcache.xml @@ -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/build/deploy/production/server/conf/log4j-cloud.xml b/build/deploy/production/server/conf/log4j-cloud.xml index 2142d81..1b56396 100755 --- a/build/deploy/production/server/conf/log4j-cloud.xml +++ b/build/deploy/production/server/conf/log4j-cloud.xml @@ -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"> diff --git a/build/deploy/production/server/conf/log4j-cloud.xml.template b/build/deploy/production/server/conf/log4j-cloud.xml.template index 5e1e659..3939000 100644 --- a/build/deploy/production/server/conf/log4j-cloud.xml.template +++ b/build/deploy/production/server/conf/log4j-cloud.xml.template @@ -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"> diff --git a/build/deploy/production/server/conf/server.xml b/build/deploy/production/server/conf/server.xml index 99ea003..a4e85a7 100755 --- a/build/deploy/production/server/conf/server.xml +++ b/build/deploy/production/server/conf/server.xml @@ -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/build/developer.xml b/build/developer.xml index 2e3bbf6..127581e 100755 --- a/build/developer.xml +++ b/build/developer.xml @@ -1,4 +1,20 @@ <?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. +--> <project name="CloudStack Developer Targets" basedir="."> diff --git a/build/package.xml b/build/package.xml index 0d892c3..7fd7a5d 100755 --- a/build/package.xml +++ b/build/package.xml @@ -1,4 +1,21 @@ <?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. +--> + <project name="Cloud Stack Package" basedir="."> <description> -- 1.7.4.4
