http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/server-setup.sql
----------------------------------------------------------------------
diff --git a/setup/db/server-setup.sql b/setup/db/server-setup.sql
index ba5afff..2cbfc16 100644
--- a/setup/db/server-setup.sql
+++ b/setup/db/server-setup.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.
+
 /* This file specifies default values that go into the database, before the 
Management Server is run. */
 
 /* Root Domain */

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/templates.kvm.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.kvm.sql b/setup/db/templates.kvm.sql
index ec20e95..7b95027 100644
--- a/setup/db/templates.kvm.sql
+++ b/setup/db/templates.kvm.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.
+
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, display_text, enable_password, 
format, guest_os_id, featured, cross_zones)
     VALUES (1, 'routing', 'DomR Template', 0, now(), 'ext3', 0, 64, 1, 
'http://download.cloud.com/templates/builtin/a88232bf-6a18-38e7-aeee-c1702725079f.qcow2.bz2',
 'e39c55e93ae96bd43bfd588ca6ee3269', 'DomR Template', 0, 'QCOW2', 21, 0, 1);
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, display_text, enable_password, 
format, guest_os_id, featured, cross_zones)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/templates.simulator.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.simulator.sql b/setup/db/templates.simulator.sql
index a839a47..2a140a4 100755
--- a/setup/db/templates.simulator.sql
+++ b/setup/db/templates.simulator.sql
@@ -1,15 +1,21 @@
-# Copyright 2012 Citrix Systems, Inc. Licensed under the
-# Apache License, Version 2.0 (the "License"); you may not use this
-# file except in compliance with the License.  Citrix Systems, Inc.
-# reserves all rights not expressly granted by the License.
-# You may obtain a copy of the License at 
http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# 
-# 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.
+
+
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text, 
format, guest_os_id, featured, cross_zones, hypervisor_type)
     VALUES (1, 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://nfs1.lab.vmops.com/templates/routing/debian/latest/systemvm.vhd.bz2', 
'c33dfaf0937b35c25ef6a0fdd98f24d3', 0, 'SystemVM Template (XenServer)', 'VHD', 
15, 0, 1, 'XenServer');
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text,  
format, guest_os_id, featured, cross_zones, hypervisor_type)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 536d479..71f2b9d 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.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.
+
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text, 
format, guest_os_id, featured, cross_zones, hypervisor_type)
     VALUES (1, 'routing-1', 'SystemVM Template (XenServer)', 0, now(), 
'SYSTEM', 0, 64, 1, 
'http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2', 
'f613f38c96bf039f2e5cbf92fa8ad4f8', 0, 'SystemVM Template (XenServer)', 'VHD', 
15, 0, 1, 'XenServer');
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
removed, type, hvm, bits, account_id, url, checksum, enable_password, 
display_text,  format, guest_os_id, featured, cross_zones, hypervisor_type, 
extractable)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/templates.vmware.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.vmware.sql b/setup/db/templates.vmware.sql
index fd38704..02d7298 100644
--- a/setup/db/templates.vmware.sql
+++ b/setup/db/templates.vmware.sql
@@ -1,95 +1,100 @@
-# 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
-INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text,  
format, guest_os_id, featured, cross_zones)
-    VALUES (2, 'blank', 'BlankVM', 1, now(), 'ext3', 0, 32, 1, 
'http://nfs1.lab.vmops.com/templates/vmware/blankvm.tar.bz2', 
'3eff7ce3d25cf9433efde8b245c63fcb', 0, 'BlankVM', 'VMDK', 47, 1, 1);
-INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text,  
format, guest_os_id, featured, cross_zones)
-    VALUES (3, 'winxpsp3', 'WindowsXP-SP3', 1, now(), 'ntfs', 0, 32, 1, 
'http://nfs1.lab.vmops.com/templates/vmware/winxpsp3.tar.bz2', 
'385e67d17a2cb3795bd0b0fb7f88dc5e', 0, 'WindowsXP-SP3', 'VMDK', 16, 1, 1);
-
-INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (1, 'Windows');
-INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (2, 'Linux');
-INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (3, 'Novell 
Netware');
-INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (4, 'Solaris');
-INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (5, 'Other');
-
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(1, 1, 'Microsoft Windows 7(32-bit)', 'Microsoft Windows 7(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(2, 1, 'Microsoft Windows 7(64-bit)', 'Microsoft Windows 7(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(3, 1, 'Microsoft Windows Server 2008 R2(64-bit)', 'Microsoft Windows Server 
2008 R2(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(4, 1, 'Microsoft Windows Server 2008(32-bit)', 'Microsoft Windows Server 
2008(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(5, 1, 'Microsoft Windows Server 2008(64-bit)', 'Windows Windows Server 
2008(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(6, 1, 'Microsoft Windows Server 2003, Enterprise Edition (32-bit)', 'Microsoft 
Windows Server 2003, Enterprise Edition (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(7, 1, 'Microsoft Windows Server 2003, Enterprise Edition (64-bit)', 'Microsoft 
Windows Server 2003, Enterprise Edition (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(8, 1, 'Microsoft Windows Server 2003, Datacenter Edition (32-bit)', 'Microsoft 
Windows Server 2003, Datacenter Edition (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(9, 1, 'Microsoft Windows Server 2003, Datacenter Edition (64-bit)', 'Microsoft 
Windows Server 2003, Datacenter Edition (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(10, 1, 'Microsoft Windows Server 2003, Standard Edition (32-bit)', 'Microsoft 
Windows Server 2003, Standard Edition (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(11, 1, 'Microsoft Windows Server 2003, Standard Edition (64-bit)', 'Microsoft 
Windows Server 2003, Standard Edition (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(12, 1, 'Microsoft Windows Server 2003, Web Edition', 'Microsoft Windows Server 
2003, Web Edition');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(13, 1, 'Microsoft Small Bussiness Server 2003', 'Microsoft Small Bussiness 
Server 2003');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(14, 1, 'Microsoft Windows Vista (32-bit)', 'Microsoft Windows Vista (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(15, 1, 'Microsoft Windows Vista (64-bit)', 'Microsoft Windows Vista (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(16, 1, 'Microsoft Windows XP Professional (32-bit)', 'Microsoft Windows XP 
Professional (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(17, 1, 'Microsoft Windows XP Professional (64-bit)', 'Microsoft Windows XP 
Professional (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(18, 1, 'Microsoft Windows 2000 Advanced Server', 'Microsoft Windows 2000 
Advanced Server');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(19, 1, 'Microsoft Windows 2000 Server', 'Microsoft Windows 2000 Server');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(20, 1, 'Microsoft Windows 2000 Professional', 'Microsoft Windows 2000 
Professional');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(21, 1, 'Microsoft Windows 98', 'Microsoft Windows 98');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(22, 1, 'Microsoft Windows 95', 'Microsoft Windows 95');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(23, 1, 'Microsoft Windows NT 4', 'Microsoft Windows NT 4');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(24, 1, 'Microsoft Windows 3.1', 'Microsoft Windows 3.1');
-
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(25, 2, 'Red Hat Enterprise Linux 5(32-bit)', 'Red Hat Enterprise Linux 
5(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(26, 2, 'Red Hat Enterprise Linux 5(64-bit)', 'Red Hat Enterprise Linux 
5(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(27, 2, 'Red Hat Enterprise Linux 4(32-bit)', 'Red Hat Enterprise Linux 
4(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(28, 2, 'Red Hat Enterprise Linux 4(64-bit)', 'Red Hat Enterprise Linux 
4(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(29, 2, 'Red Hat Enterprise Linux 3(32-bit)', 'Red Hat Enterprise Linux 
3(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(30, 2, 'Red Hat Enterprise Linux 3(64-bit)', 'Red Hat Enterprise Linux 
3(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(31, 2, 'Red Hat Enterprise Linux 2', 'Red Hat Enterprise Linux 2');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(32, 2, 'Suse Linux Enterprise 11(32-bit)', 'Suse Linux Enterprise 11(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(33, 2, 'Suse Linux Enterprise 11(64-bit)', 'Suse Linux Enterprise 11(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(34, 2, 'Suse Linux Enterprise 10(32-bit)', 'Suse Linux Enterprise 10(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(35, 2, 'Suse Linux Enterprise 10(64-bit)', 'Suse Linux Enterprise 10(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(36, 2, 'Suse Linux Enterprise 8/9(32-bit)', 'Suse Linux Enterprise 
8/9(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(37, 2, 'Suse Linux Enterprise 8/9(64-bit)', 'Suse Linux Enterprise 
8/9(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(38, 2, 'Open Enterprise Server', 'Open Enterprise Server');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(39, 2, 'Asianux 3(32-bit)', 'Asianux 3(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(40, 2, 'Asianux 3(64-bit)', 'Asianux 3(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(41, 2, 'Debian GNU/Linux 5(32-bit)', 'Debian GNU/Linux 5(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(42, 2, 'Debian GNU/Linux 5(64-bit)', 'Debian GNU/Linux 5(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(43, 2, 'Debian GNU/Linux 4(32-bit)', 'Debian GNU/Linux 4(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(44, 2, 'Debian GNU/Linux 4(64-bit)', 'Debian GNU/Linux 4(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(45, 2, 'Ubuntu Linux (32-bit)', 'Ubuntu Linux (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(46, 2, 'Ubuntu Linux (64-bit)', 'Ubuntu Linux (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(47, 2, 'Other 2.6x Linux (32-bit)', 'Other 2.6x Linux (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(48, 2, 'Other 2.6x Linux (64-bit)', 'Other 2.6x Linux (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(49, 2, 'Other Linux (32-bit)', 'Other Linux (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(50, 2, 'Other Linux (64-bit)', 'Other Linux (64-bit)');
-
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(51, 3, 'Novell Netware 6.x', 'Novell Netware 6.x');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(52, 3, 'Novell Netware 5.1', 'Novell Netware 5.1');
-
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(53, 4, 'Sun Solaris 10(32-bit)', 'Sun Solaris 10(32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(54, 4, 'Sun Solaris 10(64-bit)', 'Sun Solaris 10(64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(55, 4, 'Sun Solaris 9(Experimental)', 'Sun Solaris 9(Experimental)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(56, 4, 'Sun Solaris 8(Experimental)', 'Sun Solaris 8(Experimental)');
-
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(57, 5, 'FreeBSD (32-bit)', 'FreeBSD (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(58, 5, 'FreeBSD (64-bit)', 'FreeBSD (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(59, 5, 'OS/2', 'OS/2');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(60, 5, 'SCO OpenServer 5', 'SCO OpenServer 5');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(61, 5, 'SCO UnixWare 7', 'SCO UnixWare 7');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(62, 5, 'DOS', 'DOS');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(63, 5, 'Other (32-bit)', 'Other (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(64, 5, 'Other (64-bit)', 'Other (64-bit)');
-
-
--- temporarily added for vmware, will be moved when vmware support is fully 
in-place
-INSERT INTO `cloud`.`host_master`(`type`, `service_address`, `admin`, 
`password`) VALUES('VSphere', 'vsphere-1.lab.vmops.com', 'Administrator', 
'Suite219');
+-- 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.
+
+INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text,  
format, guest_os_id, featured, cross_zones)
+    VALUES (2, 'blank', 'BlankVM', 1, now(), 'ext3', 0, 32, 1, 
'http://nfs1.lab.vmops.com/templates/vmware/blankvm.tar.bz2', 
'3eff7ce3d25cf9433efde8b245c63fcb', 0, 'BlankVM', 'VMDK', 47, 1, 1);
+INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text,  
format, guest_os_id, featured, cross_zones)
+    VALUES (3, 'winxpsp3', 'WindowsXP-SP3', 1, now(), 'ntfs', 0, 32, 1, 
'http://nfs1.lab.vmops.com/templates/vmware/winxpsp3.tar.bz2', 
'385e67d17a2cb3795bd0b0fb7f88dc5e', 0, 'WindowsXP-SP3', 'VMDK', 16, 1, 1);
+
+INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (1, 'Windows');
+INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (2, 'Linux');
+INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (3, 'Novell 
Netware');
+INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (4, 'Solaris');
+INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (5, 'Other');
+
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(1, 1, 'Microsoft Windows 7(32-bit)', 'Microsoft Windows 7(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(2, 1, 'Microsoft Windows 7(64-bit)', 'Microsoft Windows 7(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(3, 1, 'Microsoft Windows Server 2008 R2(64-bit)', 'Microsoft Windows Server 
2008 R2(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(4, 1, 'Microsoft Windows Server 2008(32-bit)', 'Microsoft Windows Server 
2008(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(5, 1, 'Microsoft Windows Server 2008(64-bit)', 'Windows Windows Server 
2008(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(6, 1, 'Microsoft Windows Server 2003, Enterprise Edition (32-bit)', 'Microsoft 
Windows Server 2003, Enterprise Edition (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(7, 1, 'Microsoft Windows Server 2003, Enterprise Edition (64-bit)', 'Microsoft 
Windows Server 2003, Enterprise Edition (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(8, 1, 'Microsoft Windows Server 2003, Datacenter Edition (32-bit)', 'Microsoft 
Windows Server 2003, Datacenter Edition (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(9, 1, 'Microsoft Windows Server 2003, Datacenter Edition (64-bit)', 'Microsoft 
Windows Server 2003, Datacenter Edition (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(10, 1, 'Microsoft Windows Server 2003, Standard Edition (32-bit)', 'Microsoft 
Windows Server 2003, Standard Edition (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(11, 1, 'Microsoft Windows Server 2003, Standard Edition (64-bit)', 'Microsoft 
Windows Server 2003, Standard Edition (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(12, 1, 'Microsoft Windows Server 2003, Web Edition', 'Microsoft Windows Server 
2003, Web Edition');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(13, 1, 'Microsoft Small Bussiness Server 2003', 'Microsoft Small Bussiness 
Server 2003');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(14, 1, 'Microsoft Windows Vista (32-bit)', 'Microsoft Windows Vista (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(15, 1, 'Microsoft Windows Vista (64-bit)', 'Microsoft Windows Vista (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(16, 1, 'Microsoft Windows XP Professional (32-bit)', 'Microsoft Windows XP 
Professional (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(17, 1, 'Microsoft Windows XP Professional (64-bit)', 'Microsoft Windows XP 
Professional (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(18, 1, 'Microsoft Windows 2000 Advanced Server', 'Microsoft Windows 2000 
Advanced Server');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(19, 1, 'Microsoft Windows 2000 Server', 'Microsoft Windows 2000 Server');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(20, 1, 'Microsoft Windows 2000 Professional', 'Microsoft Windows 2000 
Professional');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(21, 1, 'Microsoft Windows 98', 'Microsoft Windows 98');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(22, 1, 'Microsoft Windows 95', 'Microsoft Windows 95');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(23, 1, 'Microsoft Windows NT 4', 'Microsoft Windows NT 4');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(24, 1, 'Microsoft Windows 3.1', 'Microsoft Windows 3.1');
+
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(25, 2, 'Red Hat Enterprise Linux 5(32-bit)', 'Red Hat Enterprise Linux 
5(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(26, 2, 'Red Hat Enterprise Linux 5(64-bit)', 'Red Hat Enterprise Linux 
5(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(27, 2, 'Red Hat Enterprise Linux 4(32-bit)', 'Red Hat Enterprise Linux 
4(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(28, 2, 'Red Hat Enterprise Linux 4(64-bit)', 'Red Hat Enterprise Linux 
4(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(29, 2, 'Red Hat Enterprise Linux 3(32-bit)', 'Red Hat Enterprise Linux 
3(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(30, 2, 'Red Hat Enterprise Linux 3(64-bit)', 'Red Hat Enterprise Linux 
3(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(31, 2, 'Red Hat Enterprise Linux 2', 'Red Hat Enterprise Linux 2');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(32, 2, 'Suse Linux Enterprise 11(32-bit)', 'Suse Linux Enterprise 11(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(33, 2, 'Suse Linux Enterprise 11(64-bit)', 'Suse Linux Enterprise 11(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(34, 2, 'Suse Linux Enterprise 10(32-bit)', 'Suse Linux Enterprise 10(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(35, 2, 'Suse Linux Enterprise 10(64-bit)', 'Suse Linux Enterprise 10(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(36, 2, 'Suse Linux Enterprise 8/9(32-bit)', 'Suse Linux Enterprise 
8/9(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(37, 2, 'Suse Linux Enterprise 8/9(64-bit)', 'Suse Linux Enterprise 
8/9(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(38, 2, 'Open Enterprise Server', 'Open Enterprise Server');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(39, 2, 'Asianux 3(32-bit)', 'Asianux 3(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(40, 2, 'Asianux 3(64-bit)', 'Asianux 3(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(41, 2, 'Debian GNU/Linux 5(32-bit)', 'Debian GNU/Linux 5(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(42, 2, 'Debian GNU/Linux 5(64-bit)', 'Debian GNU/Linux 5(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(43, 2, 'Debian GNU/Linux 4(32-bit)', 'Debian GNU/Linux 4(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(44, 2, 'Debian GNU/Linux 4(64-bit)', 'Debian GNU/Linux 4(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(45, 2, 'Ubuntu Linux (32-bit)', 'Ubuntu Linux (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(46, 2, 'Ubuntu Linux (64-bit)', 'Ubuntu Linux (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(47, 2, 'Other 2.6x Linux (32-bit)', 'Other 2.6x Linux (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(48, 2, 'Other 2.6x Linux (64-bit)', 'Other 2.6x Linux (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(49, 2, 'Other Linux (32-bit)', 'Other Linux (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(50, 2, 'Other Linux (64-bit)', 'Other Linux (64-bit)');
+
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(51, 3, 'Novell Netware 6.x', 'Novell Netware 6.x');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(52, 3, 'Novell Netware 5.1', 'Novell Netware 5.1');
+
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(53, 4, 'Sun Solaris 10(32-bit)', 'Sun Solaris 10(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(54, 4, 'Sun Solaris 10(64-bit)', 'Sun Solaris 10(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(55, 4, 'Sun Solaris 9(Experimental)', 'Sun Solaris 9(Experimental)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(56, 4, 'Sun Solaris 8(Experimental)', 'Sun Solaris 8(Experimental)');
+
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(57, 5, 'FreeBSD (32-bit)', 'FreeBSD (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(58, 5, 'FreeBSD (64-bit)', 'FreeBSD (64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(59, 5, 'OS/2', 'OS/2');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(60, 5, 'SCO OpenServer 5', 'SCO OpenServer 5');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(61, 5, 'SCO UnixWare 7', 'SCO UnixWare 7');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(62, 5, 'DOS', 'DOS');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(63, 5, 'Other (32-bit)', 'Other (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES 
(64, 5, 'Other (64-bit)', 'Other (64-bit)');
+
+
+-- temporarily added for vmware, will be moved when vmware support is fully 
in-place
+INSERT INTO `cloud`.`host_master`(`type`, `service_address`, `admin`, 
`password`) VALUES('VSphere', 'vsphere-1.lab.vmops.com', 'Administrator', 
'Suite219');

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fc3ac862/setup/db/templates.xenserver.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.xenserver.sql b/setup/db/templates.xenserver.sql
index bcca7fb..c8b6d6d 100644
--- a/setup/db/templates.xenserver.sql
+++ b/setup/db/templates.xenserver.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.
+
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text, 
format, guest_os_id, featured, cross_zones)
     VALUES (1, 'routing', 'SystemVM Template', 0, now(), 'ext3', 0, 64, 1, 
'http://download.cloud.com/releases/2.2/systemvm.vhd.bz2', 
'bcc7f290f4c27ab4d0fe95d1012829ea', 0, 'SystemVM Template', 'VHD', 15, 0, 1);
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, 
type, hvm, bits, account_id, url, checksum, enable_password, display_text,  
format, guest_os_id, featured, cross_zones)

Reply via email to