diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d41673fb742a..761f7436dcc2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,7 +52,7 @@ repos: exclude: \.vhd$ #- id: fix-byte-order-marker - id: mixed-line-ending - files: \.(java|md|py|txt|yaml|yml)$ + exclude: \.(cs|xml)$ # - id: trailing-whitespace - repo: https://github.com/pycqa/flake8 rev: 6.1.0 diff --git a/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql b/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql index 1233f6209eb9..b475a8e99580 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-302to303.sql @@ -1,196 +1,196 @@ --- 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. - - -#Schema upgrade from 3.0.2 to 3.0.3; - -DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.cpu.mhz'; -DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.cpu.mhz'; -DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.ram.size'; -DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.ram.size'; -DELETE FROM `cloud`.`configuration` WHERE name='open.vswitch.vlan.network'; -DELETE FROM `cloud`.`configuration` WHERE name='open.vswitch.tunnel.network'; - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'consoleproxy.service.offering', NULL, 'Service offering used by console proxy; if NULL - system offering will be used'); - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'secstorage.service.offering', NULL, 'Service offering used by secondary storage; if NULL - system offering will be used'); - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'sdn.ovs.controller', NULL, 'Enable/Disable Open vSwitch SDN controller for L2-in-L3 overlay networks'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'sdn.ovs.controller.default.label', NULL, 'Default network label to be used when fetching interface for GRE endpoints'); - -ALTER TABLE `cloud`.`user_vm` ADD COLUMN `update_parameters` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Defines if the parameters need to be set for the vm'; -UPDATE `cloud`.`user_vm` SET update_parameters=0 where id>0; - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ha.tag', NULL, 'HA tag defining that the host marked with this tag can be used for HA purposes only'); - -# Changes for Upload Volume -CREATE TABLE `cloud`.`volume_host_ref` ( - `id` bigint unsigned NOT NULL auto_increment, - `host_id` bigint unsigned NOT NULL, - `volume_id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `created` DATETIME NOT NULL, - `last_updated` DATETIME, - `job_id` varchar(255), - `download_pct` int(10) unsigned, - `size` bigint unsigned, - `physical_size` bigint unsigned DEFAULT 0, - `download_state` varchar(255), - `checksum` varchar(255) COMMENT 'checksum for the data disk', - `error_str` varchar(255), - `local_path` varchar(255), - `install_path` varchar(255), - `url` varchar(255), - `format` varchar(32) NOT NULL COMMENT 'format for the volume', - `destroyed` tinyint(1) COMMENT 'indicates whether the volume_host entry was destroyed by the user or not', - PRIMARY KEY (`id`), - CONSTRAINT `fk_volume_host_ref__host_id` FOREIGN KEY `fk_volume_host_ref__host_id` (`host_id`) REFERENCES `host` (`id`) ON DELETE CASCADE, - INDEX `i_volume_host_ref__host_id`(`host_id`), - CONSTRAINT `fk_volume_host_ref__volume_id` FOREIGN KEY `fk_volume_host_ref__volume_id` (`volume_id`) REFERENCES `volumes` (`id`), - INDEX `i_volume_host_ref__volume_id`(`volume_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; - -INSERT IGNORE INTO `cloud`.`disk_offering` (name, display_text, customized, unique_name, disk_size, system_use, type) VALUES ( 'Custom', 'Custom Disk', 1, 'Cloud.com-Custom', 0, 0, 'Disk'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'management-server', 'storage.max.volume.upload.size', 500, 'The maximum size for a uploaded volume(in GB).'); -# Changes for OVS tunnel manager - -# The Following tables are not used anymore -DROP TABLE IF EXISTS `cloud`.`ovs_host_vlan_alloc`; -DROP TABLE IF EXISTS `cloud`.`ovs_tunnel`; -DROP TABLE IF EXISTS `cloud`.`ovs_tunnel_alloc`; -DROP TABLE IF EXISTS `cloud`.`ovs_vlan_mapping_dirty`; -DROP TABLE IF EXISTS `cloud`.`ovs_vm_flow_log`; -DROP TABLE IF EXISTS `cloud`.`ovs_work`; - -CREATE TABLE `cloud`.`ovs_tunnel_interface` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `ip` varchar(16) DEFAULT NULL, - `netmask` varchar(16) DEFAULT NULL, - `mac` varchar(18) DEFAULT NULL, - `host_id` bigint(20) DEFAULT NULL, - `label` varchar(45) DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`ovs_tunnel_network`( - `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT, - `from` bigint unsigned COMMENT 'from host id', - `to` bigint unsigned COMMENT 'to host id', - `network_id` bigint unsigned COMMENT 'network identifier', - `key` int unsigned COMMENT 'gre key', - `port_name` varchar(32) COMMENT 'in port on open vswitch', - `state` varchar(16) default 'FAILED' COMMENT 'result of tunnel creatation', - PRIMARY KEY(`from`, `to`, `network_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -INSERT INTO `cloud`.`ovs_tunnel_interface` (`ip`, `netmask`, `mac`, `host_id`, `label`) VALUES ('0', '0', '0', 0, 'lock'); - -INSERT INTO `cloud`.`ovs_tunnel_network` (`from`, `to`, `network_id`, `key`, `port_name`, `state`) VALUES (0, 0, 0, 0, 'lock', 'SUCCESS'); - -UPDATE `cloud`.`configuration` set component='NetworkManager' where name='external.network.stats.interval'; -UPDATE `cloud`.`configuration` set category='Advanced' where name='guest.domain.suffix'; -UPDATE `cloud`.`configuration` set component='NetworkManager' where name='network.guest.cidr.limit'; -UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.cpu.mhz'; -UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.ram.size'; -UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.stats.interval'; -UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.template.id'; -UPDATE `cloud`.`configuration` set category='Advanced' where name='capacity.skipcounting.hours'; -UPDATE `cloud`.`configuration` set category='Advanced' where name='use.local.storage'; -UPDATE `cloud`.`configuration` set description = 'Percentage (as a value between 0 and 1) of local storage utilization above which alerts will be sent about low local storage available.' where name = 'cluster.localStorage.capacity.notificationthreshold'; - -DELETE FROM `cloud`.`configuration` WHERE name='direct.agent.pool.size'; -DELETE FROM `cloud`.`configuration` WHERE name='xen.max.product.version'; -DELETE FROM `cloud`.`configuration` WHERE name='xen.max.version'; -DELETE FROM `cloud`.`configuration` WHERE name='xen.max.xapi.version'; -DELETE FROM `cloud`.`configuration` WHERE name='xen.min.product.version'; -DELETE FROM `cloud`.`configuration` WHERE name='xen.min.version'; -DELETE FROM `cloud`.`configuration` WHERE name='xen.min.xapi.version'; - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.ec2.api', 'false', 'enable EC2 API on CloudStack'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.s3.api', 'false', 'enable Amazon S3 API on CloudStack'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'vmware.use.nexus.vswitch', 'false', 'Enable/Disable Cisco Nexus 1000v vSwitch in VMware environment'); -ALTER TABLE `cloud`.`account` ADD COLUMN `default_zone_id` bigint unsigned; -ALTER TABLE `cloud`.`account` ADD CONSTRAINT `fk_account__default_zone_id` FOREIGN KEY `fk_account__default_zone_id`(`default_zone_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE; -ALTER TABLE `cloud_usage`.`account` ADD COLUMN `default_zone_id` bigint unsigned; - -DROP TABLE IF EXISTS `cloud`.`cluster_vsm_map`; -DROP TABLE IF EXISTS `cloud`.`virtual_supervisor_module`; -DROP TABLE IF EXISTS `cloud`.`port_profile`; - -CREATE TABLE `cloud`.`cluster_vsm_map` ( - `cluster_id` bigint unsigned NOT NULL, - `vsm_id` bigint unsigned NOT NULL, - PRIMARY KEY (`cluster_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`virtual_supervisor_module` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40), - `host_id` bigint NOT NULL, - `vsm_name` varchar(255), - `username` varchar(255) NOT NULL, - `password` varchar(255) NOT NULL, - `ipaddr` varchar(80) NOT NULL, - `management_vlan` int(32), - `control_vlan` int(32), - `packet_vlan` int(32), - `storage_vlan` int(32), - `vsm_domain_id` bigint unsigned, - `config_mode` varchar(20), - `config_state` varchar(20), - `vsm_device_state` varchar(20) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`port_profile` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40), - `port_profile_name` varchar(255), - `port_mode` varchar(10), - `vsm_id` bigint unsigned NOT NULL, - `trunk_low_vlan_id` int, - `trunk_high_vlan_id` int, - `access_vlan_id` int, - `port_type` varchar(20) NOT NULL, - `port_binding` varchar(20), - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -DELETE FROM `cloud`.`storage_pool_host_ref` WHERE pool_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL); - -ALTER TABLE `cloud`.`service_offering` MODIFY `nw_rate` smallint(5) unsigned DEFAULT '200' COMMENT 'network rate throttle mbits/s'; - - -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (141, 1, 'CentOS 5.6 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (142, 1, 'CentOS 5.6 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (143, 1, 'CentOS 6.0 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (144, 1, 'CentOS 6.0 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (145, 3, 'Oracle Enterprise Linux 5.6 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (146, 3, 'Oracle Enterprise Linux 5.6 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (147, 3, 'Oracle Enterprise Linux 6.0 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (148, 3, 'Oracle Enterprise Linux 6.0 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (149, 4, 'Red Hat Enterprise Linux 5.6 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (150, 4, 'Red Hat Enterprise Linux 5.6 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (151, 5, 'SUSE Linux Enterprise Server 10 SP3 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (152, 5, 'SUSE Linux Enterprise Server 10 SP4 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (153, 5, 'SUSE Linux Enterprise Server 10 SP4 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (154, 5, 'SUSE Linux Enterprise Server 11 SP1 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (155, 5, 'SUSE Linux Enterprise Server 11 SP1 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (156, 10, 'Ubuntu 10.10 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (157, 10, 'Ubuntu 10.10 (64-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (161, 1, 'CentOS 5.7 (32-bit)'); -INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (162, 1, 'CentOS 5.7 (64-bit)'); +-- 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. + + +#Schema upgrade from 3.0.2 to 3.0.3; + +DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.cpu.mhz'; +DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.cpu.mhz'; +DELETE FROM `cloud`.`configuration` WHERE name='consoleproxy.ram.size'; +DELETE FROM `cloud`.`configuration` WHERE name='secstorage.vm.ram.size'; +DELETE FROM `cloud`.`configuration` WHERE name='open.vswitch.vlan.network'; +DELETE FROM `cloud`.`configuration` WHERE name='open.vswitch.tunnel.network'; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'consoleproxy.service.offering', NULL, 'Service offering used by console proxy; if NULL - system offering will be used'); + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'secstorage.service.offering', NULL, 'Service offering used by secondary storage; if NULL - system offering will be used'); + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'sdn.ovs.controller', NULL, 'Enable/Disable Open vSwitch SDN controller for L2-in-L3 overlay networks'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'sdn.ovs.controller.default.label', NULL, 'Default network label to be used when fetching interface for GRE endpoints'); + +ALTER TABLE `cloud`.`user_vm` ADD COLUMN `update_parameters` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Defines if the parameters need to be set for the vm'; +UPDATE `cloud`.`user_vm` SET update_parameters=0 where id>0; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ha.tag', NULL, 'HA tag defining that the host marked with this tag can be used for HA purposes only'); + +# Changes for Upload Volume +CREATE TABLE `cloud`.`volume_host_ref` ( + `id` bigint unsigned NOT NULL auto_increment, + `host_id` bigint unsigned NOT NULL, + `volume_id` bigint unsigned NOT NULL, + `zone_id` bigint unsigned NOT NULL, + `created` DATETIME NOT NULL, + `last_updated` DATETIME, + `job_id` varchar(255), + `download_pct` int(10) unsigned, + `size` bigint unsigned, + `physical_size` bigint unsigned DEFAULT 0, + `download_state` varchar(255), + `checksum` varchar(255) COMMENT 'checksum for the data disk', + `error_str` varchar(255), + `local_path` varchar(255), + `install_path` varchar(255), + `url` varchar(255), + `format` varchar(32) NOT NULL COMMENT 'format for the volume', + `destroyed` tinyint(1) COMMENT 'indicates whether the volume_host entry was destroyed by the user or not', + PRIMARY KEY (`id`), + CONSTRAINT `fk_volume_host_ref__host_id` FOREIGN KEY `fk_volume_host_ref__host_id` (`host_id`) REFERENCES `host` (`id`) ON DELETE CASCADE, + INDEX `i_volume_host_ref__host_id`(`host_id`), + CONSTRAINT `fk_volume_host_ref__volume_id` FOREIGN KEY `fk_volume_host_ref__volume_id` (`volume_id`) REFERENCES `volumes` (`id`), + INDEX `i_volume_host_ref__volume_id`(`volume_id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; + +INSERT IGNORE INTO `cloud`.`disk_offering` (name, display_text, customized, unique_name, disk_size, system_use, type) VALUES ( 'Custom', 'Custom Disk', 1, 'Cloud.com-Custom', 0, 0, 'Disk'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Storage', 'DEFAULT', 'management-server', 'storage.max.volume.upload.size', 500, 'The maximum size for a uploaded volume(in GB).'); +# Changes for OVS tunnel manager + +# The Following tables are not used anymore +DROP TABLE IF EXISTS `cloud`.`ovs_host_vlan_alloc`; +DROP TABLE IF EXISTS `cloud`.`ovs_tunnel`; +DROP TABLE IF EXISTS `cloud`.`ovs_tunnel_alloc`; +DROP TABLE IF EXISTS `cloud`.`ovs_vlan_mapping_dirty`; +DROP TABLE IF EXISTS `cloud`.`ovs_vm_flow_log`; +DROP TABLE IF EXISTS `cloud`.`ovs_work`; + +CREATE TABLE `cloud`.`ovs_tunnel_interface` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `ip` varchar(16) DEFAULT NULL, + `netmask` varchar(16) DEFAULT NULL, + `mac` varchar(18) DEFAULT NULL, + `host_id` bigint(20) DEFAULT NULL, + `label` varchar(45) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`ovs_tunnel_network`( + `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT, + `from` bigint unsigned COMMENT 'from host id', + `to` bigint unsigned COMMENT 'to host id', + `network_id` bigint unsigned COMMENT 'network identifier', + `key` int unsigned COMMENT 'gre key', + `port_name` varchar(32) COMMENT 'in port on open vswitch', + `state` varchar(16) default 'FAILED' COMMENT 'result of tunnel creatation', + PRIMARY KEY(`from`, `to`, `network_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO `cloud`.`ovs_tunnel_interface` (`ip`, `netmask`, `mac`, `host_id`, `label`) VALUES ('0', '0', '0', 0, 'lock'); + +INSERT INTO `cloud`.`ovs_tunnel_network` (`from`, `to`, `network_id`, `key`, `port_name`, `state`) VALUES (0, 0, 0, 0, 'lock', 'SUCCESS'); + +UPDATE `cloud`.`configuration` set component='NetworkManager' where name='external.network.stats.interval'; +UPDATE `cloud`.`configuration` set category='Advanced' where name='guest.domain.suffix'; +UPDATE `cloud`.`configuration` set component='NetworkManager' where name='network.guest.cidr.limit'; +UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.cpu.mhz'; +UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.ram.size'; +UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.stats.interval'; +UPDATE `cloud`.`configuration` set component='NetworkManager' where name='router.template.id'; +UPDATE `cloud`.`configuration` set category='Advanced' where name='capacity.skipcounting.hours'; +UPDATE `cloud`.`configuration` set category='Advanced' where name='use.local.storage'; +UPDATE `cloud`.`configuration` set description = 'Percentage (as a value between 0 and 1) of local storage utilization above which alerts will be sent about low local storage available.' where name = 'cluster.localStorage.capacity.notificationthreshold'; + +DELETE FROM `cloud`.`configuration` WHERE name='direct.agent.pool.size'; +DELETE FROM `cloud`.`configuration` WHERE name='xen.max.product.version'; +DELETE FROM `cloud`.`configuration` WHERE name='xen.max.version'; +DELETE FROM `cloud`.`configuration` WHERE name='xen.max.xapi.version'; +DELETE FROM `cloud`.`configuration` WHERE name='xen.min.product.version'; +DELETE FROM `cloud`.`configuration` WHERE name='xen.min.version'; +DELETE FROM `cloud`.`configuration` WHERE name='xen.min.xapi.version'; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.ec2.api', 'false', 'enable EC2 API on CloudStack'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.s3.api', 'false', 'enable Amazon S3 API on CloudStack'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'vmware.use.nexus.vswitch', 'false', 'Enable/Disable Cisco Nexus 1000v vSwitch in VMware environment'); +ALTER TABLE `cloud`.`account` ADD COLUMN `default_zone_id` bigint unsigned; +ALTER TABLE `cloud`.`account` ADD CONSTRAINT `fk_account__default_zone_id` FOREIGN KEY `fk_account__default_zone_id`(`default_zone_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE; +ALTER TABLE `cloud_usage`.`account` ADD COLUMN `default_zone_id` bigint unsigned; + +DROP TABLE IF EXISTS `cloud`.`cluster_vsm_map`; +DROP TABLE IF EXISTS `cloud`.`virtual_supervisor_module`; +DROP TABLE IF EXISTS `cloud`.`port_profile`; + +CREATE TABLE `cloud`.`cluster_vsm_map` ( + `cluster_id` bigint unsigned NOT NULL, + `vsm_id` bigint unsigned NOT NULL, + PRIMARY KEY (`cluster_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`virtual_supervisor_module` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40), + `host_id` bigint NOT NULL, + `vsm_name` varchar(255), + `username` varchar(255) NOT NULL, + `password` varchar(255) NOT NULL, + `ipaddr` varchar(80) NOT NULL, + `management_vlan` int(32), + `control_vlan` int(32), + `packet_vlan` int(32), + `storage_vlan` int(32), + `vsm_domain_id` bigint unsigned, + `config_mode` varchar(20), + `config_state` varchar(20), + `vsm_device_state` varchar(20) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`port_profile` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40), + `port_profile_name` varchar(255), + `port_mode` varchar(10), + `vsm_id` bigint unsigned NOT NULL, + `trunk_low_vlan_id` int, + `trunk_high_vlan_id` int, + `access_vlan_id` int, + `port_type` varchar(20) NOT NULL, + `port_binding` varchar(20), + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +DELETE FROM `cloud`.`storage_pool_host_ref` WHERE pool_id IN (SELECT id FROM storage_pool WHERE removed IS NOT NULL); + +ALTER TABLE `cloud`.`service_offering` MODIFY `nw_rate` smallint(5) unsigned DEFAULT '200' COMMENT 'network rate throttle mbits/s'; + + +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (141, 1, 'CentOS 5.6 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (142, 1, 'CentOS 5.6 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (143, 1, 'CentOS 6.0 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (144, 1, 'CentOS 6.0 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (145, 3, 'Oracle Enterprise Linux 5.6 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (146, 3, 'Oracle Enterprise Linux 5.6 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (147, 3, 'Oracle Enterprise Linux 6.0 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (148, 3, 'Oracle Enterprise Linux 6.0 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (149, 4, 'Red Hat Enterprise Linux 5.6 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (150, 4, 'Red Hat Enterprise Linux 5.6 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (151, 5, 'SUSE Linux Enterprise Server 10 SP3 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (152, 5, 'SUSE Linux Enterprise Server 10 SP4 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (153, 5, 'SUSE Linux Enterprise Server 10 SP4 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (154, 5, 'SUSE Linux Enterprise Server 11 SP1 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (155, 5, 'SUSE Linux Enterprise Server 11 SP1 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (156, 10, 'Ubuntu 10.10 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (157, 10, 'Ubuntu 10.10 (64-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (161, 1, 'CentOS 5.7 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (162, 1, 'CentOS 5.7 (64-bit)'); diff --git a/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql b/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql index 58f45577f61a..dfeff3f683bd 100755 --- a/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-304to305.sql @@ -1,389 +1,389 @@ --- 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. - -#Schema upgrade from 3.0.4 to 3.0.5; - -CREATE TABLE `cloud`.`resource_tags` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40), - `key` varchar(255), - `value` varchar(255), - `resource_id` bigint unsigned NOT NULL, - `resource_uuid` varchar(40), - `resource_type` varchar(255), - `customer` varchar(255), - `domain_id` bigint unsigned NOT NULL COMMENT 'foreign key to domain id', - `account_id` bigint unsigned NOT NULL COMMENT 'owner of this network', - PRIMARY KEY (`id`), - CONSTRAINT `fk_tags__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`), - CONSTRAINT `fk_tags__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`), - UNIQUE `i_tags__resource_id__resource_type__key`(`resource_id`, `resource_type`, `key`), - CONSTRAINT `uc_resource_tags__uuid` UNIQUE (`uuid`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`vpc_offerings` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40) NOT NULL, - `unique_name` varchar(64) UNIQUE COMMENT 'unique name of the vpc offering', - `name` varchar(255) COMMENT 'vpc name', - `display_text` varchar(255) COMMENT 'display text', - `state` char(32) COMMENT 'state of the vpc offering that has Disabled value by default', - `default` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if vpc offering is default', - `removed` datetime COMMENT 'date removed if not null', - `created` datetime NOT NULL COMMENT 'date created', - `service_offering_id` bigint unsigned COMMENT 'service offering id that virtual router is tied to', - PRIMARY KEY (`id`), - INDEX `i_vpc__removed`(`removed`), - CONSTRAINT `fk_vpc_offerings__service_offering_id` FOREIGN KEY `fk_vpc_offerings__service_offering_id` (`service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`vpc_offering_service_map` ( - `id` bigint unsigned NOT NULL auto_increment, - `vpc_offering_id` bigint unsigned NOT NULL COMMENT 'vpc_offering_id', - `service` varchar(255) NOT NULL COMMENT 'service', - `provider` varchar(255) COMMENT 'service provider', - `created` datetime COMMENT 'date created', - PRIMARY KEY (`id`), - CONSTRAINT `fk_vpc_offering_service_map__vpc_offering_id` FOREIGN KEY(`vpc_offering_id`) REFERENCES `vpc_offerings`(`id`) ON DELETE CASCADE, - UNIQUE (`vpc_offering_id`, `service`, `provider`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`vpc` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40) NOT NULL, - `name` varchar(255) COMMENT 'vpc name', - `display_text` varchar(255) COMMENT 'vpc display text', - `cidr` varchar(18) COMMENT 'vpc cidr', - `vpc_offering_id` bigint unsigned NOT NULL COMMENT 'vpc offering id that this vpc is created from', - `zone_id` bigint unsigned NOT NULL COMMENT 'the id of the zone this Vpc belongs to', - `state` varchar(32) NOT NULL COMMENT 'state of the VP (can be Enabled and Disabled)', - `domain_id` bigint unsigned NOT NULL COMMENT 'domain the vpc belongs to', - `account_id` bigint unsigned NOT NULL COMMENT 'owner of this vpc', - `network_domain` varchar(255) COMMENT 'network domain', - `removed` datetime COMMENT 'date removed if not null', - `created` datetime NOT NULL COMMENT 'date created', - `restart_required` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if restart is required for the VPC', - PRIMARY KEY (`id`), - INDEX `i_vpc__removed`(`removed`), - CONSTRAINT `fk_vpc__zone_id` FOREIGN KEY `fk_vpc__zone_id` (`zone_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE, - CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`) REFERENCES `vpc_offerings`(`id`), - CONSTRAINT `fk_vpc__account_id` FOREIGN KEY `fk_vpc__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_vpc__domain_id` FOREIGN KEY `fk_vpc__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - -CREATE TABLE `cloud`.`router_network_ref` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', - `router_id` bigint unsigned NOT NULL COMMENT 'router id', - `network_id` bigint unsigned NOT NULL COMMENT 'network id', - `guest_type` char(32) COMMENT 'type of guest network that can be shared or isolated', - PRIMARY KEY (`id`), - CONSTRAINT `fk_router_network_ref__networks_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE, - UNIQUE `i_router_network_ref__router_id__network_id`(`router_id`, `network_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - -CREATE TABLE `cloud`.`vpc_gateways` ( - `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id', - `uuid` varchar(40), - `ip4_address` char(40) COMMENT 'ip4 address of the gateway', - `netmask` varchar(15) COMMENT 'netmask of the gateway', - `gateway` varchar(15) COMMENT 'gateway', - `vlan_tag` varchar(255), - `type` varchar(32) COMMENT 'type of gateway; can be Public/Private/Vpn', - `network_id` bigint unsigned NOT NULL COMMENT 'network id vpc gateway belongs to', - `vpc_id` bigint unsigned NOT NULL COMMENT 'id of the vpc the gateway belongs to', - `zone_id` bigint unsigned NOT NULL COMMENT 'id of the zone the gateway belongs to', - `created` datetime COMMENT 'date created', - `account_id` bigint unsigned NOT NULL COMMENT 'owner id', - `domain_id` bigint unsigned NOT NULL COMMENT 'domain id', - `state` varchar(32) NOT NULL COMMENT 'what state the vpc gateway in', - `removed` datetime COMMENT 'date removed if not null', - PRIMARY KEY (`id`), - CONSTRAINT `fk_vpc_gateways__network_id` FOREIGN KEY `fk_vpc_gateways__network_id`(`network_id`) REFERENCES `networks`(`id`), - CONSTRAINT `fk_vpc_gateways__vpc_id` FOREIGN KEY `fk_vpc_gateways__vpc_id`(`vpc_id`) REFERENCES `vpc`(`id`), - CONSTRAINT `fk_vpc_gateways__zone_id` FOREIGN KEY `fk_vpc_gateways__zone_id`(`zone_id`) REFERENCES `data_center`(`id`), - CONSTRAINT `fk_vpc_gateways__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_vpc_gateways__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_vpc_gateways__uuid` UNIQUE (`uuid`), - INDEX `i_vpc_gateways__removed`(`removed`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`private_ip_address` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key', - `ip_address` char(40) NOT NULL COMMENT 'ip address', - `network_id` bigint unsigned NOT NULL COMMENT 'id of the network ip belongs to', - `reservation_id` char(40) COMMENT 'reservation id', - `mac_address` varchar(17) COMMENT 'mac address', - `vpc_id` bigint unsigned COMMENT 'vpc this ip belongs to', - `taken` datetime COMMENT 'Date taken', - PRIMARY KEY (`id`), - CONSTRAINT `fk_private_ip_address__vpc_id` FOREIGN KEY `fk_private_ip_address__vpc_id`(`vpc_id`) REFERENCES `vpc`(`id`), - CONSTRAINT `fk_private_ip_address__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - -CREATE TABLE `cloud`.`static_routes` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40), - `vpc_gateway_id` bigint unsigned COMMENT 'id of the corresponding ip address', - `cidr` varchar(18) COMMENT 'cidr for the static route', - `state` char(32) NOT NULL COMMENT 'current state of this rule', - `vpc_id` bigint unsigned COMMENT 'vpc the firewall rule is associated with', - `account_id` bigint unsigned NOT NULL COMMENT 'owner id', - `domain_id` bigint unsigned NOT NULL COMMENT 'domain id', - `created` datetime COMMENT 'Date created', - PRIMARY KEY (`id`), - CONSTRAINT `fk_static_routes__vpc_gateway_id` FOREIGN KEY(`vpc_gateway_id`) REFERENCES `vpc_gateways`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_static_routes__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_static_routes__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_static_routes__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_static_routes__uuid` UNIQUE (`uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - - -ALTER TABLE `cloud`.`networks` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'vpc this network belongs to'; -ALTER TABLE `cloud`.`networks`ADD CONSTRAINT `fk_networks__vpc_id` FOREIGN KEY(`vpc_id`) REFERENCES `vpc`(`id`); - -ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'vpc the firewall rule is associated with'; -ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `traffic_type` char(32) COMMENT 'the type of the rule, can be Ingress or Egress'; -ALTER TABLE `cloud`.`firewall_rules` MODIFY `ip_address_id` bigint unsigned COMMENT 'id of the corresponding ip address'; -ALTER TABLE `cloud`.`firewall_rules` ADD CONSTRAINT `fk_firewall_rules__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc`(`id`) ON DELETE CASCADE; - - -ALTER TABLE `cloud`.`user_ip_address` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'vpc the ip address is associated with'; -ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc`(`id`) ON DELETE CASCADE; - -ALTER TABLE `cloud`.`domain_router` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'correlated virtual router vpc ID'; -ALTER TABLE `cloud`.`domain_router` ADD CONSTRAINT `fk_domain_router__vpc_id` FOREIGN KEY `fk_domain_router__vpc_id`(`vpc_id`) REFERENCES `vpc`(`id`); - - -ALTER TABLE `cloud`.`physical_network_service_providers` ADD COLUMN `networkacl_service_provided` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'Is Network ACL service provided'; - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vpc.cleanup.interval', '3600', 'The interval (in seconds) between cleanup for Inactive VPCs'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vpc.max.networks', '3', 'Maximum number of networks per vpc'); - - -CREATE TABLE `cloud`.`counter` ( - `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id', - `uuid` varchar(40), - `source` varchar(255) NOT NULL COMMENT 'source e.g. netscaler, snmp', - `name` varchar(255) NOT NULL COMMENT 'Counter name', - `value` varchar(255) NOT NULL COMMENT 'Value in case of source=snmp', - `removed` datetime COMMENT 'date removed if not null', - `created` datetime NOT NULL COMMENT 'date created', - PRIMARY KEY (`id`), - CONSTRAINT `uc_counter__uuid` UNIQUE (`uuid`), - INDEX `i_counter__removed`(`removed`), - INDEX `i_counter__source`(`source`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`conditions` ( - `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id', - `uuid` varchar(40), - `counter_id` bigint unsigned NOT NULL COMMENT 'Counter Id', - `threshold` bigint unsigned NOT NULL COMMENT 'threshold value for the given counter', - `relational_operator` char(2) COMMENT 'relational operator to be used upon the counter and condition', - `domain_id` bigint unsigned NOT NULL COMMENT 'domain the Condition belongs to', - `account_id` bigint unsigned NOT NULL COMMENT 'owner of this Condition', - `removed` datetime COMMENT 'date removed if not null', - `created` datetime NOT NULL COMMENT 'date created', - PRIMARY KEY (`id`), - CONSTRAINT `fk_conditions__counter_id` FOREIGN KEY `fk_condition__counter_id`(`counter_id`) REFERENCES `counter`(`id`), - CONSTRAINT `fk_conditions__account_id` FOREIGN KEY `fk_condition__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_conditions__domain_id` FOREIGN KEY `fk_condition__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_conditions__uuid` UNIQUE (`uuid`), - INDEX `i_conditions__removed`(`removed`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`autoscale_vmprofiles` ( - `id` bigint unsigned NOT NULL auto_increment, - `uuid` varchar(40), - `zone_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `autoscale_user_id` bigint unsigned NOT NULL, - `service_offering_id` bigint unsigned NOT NULL, - `template_id` bigint unsigned NOT NULL, - `other_deploy_params` varchar(1024) COMMENT 'other deployment parameters that is in addition to zoneid,serviceofferingid,domainid', - `destroy_vm_grace_period` int unsigned COMMENT 'the time allowed for existing connections to get closed before a vm is destroyed', - `counter_params` varchar(1024) COMMENT 'the parameters for the counter to be used to get metric information from VMs', - `created` datetime NOT NULL COMMENT 'date created', - `removed` datetime COMMENT 'date removed if not null', - PRIMARY KEY (`id`), - CONSTRAINT `fk_autoscale_vmprofiles__domain_id` FOREIGN KEY `fk_autoscale_vmprofiles__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_vmprofiles__account_id` FOREIGN KEY `fk_autoscale_vmprofiles__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_vmprofiles__autoscale_user_id` FOREIGN KEY `fk_autoscale_vmprofiles__autoscale_user_id` (`autoscale_user_id`) REFERENCES `user`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_autoscale_vmprofiles__uuid` UNIQUE (`uuid`), - INDEX `i_autoscale_vmprofiles__removed`(`removed`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`autoscale_policies` ( - `id` bigint unsigned NOT NULL auto_increment, - `uuid` varchar(40), - `domain_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `duration` int unsigned NOT NULL, - `quiet_time` int unsigned NOT NULL, - `action` varchar(15), - `created` datetime NOT NULL COMMENT 'date created', - `removed` datetime COMMENT 'date removed if not null', - PRIMARY KEY (`id`), - CONSTRAINT `fk_autoscale_policies__domain_id` FOREIGN KEY `fk_autoscale_policies__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_policies__account_id` FOREIGN KEY `fk_autoscale_policies__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_autoscale_policies__uuid` UNIQUE (`uuid`), - INDEX `i_autoscale_policies__removed`(`removed`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`autoscale_vmgroups` ( - `id` bigint unsigned NOT NULL auto_increment, - `uuid` varchar(40), - `zone_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `load_balancer_id` bigint unsigned NOT NULL, - `min_members` int unsigned DEFAULT 1, - `max_members` int unsigned NOT NULL, - `member_port` int unsigned NOT NULL, - `interval` int unsigned NOT NULL, - `profile_id` bigint unsigned NOT NULL, - `state` varchar(255) NOT NULL COMMENT 'enabled or disabled, a vmgroup is disabled to stop autoscaling activity', - `created` datetime NOT NULL COMMENT 'date created', - `removed` datetime COMMENT 'date removed if not null', - PRIMARY KEY (`id`), - CONSTRAINT `fk_autoscale_vmgroup__autoscale_vmprofile_id` FOREIGN KEY(`profile_id`) REFERENCES `autoscale_vmprofiles`(`id`), - CONSTRAINT `fk_autoscale_vmgroup__load_balancer_id` FOREIGN KEY(`load_balancer_id`) REFERENCES `load_balancing_rules`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_vmgroups__domain_id` FOREIGN KEY `fk_autoscale_vmgroups__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_vmgroups__account_id` FOREIGN KEY `fk_autoscale_vmgroups__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_vmgroups__zone_id` FOREIGN KEY `fk_autoscale_vmgroups__zone_id`(`zone_id`) REFERENCES `data_center`(`id`), - CONSTRAINT `uc_autoscale_vmgroups__uuid` UNIQUE (`uuid`), - INDEX `i_autoscale_vmgroups__removed`(`removed`), - INDEX `i_autoscale_vmgroups__load_balancer_id`(`load_balancer_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`autoscale_policy_condition_map` ( - `id` bigint unsigned NOT NULL auto_increment, - `policy_id` bigint unsigned NOT NULL, - `condition_id` bigint unsigned NOT NULL, - PRIMARY KEY (`id`), - CONSTRAINT `fk_autoscale_policy_condition_map__policy_id` FOREIGN KEY `fk_autoscale_policy_condition_map__policy_id` (`policy_id`) REFERENCES `autoscale_policies` (`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_policy_condition_map__condition_id` FOREIGN KEY `fk_autoscale_policy_condition_map__condition_id` (`condition_id`) REFERENCES `conditions` (`id`), - INDEX `i_autoscale_policy_condition_map__policy_id`(`policy_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`autoscale_vmgroup_policy_map` ( - `id` bigint unsigned NOT NULL auto_increment, - `vmgroup_id` bigint unsigned NOT NULL, - `policy_id` bigint unsigned NOT NULL, - PRIMARY KEY (`id`), - CONSTRAINT `fk_autoscale_vmgroup_policy_map__vmgroup_id` FOREIGN KEY `fk_autoscale_vmgroup_policy_map__vmgroup_id` (`vmgroup_id`) REFERENCES `autoscale_vmgroups` (`id`) ON DELETE CASCADE, - CONSTRAINT `fk_autoscale_vmgroup_policy_map__policy_id` FOREIGN KEY `fk_autoscale_vmgroup_policy_map__policy_id` (`policy_id`) REFERENCES `autoscale_policies` (`id`), - INDEX `i_autoscale_vmgroup_policy_map__vmgroup_id`(`vmgroup_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (1,'snmp','Linux User CPU - percentage', '1.3.6.1.4.1.2021.11.9.0', now()); -INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (2,'snmp','Linux System CPU - percentage', '1.3.6.1.4.1.2021.11.10.0', now()); -INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (3,'snmp','Linux CPU Idle - percentage', '1.3.6.1.4.1.2021.11.11.0', now()); -INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (100,'netscaler','Response Time - microseconds', 'RESPTIME', now()); - -CREATE TABLE `cloud`.`s2s_vpn_gateway` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40), - `addr_id` bigint unsigned NOT NULL, - `vpc_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `removed` datetime COMMENT 'date removed if not null', - PRIMARY KEY (`id`), - CONSTRAINT `fk_s2s_vpn_gateway__addr_id` FOREIGN KEY (`addr_id`) REFERENCES `user_ip_address` (`id`) ON DELETE CASCADE, - CONSTRAINT `fk_s2s_vpn_gateway__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc` (`id`) ON DELETE CASCADE, - CONSTRAINT `fk_s2s_vpn_gateway__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_s2s_vpn_gateway__domain_id` FOREIGN KEY (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_s2s_vpn_gateway__uuid` UNIQUE (`uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`s2s_customer_gateway` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40), - `name` varchar(255) NOT NULL, - `gateway_ip` char(40) NOT NULL, - `guest_cidr_list` varchar(200) NOT NULL, - `ipsec_psk` varchar(256), - `ike_policy` varchar(30) NOT NULL, - `esp_policy` varchar(30) NOT NULL, - `ike_lifetime` int NOT NULL DEFAULT 86400, - `esp_lifetime` int NOT NULL DEFAULT 3600, - `dpd` int(1) NOT NULL DEFAULT 0, - `domain_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `removed` datetime COMMENT 'date removed if not null', - PRIMARY KEY (`id`), - CONSTRAINT `fk_s2s_customer_gateway__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_s2s_customer_gateway__domain_id` FOREIGN KEY (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_s2s_customer_gateway__uuid` UNIQUE (`uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud`.`s2s_vpn_connection` ( - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', - `uuid` varchar(40), - `vpn_gateway_id` bigint unsigned NULL, - `customer_gateway_id` bigint unsigned NULL, - `state` varchar(32) NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `created` datetime NOT NULL COMMENT 'date created', - `removed` datetime COMMENT 'date removed if not null', - PRIMARY KEY (`id`), - CONSTRAINT `fk_s2s_vpn_connection__vpn_gateway_id` FOREIGN KEY (`vpn_gateway_id`) REFERENCES `s2s_vpn_gateway` (`id`) ON DELETE CASCADE, - CONSTRAINT `fk_s2s_vpn_connection__customer_gateway_id` FOREIGN KEY (`customer_gateway_id`) REFERENCES `s2s_customer_gateway` (`id`) ON DELETE CASCADE, - CONSTRAINT `fk_s2s_vpn_connection__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, - CONSTRAINT `fk_s2s_vpn_connection__domain_id` FOREIGN KEY (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, - CONSTRAINT `uc_s2s_vpn_connection__uuid` UNIQUE (`uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -ALTER TABLE `cloud`.`data_center` ADD COLUMN `is_local_storage_enabled` tinyint NOT NULL DEFAULT 0 COMMENT 'Is local storage offering enabled for this data center; 1: enabled, 0: not'; -UPDATE `cloud`.`data_center` SET `is_local_storage_enabled` = IF ((SELECT `value` FROM `cloud`.`configuration` WHERE `name`='use.local.storage')='true', 1, 0) WHERE `removed` IS NULL; -DELETE FROM `cloud`.`configuration` where name='use.local.storage'; - -ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `max_data_volumes_limit` int unsigned DEFAULT 6 COMMENT 'Max. data volumes per VM supported by hypervisor'; - -UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit`=13 WHERE `hypervisor_type`='XenServer' AND (`hypervisor_version`='6.0' OR `hypervisor_version`='6.0.2'); - -UPDATE `cloud`.`configuration` SET description='In second, timeout for creating volume from snapshot' WHERE name='create.volume.from.snapshot.wait'; - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.vpcs', '20', 'The default maximum number of vpcs that can be created for an account'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.vpcs', '20', 'The default maximum number of vpcs that can be created for a project'); - -UPDATE `cloud`.`configuration` SET category='Network' WHERE name='guest.domain.suffix'; -UPDATE `cloud`.`configuration` SET component='management-server' WHERE name='agent.lb.enabled'; -UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='backup.snapshot.wait'; -UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='copy.volume.wait'; -UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='create.volume.from.snapshot.wait'; -UPDATE `cloud`.`configuration` SET component='TemplateManager' WHERE name='primary.storage.download.wait'; -UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='storage.cleanup.enabled'; -UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='storage.cleanup.interval'; -UPDATE `cloud`.`configuration` SET description='Comma separated list of cidrs internal to the datacenter that can host template download servers, please note 0.0.0.0 is not a valid site ' WHERE name='secstorage.allowed.internal.sites'; - -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'site2site.vpn.vpngateway.connection.limit', '4', 'The maximum number of VPN connection per VPN gateway'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'site2site.vpn.customergateway.subnets.limit', '10', 'The maximum number of subnets per customer gateway'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.include.zones', 'EXTERNAL', 'Traffic going into specified list of zones is metered. For metering all traffic leave this parameter empty'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.exclude.zones', '', 'Traffic going into specified list of zones is not metered'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ha.workers', '5', 'Number of ha worker threads'); - -DROP TABLE IF EXISTS `cloud`.`ovs_tunnel_account`; -UPDATE `cloud`.`snapshots` set swift_id=null where swift_id=0; -DELETE FROM `cloud`.`host_details` where name in ('storage.network.device1', 'storage.network.device2'); +-- 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. + +#Schema upgrade from 3.0.4 to 3.0.5; + +CREATE TABLE `cloud`.`resource_tags` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40), + `key` varchar(255), + `value` varchar(255), + `resource_id` bigint unsigned NOT NULL, + `resource_uuid` varchar(40), + `resource_type` varchar(255), + `customer` varchar(255), + `domain_id` bigint unsigned NOT NULL COMMENT 'foreign key to domain id', + `account_id` bigint unsigned NOT NULL COMMENT 'owner of this network', + PRIMARY KEY (`id`), + CONSTRAINT `fk_tags__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`), + CONSTRAINT `fk_tags__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`), + UNIQUE `i_tags__resource_id__resource_type__key`(`resource_id`, `resource_type`, `key`), + CONSTRAINT `uc_resource_tags__uuid` UNIQUE (`uuid`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`vpc_offerings` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40) NOT NULL, + `unique_name` varchar(64) UNIQUE COMMENT 'unique name of the vpc offering', + `name` varchar(255) COMMENT 'vpc name', + `display_text` varchar(255) COMMENT 'display text', + `state` char(32) COMMENT 'state of the vpc offering that has Disabled value by default', + `default` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if vpc offering is default', + `removed` datetime COMMENT 'date removed if not null', + `created` datetime NOT NULL COMMENT 'date created', + `service_offering_id` bigint unsigned COMMENT 'service offering id that virtual router is tied to', + PRIMARY KEY (`id`), + INDEX `i_vpc__removed`(`removed`), + CONSTRAINT `fk_vpc_offerings__service_offering_id` FOREIGN KEY `fk_vpc_offerings__service_offering_id` (`service_offering_id`) REFERENCES `service_offering`(`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`vpc_offering_service_map` ( + `id` bigint unsigned NOT NULL auto_increment, + `vpc_offering_id` bigint unsigned NOT NULL COMMENT 'vpc_offering_id', + `service` varchar(255) NOT NULL COMMENT 'service', + `provider` varchar(255) COMMENT 'service provider', + `created` datetime COMMENT 'date created', + PRIMARY KEY (`id`), + CONSTRAINT `fk_vpc_offering_service_map__vpc_offering_id` FOREIGN KEY(`vpc_offering_id`) REFERENCES `vpc_offerings`(`id`) ON DELETE CASCADE, + UNIQUE (`vpc_offering_id`, `service`, `provider`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`vpc` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40) NOT NULL, + `name` varchar(255) COMMENT 'vpc name', + `display_text` varchar(255) COMMENT 'vpc display text', + `cidr` varchar(18) COMMENT 'vpc cidr', + `vpc_offering_id` bigint unsigned NOT NULL COMMENT 'vpc offering id that this vpc is created from', + `zone_id` bigint unsigned NOT NULL COMMENT 'the id of the zone this Vpc belongs to', + `state` varchar(32) NOT NULL COMMENT 'state of the VP (can be Enabled and Disabled)', + `domain_id` bigint unsigned NOT NULL COMMENT 'domain the vpc belongs to', + `account_id` bigint unsigned NOT NULL COMMENT 'owner of this vpc', + `network_domain` varchar(255) COMMENT 'network domain', + `removed` datetime COMMENT 'date removed if not null', + `created` datetime NOT NULL COMMENT 'date created', + `restart_required` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if restart is required for the VPC', + PRIMARY KEY (`id`), + INDEX `i_vpc__removed`(`removed`), + CONSTRAINT `fk_vpc__zone_id` FOREIGN KEY `fk_vpc__zone_id` (`zone_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_vpc__vpc_offering_id` FOREIGN KEY (`vpc_offering_id`) REFERENCES `vpc_offerings`(`id`), + CONSTRAINT `fk_vpc__account_id` FOREIGN KEY `fk_vpc__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_vpc__domain_id` FOREIGN KEY `fk_vpc__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +CREATE TABLE `cloud`.`router_network_ref` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `router_id` bigint unsigned NOT NULL COMMENT 'router id', + `network_id` bigint unsigned NOT NULL COMMENT 'network id', + `guest_type` char(32) COMMENT 'type of guest network that can be shared or isolated', + PRIMARY KEY (`id`), + CONSTRAINT `fk_router_network_ref__networks_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE, + UNIQUE `i_router_network_ref__router_id__network_id`(`router_id`, `network_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +CREATE TABLE `cloud`.`vpc_gateways` ( + `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id', + `uuid` varchar(40), + `ip4_address` char(40) COMMENT 'ip4 address of the gateway', + `netmask` varchar(15) COMMENT 'netmask of the gateway', + `gateway` varchar(15) COMMENT 'gateway', + `vlan_tag` varchar(255), + `type` varchar(32) COMMENT 'type of gateway; can be Public/Private/Vpn', + `network_id` bigint unsigned NOT NULL COMMENT 'network id vpc gateway belongs to', + `vpc_id` bigint unsigned NOT NULL COMMENT 'id of the vpc the gateway belongs to', + `zone_id` bigint unsigned NOT NULL COMMENT 'id of the zone the gateway belongs to', + `created` datetime COMMENT 'date created', + `account_id` bigint unsigned NOT NULL COMMENT 'owner id', + `domain_id` bigint unsigned NOT NULL COMMENT 'domain id', + `state` varchar(32) NOT NULL COMMENT 'what state the vpc gateway in', + `removed` datetime COMMENT 'date removed if not null', + PRIMARY KEY (`id`), + CONSTRAINT `fk_vpc_gateways__network_id` FOREIGN KEY `fk_vpc_gateways__network_id`(`network_id`) REFERENCES `networks`(`id`), + CONSTRAINT `fk_vpc_gateways__vpc_id` FOREIGN KEY `fk_vpc_gateways__vpc_id`(`vpc_id`) REFERENCES `vpc`(`id`), + CONSTRAINT `fk_vpc_gateways__zone_id` FOREIGN KEY `fk_vpc_gateways__zone_id`(`zone_id`) REFERENCES `data_center`(`id`), + CONSTRAINT `fk_vpc_gateways__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_vpc_gateways__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_vpc_gateways__uuid` UNIQUE (`uuid`), + INDEX `i_vpc_gateways__removed`(`removed`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`private_ip_address` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'primary key', + `ip_address` char(40) NOT NULL COMMENT 'ip address', + `network_id` bigint unsigned NOT NULL COMMENT 'id of the network ip belongs to', + `reservation_id` char(40) COMMENT 'reservation id', + `mac_address` varchar(17) COMMENT 'mac address', + `vpc_id` bigint unsigned COMMENT 'vpc this ip belongs to', + `taken` datetime COMMENT 'Date taken', + PRIMARY KEY (`id`), + CONSTRAINT `fk_private_ip_address__vpc_id` FOREIGN KEY `fk_private_ip_address__vpc_id`(`vpc_id`) REFERENCES `vpc`(`id`), + CONSTRAINT `fk_private_ip_address__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks` (`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +CREATE TABLE `cloud`.`static_routes` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40), + `vpc_gateway_id` bigint unsigned COMMENT 'id of the corresponding ip address', + `cidr` varchar(18) COMMENT 'cidr for the static route', + `state` char(32) NOT NULL COMMENT 'current state of this rule', + `vpc_id` bigint unsigned COMMENT 'vpc the firewall rule is associated with', + `account_id` bigint unsigned NOT NULL COMMENT 'owner id', + `domain_id` bigint unsigned NOT NULL COMMENT 'domain id', + `created` datetime COMMENT 'Date created', + PRIMARY KEY (`id`), + CONSTRAINT `fk_static_routes__vpc_gateway_id` FOREIGN KEY(`vpc_gateway_id`) REFERENCES `vpc_gateways`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_static_routes__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_static_routes__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_static_routes__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_static_routes__uuid` UNIQUE (`uuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +ALTER TABLE `cloud`.`networks` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'vpc this network belongs to'; +ALTER TABLE `cloud`.`networks`ADD CONSTRAINT `fk_networks__vpc_id` FOREIGN KEY(`vpc_id`) REFERENCES `vpc`(`id`); + +ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'vpc the firewall rule is associated with'; +ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `traffic_type` char(32) COMMENT 'the type of the rule, can be Ingress or Egress'; +ALTER TABLE `cloud`.`firewall_rules` MODIFY `ip_address_id` bigint unsigned COMMENT 'id of the corresponding ip address'; +ALTER TABLE `cloud`.`firewall_rules` ADD CONSTRAINT `fk_firewall_rules__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc`(`id`) ON DELETE CASCADE; + + +ALTER TABLE `cloud`.`user_ip_address` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'vpc the ip address is associated with'; +ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc`(`id`) ON DELETE CASCADE; + +ALTER TABLE `cloud`.`domain_router` ADD COLUMN `vpc_id` bigint unsigned COMMENT 'correlated virtual router vpc ID'; +ALTER TABLE `cloud`.`domain_router` ADD CONSTRAINT `fk_domain_router__vpc_id` FOREIGN KEY `fk_domain_router__vpc_id`(`vpc_id`) REFERENCES `vpc`(`id`); + + +ALTER TABLE `cloud`.`physical_network_service_providers` ADD COLUMN `networkacl_service_provided` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'Is Network ACL service provided'; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vpc.cleanup.interval', '3600', 'The interval (in seconds) between cleanup for Inactive VPCs'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vpc.max.networks', '3', 'Maximum number of networks per vpc'); + + +CREATE TABLE `cloud`.`counter` ( + `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id', + `uuid` varchar(40), + `source` varchar(255) NOT NULL COMMENT 'source e.g. netscaler, snmp', + `name` varchar(255) NOT NULL COMMENT 'Counter name', + `value` varchar(255) NOT NULL COMMENT 'Value in case of source=snmp', + `removed` datetime COMMENT 'date removed if not null', + `created` datetime NOT NULL COMMENT 'date created', + PRIMARY KEY (`id`), + CONSTRAINT `uc_counter__uuid` UNIQUE (`uuid`), + INDEX `i_counter__removed`(`removed`), + INDEX `i_counter__source`(`source`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`conditions` ( + `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id', + `uuid` varchar(40), + `counter_id` bigint unsigned NOT NULL COMMENT 'Counter Id', + `threshold` bigint unsigned NOT NULL COMMENT 'threshold value for the given counter', + `relational_operator` char(2) COMMENT 'relational operator to be used upon the counter and condition', + `domain_id` bigint unsigned NOT NULL COMMENT 'domain the Condition belongs to', + `account_id` bigint unsigned NOT NULL COMMENT 'owner of this Condition', + `removed` datetime COMMENT 'date removed if not null', + `created` datetime NOT NULL COMMENT 'date created', + PRIMARY KEY (`id`), + CONSTRAINT `fk_conditions__counter_id` FOREIGN KEY `fk_condition__counter_id`(`counter_id`) REFERENCES `counter`(`id`), + CONSTRAINT `fk_conditions__account_id` FOREIGN KEY `fk_condition__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_conditions__domain_id` FOREIGN KEY `fk_condition__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_conditions__uuid` UNIQUE (`uuid`), + INDEX `i_conditions__removed`(`removed`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`autoscale_vmprofiles` ( + `id` bigint unsigned NOT NULL auto_increment, + `uuid` varchar(40), + `zone_id` bigint unsigned NOT NULL, + `domain_id` bigint unsigned NOT NULL, + `account_id` bigint unsigned NOT NULL, + `autoscale_user_id` bigint unsigned NOT NULL, + `service_offering_id` bigint unsigned NOT NULL, + `template_id` bigint unsigned NOT NULL, + `other_deploy_params` varchar(1024) COMMENT 'other deployment parameters that is in addition to zoneid,serviceofferingid,domainid', + `destroy_vm_grace_period` int unsigned COMMENT 'the time allowed for existing connections to get closed before a vm is destroyed', + `counter_params` varchar(1024) COMMENT 'the parameters for the counter to be used to get metric information from VMs', + `created` datetime NOT NULL COMMENT 'date created', + `removed` datetime COMMENT 'date removed if not null', + PRIMARY KEY (`id`), + CONSTRAINT `fk_autoscale_vmprofiles__domain_id` FOREIGN KEY `fk_autoscale_vmprofiles__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_vmprofiles__account_id` FOREIGN KEY `fk_autoscale_vmprofiles__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_vmprofiles__autoscale_user_id` FOREIGN KEY `fk_autoscale_vmprofiles__autoscale_user_id` (`autoscale_user_id`) REFERENCES `user`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_autoscale_vmprofiles__uuid` UNIQUE (`uuid`), + INDEX `i_autoscale_vmprofiles__removed`(`removed`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`autoscale_policies` ( + `id` bigint unsigned NOT NULL auto_increment, + `uuid` varchar(40), + `domain_id` bigint unsigned NOT NULL, + `account_id` bigint unsigned NOT NULL, + `duration` int unsigned NOT NULL, + `quiet_time` int unsigned NOT NULL, + `action` varchar(15), + `created` datetime NOT NULL COMMENT 'date created', + `removed` datetime COMMENT 'date removed if not null', + PRIMARY KEY (`id`), + CONSTRAINT `fk_autoscale_policies__domain_id` FOREIGN KEY `fk_autoscale_policies__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_policies__account_id` FOREIGN KEY `fk_autoscale_policies__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_autoscale_policies__uuid` UNIQUE (`uuid`), + INDEX `i_autoscale_policies__removed`(`removed`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`autoscale_vmgroups` ( + `id` bigint unsigned NOT NULL auto_increment, + `uuid` varchar(40), + `zone_id` bigint unsigned NOT NULL, + `domain_id` bigint unsigned NOT NULL, + `account_id` bigint unsigned NOT NULL, + `load_balancer_id` bigint unsigned NOT NULL, + `min_members` int unsigned DEFAULT 1, + `max_members` int unsigned NOT NULL, + `member_port` int unsigned NOT NULL, + `interval` int unsigned NOT NULL, + `profile_id` bigint unsigned NOT NULL, + `state` varchar(255) NOT NULL COMMENT 'enabled or disabled, a vmgroup is disabled to stop autoscaling activity', + `created` datetime NOT NULL COMMENT 'date created', + `removed` datetime COMMENT 'date removed if not null', + PRIMARY KEY (`id`), + CONSTRAINT `fk_autoscale_vmgroup__autoscale_vmprofile_id` FOREIGN KEY(`profile_id`) REFERENCES `autoscale_vmprofiles`(`id`), + CONSTRAINT `fk_autoscale_vmgroup__load_balancer_id` FOREIGN KEY(`load_balancer_id`) REFERENCES `load_balancing_rules`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_vmgroups__domain_id` FOREIGN KEY `fk_autoscale_vmgroups__domain_id` (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_vmgroups__account_id` FOREIGN KEY `fk_autoscale_vmgroups__account_id` (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_vmgroups__zone_id` FOREIGN KEY `fk_autoscale_vmgroups__zone_id`(`zone_id`) REFERENCES `data_center`(`id`), + CONSTRAINT `uc_autoscale_vmgroups__uuid` UNIQUE (`uuid`), + INDEX `i_autoscale_vmgroups__removed`(`removed`), + INDEX `i_autoscale_vmgroups__load_balancer_id`(`load_balancer_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`autoscale_policy_condition_map` ( + `id` bigint unsigned NOT NULL auto_increment, + `policy_id` bigint unsigned NOT NULL, + `condition_id` bigint unsigned NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `fk_autoscale_policy_condition_map__policy_id` FOREIGN KEY `fk_autoscale_policy_condition_map__policy_id` (`policy_id`) REFERENCES `autoscale_policies` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_policy_condition_map__condition_id` FOREIGN KEY `fk_autoscale_policy_condition_map__condition_id` (`condition_id`) REFERENCES `conditions` (`id`), + INDEX `i_autoscale_policy_condition_map__policy_id`(`policy_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`autoscale_vmgroup_policy_map` ( + `id` bigint unsigned NOT NULL auto_increment, + `vmgroup_id` bigint unsigned NOT NULL, + `policy_id` bigint unsigned NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `fk_autoscale_vmgroup_policy_map__vmgroup_id` FOREIGN KEY `fk_autoscale_vmgroup_policy_map__vmgroup_id` (`vmgroup_id`) REFERENCES `autoscale_vmgroups` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_autoscale_vmgroup_policy_map__policy_id` FOREIGN KEY `fk_autoscale_vmgroup_policy_map__policy_id` (`policy_id`) REFERENCES `autoscale_policies` (`id`), + INDEX `i_autoscale_vmgroup_policy_map__vmgroup_id`(`vmgroup_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (1,'snmp','Linux User CPU - percentage', '1.3.6.1.4.1.2021.11.9.0', now()); +INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (2,'snmp','Linux System CPU - percentage', '1.3.6.1.4.1.2021.11.10.0', now()); +INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (3,'snmp','Linux CPU Idle - percentage', '1.3.6.1.4.1.2021.11.11.0', now()); +INSERT INTO `cloud`.`counter` (id, source, name, value,created) VALUES (100,'netscaler','Response Time - microseconds', 'RESPTIME', now()); + +CREATE TABLE `cloud`.`s2s_vpn_gateway` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40), + `addr_id` bigint unsigned NOT NULL, + `vpc_id` bigint unsigned NOT NULL, + `domain_id` bigint unsigned NOT NULL, + `account_id` bigint unsigned NOT NULL, + `removed` datetime COMMENT 'date removed if not null', + PRIMARY KEY (`id`), + CONSTRAINT `fk_s2s_vpn_gateway__addr_id` FOREIGN KEY (`addr_id`) REFERENCES `user_ip_address` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_s2s_vpn_gateway__vpc_id` FOREIGN KEY (`vpc_id`) REFERENCES `vpc` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_s2s_vpn_gateway__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_s2s_vpn_gateway__domain_id` FOREIGN KEY (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_s2s_vpn_gateway__uuid` UNIQUE (`uuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`s2s_customer_gateway` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40), + `name` varchar(255) NOT NULL, + `gateway_ip` char(40) NOT NULL, + `guest_cidr_list` varchar(200) NOT NULL, + `ipsec_psk` varchar(256), + `ike_policy` varchar(30) NOT NULL, + `esp_policy` varchar(30) NOT NULL, + `ike_lifetime` int NOT NULL DEFAULT 86400, + `esp_lifetime` int NOT NULL DEFAULT 3600, + `dpd` int(1) NOT NULL DEFAULT 0, + `domain_id` bigint unsigned NOT NULL, + `account_id` bigint unsigned NOT NULL, + `removed` datetime COMMENT 'date removed if not null', + PRIMARY KEY (`id`), + CONSTRAINT `fk_s2s_customer_gateway__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_s2s_customer_gateway__domain_id` FOREIGN KEY (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_s2s_customer_gateway__uuid` UNIQUE (`uuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`s2s_vpn_connection` ( + `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', + `uuid` varchar(40), + `vpn_gateway_id` bigint unsigned NULL, + `customer_gateway_id` bigint unsigned NULL, + `state` varchar(32) NOT NULL, + `domain_id` bigint unsigned NOT NULL, + `account_id` bigint unsigned NOT NULL, + `created` datetime NOT NULL COMMENT 'date created', + `removed` datetime COMMENT 'date removed if not null', + PRIMARY KEY (`id`), + CONSTRAINT `fk_s2s_vpn_connection__vpn_gateway_id` FOREIGN KEY (`vpn_gateway_id`) REFERENCES `s2s_vpn_gateway` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_s2s_vpn_connection__customer_gateway_id` FOREIGN KEY (`customer_gateway_id`) REFERENCES `s2s_customer_gateway` (`id`) ON DELETE CASCADE, + CONSTRAINT `fk_s2s_vpn_connection__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_s2s_vpn_connection__domain_id` FOREIGN KEY (`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE, + CONSTRAINT `uc_s2s_vpn_connection__uuid` UNIQUE (`uuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +ALTER TABLE `cloud`.`data_center` ADD COLUMN `is_local_storage_enabled` tinyint NOT NULL DEFAULT 0 COMMENT 'Is local storage offering enabled for this data center; 1: enabled, 0: not'; +UPDATE `cloud`.`data_center` SET `is_local_storage_enabled` = IF ((SELECT `value` FROM `cloud`.`configuration` WHERE `name`='use.local.storage')='true', 1, 0) WHERE `removed` IS NULL; +DELETE FROM `cloud`.`configuration` where name='use.local.storage'; + +ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `max_data_volumes_limit` int unsigned DEFAULT 6 COMMENT 'Max. data volumes per VM supported by hypervisor'; + +UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit`=13 WHERE `hypervisor_type`='XenServer' AND (`hypervisor_version`='6.0' OR `hypervisor_version`='6.0.2'); + +UPDATE `cloud`.`configuration` SET description='In second, timeout for creating volume from snapshot' WHERE name='create.volume.from.snapshot.wait'; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.vpcs', '20', 'The default maximum number of vpcs that can be created for an account'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.vpcs', '20', 'The default maximum number of vpcs that can be created for a project'); + +UPDATE `cloud`.`configuration` SET category='Network' WHERE name='guest.domain.suffix'; +UPDATE `cloud`.`configuration` SET component='management-server' WHERE name='agent.lb.enabled'; +UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='backup.snapshot.wait'; +UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='copy.volume.wait'; +UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='create.volume.from.snapshot.wait'; +UPDATE `cloud`.`configuration` SET component='TemplateManager' WHERE name='primary.storage.download.wait'; +UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='storage.cleanup.enabled'; +UPDATE `cloud`.`configuration` SET component='StorageManager' WHERE name='storage.cleanup.interval'; +UPDATE `cloud`.`configuration` SET description='Comma separated list of cidrs internal to the datacenter that can host template download servers, please note 0.0.0.0 is not a valid site ' WHERE name='secstorage.allowed.internal.sites'; + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'site2site.vpn.vpngateway.connection.limit', '4', 'The maximum number of VPN connection per VPN gateway'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'site2site.vpn.customergateway.subnets.limit', '10', 'The maximum number of subnets per customer gateway'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.include.zones', 'EXTERNAL', 'Traffic going into specified list of zones is metered. For metering all traffic leave this parameter empty'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.exclude.zones', '', 'Traffic going into specified list of zones is not metered'); +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'ha.workers', '5', 'Number of ha worker threads'); + +DROP TABLE IF EXISTS `cloud`.`ovs_tunnel_account`; +UPDATE `cloud`.`snapshots` set swift_id=null where swift_id=0; +DELETE FROM `cloud`.`host_details` where name in ('storage.network.device1', 'storage.network.device2'); diff --git a/engine/service/src/main/webapp/index.jsp b/engine/service/src/main/webapp/index.jsp index 6b26cc21c4de..faa0ca071392 100644 --- a/engine/service/src/main/webapp/index.jsp +++ b/engine/service/src/main/webapp/index.jsp @@ -1,23 +1,23 @@ - - - -

Hello World!

- - + + + +

Hello World!

+ + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config index 3bdbf2e7f0b4..6efc7f7b978e 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.Config @@ -1,6 +1,6 @@  - - - - - + + + + + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets index b7cd8ddf9bb4..40eaf45788e7 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets @@ -1,4 +1,4 @@ - + - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - + + + $(MSBuildProjectDirectory)\..\ + + + false + + + false + + + true + + + false + + + + + + + - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - $([System.IO.Path]::Combine($(ProjectDir), "packages.config")) - + + $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) + $([System.IO.Path]::Combine($(ProjectDir), "packages.config")) + - - $(SolutionDir).nuget + + $(SolutionDir).nuget $(ProjectDir)packages.config - + - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) + + + $(NuGetToolsPath)\NuGet.exe + @(PackageSource) "$(NuGetExePath)" mono --runtime=v4.0.30319 $(NuGetExePath) - - $(TargetDir.Trim('\\')) - -RequireConsent - -NonInteractive - - + $(TargetDir.Trim('\\')) + + -RequireConsent + -NonInteractive + + $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir)\" $(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - + + RestorePackages; + $(BuildDependsOn); + + + + + $(BuildDependsOn); + BuildPackage; + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj index c596b8da5646..6adba776a9d7 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj @@ -1,113 +1,113 @@ - - - - - Debug - AnyCPU - {C963DFFF-65BA-4E71-ADA5-526A4DA4E0B2} - Library - Properties - HypervResource - HypervResource - v4.5 - 512 - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\NoUnitTestsDebug\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - bin\NoUnitTests\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll - - - ..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll - - - ..\packages\log4net.2.0.0\lib\net40-full\log4net.dll - - - ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {C963DFFF-65BA-4E71-ADA5-526A4DA4E0B2} + Library + Properties + HypervResource + HypervResource + v4.5 + 512 + ..\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\NoUnitTestsDebug\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\NoUnitTests\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll + + + ..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll + + + ..\packages\log4net.2.0.0\lib\net40-full\log4net.dll + + + ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll + + + + + + + + + + + + + + + + + + + + + + + + + + Always - - {db824727-bdc3-437c-a364-7a811d8a160f} - WmiWrappers - - - - + + {db824727-bdc3-437c-a364-7a811d8a160f} + WmiWrappers + + + + - + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj index d2fb47e1909e..b7c31944a9f7 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.Tests/ServerResource.Tests.csproj @@ -1,126 +1,126 @@ - - - - Debug - AnyCPU - - - 2.0 - {925FD1DE-6211-4E10-9949-3751B8ABDF59} - Library - Properties - ServerResource.Tests - ServerResource.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\NoUnitTestsDebug\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - bin\NoUnitTests\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll - - - ..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll - - - ..\packages\log4net.2.0.0\lib\net40-full\log4net.dll - - - - ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll - - - - - - - - - - - - - - - - - - - - ..\packages\xunit.1.9.2\lib\net20\xunit.dll - - - - - - - - - - Designer - - - - - Designer - - - - - {9060b539-62d0-4e71-a6c6-5944828774e9} - AgentShell - - - {c963dfff-65ba-4e71-ada5-526a4da4e0b2} - HypervResource - - - {db824727-bdc3-437c-a364-7a811d8a160f} - WmiWrappers - - - - + + + + Debug + AnyCPU + + + 2.0 + {925FD1DE-6211-4E10-9949-3751B8ABDF59} + Library + Properties + ServerResource.Tests + ServerResource.Tests + v4.5 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + ..\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\NoUnitTestsDebug\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\NoUnitTests\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll + + + ..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll + + + ..\packages\log4net.2.0.0\lib\net40-full\log4net.dll + + + + ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll + + + + + + + + + + + + + + + + + + + + ..\packages\xunit.1.9.2\lib\net20\xunit.dll + + + + + + + + + + Designer + + + + + Designer + + + + + {9060b539-62d0-4e71-a6c6-5944828774e9} + AgentShell + + + {c963dfff-65ba-4e71-ada5-526a4da4e0b2} + HypervResource + + + {db824727-bdc3-437c-a364-7a811d8a160f} + WmiWrappers + + + + @@ -131,9 +131,9 @@ - --> - - - - + --> + + + + diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj index 3232f672d6a4..ef0a926326c1 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj @@ -1,197 +1,197 @@ - - - - - Debug - AnyCPU - {DB824727-BDC3-437C-A364-7A811D8A160F} - Library - Properties - CloudStack.Plugin.WmiWrappers - WmiWrappers - v4.5 - 512 - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\NoUnitTestsDebug\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - bin\NoUnitTests\ - TRACE - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll - - - ..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll - - - ..\packages\log4net.2.0.0\lib\net40-full\log4net.dll - - - ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll - - - ..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll - - - - - - - - - - - ..\packages\xunit.1.9.2\lib\net20\xunit.dll - - - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - + + + + + Debug + AnyCPU + {DB824727-BDC3-437C-A364-7A811D8A160F} + Library + Properties + CloudStack.Plugin.WmiWrappers + WmiWrappers + v4.5 + 512 + ..\ + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\NoUnitTestsDebug\ + DEBUG;TRACE + full + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + bin\NoUnitTests\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + + + + ..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll + + + ..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll + + + ..\packages\log4net.2.0.0\lib\net40-full\log4net.dll + + + ..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll + + + + + + + + + + + ..\packages\xunit.1.9.2\lib\net20\xunit.dll + + + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + Component - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + Component - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - - - - - - - - + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + Component + + + + + + + + + + - + diff --git a/server/src/test/resources/db.properties b/server/src/test/resources/db.properties index e1cc0487aea6..eabc445c208a 100644 --- a/server/src/test/resources/db.properties +++ b/server/src/test/resources/db.properties @@ -1,72 +1,72 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -# management server clustering parameters, change cluster.node.IP to the machine IP address -# in which the management server is running -cluster.node.IP=127.0.0.1 -cluster.servlet.port=9090 - -# CloudStack database settings -db.cloud.username=cloud -db.cloud.password=cloud -db.root.password= -db.cloud.host=localhost -db.cloud.driver=jdbc:mysql -db.cloud.port=3306 -db.cloud.name=cloud - -# CloudStack database tuning parameters -db.cloud.maxActive=250 -db.cloud.maxIdle=30 -db.cloud.maxWait=10000 -db.cloud.autoReconnect=true -db.cloud.validationQuery=SELECT 1 -db.cloud.testOnBorrow=true -db.cloud.testWhileIdle=true -db.cloud.timeBetweenEvictionRunsMillis=40000 -db.cloud.minEvictableIdleTimeMillis=240000 -db.cloud.poolPreparedStatements=false -db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&prepStmtCacheSqlLimit=4096 - -# usage database settings -db.usage.username=cloud -db.usage.password=cloud -db.usage.host=localhost -# It's not guaranteed that using a different DB provider than the one from the regular cloud DB will work -db.usage.driver=jdbc:mysql -db.usage.port=3306 -db.usage.name=cloud_usage - -# usage database tuning parameters -db.usage.maxActive=100 -db.usage.maxIdle=30 -db.usage.maxWait=10000 -db.usage.autoReconnect=true - -# Simulator database settings -db.simulator.username=cloud -db.simulator.password=cloud -db.simulator.host=localhost -# It's not guaranteed that using a different DB provider than the one from the regular cloud DB will work -db.simulator.driver=jdbc:mysql -db.simulator.port=3306 -db.simulator.name=simulator -db.simulator.maxActive=250 -db.simulator.maxIdle=30 -db.simulator.maxWait=10000 -db.simulator.autoReconnect=true +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + +# management server clustering parameters, change cluster.node.IP to the machine IP address +# in which the management server is running +cluster.node.IP=127.0.0.1 +cluster.servlet.port=9090 + +# CloudStack database settings +db.cloud.username=cloud +db.cloud.password=cloud +db.root.password= +db.cloud.host=localhost +db.cloud.driver=jdbc:mysql +db.cloud.port=3306 +db.cloud.name=cloud + +# CloudStack database tuning parameters +db.cloud.maxActive=250 +db.cloud.maxIdle=30 +db.cloud.maxWait=10000 +db.cloud.autoReconnect=true +db.cloud.validationQuery=SELECT 1 +db.cloud.testOnBorrow=true +db.cloud.testWhileIdle=true +db.cloud.timeBetweenEvictionRunsMillis=40000 +db.cloud.minEvictableIdleTimeMillis=240000 +db.cloud.poolPreparedStatements=false +db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&prepStmtCacheSqlLimit=4096 + +# usage database settings +db.usage.username=cloud +db.usage.password=cloud +db.usage.host=localhost +# It's not guaranteed that using a different DB provider than the one from the regular cloud DB will work +db.usage.driver=jdbc:mysql +db.usage.port=3306 +db.usage.name=cloud_usage + +# usage database tuning parameters +db.usage.maxActive=100 +db.usage.maxIdle=30 +db.usage.maxWait=10000 +db.usage.autoReconnect=true + +# Simulator database settings +db.simulator.username=cloud +db.simulator.password=cloud +db.simulator.host=localhost +# It's not guaranteed that using a different DB provider than the one from the regular cloud DB will work +db.simulator.driver=jdbc:mysql +db.simulator.port=3306 +db.simulator.name=simulator +db.simulator.maxActive=250 +db.simulator.maxIdle=30 +db.simulator.maxWait=10000 +db.simulator.autoReconnect=true diff --git a/test/metadata/func/commands b/test/metadata/func/commands index 86754ebdd0b1..53bebedc4c3f 100644 --- a/test/metadata/func/commands +++ b/test/metadata/func/commands @@ -1,191 +1,191 @@ -# 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. - -updateAccount=no -listAccounts=no - -createUser=no -updateUser=no -deleteUser=no -listUsers=no -disableUser=yes -enableUser=no -disableAccount=yes -enableAccount=no -lockUser=no -lockAccount=no -deleteAccount=yes - -createDomain=no -updateDomain=no -deleteDomain=yes -listDomains=no -listDomainChildren=no - -updateResourceLimit=no -deleteResourceLimit=no -listResourceLimits=no - -deployVirtualMachine=yes -destroyVirtualMachine=yes -rebootVirtualMachine=yes -startVirtualMachine=yes -stopVirtualMachine=yes -resetPasswordForVirtualMachine=yes -changeServiceForVirtualMachine=no -updateVirtualMachine=no -recoverVirtualMachine=no -listVirtualMachines=no - -createSnapshot=yes -deleteSnapshot=yes -listSnapshots=no -listRecurringSnapshotSchedule=no -createVolumeFromSnapshot=yes -createSnapshotPolicy=no -deleteSnapshotPolicies=no -listSnapshotPolicies=no - -createTemplate=yes -registerTemplate=no -updateTemplate=no -deleteTemplate=no -listTemplates=no -updateTemplatePermissions=no -listTemplatePermissions=no -copyTemplate=yes - -attachIso=yes -detachIso=yes -listIsos=no -registerIso=no -updateIso=no -deleteIso=yes -copyIso=yes - -listOSTypes=no - -createServiceOffering=no -deleteServiceOffering=no -updateServiceOffering=no -listServiceOfferings=no - -createDiskOffering=no -updateDiskOffering=no -deleteDiskOffering=no -listDiskOfferings=no - -createVlan=no -deleteVlan=no - -createVlanIpRange=no -deleteVlanIpRange=no -listVlanIpRanges=no - -createVlanRange=no -deleteVlanRange=no -listVlanRanges=no - -associateIpAddress=yes -disassociateIpAddress=yes -listPublicIpAddresses=no -listPrivateIpAddresses=no -updatePublicIpRange=no -updatePrivateIpRange=no - -createPortForwardingServiceRule=yes -deletePortForwardingServiceRule=yes -listPortForwardingServiceRules=no -createPortForwardingService=no -deletePortForwardingService=yes -assignPortForwardingService=yes -removePortForwardingService=yes -listPortForwardingServices=no -listPortForwardingServicesByVm=no -createPortForwardingRule=no -deletePortForwardingRule=no -listPortForwardingRules=no -updatePortForwardingRule=no - -createIpForwardingRule=yes -deleteIpForwardingRule=yes -listIpForwardingRules=no - -createLoadBalancerRule=no -deleteLoadBalancerRule=yes -removeFromLoadBalancerRule=yes -assignToLoadBalancerRule=yes -listLoadBalancerRules=no -listLoadBalancerRuleInstances=no - -startRouter=yes -rebootRouter=yes -stopRouter=yes -listRouters=no - -startSystemVm=yes -rebootSystemVm=yes -stopSystemVm=yes -listSystemVms=no - -updateConfiguration=no -listConfigurations=no - -createPod=no -updatePod=no -deletePod=no -listPods=no - -createZone=no -updateZone=no -deleteZone=no -listZones=no - -listEvents=no - -listAlerts=no - -listCapacity=no - -addHost=no -reconnectHost=yes -deleteHost=no -prepareHostForMaintenance=yes -cancelHostMaintenance=yes -listHosts=no -addSecondaryStorage=no - -attachVolume=yes -detachVolume=yes -createVolume=yes -deleteVolume=no -listVolumes=no - -registerUserKeys=no - -queryAsyncJobResult=no - -listStoragePools=no -listStoragePoolsAndHosts=no -createStoragePool=no - - -createNetworkGroup=no -revokeNetworkGroupIngress=yes -authorizeNetworkGroupIngress=yes - -createNetwork=no +# 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. + +updateAccount=no +listAccounts=no + +createUser=no +updateUser=no +deleteUser=no +listUsers=no +disableUser=yes +enableUser=no +disableAccount=yes +enableAccount=no +lockUser=no +lockAccount=no +deleteAccount=yes + +createDomain=no +updateDomain=no +deleteDomain=yes +listDomains=no +listDomainChildren=no + +updateResourceLimit=no +deleteResourceLimit=no +listResourceLimits=no + +deployVirtualMachine=yes +destroyVirtualMachine=yes +rebootVirtualMachine=yes +startVirtualMachine=yes +stopVirtualMachine=yes +resetPasswordForVirtualMachine=yes +changeServiceForVirtualMachine=no +updateVirtualMachine=no +recoverVirtualMachine=no +listVirtualMachines=no + +createSnapshot=yes +deleteSnapshot=yes +listSnapshots=no +listRecurringSnapshotSchedule=no +createVolumeFromSnapshot=yes +createSnapshotPolicy=no +deleteSnapshotPolicies=no +listSnapshotPolicies=no + +createTemplate=yes +registerTemplate=no +updateTemplate=no +deleteTemplate=no +listTemplates=no +updateTemplatePermissions=no +listTemplatePermissions=no +copyTemplate=yes + +attachIso=yes +detachIso=yes +listIsos=no +registerIso=no +updateIso=no +deleteIso=yes +copyIso=yes + +listOSTypes=no + +createServiceOffering=no +deleteServiceOffering=no +updateServiceOffering=no +listServiceOfferings=no + +createDiskOffering=no +updateDiskOffering=no +deleteDiskOffering=no +listDiskOfferings=no + +createVlan=no +deleteVlan=no + +createVlanIpRange=no +deleteVlanIpRange=no +listVlanIpRanges=no + +createVlanRange=no +deleteVlanRange=no +listVlanRanges=no + +associateIpAddress=yes +disassociateIpAddress=yes +listPublicIpAddresses=no +listPrivateIpAddresses=no +updatePublicIpRange=no +updatePrivateIpRange=no + +createPortForwardingServiceRule=yes +deletePortForwardingServiceRule=yes +listPortForwardingServiceRules=no +createPortForwardingService=no +deletePortForwardingService=yes +assignPortForwardingService=yes +removePortForwardingService=yes +listPortForwardingServices=no +listPortForwardingServicesByVm=no +createPortForwardingRule=no +deletePortForwardingRule=no +listPortForwardingRules=no +updatePortForwardingRule=no + +createIpForwardingRule=yes +deleteIpForwardingRule=yes +listIpForwardingRules=no + +createLoadBalancerRule=no +deleteLoadBalancerRule=yes +removeFromLoadBalancerRule=yes +assignToLoadBalancerRule=yes +listLoadBalancerRules=no +listLoadBalancerRuleInstances=no + +startRouter=yes +rebootRouter=yes +stopRouter=yes +listRouters=no + +startSystemVm=yes +rebootSystemVm=yes +stopSystemVm=yes +listSystemVms=no + +updateConfiguration=no +listConfigurations=no + +createPod=no +updatePod=no +deletePod=no +listPods=no + +createZone=no +updateZone=no +deleteZone=no +listZones=no + +listEvents=no + +listAlerts=no + +listCapacity=no + +addHost=no +reconnectHost=yes +deleteHost=no +prepareHostForMaintenance=yes +cancelHostMaintenance=yes +listHosts=no +addSecondaryStorage=no + +attachVolume=yes +detachVolume=yes +createVolume=yes +deleteVolume=no +listVolumes=no + +registerUserKeys=no + +queryAsyncJobResult=no + +listStoragePools=no +listStoragePoolsAndHosts=no +createStoragePool=no + + +createNetworkGroup=no +revokeNetworkGroupIngress=yes +authorizeNetworkGroupIngress=yes + +createNetwork=no diff --git a/test/metadata/func/error_events.properties b/test/metadata/func/error_events.properties index a7c7633baa22..4d440e6981c8 100644 --- a/test/metadata/func/error_events.properties +++ b/test/metadata/func/error_events.properties @@ -1,32 +1,32 @@ -# 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. - -# All the ERROR level events that need to be checked in EventsApiTest - -VM.CREATE=1 -VM.START=1 -VM.STOP=1 -VM.REBOOT=1 -VM.UPGRADE=1 -VM.RESETPASSWORD=1 -ROUTER.CREATE=1 -ROUTER.START=1 -ROUTER.STOP=1 -ROUTER.REBOOT=1 -NET.IPASSIGN=1 -NET.RULEADD=2 -NET.RULEDELETE=2 +# 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. + +# All the ERROR level events that need to be checked in EventsApiTest + +VM.CREATE=1 +VM.START=1 +VM.STOP=1 +VM.REBOOT=1 +VM.UPGRADE=1 +VM.RESETPASSWORD=1 +ROUTER.CREATE=1 +ROUTER.START=1 +ROUTER.STOP=1 +ROUTER.REBOOT=1 +NET.IPASSIGN=1 +NET.RULEADD=2 +NET.RULEDELETE=2 diff --git a/test/metadata/func/regression_events.properties b/test/metadata/func/regression_events.properties index 456574c982db..331536370d43 100644 --- a/test/metadata/func/regression_events.properties +++ b/test/metadata/func/regression_events.properties @@ -1,43 +1,43 @@ -# 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. - -# All the events that need to be created as a result of execution of Regression test -VM.CREATE=2 -VM.DESTROY=2 -VM.START=2 -VM.STOP=2 -VM.REBOOT=1 -VM.UPGRADE=1 -VM.RESETPASSWORD=1 -ROUTER.CREATE=1 -ROUTER.DESTROY=1 -ROUTER.START=2 -ROUTER.STOP=2 -ROUTER.REBOOT=1 -NET.IPASSIGN=2 -NET.IPRELEASE=2 -SNAPSHOT.CREATE=1 -SNAPSHOT.DELETE=1 -PF.SERVICE.APPLY=1 -PF.SERVICE.REMOVE=1 -TEMPLATE.CREATE=2 -NET.RULEADD=4 -NET.RULEDELETE=4 -VOLUME.CREATE=6 -VOLUME.DELETE=6 -VOLUME.ATTACH=1 -VOLUME.DETACH=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. + +# All the events that need to be created as a result of execution of Regression test +VM.CREATE=2 +VM.DESTROY=2 +VM.START=2 +VM.STOP=2 +VM.REBOOT=1 +VM.UPGRADE=1 +VM.RESETPASSWORD=1 +ROUTER.CREATE=1 +ROUTER.DESTROY=1 +ROUTER.START=2 +ROUTER.STOP=2 +ROUTER.REBOOT=1 +NET.IPASSIGN=2 +NET.IPRELEASE=2 +SNAPSHOT.CREATE=1 +SNAPSHOT.DELETE=1 +PF.SERVICE.APPLY=1 +PF.SERVICE.REMOVE=1 +TEMPLATE.CREATE=2 +NET.RULEADD=4 +NET.RULEDELETE=4 +VOLUME.CREATE=6 +VOLUME.DELETE=6 +VOLUME.ATTACH=1 +VOLUME.DETACH=1 diff --git a/tools/eclipse/eclipse.epf b/tools/eclipse/eclipse.epf index 6b420982cf5a..562a29c366ac 100644 --- a/tools/eclipse/eclipse.epf +++ b/tools/eclipse/eclipse.epf @@ -15,416 +15,416 @@ # specific language governing permissions and limitations # under the License. -/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_parentheses_in_expressions=false -/instance/org.eclipse.team.ui/org.eclipse.team.ui.first_time=false -/instance/org.eclipse.jdt.ui/cleanup.add_default_serial_version_id=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -/instance/org.eclipse.ui.workbench/resourcetypes=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n -/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -/instance/org.eclipse.wst.sse.ui/useQuickDiffPrefPage=true -/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_method_access=false -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_private_constructors=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.continuation_indentation=2 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -/instance/org.eclipse.wst.validation/confirmDialog=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debugdefault_watchpoint_suspend_policy=0 -/instance/org.eclipse.jdt.ui/cleanup.add_missing_nls_tags=false -@org.eclipse.wst.sse.core=1.1.702.v201301241617 -/instance/org.eclipse.mylyn.context.core/mylyn.attention.migrated=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -/instance/org.eclipse.jdt.ui/useAnnotationsPrefPage=true -/instance/org.eclipse.jdt.ui/formatter_profile=_Alex -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_override_annotations=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -/instance/org.eclipse.debug.ui/preferredDetailPanes=DefaultDetailPane\:DefaultDetailPane|org.eclipse.jdt.debug.ui.DETAIL_PANE_LINE_BREAKPOINT\:org.eclipse.jdt.debug.ui.DETAIL_PANE_LINE_BREAKPOINT|org.eclipse.jdt.debug.ui.DETAIL_PANE_EXCEPTION_BREAKPOINT\:org.eclipse.jdt.debug.ui.DETAIL_PANE_EXCEPTION_BREAKPOINT| -/instance/org.eclipse.wst.validation/override=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -@org.eclipse.jdt.core=3.8.3.v20130121-145325 -/instance/org.eclipse.jdt.ui/cleanup.make_local_variable_final=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -/instance/org.eclipse.jdt.ui/sp_cleanup.sort_members=false -/instance/org.eclipse.jdt.ui/cleanup.remove_unused_imports=true -/instance/org.eclipse.jdt.ui/cleanup.add_serial_version_id=false -/instance/org.eclipse.jdt.ui/cleanup.remove_unnecessary_nls_tags=true -/instance/org.eclipse.debug.ui/preferredTargets=default\:default| -/instance/org.eclipse.jdt.debug.ui/org.eclipse.jdt.debug.ui.javaDebug.alertHCRFailed=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_types=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_SRC= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -/instance/org.eclipse.jdt.ui/cleanup_profile=_Alex -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -/instance/org.eclipse.jdt.ui/cleanup.format_source_code_changes_only=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -/instance/org.eclipse.ui.intro/org.eclipse.epp.package.java.product_fontStyle=relative -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -@org.eclipse.e4.ui.css.swt.theme=0.9.4.v20130123-162658 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.default_breakpoint_suspend_policy=2 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.editor.tab.width= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -/instance/org.eclipse.jdt.ui/sp_cleanup.make_variable_declarations_final=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -/instance/org.eclipse.core.resources/version=1 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -/instance/org.eclipse.jdt.ui/cleanup.add_missing_deprecated_annotations=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.javadoclocations.migrated=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_imports=true -/instance/org.eclipse.jdt.ui/content_assist_favorite_static_members= -/instance/org.eclipse.jdt.ui/sp_cleanup.make_type_abstract_if_missing_method=false -/instance/org.eclipse.jdt.ui/cleanup.remove_private_constructors=true -/instance/org.eclipse.core.runtime/line.separator=\n -/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -/instance/org.eclipse.jdt.ui/fontPropagated=true -/instance/org.eclipse.wst.validation/saveAuto=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.join_wrapped_lines=false -/instance/org.eclipse.ui.workbench/ENABLED_DECORATORS=de.tobject.findbugs.decorators.WorkingSetBugCountDecorator\:true,de.tobject.findbugs.decorators.ProjectBugCountDecorator\:true,de.tobject.findbugs.decorators.FolderBugCountDecorator\:true,de.tobject.findbugs.decorators.FileBugCountDecorator\:true,org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.jubula.client.teststyle.tsGuiNodeDecorator\:true,org.eclipse.jubula.client.teststyle.tsTestresultDecorator\:true,org.eclipse.jubula.client.core.model.TestResultNode\:true,org.eclipse.jubula.client.ui.rcp.decorators.resultDurationDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.resultParameterDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.completenessCheckDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.MissingReferenceDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.excelDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.activeElementDecorator\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false,org.python.pydev.navigator.decorator.problemsLabelDecorator\:true, -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -@org.eclipse.ui=3.104.0.v20121024-145224 -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ondemandthreshold=99 -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ignorelowercasenames=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -/instance/org.eclipse.debug.core/org.eclipse.debug.core.PREF_BREAKPOINT_MANAGER_ENABLED_STATE=true -/instance/org.eclipse.mylyn.java.ui/org.eclipse.mylyn.java.ui.run.count.3_1_0=1 -/instance/org.eclipse.ui.ide/IMPORT_FILES_AND_FOLDERS_MODE=prompt -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -/instance/org.eclipse.jdt.ui/spelling_ignore_digits=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JUNIT_HOME=C\:/bin/Eclipse/current/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/ -/instance/org.eclipse.jdt.junit/org.eclipse.jdt.junit.show_in_all_views=false -/instance/org.eclipse.jdt.ui/sp_cleanup.make_private_fields_final=true -@org.eclipse.jdt.junit=3.7.100.v20120523-1543 -/instance/org.eclipse.jdt.ui/proposalOrderMigrated=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -/instance/org.eclipse.wst.validation/vf.version=3 -/instance/org.eclipse.jdt.ui/spelling_ignore_single_letters=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -/instance/org.eclipse.m2e.core/eclipse.m2.userSettingsFile=c\:\\bin\\Maven\\current\\conf\\settings.xml -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -/instance/org.eclipse.ui.ide/IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -@org.python.pydev=2.7.5.2013052819 -/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_this_for_non_static_field_access=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -/instance/org.eclipse.ui.intro.universal/org.eclipse.epp.package.java.product_INTRO_DATA=\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n -/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.DebugVieworg.eclipse.debug.ui.DebugView=\r\n -/instance/org.eclipse.jdt.ui/spelling_ignore_non_letters=true -/instance/org.python.pydev/PYDEV_FUNDING_SHOWN=true -/instance/org.eclipse.jdt.ui/hoverModifierMasks=org.eclipse.jdt.ui.BestMatchHover;0;org.eclipse.jdt.internal.debug.ui.JavaDebugHover;0;org.eclipse.jdt.ui.ProblemHover;0;org.eclipse.jdt.ui.NLSStringHover;327680;org.eclipse.jdt.ui.JavadocHover;393216;org.eclipse.jdt.ui.AnnotationHover;0;org.eclipse.jdt.ui.JavaSourceHover;131072; -/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_override_annotations_interface_methods=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.suspend_for_breakpoints_during_evaluation=true -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_trailing_whitespaces_all=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -/instance/org.eclipse.jdt.ui/cleanup.always_use_blocks=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.code_templates_migrated=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.tabulation.size=4 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -/instance/org.eclipse.jdt.ui/useQuickDiffPrefPage=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -@org.eclipse.egit.core=2.3.1.201302201838-r -/configuration/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.exception.name=e -/instance/org.eclipse.wst.validation/USER_BUILD_PREFERENCE=enabledBuildValidatorList -/instance/org.eclipse.jdt.ui/cleanup.add_missing_methods=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -/instance/org.eclipse.jdt.ui/sp_cleanup.never_use_blocks=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -/instance/org.eclipse.jdt.ui/sp_cleanup.add_serial_version_id=false -/instance/org.eclipse.jdt.ui/cleanup_settings_version=2 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -/instance/org.eclipse.ui.intro.universal/org.eclipse.epp.package.java.product_INTRO_ROOT_PAGES=overview,tutorials,samples,whatsnew -/instance/org.eclipse.e4.ui.css.swt.theme/themeid=org.eclipse.e4.ui.css.theme.e4_classic -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -/instance/org.eclipse.jdt.ui/hoverModifiers=org.eclipse.jdt.ui.BestMatchHover;0;org.eclipse.jdt.internal.debug.ui.JavaDebugHover;\!0;org.eclipse.jdt.ui.ProblemHover;\!0;org.eclipse.jdt.ui.NLSStringHover;Ctrl+Alt;org.eclipse.jdt.ui.JavadocHover;Ctrl+Shift;org.eclipse.jdt.ui.AnnotationHover;\!0;org.eclipse.jdt.ui.JavaSourceHover;Shift; -/instance/org.eclipse.jdt.ui/cleanup.make_type_abstract_if_missing_method=false -@org.eclipse.wst.validation=1.2.402.v201212031633 -/instance/org.eclipse.wst.validation/USER_PREFERENCE=saveAutomaticallyfalseprojectsCanOverridetruedisableAllValidationfalseversion1.2.402.v201212031633 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indentation.size=4 -/instance/org.eclipse.jdt.ui/cleanup.sort_members_all=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -\!/= -/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_with_declaring_class=true -/instance/org.eclipse.jdt.ui/cleanup.organize_imports=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -/instance/org.eclipse.jdt.ui/spelling_ignore_mixed=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.join_lines_in_comments=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -/instance/org.eclipse.jdt.ui/spelling_ignore_upper=true -/instance/org.eclipse.jdt.ui/content_assist_proposals_foreground=0,0,0 -@org.eclipse.ui.editors=3.8.0.v20120523-1540 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -/instance/org.eclipse.jdt.ui/cleanup.add_missing_annotations=true -/instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor=255,255,225 -/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_nls_tags=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -@org.eclipse.mylyn.java.ui=3.8.3.v20130107-0100 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces_ignore_empty=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -/instance/org.eclipse.ui.ide/platformState=1364576568717 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -@org.eclipse.team.cvs.ui=3.3.500.v20120522-1148 -/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_method_access=true -/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_this_for_non_static_method_access=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -/instance/org.eclipse.jdt.ui/cleanup.make_private_fields_final=true -/instance/org.eclipse.ui.editors/lineNumberRuler=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -/instance/org.eclipse.jdt.ui/sp_cleanup.format_source_code_changes_only=true -/configuration/org.eclipse.ui.ide/RECENT_WORKSPACES_PROTOCOL=3 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_line_comments=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -/instance/org.eclipse.debug.ui/org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\r\n\r\n -/instance/org.eclipse.m2e.editor.xml/org.eclipse.m2e.editor.xml.templates= -/instance/org.eclipse.epp.mpc.ui/CatalogDescriptor=http\://marketplace.eclipse.org -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_local_variables=false -/instance/org.eclipse.jdt.ui/cleanup.convert_to_enhanced_for_loop=false -@org.eclipse.team.core=3.6.100.v20120524-0627 -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_members=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -/instance/org.eclipse.egit.ui/resourcehistory_rev_split=700,300 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.gettersetter.use.is=true -/instance/org.eclipse.jdt.ui/sp_cleanup.format_source_code=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -@org.eclipse.ui.intro.universal=3.2.600.v20120912-155524 -/instance/org.eclipse.jdt.ui/spelling_locale_initialized=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.convert_to_enhanced_for_loop=false -/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations=true -/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n\r\n\r\n\r\n\r\n -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -/configuration/org.eclipse.ui.ide/SHOW_WORKSPACE_SELECTION_DIALOG=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.ExpressionView=\r\n\r\n\r\n -/instance/org.eclipse.jdt.ui/cleanup.use_parentheses_in_expressions=false -/instance/org.python.pydev.debug/INITIAL_INTERPRETER_CMDS=import sys; print('%s %s' % (sys.executable or sys.platform, sys.version))\r\n -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_deprecated_annotations=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access_only_if_necessary=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.templates_migrated=true -/instance/org.eclipse.egit.ui/merge_mode=0 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -/instance/org.eclipse.wst.sse.ui/useAnnotationsPrefPage=true -@org.eclipse.m2e.discovery=1.3.1.20130219-1424 -@org.eclipse.wst.sse.ui=1.3.102.v201301162301 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_CONNECT_TIMEOUT=20000 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access_only_if_necessary=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -/instance/org.eclipse.ui.workbench/org.eclipse.ui.commands=\r\n -/instance/org.eclipse.wst.xml.core/indentationChar=space -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_methods=true -/instance/org.eclipse.wst.sse.ui/content_assist_number_of_computers=2 -/instance/org.eclipse.team.cvs.ui/pref_first_startup=false -/instance/org.eclipse.egit.ui/Blame_IgnoreWhitespace=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_field_access=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_templates= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.timeoutForParameterNameFromAttachedJavadoc=50 -/instance/org.eclipse.jdt.ui/formatter_settings_version=12 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -/instance/org.eclipse.jdt.ui/spelling_ignore_sentence=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -/instance/org.eclipse.jdt.ui/sp_cleanup.never_use_parentheses_in_expressions=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations_interface_methods=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -/instance/org.eclipse.jdt.ui/spelling_ignore_java_strings=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -/instance/org.eclipse.jdt.ui/tabWidthPropagated=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n -/instance/org.eclipse.wst.xml.core/lineWidth=80 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -/instance/org.eclipse.jdt.ui/cleanup.make_parameters_final=false -/instance/org.eclipse.jdt.ui/sp_cleanup.use_blocks=false -/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -/instance/org.python.pydev/IRONPYTHON_INTERPRETER_PATH=\nC\:\\Program Files (x86)\\IronPython 2.7\\ipy64.exe\n2.7\nC\:\\Program Files (x86)\\IronPython 2.7\\ipy64.exe\nC\:\\Program Files (x86)\\IronPython 2.7\\Lib\nC\:\\Program Files (x86)\\IronPython 2.7\\DLLs\nC\:\\Program Files (x86)\\IronPython 2.7\nC\:\\Program Files (x86)\\IronPython 2.7\\lib\\site-packages\nIEHost.Execute\nMicrosoft\nMicrosoft.Aspnet.Snapin\nMicrosoft.Build.BuildEngine\nMicrosoft.Build.Conversion\nMicrosoft.Build.Framework\nMicrosoft.Build.Tasks\nMicrosoft.Build.Tasks.Deployment.Bootstrapper\nMicrosoft.Build.Tasks.Deployment.ManifestUtilities\nMicrosoft.Build.Tasks.Hosting\nMicrosoft.Build.Tasks.Windows\nMicrosoft.Build.Utilities\nMicrosoft.CLRAdmin\nMicrosoft.CSharp\nMicrosoft.Data.Entity.Build.Tasks\nMicrosoft.IE\nMicrosoft.Ink\nMicrosoft.Ink.TextInput\nMicrosoft.JScript\nMicrosoft.JScript.Vsa\nMicrosoft.ManagementConsole\nMicrosoft.ManagementConsole.Advanced\nMicrosoft.ManagementConsole.Internal\nMicrosoft.ServiceModel.Channels.Mail\nMicrosoft.ServiceModel.Channels.Mail.ExchangeWebService\nMicrosoft.ServiceModel.Channels.Mail.ExchangeWebService.Exchange2007\nMicrosoft.ServiceModel.Channels.Mail.WindowsMobile\nMicrosoft.SqlServer.Server\nMicrosoft.StylusInput\nMicrosoft.StylusInput.PluginData\nMicrosoft.VisualBasic\nMicrosoft.VisualBasic.ApplicationServices\nMicrosoft.VisualBasic.Compatibility.VB6\nMicrosoft.VisualBasic.CompilerServices\nMicrosoft.VisualBasic.Devices\nMicrosoft.VisualBasic.FileIO\nMicrosoft.VisualBasic.Logging\nMicrosoft.VisualBasic.MyServices\nMicrosoft.VisualBasic.MyServices.Internal\nMicrosoft.VisualBasic.Vsa\nMicrosoft.VisualC\nMicrosoft.VisualC.StlClr\nMicrosoft.VisualC.StlClr.Generic\nMicrosoft.Vsa\nMicrosoft.Vsa.Vb.CodeDOM\nMicrosoft.Win32\nMicrosoft.Win32.SafeHandles\nMicrosoft.Windows.Themes\nMicrosoft.WindowsCE.Forms\nMicrosoft.WindowsMobile.DirectX\nMicrosoft.WindowsMobile.DirectX.Direct3D\nMicrosoft_VsaVb\nRegCode\nSystem\nSystem.AddIn\nSystem.AddIn.Contract\nSystem.AddIn.Contract.Automation\nSystem.AddIn.Contract.Collections\nSystem.AddIn.Hosting\nSystem.AddIn.Pipeline\nSystem.CodeDom\nSystem.CodeDom.Compiler\nSystem.Collections\nSystem.Collections.Generic\nSystem.Collections.ObjectModel\nSystem.Collections.Specialized\nSystem.ComponentModel\nSystem.ComponentModel.DataAnnotations\nSystem.ComponentModel.Design\nSystem.ComponentModel.Design.Data\nSystem.ComponentModel.Design.Serialization\nSystem.Configuration\nSystem.Configuration.Assemblies\nSystem.Configuration.Install\nSystem.Configuration.Internal\nSystem.Configuration.Provider\nSystem.Data\nSystem.Data.Common\nSystem.Data.Common.CommandTrees\nSystem.Data.Design\nSystem.Data.Entity.Design\nSystem.Data.Entity.Design.AspNet\nSystem.Data.EntityClient\nSystem.Data.Linq\nSystem.Data.Linq.Mapping\nSystem.Data.Linq.SqlClient\nSystem.Data.Linq.SqlClient.Implementation\nSystem.Data.Mapping\nSystem.Data.Metadata.Edm\nSystem.Data.Objects\nSystem.Data.Objects.DataClasses\nSystem.Data.Odbc\nSystem.Data.OleDb\nSystem.Data.OracleClient\nSystem.Data.Services\nSystem.Data.Services.Client\nSystem.Data.Services.Common\nSystem.Data.Services.Design\nSystem.Data.Services.Internal\nSystem.Data.Sql\nSystem.Data.SqlClient\nSystem.Data.SqlTypes\nSystem.Deployment.Application\nSystem.Deployment.Internal\nSystem.Diagnostics\nSystem.Diagnostics.CodeAnalysis\nSystem.Diagnostics.Design\nSystem.Diagnostics.Eventing\nSystem.Diagnostics.Eventing.Reader\nSystem.Diagnostics.PerformanceData\nSystem.Diagnostics.SymbolStore\nSystem.DirectoryServices\nSystem.DirectoryServices.AccountManagement\nSystem.DirectoryServices.ActiveDirectory\nSystem.DirectoryServices.Protocols\nSystem.Drawing\nSystem.Drawing.Design\nSystem.Drawing.Drawing2D\nSystem.Drawing.Imaging\nSystem.Drawing.Printing\nSystem.Drawing.Text\nSystem.EnterpriseServices\nSystem.EnterpriseServices.CompensatingResourceManager\nSystem.EnterpriseServices.Internal\nSystem.Globalization\nSystem.IO\nSystem.IO.Compression\nSystem.IO.IsolatedStorage\nSystem.IO.Log\nSystem.IO.Packaging\nSystem.IO.Pipes\nSystem.IO.Ports\nSystem.IdentityModel.Claims\nSystem.IdentityModel.Policy\nSystem.IdentityModel.Selectors\nSystem.IdentityModel.Tokens\nSystem.Linq\nSystem.Linq.Expressions\nSystem.Management\nSystem.Management.Instrumentation\nSystem.Media\nSystem.Messaging\nSystem.Messaging.Design\nSystem.Net\nSystem.Net.Cache\nSystem.Net.Configuration\nSystem.Net.Mail\nSystem.Net.Mime\nSystem.Net.NetworkInformation\nSystem.Net.PeerToPeer\nSystem.Net.PeerToPeer.Collaboration\nSystem.Net.Security\nSystem.Net.Sockets\nSystem.Printing\nSystem.Printing.IndexedProperties\nSystem.Printing.Interop\nSystem.Reflection\nSystem.Reflection.Emit\nSystem.Resources\nSystem.Resources.Tools\nSystem.Runtime\nSystem.Runtime.CompilerServices\nSystem.Runtime.ConstrainedExecution\nSystem.Runtime.Hosting\nSystem.Runtime.InteropServices\nSystem.Runtime.InteropServices.ComTypes\nSystem.Runtime.InteropServices.CustomMarshalers\nSystem.Runtime.InteropServices.Expando\nSystem.Runtime.Remoting\nSystem.Runtime.Remoting.Activation\nSystem.Runtime.Remoting.Channels\nSystem.Runtime.Remoting.Channels.Http\nSystem.Runtime.Remoting.Channels.Ipc\nSystem.Runtime.Remoting.Channels.Tcp\nSystem.Runtime.Remoting.Contexts\nSystem.Runtime.Remoting.Lifetime\nSystem.Runtime.Remoting.Messaging\nSystem.Runtime.Remoting.Metadata\nSystem.Runtime.Remoting.MetadataServices\nSystem.Runtime.Remoting.Proxies\nSystem.Runtime.Remoting.Services\nSystem.Runtime.Serialization\nSystem.Runtime.Serialization.Configuration\nSystem.Runtime.Serialization.Formatters\nSystem.Runtime.Serialization.Formatters.Binary\nSystem.Runtime.Serialization.Formatters.Soap\nSystem.Runtime.Serialization.Json\nSystem.Runtime.Versioning\nSystem.Security\nSystem.Security.AccessControl\nSystem.Security.Authentication\nSystem.Security.Authentication.ExtendedProtection\nSystem.Security.Authentication.ExtendedProtection.Configuration\nSystem.Security.Cryptography\nSystem.Security.Cryptography.Pkcs\nSystem.Security.Cryptography.X509Certificates\nSystem.Security.Cryptography.Xml\nSystem.Security.Permissions\nSystem.Security.Policy\nSystem.Security.Principal\nSystem.Security.RightsManagement\nSystem.ServiceModel\nSystem.ServiceModel.Activation\nSystem.ServiceModel.Activation.Configuration\nSystem.ServiceModel.Channels\nSystem.ServiceModel.ComIntegration\nSystem.ServiceModel.Configuration\nSystem.ServiceModel.Description\nSystem.ServiceModel.Diagnostics\nSystem.ServiceModel.Dispatcher\nSystem.ServiceModel.Install.Configuration\nSystem.ServiceModel.Internal\nSystem.ServiceModel.MsmqIntegration\nSystem.ServiceModel.PeerResolvers\nSystem.ServiceModel.Persistence\nSystem.ServiceModel.Security\nSystem.ServiceModel.Security.Tokens\nSystem.ServiceModel.Syndication\nSystem.ServiceModel.Web\nSystem.ServiceProcess\nSystem.ServiceProcess.Design\nSystem.Speech.AudioFormat\nSystem.Speech.Recognition\nSystem.Speech.Recognition.SrgsGrammar\nSystem.Speech.Synthesis\nSystem.Speech.Synthesis.TtsEngine\nSystem.Text\nSystem.Text.RegularExpressions\nSystem.Threading\nSystem.Timers\nSystem.Transactions\nSystem.Transactions.Configuration\nSystem.Web\nSystem.Web.ApplicationServices\nSystem.Web.Caching\nSystem.Web.ClientServices\nSystem.Web.ClientServices.Providers\nSystem.Web.Compilation\nSystem.Web.Configuration\nSystem.Web.Configuration.Internal\nSystem.Web.DynamicData\nSystem.Web.DynamicData.Design\nSystem.Web.DynamicData.ModelProviders\nSystem.Web.Handlers\nSystem.Web.Hosting\nSystem.Web.Mail\nSystem.Web.Management\nSystem.Web.Mobile\nSystem.Web.Profile\nSystem.Web.Query.Dynamic\nSystem.Web.RegularExpressions\nSystem.Web.Routing\nSystem.Web.Script.Serialization\nSystem.Web.Script.Services\nSystem.Web.Security\nSystem.Web.Services\nSystem.Web.Services.Configuration\nSystem.Web.Services.Description\nSystem.Web.Services.Discovery\nSystem.Web.Services.Protocols\nSystem.Web.SessionState\nSystem.Web.UI\nSystem.Web.UI.Adapters\nSystem.Web.UI.Design\nSystem.Web.UI.Design.MobileControls\nSystem.Web.UI.Design.MobileControls.Converters\nSystem.Web.UI.Design.WebControls\nSystem.Web.UI.Design.WebControls.WebParts\nSystem.Web.UI.MobileControls\nSystem.Web.UI.MobileControls.Adapters\nSystem.Web.UI.MobileControls.Adapters.XhtmlAdapters\nSystem.Web.UI.WebControls\nSystem.Web.UI.WebControls.Adapters\nSystem.Web.UI.WebControls.WebParts\nSystem.Web.Util\nSystem.Windows\nSystem.Windows.Annotations\nSystem.Windows.Annotations.Storage\nSystem.Windows.Automation\nSystem.Windows.Automation.Peers\nSystem.Windows.Automation.Provider\nSystem.Windows.Automation.Text\nSystem.Windows.Controls\nSystem.Windows.Controls.Primitives\nSystem.Windows.Converters\nSystem.Windows.Data\nSystem.Windows.Documents\nSystem.Windows.Documents.Serialization\nSystem.Windows.Forms\nSystem.Windows.Forms.ComponentModel.Com2Interop\nSystem.Windows.Forms.Design\nSystem.Windows.Forms.Design.Behavior\nSystem.Windows.Forms.Integration\nSystem.Windows.Forms.Layout\nSystem.Windows.Forms.PropertyGridInternal\nSystem.Windows.Forms.VisualStyles\nSystem.Windows.Ink\nSystem.Windows.Ink.AnalysisCore\nSystem.Windows.Input\nSystem.Windows.Input.StylusPlugIns\nSystem.Windows.Interop\nSystem.Windows.Markup\nSystem.Windows.Markup.Localizer\nSystem.Windows.Markup.Primitives\nSystem.Windows.Media\nSystem.Windows.Media.Animation\nSystem.Windows.Media.Converters\nSystem.Windows.Media.Effects\nSystem.Windows.Media.Imaging\nSystem.Windows.Media.Media3D\nSystem.Windows.Media.Media3D.Converters\nSystem.Windows.Media.TextFormatting\nSystem.Windows.Navigation\nSystem.Windows.Resources\nSystem.Windows.Shapes\nSystem.Windows.Threading\nSystem.Windows.Xps\nSystem.Windows.Xps.Packaging\nSystem.Windows.Xps.Serialization\nSystem.Workflow.Activities\nSystem.Workflow.Activities.Configuration\nSystem.Workflow.Activities.Rules\nSystem.Workflow.Activities.Rules.Design\nSystem.Workflow.ComponentModel\nSystem.Workflow.ComponentModel.Compiler\nSystem.Workflow.ComponentModel.Design\nSystem.Workflow.ComponentModel.Serialization\nSystem.Workflow.Runtime\nSystem.Workflow.Runtime.Configuration\nSystem.Workflow.Runtime.DebugEngine\nSystem.Workflow.Runtime.Hosting\nSystem.Workflow.Runtime.Tracking\nSystem.Xml\nSystem.Xml.Linq\nSystem.Xml.Schema\nSystem.Xml.Serialization\nSystem.Xml.Serialization.Advanced\nSystem.Xml.Serialization.Configuration\nSystem.Xml.XPath\nSystem.Xml.Xsl\nSystem.Xml.Xsl.Runtime\nUIAutomationClientsideProviders\n__builtin__\n_ast\n_bisect\n_codecs\n_collections\n_csv\n_ctypes\n_ctypes_test\n_functools\n_heapq\n_io\n_locale\n_md5\n_random\n_sha\n_sha256\n_sha512\n_sqlite3\n_sre\n_ssl\n_struct\n_subprocess\n_warnings\n_weakref\n_winreg\narray\nbinascii\nbz2\ncPickle\ncStringIO\nclr\ncmath\ncopy_reg\ndatetime\nemail\nerrno\nexceptions\nfuture_builtins\ngc\nhashlib\nimp\nitertools\nmarshal\nmath\nmmap\nmsvcrt\nnt\noperator\nos\nos.path\npytest\nre\nselect\nsignal\nsocket\nsys\nthread\ntime\nunicodedata\nwinsound\nwpf\nxxsubtype\nzipimport\nzlib\n&&&&& -/instance/org.eclipse.jdt.ui/cleanup.add_generated_serial_version_id=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -/instance/org.eclipse.wst.validation/suspend=false -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles.version=12 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -/instance/org.eclipse.compare/org.eclipse.compare.IgnoreWhitespace=true -/instance/org.eclipse.egit.ui/resourcehistory_graph_split=500,500 -@org.eclipse.mylyn.monitor.ui=3.8.3.v20130107-0100 -/instance/org.eclipse.ui.ide/PROBLEMS_FILTERS_MIGRATE=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -/instance/org.eclipse.jdt.ui/cleanup.always_use_parentheses_in_expressions=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentSuffixes= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -/instance/org.eclipse.jdt.ui/sp_cleanup.add_default_serial_version_id=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.BreakpointView=\r\n\r\n\r\n\r\n\r\n -@org.eclipse.ui.workbench=3.104.0.v20130204-164612 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.importorder=java;javax;org;com;org.apache.cloudstack;com.cloud; -/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_field_access=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.organize_imports=true -/instance/org.eclipse.jdt.ui/cleanup.qualify_static_method_accesses_with_declaring_class=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -@org.eclipse.egit.ui=2.3.1.201302201838-r -/instance/org.eclipse.ui.editors/quickdiff.nowarn.before.switch=always -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.line_length=120 -/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -/instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.VariableView.org.eclipse.jdt.debug.ui.show_null_entries=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldSuffixes= -/instance/org.eclipse.jdt.ui/content_assist_number_of_computers=21 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localSuffixes= -/instance/org.eclipse.jdt.junit.core/org.eclipse.jdt.junit.enable_assertions=true -@org.eclipse.core.resources=3.8.1.v20121114-124432 -/instance/org.eclipse.jdt.ui/spelling_ignore_urls=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -/instance/org.eclipse.jdt.ui/content_assist_autoactivation_delay=50 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -@org.eclipse.search=3.8.0.v20120523-1540 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -/instance/org.eclipse.ui.intro/org.eclipse.epp.package.java.product_INTRO_THEME=org.eclipse.ui.intro.universal.circles -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JSR305_ANNOTATIONS=C\:/bin/Eclipse/current/plugins/edu.umd.cs.findbugs.plugin.eclipse_2.0.2.20121210/lib/jsr305.jar -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_LIB=C\:/bin/Java/jre7/lib/rt.jar -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.lineSplit=180 -/instance/org.eclipse.jdt.ui/content_assist_disabled_computers=org.eclipse.recommenders.completion.rcp.templates.category\u0000org.eclipse.jdt.ui.javaAllProposalCategory\u0000org.eclipse.jdt.ui.javaNoTypeProposalCategory\u0000org.eclipse.recommenders.completion.rcp.chain.category\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\u0000org.eclipse.jdt.ui.textProposalCategory\u0000org.eclipse.recommenders.subwords.rcp.category\u0000 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -@org.eclipse.ui.ide=3.8.2.v20121106-165923 -@org.eclipse.core.runtime=3.8.0.v20120912-155025 -/instance/org.eclipse.jdt.ui/editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_trailing_whitespaces_ignore_empty=true -/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_blocks=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.PREF_HCR_WITH_COMPILATION_ERRORS=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_html=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -/instance/org.eclipse.m2e.core/eclipse.m2.WorkspacelifecycleMappingsLocation=D\:/src/workspaces/master/.metadata/.plugins/org.eclipse.m2e.core/lifecycle-mapping-metadata.xml -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -/instance/org.eclipse.jdt.ui/cleanup.make_variable_declarations_final=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access=true +/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_parentheses_in_expressions=false +/instance/org.eclipse.team.ui/org.eclipse.team.ui.first_time=false +/instance/org.eclipse.jdt.ui/cleanup.add_default_serial_version_id=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +/instance/org.eclipse.ui.workbench/resourcetypes=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n +/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +/instance/org.eclipse.wst.sse.ui/useQuickDiffPrefPage=true +/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_method_access=false +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_private_constructors=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.continuation_indentation=2 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +/instance/org.eclipse.wst.validation/confirmDialog=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debugdefault_watchpoint_suspend_policy=0 +/instance/org.eclipse.jdt.ui/cleanup.add_missing_nls_tags=false +@org.eclipse.wst.sse.core=1.1.702.v201301241617 +/instance/org.eclipse.mylyn.context.core/mylyn.attention.migrated=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +/instance/org.eclipse.jdt.ui/useAnnotationsPrefPage=true +/instance/org.eclipse.jdt.ui/formatter_profile=_Alex +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_override_annotations=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +/instance/org.eclipse.debug.ui/preferredDetailPanes=DefaultDetailPane\:DefaultDetailPane|org.eclipse.jdt.debug.ui.DETAIL_PANE_LINE_BREAKPOINT\:org.eclipse.jdt.debug.ui.DETAIL_PANE_LINE_BREAKPOINT|org.eclipse.jdt.debug.ui.DETAIL_PANE_EXCEPTION_BREAKPOINT\:org.eclipse.jdt.debug.ui.DETAIL_PANE_EXCEPTION_BREAKPOINT| +/instance/org.eclipse.wst.validation/override=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +@org.eclipse.jdt.core=3.8.3.v20130121-145325 +/instance/org.eclipse.jdt.ui/cleanup.make_local_variable_final=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +/instance/org.eclipse.jdt.ui/sp_cleanup.sort_members=false +/instance/org.eclipse.jdt.ui/cleanup.remove_unused_imports=true +/instance/org.eclipse.jdt.ui/cleanup.add_serial_version_id=false +/instance/org.eclipse.jdt.ui/cleanup.remove_unnecessary_nls_tags=true +/instance/org.eclipse.debug.ui/preferredTargets=default\:default| +/instance/org.eclipse.jdt.debug.ui/org.eclipse.jdt.debug.ui.javaDebug.alertHCRFailed=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_types=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_SRC= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +/instance/org.eclipse.jdt.ui/cleanup_profile=_Alex +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +/instance/org.eclipse.jdt.ui/cleanup.format_source_code_changes_only=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +/instance/org.eclipse.ui.intro/org.eclipse.epp.package.java.product_fontStyle=relative +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +@org.eclipse.e4.ui.css.swt.theme=0.9.4.v20130123-162658 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.default_breakpoint_suspend_policy=2 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.editor.tab.width= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +/instance/org.eclipse.jdt.ui/sp_cleanup.make_variable_declarations_final=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +/instance/org.eclipse.core.resources/version=1 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +/instance/org.eclipse.jdt.ui/cleanup.add_missing_deprecated_annotations=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.javadoclocations.migrated=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_imports=true +/instance/org.eclipse.jdt.ui/content_assist_favorite_static_members= +/instance/org.eclipse.jdt.ui/sp_cleanup.make_type_abstract_if_missing_method=false +/instance/org.eclipse.jdt.ui/cleanup.remove_private_constructors=true +/instance/org.eclipse.core.runtime/line.separator=\n +/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +/instance/org.eclipse.jdt.ui/fontPropagated=true +/instance/org.eclipse.wst.validation/saveAuto=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.join_wrapped_lines=false +/instance/org.eclipse.ui.workbench/ENABLED_DECORATORS=de.tobject.findbugs.decorators.WorkingSetBugCountDecorator\:true,de.tobject.findbugs.decorators.ProjectBugCountDecorator\:true,de.tobject.findbugs.decorators.FolderBugCountDecorator\:true,de.tobject.findbugs.decorators.FileBugCountDecorator\:true,org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.jubula.client.teststyle.tsGuiNodeDecorator\:true,org.eclipse.jubula.client.teststyle.tsTestresultDecorator\:true,org.eclipse.jubula.client.core.model.TestResultNode\:true,org.eclipse.jubula.client.ui.rcp.decorators.resultDurationDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.resultParameterDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.completenessCheckDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.MissingReferenceDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.excelDecorator\:true,org.eclipse.jubula.client.ui.rcp.decorators.activeElementDecorator\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false,org.python.pydev.navigator.decorator.problemsLabelDecorator\:true, +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +@org.eclipse.ui=3.104.0.v20121024-145224 +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ondemandthreshold=99 +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ignorelowercasenames=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +/instance/org.eclipse.debug.core/org.eclipse.debug.core.PREF_BREAKPOINT_MANAGER_ENABLED_STATE=true +/instance/org.eclipse.mylyn.java.ui/org.eclipse.mylyn.java.ui.run.count.3_1_0=1 +/instance/org.eclipse.ui.ide/IMPORT_FILES_AND_FOLDERS_MODE=prompt +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +/instance/org.eclipse.jdt.ui/spelling_ignore_digits=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JUNIT_HOME=C\:/bin/Eclipse/current/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/ +/instance/org.eclipse.jdt.junit/org.eclipse.jdt.junit.show_in_all_views=false +/instance/org.eclipse.jdt.ui/sp_cleanup.make_private_fields_final=true +@org.eclipse.jdt.junit=3.7.100.v20120523-1543 +/instance/org.eclipse.jdt.ui/proposalOrderMigrated=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +/instance/org.eclipse.wst.validation/vf.version=3 +/instance/org.eclipse.jdt.ui/spelling_ignore_single_letters=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +/instance/org.eclipse.m2e.core/eclipse.m2.userSettingsFile=c\:\\bin\\Maven\\current\\conf\\settings.xml +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +/instance/org.eclipse.ui.ide/IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +@org.python.pydev=2.7.5.2013052819 +/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_this_for_non_static_field_access=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +/instance/org.eclipse.ui.intro.universal/org.eclipse.epp.package.java.product_INTRO_DATA=\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n +/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.DebugVieworg.eclipse.debug.ui.DebugView=\r\n +/instance/org.eclipse.jdt.ui/spelling_ignore_non_letters=true +/instance/org.python.pydev/PYDEV_FUNDING_SHOWN=true +/instance/org.eclipse.jdt.ui/hoverModifierMasks=org.eclipse.jdt.ui.BestMatchHover;0;org.eclipse.jdt.internal.debug.ui.JavaDebugHover;0;org.eclipse.jdt.ui.ProblemHover;0;org.eclipse.jdt.ui.NLSStringHover;327680;org.eclipse.jdt.ui.JavadocHover;393216;org.eclipse.jdt.ui.AnnotationHover;0;org.eclipse.jdt.ui.JavaSourceHover;131072; +/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_override_annotations_interface_methods=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= +/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.suspend_for_breakpoints_during_evaluation=true +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_trailing_whitespaces_all=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +/instance/org.eclipse.jdt.ui/cleanup.always_use_blocks=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.code_templates_migrated=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.tabulation.size=4 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +/instance/org.eclipse.jdt.ui/useQuickDiffPrefPage=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +@org.eclipse.egit.core=2.3.1.201302201838-r +/configuration/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.exception.name=e +/instance/org.eclipse.wst.validation/USER_BUILD_PREFERENCE=enabledBuildValidatorList +/instance/org.eclipse.jdt.ui/cleanup.add_missing_methods=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +/instance/org.eclipse.jdt.ui/sp_cleanup.never_use_blocks=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +/instance/org.eclipse.jdt.ui/sp_cleanup.add_serial_version_id=false +/instance/org.eclipse.jdt.ui/cleanup_settings_version=2 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +/instance/org.eclipse.ui.intro.universal/org.eclipse.epp.package.java.product_INTRO_ROOT_PAGES=overview,tutorials,samples,whatsnew +/instance/org.eclipse.e4.ui.css.swt.theme/themeid=org.eclipse.e4.ui.css.theme.e4_classic +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +/instance/org.eclipse.jdt.ui/hoverModifiers=org.eclipse.jdt.ui.BestMatchHover;0;org.eclipse.jdt.internal.debug.ui.JavaDebugHover;\!0;org.eclipse.jdt.ui.ProblemHover;\!0;org.eclipse.jdt.ui.NLSStringHover;Ctrl+Alt;org.eclipse.jdt.ui.JavadocHover;Ctrl+Shift;org.eclipse.jdt.ui.AnnotationHover;\!0;org.eclipse.jdt.ui.JavaSourceHover;Shift; +/instance/org.eclipse.jdt.ui/cleanup.make_type_abstract_if_missing_method=false +@org.eclipse.wst.validation=1.2.402.v201212031633 +/instance/org.eclipse.wst.validation/USER_PREFERENCE=saveAutomaticallyfalseprojectsCanOverridetruedisableAllValidationfalseversion1.2.402.v201212031633 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indentation.size=4 +/instance/org.eclipse.jdt.ui/cleanup.sort_members_all=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +\!/= +/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_with_declaring_class=true +/instance/org.eclipse.jdt.ui/cleanup.organize_imports=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +/instance/org.eclipse.jdt.ui/spelling_ignore_mixed=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.join_lines_in_comments=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +/instance/org.eclipse.jdt.ui/spelling_ignore_upper=true +/instance/org.eclipse.jdt.ui/content_assist_proposals_foreground=0,0,0 +@org.eclipse.ui.editors=3.8.0.v20120523-1540 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +/instance/org.eclipse.jdt.ui/cleanup.add_missing_annotations=true +/instance/org.eclipse.jdt.ui/sourceHoverBackgroundColor=255,255,225 +/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_nls_tags=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +@org.eclipse.mylyn.java.ui=3.8.3.v20130107-0100 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces_ignore_empty=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +/instance/org.eclipse.ui.ide/platformState=1364576568717 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +@org.eclipse.team.cvs.ui=3.3.500.v20120522-1148 +/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_method_access=true +/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_this_for_non_static_method_access=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +/instance/org.eclipse.jdt.ui/cleanup.make_private_fields_final=true +/instance/org.eclipse.ui.editors/lineNumberRuler=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= +/instance/org.eclipse.jdt.ui/sp_cleanup.format_source_code_changes_only=true +/configuration/org.eclipse.ui.ide/RECENT_WORKSPACES_PROTOCOL=3 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_line_comments=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +/instance/org.eclipse.debug.ui/org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\r\n\r\n +/instance/org.eclipse.m2e.editor.xml/org.eclipse.m2e.editor.xml.templates= +/instance/org.eclipse.epp.mpc.ui/CatalogDescriptor=http\://marketplace.eclipse.org +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_local_variables=false +/instance/org.eclipse.jdt.ui/cleanup.convert_to_enhanced_for_loop=false +@org.eclipse.team.core=3.6.100.v20120524-0627 +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_members=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +/instance/org.eclipse.egit.ui/resourcehistory_rev_split=700,300 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.gettersetter.use.is=true +/instance/org.eclipse.jdt.ui/sp_cleanup.format_source_code=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +@org.eclipse.ui.intro.universal=3.2.600.v20120912-155524 +/instance/org.eclipse.jdt.ui/spelling_locale_initialized=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.convert_to_enhanced_for_loop=false +/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations=true +/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n\r\n\r\n\r\n\r\n +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +/configuration/org.eclipse.ui.ide/SHOW_WORKSPACE_SELECTION_DIALOG=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.ExpressionView=\r\n\r\n\r\n +/instance/org.eclipse.jdt.ui/cleanup.use_parentheses_in_expressions=false +/instance/org.python.pydev.debug/INITIAL_INTERPRETER_CMDS=import sys; print('%s %s' % (sys.executable or sys.platform, sys.version))\r\n +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_deprecated_annotations=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access_only_if_necessary=true +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.templates_migrated=true +/instance/org.eclipse.egit.ui/merge_mode=0 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +/instance/org.eclipse.wst.sse.ui/useAnnotationsPrefPage=true +@org.eclipse.m2e.discovery=1.3.1.20130219-1424 +@org.eclipse.wst.sse.ui=1.3.102.v201301162301 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_CONNECT_TIMEOUT=20000 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access_only_if_necessary=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +/instance/org.eclipse.ui.workbench/org.eclipse.ui.commands=\r\n +/instance/org.eclipse.wst.xml.core/indentationChar=space +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_methods=true +/instance/org.eclipse.wst.sse.ui/content_assist_number_of_computers=2 +/instance/org.eclipse.team.cvs.ui/pref_first_startup=false +/instance/org.eclipse.egit.ui/Blame_IgnoreWhitespace=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_field_access=true +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_templates= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.timeoutForParameterNameFromAttachedJavadoc=50 +/instance/org.eclipse.jdt.ui/formatter_settings_version=12 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +/instance/org.eclipse.jdt.ui/spelling_ignore_sentence=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +/instance/org.eclipse.jdt.ui/sp_cleanup.never_use_parentheses_in_expressions=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations_interface_methods=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +/instance/org.eclipse.jdt.ui/spelling_ignore_java_strings=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +/instance/org.eclipse.jdt.ui/tabWidthPropagated=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n +/instance/org.eclipse.wst.xml.core/lineWidth=80 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +/instance/org.eclipse.jdt.ui/cleanup.make_parameters_final=false +/instance/org.eclipse.jdt.ui/sp_cleanup.use_blocks=false +/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +/instance/org.python.pydev/IRONPYTHON_INTERPRETER_PATH=\nC\:\\Program Files (x86)\\IronPython 2.7\\ipy64.exe\n2.7\nC\:\\Program Files (x86)\\IronPython 2.7\\ipy64.exe\nC\:\\Program Files (x86)\\IronPython 2.7\\Lib\nC\:\\Program Files (x86)\\IronPython 2.7\\DLLs\nC\:\\Program Files (x86)\\IronPython 2.7\nC\:\\Program Files (x86)\\IronPython 2.7\\lib\\site-packages\nIEHost.Execute\nMicrosoft\nMicrosoft.Aspnet.Snapin\nMicrosoft.Build.BuildEngine\nMicrosoft.Build.Conversion\nMicrosoft.Build.Framework\nMicrosoft.Build.Tasks\nMicrosoft.Build.Tasks.Deployment.Bootstrapper\nMicrosoft.Build.Tasks.Deployment.ManifestUtilities\nMicrosoft.Build.Tasks.Hosting\nMicrosoft.Build.Tasks.Windows\nMicrosoft.Build.Utilities\nMicrosoft.CLRAdmin\nMicrosoft.CSharp\nMicrosoft.Data.Entity.Build.Tasks\nMicrosoft.IE\nMicrosoft.Ink\nMicrosoft.Ink.TextInput\nMicrosoft.JScript\nMicrosoft.JScript.Vsa\nMicrosoft.ManagementConsole\nMicrosoft.ManagementConsole.Advanced\nMicrosoft.ManagementConsole.Internal\nMicrosoft.ServiceModel.Channels.Mail\nMicrosoft.ServiceModel.Channels.Mail.ExchangeWebService\nMicrosoft.ServiceModel.Channels.Mail.ExchangeWebService.Exchange2007\nMicrosoft.ServiceModel.Channels.Mail.WindowsMobile\nMicrosoft.SqlServer.Server\nMicrosoft.StylusInput\nMicrosoft.StylusInput.PluginData\nMicrosoft.VisualBasic\nMicrosoft.VisualBasic.ApplicationServices\nMicrosoft.VisualBasic.Compatibility.VB6\nMicrosoft.VisualBasic.CompilerServices\nMicrosoft.VisualBasic.Devices\nMicrosoft.VisualBasic.FileIO\nMicrosoft.VisualBasic.Logging\nMicrosoft.VisualBasic.MyServices\nMicrosoft.VisualBasic.MyServices.Internal\nMicrosoft.VisualBasic.Vsa\nMicrosoft.VisualC\nMicrosoft.VisualC.StlClr\nMicrosoft.VisualC.StlClr.Generic\nMicrosoft.Vsa\nMicrosoft.Vsa.Vb.CodeDOM\nMicrosoft.Win32\nMicrosoft.Win32.SafeHandles\nMicrosoft.Windows.Themes\nMicrosoft.WindowsCE.Forms\nMicrosoft.WindowsMobile.DirectX\nMicrosoft.WindowsMobile.DirectX.Direct3D\nMicrosoft_VsaVb\nRegCode\nSystem\nSystem.AddIn\nSystem.AddIn.Contract\nSystem.AddIn.Contract.Automation\nSystem.AddIn.Contract.Collections\nSystem.AddIn.Hosting\nSystem.AddIn.Pipeline\nSystem.CodeDom\nSystem.CodeDom.Compiler\nSystem.Collections\nSystem.Collections.Generic\nSystem.Collections.ObjectModel\nSystem.Collections.Specialized\nSystem.ComponentModel\nSystem.ComponentModel.DataAnnotations\nSystem.ComponentModel.Design\nSystem.ComponentModel.Design.Data\nSystem.ComponentModel.Design.Serialization\nSystem.Configuration\nSystem.Configuration.Assemblies\nSystem.Configuration.Install\nSystem.Configuration.Internal\nSystem.Configuration.Provider\nSystem.Data\nSystem.Data.Common\nSystem.Data.Common.CommandTrees\nSystem.Data.Design\nSystem.Data.Entity.Design\nSystem.Data.Entity.Design.AspNet\nSystem.Data.EntityClient\nSystem.Data.Linq\nSystem.Data.Linq.Mapping\nSystem.Data.Linq.SqlClient\nSystem.Data.Linq.SqlClient.Implementation\nSystem.Data.Mapping\nSystem.Data.Metadata.Edm\nSystem.Data.Objects\nSystem.Data.Objects.DataClasses\nSystem.Data.Odbc\nSystem.Data.OleDb\nSystem.Data.OracleClient\nSystem.Data.Services\nSystem.Data.Services.Client\nSystem.Data.Services.Common\nSystem.Data.Services.Design\nSystem.Data.Services.Internal\nSystem.Data.Sql\nSystem.Data.SqlClient\nSystem.Data.SqlTypes\nSystem.Deployment.Application\nSystem.Deployment.Internal\nSystem.Diagnostics\nSystem.Diagnostics.CodeAnalysis\nSystem.Diagnostics.Design\nSystem.Diagnostics.Eventing\nSystem.Diagnostics.Eventing.Reader\nSystem.Diagnostics.PerformanceData\nSystem.Diagnostics.SymbolStore\nSystem.DirectoryServices\nSystem.DirectoryServices.AccountManagement\nSystem.DirectoryServices.ActiveDirectory\nSystem.DirectoryServices.Protocols\nSystem.Drawing\nSystem.Drawing.Design\nSystem.Drawing.Drawing2D\nSystem.Drawing.Imaging\nSystem.Drawing.Printing\nSystem.Drawing.Text\nSystem.EnterpriseServices\nSystem.EnterpriseServices.CompensatingResourceManager\nSystem.EnterpriseServices.Internal\nSystem.Globalization\nSystem.IO\nSystem.IO.Compression\nSystem.IO.IsolatedStorage\nSystem.IO.Log\nSystem.IO.Packaging\nSystem.IO.Pipes\nSystem.IO.Ports\nSystem.IdentityModel.Claims\nSystem.IdentityModel.Policy\nSystem.IdentityModel.Selectors\nSystem.IdentityModel.Tokens\nSystem.Linq\nSystem.Linq.Expressions\nSystem.Management\nSystem.Management.Instrumentation\nSystem.Media\nSystem.Messaging\nSystem.Messaging.Design\nSystem.Net\nSystem.Net.Cache\nSystem.Net.Configuration\nSystem.Net.Mail\nSystem.Net.Mime\nSystem.Net.NetworkInformation\nSystem.Net.PeerToPeer\nSystem.Net.PeerToPeer.Collaboration\nSystem.Net.Security\nSystem.Net.Sockets\nSystem.Printing\nSystem.Printing.IndexedProperties\nSystem.Printing.Interop\nSystem.Reflection\nSystem.Reflection.Emit\nSystem.Resources\nSystem.Resources.Tools\nSystem.Runtime\nSystem.Runtime.CompilerServices\nSystem.Runtime.ConstrainedExecution\nSystem.Runtime.Hosting\nSystem.Runtime.InteropServices\nSystem.Runtime.InteropServices.ComTypes\nSystem.Runtime.InteropServices.CustomMarshalers\nSystem.Runtime.InteropServices.Expando\nSystem.Runtime.Remoting\nSystem.Runtime.Remoting.Activation\nSystem.Runtime.Remoting.Channels\nSystem.Runtime.Remoting.Channels.Http\nSystem.Runtime.Remoting.Channels.Ipc\nSystem.Runtime.Remoting.Channels.Tcp\nSystem.Runtime.Remoting.Contexts\nSystem.Runtime.Remoting.Lifetime\nSystem.Runtime.Remoting.Messaging\nSystem.Runtime.Remoting.Metadata\nSystem.Runtime.Remoting.MetadataServices\nSystem.Runtime.Remoting.Proxies\nSystem.Runtime.Remoting.Services\nSystem.Runtime.Serialization\nSystem.Runtime.Serialization.Configuration\nSystem.Runtime.Serialization.Formatters\nSystem.Runtime.Serialization.Formatters.Binary\nSystem.Runtime.Serialization.Formatters.Soap\nSystem.Runtime.Serialization.Json\nSystem.Runtime.Versioning\nSystem.Security\nSystem.Security.AccessControl\nSystem.Security.Authentication\nSystem.Security.Authentication.ExtendedProtection\nSystem.Security.Authentication.ExtendedProtection.Configuration\nSystem.Security.Cryptography\nSystem.Security.Cryptography.Pkcs\nSystem.Security.Cryptography.X509Certificates\nSystem.Security.Cryptography.Xml\nSystem.Security.Permissions\nSystem.Security.Policy\nSystem.Security.Principal\nSystem.Security.RightsManagement\nSystem.ServiceModel\nSystem.ServiceModel.Activation\nSystem.ServiceModel.Activation.Configuration\nSystem.ServiceModel.Channels\nSystem.ServiceModel.ComIntegration\nSystem.ServiceModel.Configuration\nSystem.ServiceModel.Description\nSystem.ServiceModel.Diagnostics\nSystem.ServiceModel.Dispatcher\nSystem.ServiceModel.Install.Configuration\nSystem.ServiceModel.Internal\nSystem.ServiceModel.MsmqIntegration\nSystem.ServiceModel.PeerResolvers\nSystem.ServiceModel.Persistence\nSystem.ServiceModel.Security\nSystem.ServiceModel.Security.Tokens\nSystem.ServiceModel.Syndication\nSystem.ServiceModel.Web\nSystem.ServiceProcess\nSystem.ServiceProcess.Design\nSystem.Speech.AudioFormat\nSystem.Speech.Recognition\nSystem.Speech.Recognition.SrgsGrammar\nSystem.Speech.Synthesis\nSystem.Speech.Synthesis.TtsEngine\nSystem.Text\nSystem.Text.RegularExpressions\nSystem.Threading\nSystem.Timers\nSystem.Transactions\nSystem.Transactions.Configuration\nSystem.Web\nSystem.Web.ApplicationServices\nSystem.Web.Caching\nSystem.Web.ClientServices\nSystem.Web.ClientServices.Providers\nSystem.Web.Compilation\nSystem.Web.Configuration\nSystem.Web.Configuration.Internal\nSystem.Web.DynamicData\nSystem.Web.DynamicData.Design\nSystem.Web.DynamicData.ModelProviders\nSystem.Web.Handlers\nSystem.Web.Hosting\nSystem.Web.Mail\nSystem.Web.Management\nSystem.Web.Mobile\nSystem.Web.Profile\nSystem.Web.Query.Dynamic\nSystem.Web.RegularExpressions\nSystem.Web.Routing\nSystem.Web.Script.Serialization\nSystem.Web.Script.Services\nSystem.Web.Security\nSystem.Web.Services\nSystem.Web.Services.Configuration\nSystem.Web.Services.Description\nSystem.Web.Services.Discovery\nSystem.Web.Services.Protocols\nSystem.Web.SessionState\nSystem.Web.UI\nSystem.Web.UI.Adapters\nSystem.Web.UI.Design\nSystem.Web.UI.Design.MobileControls\nSystem.Web.UI.Design.MobileControls.Converters\nSystem.Web.UI.Design.WebControls\nSystem.Web.UI.Design.WebControls.WebParts\nSystem.Web.UI.MobileControls\nSystem.Web.UI.MobileControls.Adapters\nSystem.Web.UI.MobileControls.Adapters.XhtmlAdapters\nSystem.Web.UI.WebControls\nSystem.Web.UI.WebControls.Adapters\nSystem.Web.UI.WebControls.WebParts\nSystem.Web.Util\nSystem.Windows\nSystem.Windows.Annotations\nSystem.Windows.Annotations.Storage\nSystem.Windows.Automation\nSystem.Windows.Automation.Peers\nSystem.Windows.Automation.Provider\nSystem.Windows.Automation.Text\nSystem.Windows.Controls\nSystem.Windows.Controls.Primitives\nSystem.Windows.Converters\nSystem.Windows.Data\nSystem.Windows.Documents\nSystem.Windows.Documents.Serialization\nSystem.Windows.Forms\nSystem.Windows.Forms.ComponentModel.Com2Interop\nSystem.Windows.Forms.Design\nSystem.Windows.Forms.Design.Behavior\nSystem.Windows.Forms.Integration\nSystem.Windows.Forms.Layout\nSystem.Windows.Forms.PropertyGridInternal\nSystem.Windows.Forms.VisualStyles\nSystem.Windows.Ink\nSystem.Windows.Ink.AnalysisCore\nSystem.Windows.Input\nSystem.Windows.Input.StylusPlugIns\nSystem.Windows.Interop\nSystem.Windows.Markup\nSystem.Windows.Markup.Localizer\nSystem.Windows.Markup.Primitives\nSystem.Windows.Media\nSystem.Windows.Media.Animation\nSystem.Windows.Media.Converters\nSystem.Windows.Media.Effects\nSystem.Windows.Media.Imaging\nSystem.Windows.Media.Media3D\nSystem.Windows.Media.Media3D.Converters\nSystem.Windows.Media.TextFormatting\nSystem.Windows.Navigation\nSystem.Windows.Resources\nSystem.Windows.Shapes\nSystem.Windows.Threading\nSystem.Windows.Xps\nSystem.Windows.Xps.Packaging\nSystem.Windows.Xps.Serialization\nSystem.Workflow.Activities\nSystem.Workflow.Activities.Configuration\nSystem.Workflow.Activities.Rules\nSystem.Workflow.Activities.Rules.Design\nSystem.Workflow.ComponentModel\nSystem.Workflow.ComponentModel.Compiler\nSystem.Workflow.ComponentModel.Design\nSystem.Workflow.ComponentModel.Serialization\nSystem.Workflow.Runtime\nSystem.Workflow.Runtime.Configuration\nSystem.Workflow.Runtime.DebugEngine\nSystem.Workflow.Runtime.Hosting\nSystem.Workflow.Runtime.Tracking\nSystem.Xml\nSystem.Xml.Linq\nSystem.Xml.Schema\nSystem.Xml.Serialization\nSystem.Xml.Serialization.Advanced\nSystem.Xml.Serialization.Configuration\nSystem.Xml.XPath\nSystem.Xml.Xsl\nSystem.Xml.Xsl.Runtime\nUIAutomationClientsideProviders\n__builtin__\n_ast\n_bisect\n_codecs\n_collections\n_csv\n_ctypes\n_ctypes_test\n_functools\n_heapq\n_io\n_locale\n_md5\n_random\n_sha\n_sha256\n_sha512\n_sqlite3\n_sre\n_ssl\n_struct\n_subprocess\n_warnings\n_weakref\n_winreg\narray\nbinascii\nbz2\ncPickle\ncStringIO\nclr\ncmath\ncopy_reg\ndatetime\nemail\nerrno\nexceptions\nfuture_builtins\ngc\nhashlib\nimp\nitertools\nmarshal\nmath\nmmap\nmsvcrt\nnt\noperator\nos\nos.path\npytest\nre\nselect\nsignal\nsocket\nsys\nthread\ntime\nunicodedata\nwinsound\nwpf\nxxsubtype\nzipimport\nzlib\n&&&&& +/instance/org.eclipse.jdt.ui/cleanup.add_generated_serial_version_id=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +/instance/org.eclipse.wst.validation/suspend=false +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles.version=12 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +/instance/org.eclipse.compare/org.eclipse.compare.IgnoreWhitespace=true +/instance/org.eclipse.egit.ui/resourcehistory_graph_split=500,500 +@org.eclipse.mylyn.monitor.ui=3.8.3.v20130107-0100 +/instance/org.eclipse.ui.ide/PROBLEMS_FILTERS_MIGRATE=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +/instance/org.eclipse.jdt.ui/cleanup.always_use_parentheses_in_expressions=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentSuffixes= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +/instance/org.eclipse.jdt.ui/sp_cleanup.add_default_serial_version_id=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.BreakpointView=\r\n\r\n\r\n\r\n\r\n +@org.eclipse.ui.workbench=3.104.0.v20130204-164612 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.importorder=java;javax;org;com;org.apache.cloudstack;com.cloud; +/instance/org.eclipse.jdt.ui/sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_field_access=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.organize_imports=true +/instance/org.eclipse.jdt.ui/cleanup.qualify_static_method_accesses_with_declaring_class=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +@org.eclipse.egit.ui=2.3.1.201302201838-r +/instance/org.eclipse.ui.editors/quickdiff.nowarn.before.switch=always +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.line_length=120 +/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +/instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.VariableView.org.eclipse.jdt.debug.ui.show_null_entries=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldSuffixes= +/instance/org.eclipse.jdt.ui/content_assist_number_of_computers=21 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localSuffixes= +/instance/org.eclipse.jdt.junit.core/org.eclipse.jdt.junit.enable_assertions=true +@org.eclipse.core.resources=3.8.1.v20121114-124432 +/instance/org.eclipse.jdt.ui/spelling_ignore_urls=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +/instance/org.eclipse.jdt.ui/content_assist_autoactivation_delay=50 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +@org.eclipse.search=3.8.0.v20120523-1540 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +/instance/org.eclipse.ui.intro/org.eclipse.epp.package.java.product_INTRO_THEME=org.eclipse.ui.intro.universal.circles +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JSR305_ANNOTATIONS=C\:/bin/Eclipse/current/plugins/edu.umd.cs.findbugs.plugin.eclipse_2.0.2.20121210/lib/jsr305.jar +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.JRE_LIB=C\:/bin/Java/jre7/lib/rt.jar +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.lineSplit=180 +/instance/org.eclipse.jdt.ui/content_assist_disabled_computers=org.eclipse.recommenders.completion.rcp.templates.category\u0000org.eclipse.jdt.ui.javaAllProposalCategory\u0000org.eclipse.jdt.ui.javaNoTypeProposalCategory\u0000org.eclipse.recommenders.completion.rcp.chain.category\u0000org.eclipse.jdt.ui.javaTypeProposalCategory\u0000org.eclipse.jdt.ui.textProposalCategory\u0000org.eclipse.recommenders.subwords.rcp.category\u0000 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +@org.eclipse.ui.ide=3.8.2.v20121106-165923 +@org.eclipse.core.runtime=3.8.0.v20120912-155025 +/instance/org.eclipse.jdt.ui/editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_trailing_whitespaces_ignore_empty=true +/instance/org.eclipse.jdt.ui/sp_cleanup.always_use_blocks=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.PREF_HCR_WITH_COMPILATION_ERRORS=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_html=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +/instance/org.eclipse.m2e.core/eclipse.m2.WorkspacelifecycleMappingsLocation=D\:/src/workspaces/master/.metadata/.plugins/org.eclipse.m2e.core/lifecycle-mapping-metadata.xml +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +/instance/org.eclipse.jdt.ui/cleanup.make_variable_declarations_final=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access=true /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert @@ -432,185 +432,185 @@ /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.ExpressionView.org.eclipse.jdt.debug.ui.show_null_entries=true /instance/org.eclipse.jdt.ui/sp_cleanup.correct_indentation=false /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_source_code=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -/instance/org.eclipse.jdt.ui/cleanup.never_use_parentheses_in_expressions=true -@org.eclipse.debug.core=3.7.100.v20120521-2012 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -file_export_version=3.0 -@org.eclipse.jdt.debug.ui=3.6.100.v20120530-1425 -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_trailing_whitespaces=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.PREF_REQUEST_TIMEOUT=3000 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -/instance/org.eclipse.jdt.ui/cleanup.format_source_code=false -/configuration/org.eclipse.ui.ide/RECENT_WORKSPACES=d\:\\src\\workspaces\\vmsync\nd\:\\src\\workspaces\\master\nd\:\\src\\workspaces\\4.x -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unnecessary_casts=true -@org.eclipse.jdt.junit.core=3.7.100.v20120523-1257 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -/instance/org.eclipse.m2e.discovery/org.eclipse.m2e.discovery.pref.projects= -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation=true -/instance/org.eclipse.jdt.ui/sp_cleanup.sort_members_all=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentPrefixes= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.VariableView=\r\n\r\n\r\n -/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.internal.ui.navigator.layout=2 -/instance/org.eclipse.jdt.ui/sp_cleanup.make_parameters_final=false -/instance/org.eclipse.jdt.ui/cleanup.remove_unnecessary_casts=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -@org.eclipse.m2e.core=1.3.1.20130219-1424 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_empty_lines=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -/instance/org.eclipse.ui/showIntro=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -/instance/org.eclipse.jdt.ui/cleanup.qualify_static_field_accesses_with_declaring_class=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldPrefixes= -/instance/org.eclipse.mylyn.monitor.ui/org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localPrefixes= -/instance/org.eclipse.team.core/ignore_files=target\ntrue\n -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles.version=2 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -/instance/org.eclipse.ui.browser/internalWebBrowserHistory=file\:///D\:/src/acs/vmsync/tools/apidoc/target/xmldoc/html/root_admin/updateHypervisorCapabilities.html|*|file\:/D\:/src/acs/vmsync/tools/apidoc/target/xmldoc/html/root_admin/updateHypervisorCapabilities.html|*| -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -/instance/org.eclipse.jdt.ui/spelling_user_dictionary_encoding= -/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_annotations=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true -/instance/org.eclipse.jdt.ui/cleanup.never_use_blocks=false -/instance/org.eclipse.wst.validation/USER_MANUAL_PREFERENCE=enabledManualValidatorList -@org.eclipse.mylyn.context.core=3.8.3.v20130107-0100 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -@org.eclipse.jdt.launching=3.6.101.v20130111-183046 -@org.eclipse.jdt.debug=3.7.101.v20120913-153601 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6 -@org.eclipse.m2e.editor.xml=1.3.1.20130219-1424 -/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_fields=true -/instance/org.eclipse.jdt.ui/sp_cleanup.use_blocks_only_for_return_and_throw=false -/instance/org.eclipse.jdt.ui/cleanup.remove_unused_local_variables=false -/instance/org.eclipse.debug.ui/org.eclipse.debug.ui.user_view_bindings=\r\n\r\n\r\n\r\n\r\n\r\n -/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_members=false -@org.python.pydev.debug=2.7.5.2013052819 -/instance/org.eclipse.jdt.ui/sp_cleanup.add_generated_serial_version_id=false -/configuration/org.eclipse.ui.ide/MAX_RECENT_WORKSPACES=5 -/instance/org.eclipse.jdt.ui/spelling_ignore_ampersand_in_properties=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.use_on_off_tags=true -@org.eclipse.ui.intro=3.4.200.v20120521-2344 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6 -/instance/org.eclipse.wst.xml.core/indentationSize=2 -/instance/org.eclipse.jdt.ui/cleanup.use_blocks_only_for_return_and_throw=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_fields=true -/instance/org.eclipse.jdt.ui/sp_cleanup.make_local_variable_final=false -/instance/org.eclipse.m2e.core/eclipse.m2.defaultPomEditorPage=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -/instance/org.eclipse.jdt.ui/content_assist_autoactivation_triggers_java=.( -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -/instance/org.eclipse.jdt.ui/cleanup.use_blocks=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.FINDBUGS_ANNOTATIONS=C\:/bin/Eclipse/current/plugins/edu.umd.cs.findbugs.plugin.eclipse_2.0.2.20121210/lib/annotations.jar -/instance/org.eclipse.egit.core/GitRepositoriesView.GitDirectories=D\:\\src\\acs\\master\\.git;D\:\\src\\acs\\vmsync\\.git; -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -/instance/org.eclipse.ui.workbench/editors=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.compact_else_if=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -/instance/org.eclipse.jdt.ui/content_assist_proposals_background=255,255,255 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_header=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.tabulation.char=space -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_block_comments=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -/instance/org.eclipse.debug.core/prefWatchExpressions=\r\n\r\n\r\n\r\n\r\n -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -/instance/org.eclipse.wst.validation/DELEGATES_PREFERENCE=delegateValidatorList -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -@org.eclipse.team.ui=3.6.201.v20130125-135424 -/instance/org.eclipse.ui.editors/overviewRuler_migration=migrated_3.1 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -@org.eclipse.wst.xml.core=1.1.702.v201301101836 -/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_methods=true -@org.eclipse.wst.xml.ui=1.1.302.v201301172222 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -/instance/org.eclipse.ui.ide/tipsAndTricks=true -/instance/org.eclipse.search/org.eclipse.search.defaultPerspective=org.eclipse.search.defaultPerspective.none -/instance/org.eclipse.egit.ui/default_repository_dir=d\:\\src -/instance/org.eclipse.jdt.ui/sp_cleanup.on_save_use_additional_actions=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -/instance/org.eclipse.jdt.ui/cleanup.sort_members=false -/instance/org.eclipse.jdt.ui/sp_cleanup.use_parentheses_in_expressions=false -@org.eclipse.debug.ui=3.8.2.v20130130-171415 -@org.eclipse.compare=3.5.301.v20130125-135424 -/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access=true -/instance/org.eclipse.jdt.ui/org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New; -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -/instance/org.eclipse.ui.editors/printMargin=true -/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces_all=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -/instance/org.eclipse.wst.validation/stateTS=0 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -@org.eclipse.jdt.ui=3.8.2.v20130107-165834 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.M2_REPO=d\:/src/maven -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unnecessary_nls_tags=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -/instance/org.eclipse.wst.xml.ui/org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart.lastActivePage=1 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -/instance/org.eclipse.mylyn.wikitext.ui/org.eclipse.mylyn.wikitext.ui.customtemplates= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -@org.eclipse.ui.browser=3.4.2.v20130123-162658 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_methods=false -/instance/org.eclipse.debug.ui/org.eclipse.debug.ui.switch_perspective_on_suspend=always -/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_types=true -/instance/org.eclipse.jdt.ui/content_assist_lru_history= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -/instance/org.eclipse.ui.editors/spacesForTabs=true -@org.eclipse.mylyn.wikitext.ui=1.7.3.v20130107-0100 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -/instance/org.python.pydev/INTERPRETER_CONFIGURATION_0=DONT_ASK -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -@org.eclipse.epp.mpc.ui=1.1.1.I20110907-0947 -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_DEFAULT_ENVIRONMENTS_XML= -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -/instance/org.eclipse.jdt.ui/cleanup.correct_indentation=true -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -/instance/org.eclipse.ui.ide/quickStart=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -/instance/org.eclipse.ui.workbench/PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +/instance/org.eclipse.jdt.ui/cleanup.never_use_parentheses_in_expressions=true +@org.eclipse.debug.core=3.7.100.v20120521-2012 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +file_export_version=3.0 +@org.eclipse.jdt.debug.ui=3.6.100.v20120530-1425 +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_trailing_whitespaces=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +/instance/org.eclipse.jdt.debug/org.eclipse.jdt.debug.PREF_REQUEST_TIMEOUT=3000 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +/instance/org.eclipse.jdt.ui/cleanup.format_source_code=false +/configuration/org.eclipse.ui.ide/RECENT_WORKSPACES=d\:\\src\\workspaces\\vmsync\nd\:\\src\\workspaces\\master\nd\:\\src\\workspaces\\4.x +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unnecessary_casts=true +@org.eclipse.jdt.junit.core=3.7.100.v20120523-1257 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +/instance/org.eclipse.m2e.discovery/org.eclipse.m2e.discovery.pref.projects= +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation=true +/instance/org.eclipse.jdt.ui/sp_cleanup.sort_members_all=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentPrefixes= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +/instance/org.eclipse.debug.ui/pref_state_memento.org.eclipse.debug.ui.VariableView=\r\n\r\n\r\n +/instance/org.eclipse.jdt.ui/sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.internal.ui.navigator.layout=2 +/instance/org.eclipse.jdt.ui/sp_cleanup.make_parameters_final=false +/instance/org.eclipse.jdt.ui/cleanup.remove_unnecessary_casts=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +@org.eclipse.m2e.core=1.3.1.20130219-1424 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_empty_lines=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +/instance/org.eclipse.ui/showIntro=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +/instance/org.eclipse.jdt.ui/cleanup.qualify_static_field_accesses_with_declaring_class=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldPrefixes= +/instance/org.eclipse.mylyn.monitor.ui/org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localPrefixes= +/instance/org.eclipse.team.core/ignore_files=target\ntrue\n +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles.version=2 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +/instance/org.eclipse.ui.browser/internalWebBrowserHistory=file\:///D\:/src/acs/vmsync/tools/apidoc/target/xmldoc/html/root_admin/updateHypervisorCapabilities.html|*|file\:/D\:/src/acs/vmsync/tools/apidoc/target/xmldoc/html/root_admin/updateHypervisorCapabilities.html|*| +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +/instance/org.eclipse.jdt.ui/spelling_user_dictionary_encoding= +/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_annotations=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true +/instance/org.eclipse.jdt.ui/cleanup.never_use_blocks=false +/instance/org.eclipse.wst.validation/USER_MANUAL_PREFERENCE=enabledManualValidatorList +@org.eclipse.mylyn.context.core=3.8.3.v20130107-0100 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +@org.eclipse.jdt.launching=3.6.101.v20130111-183046 +@org.eclipse.jdt.debug=3.7.101.v20120913-153601 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6 +@org.eclipse.m2e.editor.xml=1.3.1.20130219-1424 +/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_fields=true +/instance/org.eclipse.jdt.ui/sp_cleanup.use_blocks_only_for_return_and_throw=false +/instance/org.eclipse.jdt.ui/cleanup.remove_unused_local_variables=false +/instance/org.eclipse.debug.ui/org.eclipse.debug.ui.user_view_bindings=\r\n\r\n\r\n\r\n\r\n\r\n +/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_members=false +@org.python.pydev.debug=2.7.5.2013052819 +/instance/org.eclipse.jdt.ui/sp_cleanup.add_generated_serial_version_id=false +/configuration/org.eclipse.ui.ide/MAX_RECENT_WORKSPACES=5 +/instance/org.eclipse.jdt.ui/spelling_ignore_ampersand_in_properties=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.use_on_off_tags=true +@org.eclipse.ui.intro=3.4.200.v20120521-2344 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6 +/instance/org.eclipse.wst.xml.core/indentationSize=2 +/instance/org.eclipse.jdt.ui/cleanup.use_blocks_only_for_return_and_throw=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_fields=true +/instance/org.eclipse.jdt.ui/sp_cleanup.make_local_variable_final=false +/instance/org.eclipse.m2e.core/eclipse.m2.defaultPomEditorPage=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +/instance/org.eclipse.jdt.ui/content_assist_autoactivation_triggers_java=.( +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +/instance/org.eclipse.jdt.ui/cleanup.use_blocks=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.FINDBUGS_ANNOTATIONS=C\:/bin/Eclipse/current/plugins/edu.umd.cs.findbugs.plugin.eclipse_2.0.2.20121210/lib/annotations.jar +/instance/org.eclipse.egit.core/GitRepositoriesView.GitDirectories=D\:\\src\\acs\\master\\.git;D\:\\src\\acs\\vmsync\\.git; +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +/instance/org.eclipse.ui.workbench/editors=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.compact_else_if=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +/instance/org.eclipse.jdt.ui/content_assist_proposals_background=255,255,255 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_header=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.tabulation.char=space +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_block_comments=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +/instance/org.eclipse.debug.core/prefWatchExpressions=\r\n\r\n\r\n\r\n\r\n +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +/instance/org.eclipse.wst.validation/DELEGATES_PREFERENCE=delegateValidatorList +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +@org.eclipse.team.ui=3.6.201.v20130125-135424 +/instance/org.eclipse.ui.editors/overviewRuler_migration=migrated_3.1 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +@org.eclipse.wst.xml.core=1.1.702.v201301101836 +/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_methods=true +@org.eclipse.wst.xml.ui=1.1.302.v201301172222 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +/instance/org.eclipse.ui.ide/tipsAndTricks=true +/instance/org.eclipse.search/org.eclipse.search.defaultPerspective=org.eclipse.search.defaultPerspective.none +/instance/org.eclipse.egit.ui/default_repository_dir=d\:\\src +/instance/org.eclipse.jdt.ui/sp_cleanup.on_save_use_additional_actions=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +/instance/org.eclipse.jdt.ui/cleanup.sort_members=false +/instance/org.eclipse.jdt.ui/sp_cleanup.use_parentheses_in_expressions=false +@org.eclipse.debug.ui=3.8.2.v20130130-171415 +@org.eclipse.compare=3.5.301.v20130125-135424 +/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access=true +/instance/org.eclipse.jdt.ui/org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New; +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +/instance/org.eclipse.ui.editors/printMargin=true +/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces_all=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +/instance/org.eclipse.wst.validation/stateTS=0 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +@org.eclipse.jdt.ui=3.8.2.v20130107-165834 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.classpathVariable.M2_REPO=d\:/src/maven +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unnecessary_nls_tags=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +/instance/org.eclipse.wst.xml.ui/org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart.lastActivePage=1 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +/instance/org.eclipse.mylyn.wikitext.ui/org.eclipse.mylyn.wikitext.ui.customtemplates= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +@org.eclipse.ui.browser=3.4.2.v20130123-162658 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +/instance/org.eclipse.jdt.ui/sp_cleanup.add_missing_methods=false +/instance/org.eclipse.debug.ui/org.eclipse.debug.ui.switch_perspective_on_suspend=always +/instance/org.eclipse.jdt.ui/sp_cleanup.remove_unused_private_types=true +/instance/org.eclipse.jdt.ui/content_assist_lru_history= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +/instance/org.eclipse.ui.editors/spacesForTabs=true +@org.eclipse.mylyn.wikitext.ui=1.7.3.v20130107-0100 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +/instance/org.python.pydev/INTERPRETER_CONFIGURATION_0=DONT_ASK +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +@org.eclipse.epp.mpc.ui=1.1.1.I20110907-0947 +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_DEFAULT_ENVIRONMENTS_XML= +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +/instance/org.eclipse.jdt.ui/cleanup.correct_indentation=true +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +/instance/org.eclipse.ui.ide/quickStart=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +/instance/org.eclipse.ui.workbench/PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert