You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/14 23:16:46 UTC
[31/51] [abbrv] git commit: License header updates,
and modification to root pom for exclusions.
License header updates, and modification to root pom for exclusions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/763311c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/763311c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/763311c0
Branch: refs/heads/4.0
Commit: 763311c006ec8788f1d49e2418b3f02be2449a96
Parents: 7f8a1aa
Author: Chip Childers <ch...@gmail.com>
Authored: Thu Sep 13 16:54:27 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Thu Sep 13 16:55:48 2012 -0400
----------------------------------------------------------------------
console-proxy/systemvm-descriptor.xml | 18 +++++++++++++++
deps/install-non-oss.sh | 16 +++++++++++++
patches/cloudpatch-descriptor.xml | 16 +++++++++++++
.../debian/config/etc/cron.daily/cloud-cleanup | 16 +++++++++++++
patches/systemvm/debian/config/etc/default/cloud | 17 ++++++++++++++
.../debian/config/etc/default/cloud-passwd-srvr | 17 ++++++++++++++
patches/systemvm/debian/config/etc/init.d/cloud | 16 +++++++++++++
.../debian/config/etc/init.d/cloud-early-config | 16 +++++++++++++
.../debian/config/etc/init.d/cloud-passwd-srvr | 17 +++++++++++++-
.../debian/config/opt/cloud/bin/checks2svpn.sh | 16 +++++++++++++
.../debian/config/opt/cloud/bin/cloud-nic.sh | 17 +++++++++++++-
.../debian/config/opt/cloud/bin/passwd_server | 16 +++++++++++++
patches/systemvm/debian/systemvm.xml | 16 +++++++++++++
.../network-elements/midokura-midonet/build.xml | 17 ++++++++++++++
pom.xml | 1 +
15 files changed, 230 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/console-proxy/systemvm-descriptor.xml
----------------------------------------------------------------------
diff --git a/console-proxy/systemvm-descriptor.xml b/console-proxy/systemvm-descriptor.xml
index 37a1ae9..44ce2eb 100644
--- a/console-proxy/systemvm-descriptor.xml
+++ b/console-proxy/systemvm-descriptor.xml
@@ -1,3 +1,21 @@
+<!--
+ 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.
+-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/deps/install-non-oss.sh
----------------------------------------------------------------------
diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 85512bd..9c65a31 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -1,4 +1,20 @@
#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
mvn install:install-file -Dfile=cloud-iControl.jar -DgroupId=com.cloud.com.f5 -DartifactId=icontrol -Dversion=1.0 -Dpackaging=jar
mvn install:install-file -Dfile=cloud-netscaler.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler -Dversion=1.0 -Dpackaging=jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/cloudpatch-descriptor.xml
----------------------------------------------------------------------
diff --git a/patches/cloudpatch-descriptor.xml b/patches/cloudpatch-descriptor.xml
index 263fb34..4710b05 100644
--- a/patches/cloudpatch-descriptor.xml
+++ b/patches/cloudpatch-descriptor.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup b/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup
index e02b352..9d254d3 100755
--- a/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup
+++ b/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup
@@ -1,5 +1,21 @@
#!/bin/sh
# /etc/cron.daily/cloud-cleanup: cleanup old cloudstack logs
+# 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.
cd /
output=$(find /var/log/cloud -mtime +7 -size +1M -exec rm -v '{}' \; )
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/etc/default/cloud
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/default/cloud b/patches/systemvm/debian/config/etc/default/cloud
index 6da9d94..0b85c63 100644
--- a/patches/systemvm/debian/config/etc/default/cloud
+++ b/patches/systemvm/debian/config/etc/default/cloud
@@ -1,2 +1,19 @@
+# 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 ENABLED to 1 if you want the init script to start the password server
ENABLED=0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr b/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr
index 6da9d94..0b85c63 100644
--- a/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr
+++ b/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr
@@ -1,2 +1,19 @@
+# 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 ENABLED to 1 if you want the init script to start the password server
ENABLED=0
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/etc/init.d/cloud
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud b/patches/systemvm/debian/config/etc/init.d/cloud
index 459d2db..b8e6ed2 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud
+++ b/patches/systemvm/debian/config/etc/init.d/cloud
@@ -9,6 +9,22 @@
# Default-Stop: 0 1 6
# Short-Description: Start up the cloud.com service
### END INIT INFO
+# 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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index a7f9b70..ca97d29 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -9,6 +9,22 @@
# Default-Stop: 0 6
# Short-Description: configure according to cmdline
### END INIT INFO
+# 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.
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr b/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr
index 96395b1..553fe0a 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr
@@ -9,7 +9,22 @@
# Default-Stop: 0 6
# Short-Description: Web server that sends passwords to User VMs
### END INIT INFO
-
+# 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.
ENABLED=0
[ -e /etc/default/cloud-passwd-srvr ] && . /etc/default/cloud-passwd-srvr
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh b/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh
index cecc38a..59ab426 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh
@@ -1,4 +1,20 @@
#!/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.
if [ -z $1 ]
then
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh b/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh
index b067a98..871b789 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh
+++ b/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh
@@ -1,5 +1,20 @@
#!/usr/bin/env bash
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
plug_nic() {
sudo echo "$tableNo $tableName" >> /etc/iproute2/rt_tables 2>/dev/null
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
index 7e93b67..95225b6 100755
--- a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
+++ b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server
@@ -1,4 +1,20 @@
#!/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.
. /etc/default/cloud-passwd-srvr
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/patches/systemvm/debian/systemvm.xml
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/systemvm.xml b/patches/systemvm/debian/systemvm.xml
index ce6ecaf..fffc077 100644
--- a/patches/systemvm/debian/systemvm.xml
+++ b/patches/systemvm/debian/systemvm.xml
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<domain type='kvm' id='4'>
<name>systemvm2</name>
<memory>1572864</memory>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/plugins/network-elements/midokura-midonet/build.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midokura-midonet/build.xml b/plugins/network-elements/midokura-midonet/build.xml
index e69de29..6b826e7 100644
--- a/plugins/network-elements/midokura-midonet/build.xml
+++ b/plugins/network-elements/midokura-midonet/build.xml
@@ -0,0 +1,17 @@
+<?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.
+-->
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/763311c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d585771..e365e6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,6 +209,7 @@
<exclude>dist/console-proxy/js/jquery.js</exclude>
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
+ <exclude>tools/devcloud/devcloud.cfg</exclude>
<exclude>ui/lib/flot/jquery.colorhelpers.js</exclude>
<exclude>ui/lib/flot/jquery.flot.crosshair.js</exclude>
<exclude>ui/lib/flot/jquery.flot.fillbetween.js</exclude>