You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/06/26 16:47:06 UTC
[4/10] git commit: applying the commits from Chip Childers licensing
cleanup
applying the commits from Chip Childers licensing cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fc3ac862
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fc3ac862
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fc3ac862
Branch: refs/heads/master
Commit: fc3ac862dcc1cb6b67c59b1636e607c91fa25352
Parents: 712565c
Author: David Nalley <da...@gnsa.us>
Authored: Tue Jun 26 10:44:04 2012 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Tue Jun 26 10:44:04 2012 -0400
----------------------------------------------------------------------
.../com/xensource/xenapi/APIVersion.java | 147 +-
deps/XenServerJava/com/xensource/xenapi/Auth.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Blob.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Bond.java | 5 -
.../com/xensource/xenapi/Connection.java | 5 -
.../com/xensource/xenapi/Console.java | 5 -
.../com/xensource/xenapi/Crashdump.java | 5 -
.../com/xensource/xenapi/DataSource.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Event.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Host.java | 5 -
.../com/xensource/xenapi/HostCpu.java | 5 -
.../com/xensource/xenapi/HostCrashdump.java | 5 -
.../com/xensource/xenapi/HostMetrics.java | 5 -
.../com/xensource/xenapi/HostPatch.java | 5 -
.../com/xensource/xenapi/Marshalling.java | 5 -
.../com/xensource/xenapi/Message.java | 5 -
.../com/xensource/xenapi/Network.java | 5 -
deps/XenServerJava/com/xensource/xenapi/PBD.java | 5 -
deps/XenServerJava/com/xensource/xenapi/PIF.java | 5 -
.../com/xensource/xenapi/PIFMetrics.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Pool.java | 5 -
.../com/xensource/xenapi/PoolPatch.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Role.java | 5 -
deps/XenServerJava/com/xensource/xenapi/SM.java | 5 -
deps/XenServerJava/com/xensource/xenapi/SR.java | 5 -
.../XenServerJava/com/xensource/xenapi/Secret.java | 5 -
.../com/xensource/xenapi/Session.java | 5 -
.../com/xensource/xenapi/Subject.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Task.java | 5 -
.../XenServerJava/com/xensource/xenapi/Tunnel.java | 5 -
deps/XenServerJava/com/xensource/xenapi/Types.java | 5 -
deps/XenServerJava/com/xensource/xenapi/User.java | 5 -
deps/XenServerJava/com/xensource/xenapi/VBD.java | 5 -
.../com/xensource/xenapi/VBDMetrics.java | 5 -
deps/XenServerJava/com/xensource/xenapi/VDI.java | 5 -
deps/XenServerJava/com/xensource/xenapi/VIF.java | 5 -
.../com/xensource/xenapi/VIFMetrics.java | 5 -
deps/XenServerJava/com/xensource/xenapi/VLAN.java | 5 -
deps/XenServerJava/com/xensource/xenapi/VM.java | 5 -
.../com/xensource/xenapi/VMGuestMetrics.java | 5 -
.../com/xensource/xenapi/VMMetrics.java | 5 -
deps/XenServerJava/com/xensource/xenapi/VMPP.java | 5 -
deps/XenServerJava/com/xensource/xenapi/VTPM.java | 5 -
.../com/xensource/xenapi/XenAPIObject.java | 5 -
setup/apidoc/XmlToHtmlConverter.java | 29 +-
setup/apidoc/build-apidoc.sh | 26 +-
setup/apidoc/gen_toc.py | 26 +-
setup/bindir/cloud-migrate-databases.in | 18 +
setup/bindir/cloud-set-guest-password.in | 18 +
setup/bindir/cloud-set-guest-sshkey.in | 18 +
setup/bindir/cloud-setup-databases.in | 18 +
setup/bindir/cloud-setup-encryption.in | 18 +
setup/bindir/cloud-sysvmadm.in | 18 +
setup/db/221to222upgrade.sh | 26 +-
setup/db/22beta4to22GA.sql | 29 +-
setup/db/create-database-premium.sql | 29 +-
setup/db/create-database.sql | 127 +-
setup/db/create-index-fk.sql | 185 +-
setup/db/create-schema-premium.sql | 29 +-
setup/db/create-schema-simulator.sql | 29 +-
setup/db/data-20to21.sql | 72 +-
setup/db/data-22beta1to22beta2.sql | 29 +-
setup/db/db/data-217to218.sql | 29 +-
setup/db/db/schema-20to21.sql | 397 ++--
setup/db/db/schema-217to218.sql | 32 +-
setup/db/db/schema-21to22-cleanup.sql | 29 +-
setup/db/db/schema-21to22-premium.sql | 157 +-
setup/db/db/schema-21to22.sql | 2033 ++++++++-------
setup/db/db/schema-2210to2211.sql | 29 +-
setup/db/db/schema-2211to2212-premium.sql | 119 +-
setup/db/db/schema-2211to2212.sql | 121 +-
setup/db/db/schema-2212to2213.sql | 161 +-
setup/db/db/schema-2213to2214.sql | 171 +-
setup/db/db/schema-2214to30-cleanup.sql | 28 +-
setup/db/db/schema-2214to30.sql | 31 +-
setup/db/db/schema-221to222-cleanup.sql | 29 +-
setup/db/db/schema-221to222-premium.sql | 47 +-
setup/db/db/schema-221to222.sql | 29 +-
setup/db/db/schema-222to224-cleanup.sql | 30 +-
setup/db/db/schema-222to224-premium.sql | 43 +-
setup/db/db/schema-222to224.sql | 387 ++--
setup/db/db/schema-224to225-cleanup.sql | 29 +-
setup/db/db/schema-224to225.sql | 29 +-
setup/db/db/schema-225to226.sql | 29 +-
setup/db/db/schema-227to228-premium.sql | 147 +-
setup/db/db/schema-227to228.sql | 331 ++--
setup/db/db/schema-228to229.sql | 187 +-
setup/db/db/schema-229to2210.sql | 157 +-
setup/db/db/schema-22beta1to22beta2.sql | 29 +-
setup/db/db/schema-22beta3to22beta4.sql | 29 +-
setup/db/db/schema-301to302-cleanup.sql | 29 +-
setup/db/db/schema-301to302.sql | 119 +-
setup/db/db/schema-302to303.sql | 355 ++--
setup/db/db/schema-30to301.sql | 67 +-
setup/db/db/schema-level.sql | 29 +-
setup/db/db/schema-snapshot-217to224.sql | 29 +-
setup/db/db/schema-snapshot-223to224.sql | 30 +-
setup/db/deploy-db-dev.sh | 26 +-
setup/db/deploy-db-simulator.sh | 26 +-
setup/db/index-20to21.sql | 115 +-
setup/db/index-212to213.sql | 30 +-
setup/db/postprocess-20to21.sql | 65 +-
setup/db/server-setup.sql | 29 +-
setup/db/templates.kvm.sql | 29 +-
setup/db/templates.simulator.sql | 30 +-
setup/db/templates.sql | 29 +-
setup/db/templates.vmware.sql | 195 +-
setup/db/templates.xenserver.sql | 29 +-
108 files changed, 3705 insertions(+), 3531 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/APIVersion.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/APIVersion.java b/deps/XenServerJava/com/xensource/xenapi/APIVersion.java
index 497b2d9..c003fbc 100644
--- a/deps/XenServerJava/com/xensource/xenapi/APIVersion.java
+++ b/deps/XenServerJava/com/xensource/xenapi/APIVersion.java
@@ -10,79 +10,74 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-package com.xensource.xenapi;
-
-public enum APIVersion
-{
- API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, UNKNOWN;
-
- public static APIVersion latest()
- {
- return API_1_7;
- }
-
- public static APIVersion fromMajorMinor(long major, long minor)
- {
- if (major == 1 && minor == 7)
- {
- return API_1_7;
- }
- else if (major == 1 && minor == 6)
- {
- return API_1_6;
- }
- else if (major == 1 && minor == 5)
- {
- return API_1_5;
- }
- else if (major == 1 && minor == 4)
- {
- return API_1_4;
- }
- else if (major == 1 && minor == 3)
- {
- return API_1_3;
- }
- else if (major == 1 && minor == 2)
- {
- return API_1_2;
- }
- else if (major == 1 && minor == 1)
- {
- return API_1_1;
- }
- else
- {
- return UNKNOWN;
- }
- }
-
- @Override
- public String toString()
- {
- switch (this)
- {
- case API_1_1:
- return "1.1";
- case API_1_2:
- return "1.2";
- case API_1_3:
- return "1.3";
- case API_1_4:
- return "1.4";
- case API_1_5:
- return "1.5";
- case API_1_6:
- return "1.6";
- case API_1_7:
- return "1.7";
- default:
- return "Unknown";
- }
- }
-}
+package com.xensource.xenapi;
+
+public enum APIVersion
+{
+ API_1_1, API_1_2, API_1_3, API_1_4, API_1_5, API_1_6, API_1_7, UNKNOWN;
+
+ public static APIVersion latest()
+ {
+ return API_1_7;
+ }
+
+ public static APIVersion fromMajorMinor(long major, long minor)
+ {
+ if (major == 1 && minor == 7)
+ {
+ return API_1_7;
+ }
+ else if (major == 1 && minor == 6)
+ {
+ return API_1_6;
+ }
+ else if (major == 1 && minor == 5)
+ {
+ return API_1_5;
+ }
+ else if (major == 1 && minor == 4)
+ {
+ return API_1_4;
+ }
+ else if (major == 1 && minor == 3)
+ {
+ return API_1_3;
+ }
+ else if (major == 1 && minor == 2)
+ {
+ return API_1_2;
+ }
+ else if (major == 1 && minor == 1)
+ {
+ return API_1_1;
+ }
+ else
+ {
+ return UNKNOWN;
+ }
+ }
+
+ @Override
+ public String toString()
+ {
+ switch (this)
+ {
+ case API_1_1:
+ return "1.1";
+ case API_1_2:
+ return "1.2";
+ case API_1_3:
+ return "1.3";
+ case API_1_4:
+ return "1.4";
+ case API_1_5:
+ return "1.5";
+ case API_1_6:
+ return "1.6";
+ case API_1_7:
+ return "1.7";
+ default:
+ return "Unknown";
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Auth.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Auth.java b/deps/XenServerJava/com/xensource/xenapi/Auth.java
index 4c4074e..142be36 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Auth.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Auth.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Blob.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Blob.java b/deps/XenServerJava/com/xensource/xenapi/Blob.java
index afb7c1c..9489d04 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Blob.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Blob.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Bond.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Bond.java b/deps/XenServerJava/com/xensource/xenapi/Bond.java
index 58ae9cc..171d8b1 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Bond.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Bond.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Connection.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Connection.java b/deps/XenServerJava/com/xensource/xenapi/Connection.java
index 7a5f8fe..c856a7a 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Connection.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Connection.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Console.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Console.java b/deps/XenServerJava/com/xensource/xenapi/Console.java
index 79bd8ae..04909e5 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Console.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Console.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Crashdump.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Crashdump.java b/deps/XenServerJava/com/xensource/xenapi/Crashdump.java
index 6d7b1df..8dab0ad 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Crashdump.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Crashdump.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/DataSource.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/DataSource.java b/deps/XenServerJava/com/xensource/xenapi/DataSource.java
index 015ab51..e623c10 100644
--- a/deps/XenServerJava/com/xensource/xenapi/DataSource.java
+++ b/deps/XenServerJava/com/xensource/xenapi/DataSource.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Event.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Event.java b/deps/XenServerJava/com/xensource/xenapi/Event.java
index 5ddf445..46e2d6c 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Event.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Event.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import java.io.PrintWriter;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Host.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Host.java b/deps/XenServerJava/com/xensource/xenapi/Host.java
index 374e080..a80af94 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Host.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Host.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/HostCpu.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/HostCpu.java b/deps/XenServerJava/com/xensource/xenapi/HostCpu.java
index cff81b8..f73b583 100644
--- a/deps/XenServerJava/com/xensource/xenapi/HostCpu.java
+++ b/deps/XenServerJava/com/xensource/xenapi/HostCpu.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/HostCrashdump.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/HostCrashdump.java b/deps/XenServerJava/com/xensource/xenapi/HostCrashdump.java
index 771f9dd..a465e4d 100644
--- a/deps/XenServerJava/com/xensource/xenapi/HostCrashdump.java
+++ b/deps/XenServerJava/com/xensource/xenapi/HostCrashdump.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/HostMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/HostMetrics.java b/deps/XenServerJava/com/xensource/xenapi/HostMetrics.java
index 04b2192..d7e447f 100644
--- a/deps/XenServerJava/com/xensource/xenapi/HostMetrics.java
+++ b/deps/XenServerJava/com/xensource/xenapi/HostMetrics.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/HostPatch.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/HostPatch.java b/deps/XenServerJava/com/xensource/xenapi/HostPatch.java
index c7a8eef..889a5c5 100644
--- a/deps/XenServerJava/com/xensource/xenapi/HostPatch.java
+++ b/deps/XenServerJava/com/xensource/xenapi/HostPatch.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Marshalling.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Marshalling.java b/deps/XenServerJava/com/xensource/xenapi/Marshalling.java
index f3b5ca7..e2ee9d6 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Marshalling.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Marshalling.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Message.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Message.java b/deps/XenServerJava/com/xensource/xenapi/Message.java
index 9f61464..927ca5c 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Message.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Message.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Network.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Network.java b/deps/XenServerJava/com/xensource/xenapi/Network.java
index 4400a51..a013c89 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Network.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Network.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/PBD.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/PBD.java b/deps/XenServerJava/com/xensource/xenapi/PBD.java
index 0c9dc78..af9e732 100644
--- a/deps/XenServerJava/com/xensource/xenapi/PBD.java
+++ b/deps/XenServerJava/com/xensource/xenapi/PBD.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/PIF.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/PIF.java b/deps/XenServerJava/com/xensource/xenapi/PIF.java
index 75276c7..e23e942 100644
--- a/deps/XenServerJava/com/xensource/xenapi/PIF.java
+++ b/deps/XenServerJava/com/xensource/xenapi/PIF.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/PIFMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/PIFMetrics.java b/deps/XenServerJava/com/xensource/xenapi/PIFMetrics.java
index 2a2c3dc..e3b9eca 100644
--- a/deps/XenServerJava/com/xensource/xenapi/PIFMetrics.java
+++ b/deps/XenServerJava/com/xensource/xenapi/PIFMetrics.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Pool.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Pool.java b/deps/XenServerJava/com/xensource/xenapi/Pool.java
index ed5f41c..1ace8bf 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Pool.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Pool.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/PoolPatch.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/PoolPatch.java b/deps/XenServerJava/com/xensource/xenapi/PoolPatch.java
index 0d20fe4..2d2649f 100644
--- a/deps/XenServerJava/com/xensource/xenapi/PoolPatch.java
+++ b/deps/XenServerJava/com/xensource/xenapi/PoolPatch.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Role.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Role.java b/deps/XenServerJava/com/xensource/xenapi/Role.java
index e550bde..e0ac9de 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Role.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Role.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/SM.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/SM.java b/deps/XenServerJava/com/xensource/xenapi/SM.java
index 66490ed..c138ac5 100644
--- a/deps/XenServerJava/com/xensource/xenapi/SM.java
+++ b/deps/XenServerJava/com/xensource/xenapi/SM.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/SR.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/SR.java b/deps/XenServerJava/com/xensource/xenapi/SR.java
index c57d33d..114a66a 100644
--- a/deps/XenServerJava/com/xensource/xenapi/SR.java
+++ b/deps/XenServerJava/com/xensource/xenapi/SR.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Secret.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Secret.java b/deps/XenServerJava/com/xensource/xenapi/Secret.java
index 114a723..9e692d6 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Secret.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Secret.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Session.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Session.java b/deps/XenServerJava/com/xensource/xenapi/Session.java
index bbbcd81..042ed1a 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Session.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Session.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Subject.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Subject.java b/deps/XenServerJava/com/xensource/xenapi/Subject.java
index d0d01c5..cbba9a4 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Subject.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Subject.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Task.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Task.java b/deps/XenServerJava/com/xensource/xenapi/Task.java
index 9d8ee6b..ee688c7 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Task.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Task.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Tunnel.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Tunnel.java b/deps/XenServerJava/com/xensource/xenapi/Tunnel.java
index ca4c8f4..660eafb 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Tunnel.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Tunnel.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/Types.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/Types.java b/deps/XenServerJava/com/xensource/xenapi/Types.java
index 263a748..2e9f699 100644
--- a/deps/XenServerJava/com/xensource/xenapi/Types.java
+++ b/deps/XenServerJava/com/xensource/xenapi/Types.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/User.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/User.java b/deps/XenServerJava/com/xensource/xenapi/User.java
index f439c87..0c107b9 100644
--- a/deps/XenServerJava/com/xensource/xenapi/User.java
+++ b/deps/XenServerJava/com/xensource/xenapi/User.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VBD.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VBD.java b/deps/XenServerJava/com/xensource/xenapi/VBD.java
index 7914561..d644688 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VBD.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VBD.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VBDMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VBDMetrics.java b/deps/XenServerJava/com/xensource/xenapi/VBDMetrics.java
index a5b4e22..245e488 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VBDMetrics.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VBDMetrics.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VDI.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VDI.java b/deps/XenServerJava/com/xensource/xenapi/VDI.java
index aea5b2e..99ab210 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VDI.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VDI.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VIF.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VIF.java b/deps/XenServerJava/com/xensource/xenapi/VIF.java
index ac025a1..25323de 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VIF.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VIF.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VIFMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VIFMetrics.java b/deps/XenServerJava/com/xensource/xenapi/VIFMetrics.java
index 10e5588..565747f 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VIFMetrics.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VIFMetrics.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VLAN.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VLAN.java b/deps/XenServerJava/com/xensource/xenapi/VLAN.java
index bbda876..5429077 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VLAN.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VLAN.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VM.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VM.java b/deps/XenServerJava/com/xensource/xenapi/VM.java
index 008431a..1b26d97 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VM.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VM.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VMGuestMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VMGuestMetrics.java b/deps/XenServerJava/com/xensource/xenapi/VMGuestMetrics.java
index c849871..12dd26a 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VMGuestMetrics.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VMGuestMetrics.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VMMetrics.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VMMetrics.java b/deps/XenServerJava/com/xensource/xenapi/VMMetrics.java
index 9e2c836..47634e9 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VMMetrics.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VMMetrics.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VMPP.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VMPP.java b/deps/XenServerJava/com/xensource/xenapi/VMPP.java
index 8732c8b..5df76ad 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VMPP.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VMPP.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/VTPM.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/VTPM.java b/deps/XenServerJava/com/xensource/xenapi/VTPM.java
index a993fe5..a443d51 100644
--- a/deps/XenServerJava/com/xensource/xenapi/VTPM.java
+++ b/deps/XenServerJava/com/xensource/xenapi/VTPM.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
import com.xensource.xenapi.Types.BadServerResponse;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/deps/XenServerJava/com/xensource/xenapi/XenAPIObject.java
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/com/xensource/xenapi/XenAPIObject.java b/deps/XenServerJava/com/xensource/xenapi/XenAPIObject.java
index f323f61..700e329 100644
--- a/deps/XenServerJava/com/xensource/xenapi/XenAPIObject.java
+++ b/deps/XenServerJava/com/xensource/xenapi/XenAPIObject.java
@@ -10,11 +10,6 @@
// limitations under the License.
//
// Automatically generated by addcopyright.py at 04/03/2012
- * follows:
- * Linking this library statically or dynamically with other modules is
- * making a combined work based on this library. Thus, the terms and
- * permission to link this library with independent modules to produce an
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
package com.xensource.xenapi;
public abstract class XenAPIObject
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/apidoc/XmlToHtmlConverter.java
----------------------------------------------------------------------
diff --git a/setup/apidoc/XmlToHtmlConverter.java b/setup/apidoc/XmlToHtmlConverter.java
index cf39bbd..8b7cfcc 100644
--- a/setup/apidoc/XmlToHtmlConverter.java
+++ b/setup/apidoc/XmlToHtmlConverter.java
@@ -1,16 +1,19 @@
-// 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
-// jdk1.4.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.
import javax.xml.transform.*;
import java.io.*;
public class XmlToHtmlConverter extends XmlToHtmlConverterData {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/apidoc/build-apidoc.sh
----------------------------------------------------------------------
diff --git a/setup/apidoc/build-apidoc.sh b/setup/apidoc/build-apidoc.sh
index 4e3752d..618273f 100644
--- a/setup/apidoc/build-apidoc.sh
+++ b/setup/apidoc/build-apidoc.sh
@@ -1,16 +1,20 @@
#!/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.
+# 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
#
-# Automatically generated by addcopyright.py at 04/03/2012
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
# cloud-build-api-doc.sh -- builds api documentation.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/apidoc/gen_toc.py
----------------------------------------------------------------------
diff --git a/setup/apidoc/gen_toc.py b/setup/apidoc/gen_toc.py
index 3775f9f..f7a34eb 100644
--- a/setup/apidoc/gen_toc.py
+++ b/setup/apidoc/gen_toc.py
@@ -1,16 +1,20 @@
#!/usr/bin/python
-# 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.
+# 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
#
-# Automatically generated by addcopyright.py at 04/03/2012
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
import os
import os.path
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/bindir/cloud-migrate-databases.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-migrate-databases.in b/setup/bindir/cloud-migrate-databases.in
index 114bb92..58a02d5 100644
--- a/setup/bindir/cloud-migrate-databases.in
+++ b/setup/bindir/cloud-migrate-databases.in
@@ -1,5 +1,23 @@
#!/usr/bin/env 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.
+
+
import os,logging,sys
from optparse import OptionParser
import MySQLdb
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/bindir/cloud-set-guest-password.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-set-guest-password.in b/setup/bindir/cloud-set-guest-password.in
index a3f80d2..97e6e3d 100755
--- a/setup/bindir/cloud-set-guest-password.in
+++ b/setup/bindir/cloud-set-guest-password.in
@@ -5,6 +5,24 @@
# chkconfig: 345 98 02
# description: Password Download Client
+# 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.
+
+
# Modify this line to specify the user (default is root)
user=root
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/bindir/cloud-set-guest-sshkey.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-set-guest-sshkey.in b/setup/bindir/cloud-set-guest-sshkey.in
index 2f19f1f..69124dc 100755
--- a/setup/bindir/cloud-set-guest-sshkey.in
+++ b/setup/bindir/cloud-set-guest-sshkey.in
@@ -5,6 +5,24 @@
# chkconfig: 345 98 02
# description: SSH Public Keys Download Client
+# 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.
+
+
# Modify this line to specify the user (default is root)
user=root
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/bindir/cloud-setup-databases.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index 62c7135..06d07d7 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -1,6 +1,24 @@
#!/usr/bin/python
# -*- coding: 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.
+
+
import os
import sys
import subprocess
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/bindir/cloud-setup-encryption.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in
index 009b694..f2de2ec 100755
--- a/setup/bindir/cloud-setup-encryption.in
+++ b/setup/bindir/cloud-setup-encryption.in
@@ -1,6 +1,24 @@
#!/usr/bin/python
# -*- coding: 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.
+
+
import os
import sys
import subprocess
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/bindir/cloud-sysvmadm.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-sysvmadm.in b/setup/bindir/cloud-sysvmadm.in
index 3bb9c2f..0a7b454 100755
--- a/setup/bindir/cloud-sysvmadm.in
+++ b/setup/bindir/cloud-sysvmadm.in
@@ -1,5 +1,23 @@
#!/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/rc.d/init.d/functions
#set -x
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/221to222upgrade.sh
----------------------------------------------------------------------
diff --git a/setup/db/221to222upgrade.sh b/setup/db/221to222upgrade.sh
index c82439f..8fb1e75 100644
--- a/setup/db/221to222upgrade.sh
+++ b/setup/db/221to222upgrade.sh
@@ -1,16 +1,20 @@
#!/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.
+# 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
#
-# Automatically generated by addcopyright.py at 04/03/2012
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/22beta4to22GA.sql
----------------------------------------------------------------------
diff --git a/setup/db/22beta4to22GA.sql b/setup/db/22beta4to22GA.sql
index 27f78de..913afb1 100644
--- a/setup/db/22beta4to22GA.sql
+++ b/setup/db/22beta4to22GA.sql
@@ -1,15 +1,20 @@
-# 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
+-- 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.
+
--step 1
-- drop all constraints for user_ip_address
ALTER TABLE firewall_rules DROP foreign key fk_firewall_rules__ip_address ;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/create-database-premium.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-database-premium.sql b/setup/db/create-database-premium.sql
index d214c44..18af181 100644
--- a/setup/db/create-database-premium.sql
+++ b/setup/db/create-database-premium.sql
@@ -1,15 +1,20 @@
-# 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
+-- 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 @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI';
DROP DATABASE IF EXISTS `cloud_usage`;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/create-database.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-database.sql b/setup/db/create-database.sql
index 41fcef8..51f5656 100644
--- a/setup/db/create-database.sql
+++ b/setup/db/create-database.sql
@@ -1,61 +1,66 @@
-# 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
-SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI';
-
-USE `mysql`;
-
-DROP PROCEDURE IF EXISTS `mysql`.`cloud_drop_user_if_exists` ;
-DELIMITER $$
-CREATE PROCEDURE `mysql`.`cloud_drop_user_if_exists`()
-BEGIN
- DECLARE foo BIGINT DEFAULT 0 ;
- SELECT COUNT(*)
- INTO foo
- FROM `mysql`.`user`
- WHERE `User` = 'cloud' and host = 'localhost';
-
- IF foo > 0 THEN
- DROP USER 'cloud'@'localhost' ;
- END IF;
-
- SELECT COUNT(*)
- INTO foo
- FROM `mysql`.`user`
- WHERE `User` = 'cloud' and host = '%';
-
- IF foo > 0 THEN
- DROP USER 'cloud'@'%' ;
- END IF;
-END $$
-DELIMITER ;
-
-CALL `mysql`.`cloud_drop_user_if_exists`() ;
-
-DROP PROCEDURE IF EXISTS `mysql`.`cloud_drop_users_if_exists` ;
-
-SET SQL_MODE=@OLD_SQL_MODE ;
-
-DROP DATABASE IF EXISTS `billing`;
-DROP DATABASE IF EXISTS `cloud`;
-
-CREATE DATABASE `cloud`;
-
-CREATE USER cloud identified by 'cloud';
-
-GRANT ALL ON cloud.* to cloud@`localhost` identified by 'cloud';
-GRANT ALL ON cloud.* to cloud@`%` identified by 'cloud';
-
-GRANT process ON *.* TO cloud@`localhost`;
-GRANT process ON *.* TO cloud@`%`;
-
-commit;
+-- 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 @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI';
+
+USE `mysql`;
+
+DROP PROCEDURE IF EXISTS `mysql`.`cloud_drop_user_if_exists` ;
+DELIMITER $$
+CREATE PROCEDURE `mysql`.`cloud_drop_user_if_exists`()
+BEGIN
+ DECLARE foo BIGINT DEFAULT 0 ;
+ SELECT COUNT(*)
+ INTO foo
+ FROM `mysql`.`user`
+ WHERE `User` = 'cloud' and host = 'localhost';
+
+ IF foo > 0 THEN
+ DROP USER 'cloud'@'localhost' ;
+ END IF;
+
+ SELECT COUNT(*)
+ INTO foo
+ FROM `mysql`.`user`
+ WHERE `User` = 'cloud' and host = '%';
+
+ IF foo > 0 THEN
+ DROP USER 'cloud'@'%' ;
+ END IF;
+END $$
+DELIMITER ;
+
+CALL `mysql`.`cloud_drop_user_if_exists`() ;
+
+DROP PROCEDURE IF EXISTS `mysql`.`cloud_drop_users_if_exists` ;
+
+SET SQL_MODE=@OLD_SQL_MODE ;
+
+DROP DATABASE IF EXISTS `billing`;
+DROP DATABASE IF EXISTS `cloud`;
+
+CREATE DATABASE `cloud`;
+
+CREATE USER cloud identified by 'cloud';
+
+GRANT ALL ON cloud.* to cloud@`localhost` identified by 'cloud';
+GRANT ALL ON cloud.* to cloud@`%` identified by 'cloud';
+
+GRANT process ON *.* TO cloud@`localhost`;
+GRANT process ON *.* TO cloud@`%`;
+
+commit;