Diverse Korrekturen fuer SimpleAddress, noch ohne Update Routine.

git-svn-id: https://svn.libreccm.org/ccm/trunk@794 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-types-simpleaddress/application.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-cms-types-oldaddress"
+  name="ccm-cms-types-simpleaddress"
-  prettyName="Red Hat CCM Content Types"
+  prettyName="Simple Address Red Hat CCM Content Type"
-  version="6.6.0"
+  version="6.6.1"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
@@ -18,7 +18,14 @@
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
+
   <ccm:description>
-    The old Address Content Type for the Red Hat CCM CMS.
+    Simple Address is the old Address Content Type for the Red Hat CCM CMS
+    (previously named ccm-cms-types-address up to 6.6.0). 
+    
+    The old type is incompatible with the new generic basic content types
+    intoduced with  6.6.1 (table name conflicts etc.). It has been modified
+    so it can be installed in parallel to the new type (ccm-cms-types-address).
   </ccm:description>
+
 </ccm:application>

ccm-cms-types-simpleaddress/pdl/com/arsdigita/content-types/SimpleAddress.pdl

@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: Address.pdl 1597 2007-07-10 16:27:26Z p_boy $
+// $Id: SimpleAddress.pdl 1597 2007-07-10 16:27:26Z p_boy $
 // $DateTime: 2004/08/17 23:15:09 $
 model com.arsdigita.cms.contenttypes;
 
@@ -24,34 +24,34 @@ import com.arsdigita.cms.ContentPage;
 // mapping table for mapping iso country code to country name
 object type IsoCountry {
     // The country iso code
-    String[1..1] isoCode = iso_countries.iso_code CHAR(2);
+    String[1..1] isoCode = ct_simpleaddr_iso_countries.iso_code CHAR(2);
     // The country name
-    String[1..1] countryName = iso_countries.country_name VARCHAR(100);
+    String[1..1] countryName = ct_simpleaddr_iso_countries.country_name VARCHAR(100);
 
     object key (isoCode);
 }
 
 // a simple content type to hold generic address information
-object type Address extends ContentPage {
+object type SimpleAddress extends ContentPage {
     // The street address, flexible enough to handle different formats
-    String[0..1] address = ct_addresses.address VARCHAR(1000);
+    String[0..1] address = ct_simpleaddr_addresses.address VARCHAR(1000);
     // The country iso code
-    IsoCountry[0..1] isoCountryCode = join ct_addresses.iso_country_code 
+    IsoCountry[0..1] isoCountryCode = join ct_simpleaddr_addresses.iso_country_code
-                                        to iso_countries.iso_code;
+                                        to ct_simpleaddr_iso_countries.iso_code;
     // The postal code
-    String[0..1] postalCode = ct_addresses.postal_code VARCHAR(20);
+    String[0..1] postalCode = ct_simpleaddr_addresses.postal_code VARCHAR(20);
     // The phone number
-    String[0..1] phone = ct_addresses.phone VARCHAR(20);
+    String[0..1] phone = ct_simpleaddr_addresses.phone VARCHAR(20);
     // The mobile phone number
-    String[0..1] mobile = ct_addresses.mobile VARCHAR(20);
+    String[0..1] mobile = ct_simpleaddr_addresses.mobile VARCHAR(20);
     // The fax phone number
-    String[0..1] fax = ct_addresses.fax VARCHAR(20);
+    String[0..1] fax = ct_simpleaddr_addresses.fax VARCHAR(20);
     // The email address
-    String[0..1] email = ct_addresses.email VARCHAR(75);
+    String[0..1] email = ct_simpleaddr_addresses.email VARCHAR(75);
     // Notes about the address and address owner
-    String[0..1] notes = ct_addresses.notes CLOB;
+    String[0..1] notes = ct_simpleaddr_addresses.notes CLOB;
     // URI for the address
-    String[0..1] uri = ct_addresses.uri VARCHAR(250);
+    String[0..1] uri = ct_simpleaddr_addresses.uri VARCHAR(250);
 
-    reference key (ct_addresses.address_id);
+    reference key (ct_simpleaddr_addresses.address_id);
 }

ccm-cms-types-simpleaddress/sql/ccm-cms-types-oldaddress/default/insert-iso-countries.sql

@@ -1,259 +0,0 @@
---
--- Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
---
--- This library is free software; you can redistribute it and/or
--- modify it under the terms of the GNU Lesser General Public License
--- as published by the Free Software Foundation; either version 2.1 of
--- the License, or (at your option) any later version.
---
--- This library is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--- Lesser General Public License for more details.
---
--- You should have received a copy of the GNU Lesser General Public
--- License along with this library; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---
--- $Id: insert-iso-countries.sql 1597 2007-07-10 16:27:26Z p_boy $
--- $DateTime: 2004/08/17 23:15:09 $
-insert into iso_countries (iso_code, country_name) values ('AF', 'Afghanistan');
-insert into iso_countries (iso_code, country_name) values ('AL', 'Albania');
-insert into iso_countries (iso_code, country_name) values ('DZ', 'Algeria');
-insert into iso_countries (iso_code, country_name) values ('AS', 'American Samoa');
-insert into iso_countries (iso_code, country_name) values ('AD', 'andorra');
-insert into iso_countries (iso_code, country_name) values ('AO', 'Angola');
-insert into iso_countries (iso_code, country_name) values ('AI', 'Anguilla');
-insert into iso_countries (iso_code, country_name) values ('AQ', 'Antarctica');
-insert into iso_countries (iso_code, country_name) values ('AG', 'Antigua and Barbuda');
-insert into iso_countries (iso_code, country_name) values ('AR', 'Argentina');
-insert into iso_countries (iso_code, country_name) values ('AM', 'Armenia');
-insert into iso_countries (iso_code, country_name) values ('AW', 'Aruba');
-insert into iso_countries (iso_code, country_name) values ('AU', 'Australia');
-insert into iso_countries (iso_code, country_name) values ('AT', 'Austria');
-insert into iso_countries (iso_code, country_name) values ('AZ', 'Azerbaijan');
-insert into iso_countries (iso_code, country_name) values ('BS', 'Bahamas');
-insert into iso_countries (iso_code, country_name) values ('BH', 'Bahrain');
-insert into iso_countries (iso_code, country_name) values ('BD', 'Bangladesh');
-insert into iso_countries (iso_code, country_name) values ('BB', 'Barbados');
-insert into iso_countries (iso_code, country_name) values ('BY', 'Belarus');
-insert into iso_countries (iso_code, country_name) values ('BE', 'Belgium');
-insert into iso_countries (iso_code, country_name) values ('BZ', 'Belize');
-insert into iso_countries (iso_code, country_name) values ('BJ', 'Benin');
-insert into iso_countries (iso_code, country_name) values ('BM', 'Bermuda');
-insert into iso_countries (iso_code, country_name) values ('BT', 'Bhutan');
-insert into iso_countries (iso_code, country_name) values ('BO', 'Bolivia');
-insert into iso_countries (iso_code, country_name) values ('BA', 'Bosnia and Herzegovina');
-insert into iso_countries (iso_code, country_name) values ('BW', 'Botswana');
-insert into iso_countries (iso_code, country_name) values ('BV', 'Bouvet Island');
-insert into iso_countries (iso_code, country_name) values ('BR', 'Brazil');
-insert into iso_countries (iso_code, country_name) values ('IO', 'British Indian Ocean Territory');
-insert into iso_countries (iso_code, country_name) values ('BN', 'Brunei Darussalam');
-insert into iso_countries (iso_code, country_name) values ('BG', 'Bulgaria');
-insert into iso_countries (iso_code, country_name) values ('BF', 'Burkina Faso');
-insert into iso_countries (iso_code, country_name) values ('BI', 'Burundi');
-insert into iso_countries (iso_code, country_name) values ('KH', 'Cambodia');
-insert into iso_countries (iso_code, country_name) values ('CM', 'Cameroon');
-insert into iso_countries (iso_code, country_name) values ('CA', 'Canada');
-insert into iso_countries (iso_code, country_name) values ('CV', 'Cape Verde');
-insert into iso_countries (iso_code, country_name) values ('KY', 'Cayman Islands');
-insert into iso_countries (iso_code, country_name) values ('CF', 'Central African Republic');
-insert into iso_countries (iso_code, country_name) values ('TD', 'Chad');
-insert into iso_countries (iso_code, country_name) values ('CL', 'Chile');
-insert into iso_countries (iso_code, country_name) values ('CN', 'China');
-insert into iso_countries (iso_code, country_name) values ('CX', 'Christmas Island');
-insert into iso_countries (iso_code, country_name) values ('CC', 'Cocos (Keeling) Islands');
-insert into iso_countries (iso_code, country_name) values ('CO', 'Colombia');
-insert into iso_countries (iso_code, country_name) values ('KM', 'Comoros');
-insert into iso_countries (iso_code, country_name) values ('CG', 'Congo');
-insert into iso_countries (iso_code, country_name) values ('CD', 'Congo, the Democratic Republic of the');
-insert into iso_countries (iso_code, country_name) values ('CK', 'Cook Islands');
-insert into iso_countries (iso_code, country_name) values ('CR', 'Costa Rica');
-insert into iso_countries (iso_code, country_name) values ('CI', 'Cote D''Ivoire');
-insert into iso_countries (iso_code, country_name) values ('HR', 'Croatia');
-insert into iso_countries (iso_code, country_name) values ('CU', 'Cuba');
-insert into iso_countries (iso_code, country_name) values ('CY', 'Cyprus');
-insert into iso_countries (iso_code, country_name) values ('CZ', 'Czech Republic');
-insert into iso_countries (iso_code, country_name) values ('DK', 'Denmark');
-insert into iso_countries (iso_code, country_name) values ('DJ', 'Djibouti');
-insert into iso_countries (iso_code, country_name) values ('DM', 'Dominica');
-insert into iso_countries (iso_code, country_name) values ('DO', 'Dominican Republic');
-insert into iso_countries (iso_code, country_name) values ('EC', 'Ecuador');
-insert into iso_countries (iso_code, country_name) values ('EG', 'Egypt');
-insert into iso_countries (iso_code, country_name) values ('SV', 'El Salvador');
-insert into iso_countries (iso_code, country_name) values ('GQ', 'Equatorial Guinea');
-insert into iso_countries (iso_code, country_name) values ('ER', 'Eritrea');
-insert into iso_countries (iso_code, country_name) values ('EE', 'Estonia');
-insert into iso_countries (iso_code, country_name) values ('ET', 'Ethiopia');
-insert into iso_countries (iso_code, country_name) values ('FK', 'Falkland Islands (Malvinas)');
-insert into iso_countries (iso_code, country_name) values ('FO', 'Faroe Islands');
-insert into iso_countries (iso_code, country_name) values ('FJ', 'Fiji');
-insert into iso_countries (iso_code, country_name) values ('FI', 'Finland');
-insert into iso_countries (iso_code, country_name) values ('FR', 'France');
-insert into iso_countries (iso_code, country_name) values ('GF', 'French Guiana');
-insert into iso_countries (iso_code, country_name) values ('PF', 'French Polynesia');
-insert into iso_countries (iso_code, country_name) values ('TF', 'French Southern Territories');
-insert into iso_countries (iso_code, country_name) values ('GA', 'Gabon');
-insert into iso_countries (iso_code, country_name) values ('GM', 'Gambia');
-insert into iso_countries (iso_code, country_name) values ('GE', 'Georgia');
-insert into iso_countries (iso_code, country_name) values ('DE', 'Germany');
-insert into iso_countries (iso_code, country_name) values ('GH', 'Ghana');
-insert into iso_countries (iso_code, country_name) values ('GI', 'Gibraltar');
-insert into iso_countries (iso_code, country_name) values ('GR', 'Greece');
-insert into iso_countries (iso_code, country_name) values ('GL', 'Greenland');
-insert into iso_countries (iso_code, country_name) values ('GD', 'Grenada');
-insert into iso_countries (iso_code, country_name) values ('GP', 'Guadeloupe');
-insert into iso_countries (iso_code, country_name) values ('GU', 'Guam');
-insert into iso_countries (iso_code, country_name) values ('GT', 'Guatemala');
-insert into iso_countries (iso_code, country_name) values ('GN', 'Guinea');
-insert into iso_countries (iso_code, country_name) values ('GW', 'Guinea-Bissau');
-insert into iso_countries (iso_code, country_name) values ('GY', 'Guyana');
-insert into iso_countries (iso_code, country_name) values ('HT', 'Haiti');
-insert into iso_countries (iso_code, country_name) values ('HM', 'Heard Island and Mcdonald Islands');
-insert into iso_countries (iso_code, country_name) values ('VA', 'Holy See (Vatican City State)');
-insert into iso_countries (iso_code, country_name) values ('HN', 'Honduras');
-insert into iso_countries (iso_code, country_name) values ('HK', 'Hong Kong');
-insert into iso_countries (iso_code, country_name) values ('HU', 'Hungary');
-insert into iso_countries (iso_code, country_name) values ('IS', 'Iceland');
-insert into iso_countries (iso_code, country_name) values ('IN', 'India');
-insert into iso_countries (iso_code, country_name) values ('ID', 'Indonesia');
-insert into iso_countries (iso_code, country_name) values ('IR', 'Iran, Islamic Republic of');
-insert into iso_countries (iso_code, country_name) values ('IQ', 'Iraq');
-insert into iso_countries (iso_code, country_name) values ('IE', 'Ireland');
-insert into iso_countries (iso_code, country_name) values ('IL', 'Israel');
-insert into iso_countries (iso_code, country_name) values ('IT', 'Italy');
-insert into iso_countries (iso_code, country_name) values ('JM', 'Jamaica');
-insert into iso_countries (iso_code, country_name) values ('JP', 'Japan');
-insert into iso_countries (iso_code, country_name) values ('JO', 'Jordan');
-insert into iso_countries (iso_code, country_name) values ('KZ', 'Kazakhstan');
-insert into iso_countries (iso_code, country_name) values ('KE', 'Kenya');
-insert into iso_countries (iso_code, country_name) values ('KI', 'Kiribati');
-insert into iso_countries (iso_code, country_name) values ('KP', 'Korea, Democratic People''S Republic of');
-insert into iso_countries (iso_code, country_name) values ('KR', 'Korea, Republic of');
-insert into iso_countries (iso_code, country_name) values ('KW', 'Kuwait');
-insert into iso_countries (iso_code, country_name) values ('KG', 'Kyrgyzstan');
-insert into iso_countries (iso_code, country_name) values ('LA', 'Lao People''S Democratic Republic');
-insert into iso_countries (iso_code, country_name) values ('LV', 'Latvia');
-insert into iso_countries (iso_code, country_name) values ('LB', 'Lebanon');
-insert into iso_countries (iso_code, country_name) values ('LS', 'Lesotho');
-insert into iso_countries (iso_code, country_name) values ('LR', 'Liberia');
-insert into iso_countries (iso_code, country_name) values ('LY', 'Libyan Arab Jamahiriya');
-insert into iso_countries (iso_code, country_name) values ('LI', 'Liechtenstein');
-insert into iso_countries (iso_code, country_name) values ('LT', 'Lithuania');
-insert into iso_countries (iso_code, country_name) values ('LU', 'Luxembourg');
-insert into iso_countries (iso_code, country_name) values ('MO', 'Macao');
-insert into iso_countries (iso_code, country_name) values ('MK', 'Macedonia, the Former Yugoslav Republic of');
-insert into iso_countries (iso_code, country_name) values ('MG', 'Madagascar');
-insert into iso_countries (iso_code, country_name) values ('MW', 'Malawi');
-insert into iso_countries (iso_code, country_name) values ('MY', 'Malaysia');
-insert into iso_countries (iso_code, country_name) values ('MV', 'Maldives');
-insert into iso_countries (iso_code, country_name) values ('ML', 'Mali');
-insert into iso_countries (iso_code, country_name) values ('MT', 'Malta');
-insert into iso_countries (iso_code, country_name) values ('MH', 'Marshall Islands');
-insert into iso_countries (iso_code, country_name) values ('MQ', 'Martinique');
-insert into iso_countries (iso_code, country_name) values ('MR', 'Mauritania');
-insert into iso_countries (iso_code, country_name) values ('MU', 'Mauritius');
-insert into iso_countries (iso_code, country_name) values ('YT', 'Mayotte');
-insert into iso_countries (iso_code, country_name) values ('MX', 'Mexico');
-insert into iso_countries (iso_code, country_name) values ('FM', 'Micronesia, Federated States of');
-insert into iso_countries (iso_code, country_name) values ('MD', 'Moldova, Republic of');
-insert into iso_countries (iso_code, country_name) values ('MC', 'Monaco');
-insert into iso_countries (iso_code, country_name) values ('MN', 'Mongolia');
-insert into iso_countries (iso_code, country_name) values ('MS', 'Montserrat');
-insert into iso_countries (iso_code, country_name) values ('MA', 'Morocco');
-insert into iso_countries (iso_code, country_name) values ('MZ', 'Mozambique');
-insert into iso_countries (iso_code, country_name) values ('MM', 'Myanmar');
-insert into iso_countries (iso_code, country_name) values ('NA', 'Namibia');
-insert into iso_countries (iso_code, country_name) values ('NR', 'Nauru');
-insert into iso_countries (iso_code, country_name) values ('NP', 'Nepal');
-insert into iso_countries (iso_code, country_name) values ('NL', 'Netherlands');
-insert into iso_countries (iso_code, country_name) values ('AN', 'Netherlands Antilles');
-insert into iso_countries (iso_code, country_name) values ('NC', 'New Caledonia');
-insert into iso_countries (iso_code, country_name) values ('NZ', 'New Zealand');
-insert into iso_countries (iso_code, country_name) values ('NI', 'Nicaragua');
-insert into iso_countries (iso_code, country_name) values ('NE', 'Niger');
-insert into iso_countries (iso_code, country_name) values ('NG', 'Nigeria');
-insert into iso_countries (iso_code, country_name) values ('NU', 'Niue');
-insert into iso_countries (iso_code, country_name) values ('NF', 'Norfolk Island');
-insert into iso_countries (iso_code, country_name) values ('MP', 'Northern Mariana Islands');
-insert into iso_countries (iso_code, country_name) values ('NO', 'Norway');
-insert into iso_countries (iso_code, country_name) values ('OM', 'Oman');
-insert into iso_countries (iso_code, country_name) values ('PK', 'Pakistan');
-insert into iso_countries (iso_code, country_name) values ('PW', 'Palau');
-insert into iso_countries (iso_code, country_name) values ('PS', 'Palestinian Territory, Occupied');
-insert into iso_countries (iso_code, country_name) values ('PA', 'Panama');
-insert into iso_countries (iso_code, country_name) values ('PG', 'Papua New Guinea');
-insert into iso_countries (iso_code, country_name) values ('PY', 'Paraguay');
-insert into iso_countries (iso_code, country_name) values ('PE', 'Peru');
-insert into iso_countries (iso_code, country_name) values ('PH', 'Philippines');
-insert into iso_countries (iso_code, country_name) values ('PN', 'Pitcairn');
-insert into iso_countries (iso_code, country_name) values ('PL', 'Poland');
-insert into iso_countries (iso_code, country_name) values ('PT', 'Portugal');
-insert into iso_countries (iso_code, country_name) values ('PR', 'Puerto Rico');
-insert into iso_countries (iso_code, country_name) values ('QA', 'Qatar');
-insert into iso_countries (iso_code, country_name) values ('RE', 'Reunion');
-insert into iso_countries (iso_code, country_name) values ('RO', 'Romania');
-insert into iso_countries (iso_code, country_name) values ('RU', 'Russian Federation');
-insert into iso_countries (iso_code, country_name) values ('RW', 'Rwanda');
-insert into iso_countries (iso_code, country_name) values ('SH', 'Saint Helena');
-insert into iso_countries (iso_code, country_name) values ('KN', 'Saint Kitts and Nevis');
-insert into iso_countries (iso_code, country_name) values ('LC', 'Saint Lucia');
-insert into iso_countries (iso_code, country_name) values ('PM', 'Saint Pierre and Miquelon');
-insert into iso_countries (iso_code, country_name) values ('VC', 'Saint Vincent and the Grenadines');
-insert into iso_countries (iso_code, country_name) values ('WS', 'Samoa');
-insert into iso_countries (iso_code, country_name) values ('SM', 'San Marino');
-insert into iso_countries (iso_code, country_name) values ('ST', 'Sao Tome and Principe');
-insert into iso_countries (iso_code, country_name) values ('SA', 'Saudi Arabia');
-insert into iso_countries (iso_code, country_name) values ('SN', 'Senegal');
-insert into iso_countries (iso_code, country_name) values ('SC', 'Seychelles');
-insert into iso_countries (iso_code, country_name) values ('SL', 'Sierra Leone');
-insert into iso_countries (iso_code, country_name) values ('SG', 'Singapore');
-insert into iso_countries (iso_code, country_name) values ('SK', 'Slovakia');
-insert into iso_countries (iso_code, country_name) values ('SI', 'Slovenia');
-insert into iso_countries (iso_code, country_name) values ('SB', 'Solomon Islands');
-insert into iso_countries (iso_code, country_name) values ('SO', 'Somalia');
-insert into iso_countries (iso_code, country_name) values ('ZA', 'South Africa');
-insert into iso_countries (iso_code, country_name) values ('GS', 'South Georgia and the South Sandwich Islands');
-insert into iso_countries (iso_code, country_name) values ('ES', 'Spain');
-insert into iso_countries (iso_code, country_name) values ('LK', 'Sri Lanka');
-insert into iso_countries (iso_code, country_name) values ('SD', 'Sudan');
-insert into iso_countries (iso_code, country_name) values ('SR', 'Suriname');
-insert into iso_countries (iso_code, country_name) values ('SJ', 'Svalbard and Jan Mayen');
-insert into iso_countries (iso_code, country_name) values ('SZ', 'Swaziland');
-insert into iso_countries (iso_code, country_name) values ('SE', 'Sweden');
-insert into iso_countries (iso_code, country_name) values ('CH', 'Switzerland');
-insert into iso_countries (iso_code, country_name) values ('SY', 'Syrian Arab Republic');
-insert into iso_countries (iso_code, country_name) values ('TW', 'Taiwan, Province of China');
-insert into iso_countries (iso_code, country_name) values ('TJ', 'Tajikistan');
-insert into iso_countries (iso_code, country_name) values ('TZ', 'Tanzania, United Republic of');
-insert into iso_countries (iso_code, country_name) values ('TH', 'Thailand');
-insert into iso_countries (iso_code, country_name) values ('TL', 'Timor-Leste');
-insert into iso_countries (iso_code, country_name) values ('TG', 'Togo');
-insert into iso_countries (iso_code, country_name) values ('TK', 'Tokelau');
-insert into iso_countries (iso_code, country_name) values ('TO', 'Tonga');
-insert into iso_countries (iso_code, country_name) values ('TT', 'Trinidad and Tobago');
-insert into iso_countries (iso_code, country_name) values ('TN', 'Tunisia');
-insert into iso_countries (iso_code, country_name) values ('TR', 'Turkey');
-insert into iso_countries (iso_code, country_name) values ('TM', 'Turkmenistan');
-insert into iso_countries (iso_code, country_name) values ('TC', 'Turks and Caicos Islands');
-insert into iso_countries (iso_code, country_name) values ('TV', 'Tuvalu');
-insert into iso_countries (iso_code, country_name) values ('UG', 'Uganda');
-insert into iso_countries (iso_code, country_name) values ('UA', 'Ukraine');
-insert into iso_countries (iso_code, country_name) values ('AE', 'United Arab Emirates');
-insert into iso_countries (iso_code, country_name) values ('GB', 'United Kingdom');
-insert into iso_countries (iso_code, country_name) values ('US', 'United States');
-insert into iso_countries (iso_code, country_name) values ('UM', 'United States Minor Outlying Islands');
-insert into iso_countries (iso_code, country_name) values ('UY', 'Uruguay');
-insert into iso_countries (iso_code, country_name) values ('UZ', 'Uzbekistan');
-insert into iso_countries (iso_code, country_name) values ('VU', 'Vanuatu');
-insert into iso_countries (iso_code, country_name) values ('VE', 'Venezuela');
-insert into iso_countries (iso_code, country_name) values ('VN', 'Viet Nam');
-insert into iso_countries (iso_code, country_name) values ('VG', 'Virgin Islands, British');
-insert into iso_countries (iso_code, country_name) values ('VI', 'Virgin Islands, U.S.');
-insert into iso_countries (iso_code, country_name) values ('WF', 'Wallis and Futuna');
-insert into iso_countries (iso_code, country_name) values ('EH', 'Western Sahara');
-insert into iso_countries (iso_code, country_name) values ('YE', 'Yemen');
-insert into iso_countries (iso_code, country_name) values ('YU', 'Yugoslavia');
-insert into iso_countries (iso_code, country_name) values ('ZM', 'Zambia');
-insert into iso_countries (iso_code, country_name) values ('ZW', 'Zimbabwe');
--- End

ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/default/insert-iso-countries.sql

@@ -0,0 +1,259 @@
+--
+-- Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: insert-iso-countries.sql 1597 2007-07-10 16:27:26Z p_boy $
+-- $DateTime: 2004/08/17 23:15:09 $
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AF', 'Afghanistan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AL', 'Albania');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('DZ', 'Algeria');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AS', 'American Samoa');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AD', 'andorra');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AO', 'Angola');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AI', 'Anguilla');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AQ', 'Antarctica');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AG', 'Antigua and Barbuda');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AR', 'Argentina');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AM', 'Armenia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AW', 'Aruba');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AU', 'Australia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AT', 'Austria');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AZ', 'Azerbaijan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BS', 'Bahamas');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BH', 'Bahrain');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BD', 'Bangladesh');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BB', 'Barbados');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BY', 'Belarus');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BE', 'Belgium');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BZ', 'Belize');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BJ', 'Benin');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BM', 'Bermuda');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BT', 'Bhutan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BO', 'Bolivia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BA', 'Bosnia and Herzegovina');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BW', 'Botswana');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BV', 'Bouvet Island');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BR', 'Brazil');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IO', 'British Indian Ocean Territory');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BN', 'Brunei Darussalam');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BG', 'Bulgaria');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BF', 'Burkina Faso');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('BI', 'Burundi');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KH', 'Cambodia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CM', 'Cameroon');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CA', 'Canada');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CV', 'Cape Verde');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KY', 'Cayman Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CF', 'Central African Republic');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TD', 'Chad');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CL', 'Chile');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CN', 'China');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CX', 'Christmas Island');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CC', 'Cocos (Keeling) Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CO', 'Colombia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KM', 'Comoros');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CG', 'Congo');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CD', 'Congo, the Democratic Republic of the');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CK', 'Cook Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CR', 'Costa Rica');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CI', 'Cote D''Ivoire');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('HR', 'Croatia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CU', 'Cuba');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CY', 'Cyprus');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CZ', 'Czech Republic');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('DK', 'Denmark');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('DJ', 'Djibouti');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('DM', 'Dominica');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('DO', 'Dominican Republic');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('EC', 'Ecuador');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('EG', 'Egypt');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SV', 'El Salvador');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GQ', 'Equatorial Guinea');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ER', 'Eritrea');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('EE', 'Estonia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ET', 'Ethiopia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('FK', 'Falkland Islands (Malvinas)');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('FO', 'Faroe Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('FJ', 'Fiji');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('FI', 'Finland');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('FR', 'France');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GF', 'French Guiana');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PF', 'French Polynesia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TF', 'French Southern Territories');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GA', 'Gabon');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GM', 'Gambia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GE', 'Georgia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('DE', 'Germany');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GH', 'Ghana');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GI', 'Gibraltar');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GR', 'Greece');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GL', 'Greenland');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GD', 'Grenada');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GP', 'Guadeloupe');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GU', 'Guam');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GT', 'Guatemala');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GN', 'Guinea');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GW', 'Guinea-Bissau');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GY', 'Guyana');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('HT', 'Haiti');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('HM', 'Heard Island and Mcdonald Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('VA', 'Holy See (Vatican City State)');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('HN', 'Honduras');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('HK', 'Hong Kong');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('HU', 'Hungary');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IS', 'Iceland');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IN', 'India');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ID', 'Indonesia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IR', 'Iran, Islamic Republic of');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IQ', 'Iraq');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IE', 'Ireland');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IL', 'Israel');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('IT', 'Italy');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('JM', 'Jamaica');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('JP', 'Japan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('JO', 'Jordan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KZ', 'Kazakhstan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KE', 'Kenya');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KI', 'Kiribati');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KP', 'Korea, Democratic People''S Republic of');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KR', 'Korea, Republic of');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KW', 'Kuwait');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KG', 'Kyrgyzstan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LA', 'Lao People''S Democratic Republic');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LV', 'Latvia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LB', 'Lebanon');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LS', 'Lesotho');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LR', 'Liberia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LY', 'Libyan Arab Jamahiriya');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LI', 'Liechtenstein');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LT', 'Lithuania');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LU', 'Luxembourg');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MO', 'Macao');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MK', 'Macedonia, the Former Yugoslav Republic of');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MG', 'Madagascar');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MW', 'Malawi');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MY', 'Malaysia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MV', 'Maldives');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ML', 'Mali');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MT', 'Malta');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MH', 'Marshall Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MQ', 'Martinique');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MR', 'Mauritania');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MU', 'Mauritius');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('YT', 'Mayotte');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MX', 'Mexico');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('FM', 'Micronesia, Federated States of');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MD', 'Moldova, Republic of');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MC', 'Monaco');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MN', 'Mongolia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MS', 'Montserrat');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MA', 'Morocco');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MZ', 'Mozambique');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MM', 'Myanmar');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NA', 'Namibia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NR', 'Nauru');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NP', 'Nepal');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NL', 'Netherlands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AN', 'Netherlands Antilles');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NC', 'New Caledonia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NZ', 'New Zealand');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NI', 'Nicaragua');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NE', 'Niger');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NG', 'Nigeria');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NU', 'Niue');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NF', 'Norfolk Island');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('MP', 'Northern Mariana Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('NO', 'Norway');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('OM', 'Oman');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PK', 'Pakistan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PW', 'Palau');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PS', 'Palestinian Territory, Occupied');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PA', 'Panama');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PG', 'Papua New Guinea');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PY', 'Paraguay');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PE', 'Peru');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PH', 'Philippines');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PN', 'Pitcairn');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PL', 'Poland');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PT', 'Portugal');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PR', 'Puerto Rico');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('QA', 'Qatar');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('RE', 'Reunion');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('RO', 'Romania');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('RU', 'Russian Federation');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('RW', 'Rwanda');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SH', 'Saint Helena');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('KN', 'Saint Kitts and Nevis');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LC', 'Saint Lucia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('PM', 'Saint Pierre and Miquelon');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('VC', 'Saint Vincent and the Grenadines');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('WS', 'Samoa');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SM', 'San Marino');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ST', 'Sao Tome and Principe');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SA', 'Saudi Arabia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SN', 'Senegal');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SC', 'Seychelles');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SL', 'Sierra Leone');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SG', 'Singapore');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SK', 'Slovakia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SI', 'Slovenia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SB', 'Solomon Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SO', 'Somalia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ZA', 'South Africa');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GS', 'South Georgia and the South Sandwich Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ES', 'Spain');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('LK', 'Sri Lanka');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SD', 'Sudan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SR', 'Suriname');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SJ', 'Svalbard and Jan Mayen');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SZ', 'Swaziland');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SE', 'Sweden');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('CH', 'Switzerland');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('SY', 'Syrian Arab Republic');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TW', 'Taiwan, Province of China');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TJ', 'Tajikistan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TZ', 'Tanzania, United Republic of');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TH', 'Thailand');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TL', 'Timor-Leste');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TG', 'Togo');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TK', 'Tokelau');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TO', 'Tonga');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TT', 'Trinidad and Tobago');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TN', 'Tunisia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TR', 'Turkey');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TM', 'Turkmenistan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TC', 'Turks and Caicos Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('TV', 'Tuvalu');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('UG', 'Uganda');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('UA', 'Ukraine');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('AE', 'United Arab Emirates');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('GB', 'United Kingdom');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('US', 'United States');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('UM', 'United States Minor Outlying Islands');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('UY', 'Uruguay');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('UZ', 'Uzbekistan');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('VU', 'Vanuatu');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('VE', 'Venezuela');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('VN', 'Viet Nam');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('VG', 'Virgin Islands, British');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('VI', 'Virgin Islands, U.S.');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('WF', 'Wallis and Futuna');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('EH', 'Western Sahara');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('YE', 'Yemen');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('YU', 'Yugoslavia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ZM', 'Zambia');
+insert into ct_simpleaddr_iso_countries (iso_code, country_name) values ('ZW', 'Zimbabwe');
+-- End

ccm-cms-types-simpleaddress/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SimpleAddress.xml

@@ -14,9 +14,9 @@
        createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
      
       <ctd:authoring-step 
-                 labelKey="address.authoring.basic_properties.title" 
+                 labelKey="simpleaddress.authoring.basic_properties.title"
               labelBundle="com.arsdigita.cms.contenttypes.SimpleAddressResources"
-           descriptionKey="address.authoring.basic_properties.description" 
+           descriptionKey="simpleaddress.authoring.basic_properties.description"
         descriptionBundle="com.arsdigita.cms.contenttypes.SimpleAddressResources"
                 component="com.arsdigita.cms.contenttypes.ui.SimpleAddressPropertiesStep"
                  ordering="1"/>

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddress.java

@@ -24,7 +24,10 @@ import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.util.Assert;
+
 import java.math.BigDecimal;
+import org.apache.log4j.Logger;
+
 
 /**
  * <p><code>DomainObject</code> class to represent address <code>ContentType</code>
@@ -41,7 +44,10 @@ import java.math.BigDecimal;
  **/
 public class SimpleAddress extends ContentPage {
 
+    /** Private logger instance for debugging purpose  */
     private static final Logger logger = Logger.getLogger(SimpleAddress.class);
+
+    // PDL stuff
     /** PDL property name for address */
     public static final String ADDRESS = "address";
     /** PDL property name for country iso code */
@@ -62,17 +68,12 @@ public class SimpleAddress extends ContentPage {
     public static final String URI = "uri";
     /** Data object type for this domain object */
     public static final String BASE_DATA_OBJECT_TYPE =
-                               "com.arsdigita.cms.contenttypes.Address";
+                               "com.arsdigita.cms.contenttypes.SimpleAddress";
+
     private static final SimpleAddressConfig s_config =
-                                             new SimpleAddressConfig();
+                                             SimpleAddressConfig.getConfig();
 
-    static {
+    public static SimpleAddressConfig getConfig() {
-        logger.debug("Static initalizer starting...");
-        s_config.load();
-        logger.debug("Static initalizer finisheds. .");
-    }
-
-    public static final SimpleAddressConfig getConfig() {
         return s_config;
     }
 
@@ -134,9 +135,9 @@ public class SimpleAddress extends ContentPage {
      * For new content items, sets the associated content type if it
      * has not been already set.
      */
+    @Override
     public void beforeSave() {
         super.beforeSave();
-
         Assert.exists(getContentType(), ContentType.class);
     }
 

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressAddressConfig_parameter.properties

@@ -1,9 +0,0 @@
-com.arsdigita.cms.contenttypes.address.hide_country_code_selection.title=Hide ISO Country Code 
-com.arsdigita.cms.contenttypes.address.hide_country_code_selection.purpose=Hide the ISO country code selection box
-com.arsdigita.cms.contenttypes.address.hide_country_code_selection.example=false
-com.arsdigita.cms.contenttypes.address.hide_country_code_selection.format=[boolean]
-
-com.arsdigita.cms.contenttypes.address.hide_postal_code.title=Hide Postal Code
-com.arsdigita.cms.contenttypes.address.hide_postal_code.purpose=Hide the the postal code entry field
-com.arsdigita.cms.contenttypes.address.hide_postal_code.example=false
-com.arsdigita.cms.contenttypes.address.hide_postal_code.format=[boolean]

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressConfig.java

@@ -22,25 +22,53 @@ import com.arsdigita.runtime.AbstractConfig;
 import com.arsdigita.util.parameter.Parameter;
 import com.arsdigita.util.parameter.BooleanParameter;
 
-public class SimpleAddressConfig extends AbstractConfig {
+import org.apache.log4j.Logger;
-    
-    private final Parameter m_hideCountryCodeSelection;
-    private final Parameter m_hidePostalCode;
 
+public class SimpleAddressConfig extends AbstractConfig {
+
+    /** A logger instance.  */
+    private static final Logger s_log = Logger.getLogger(SimpleAddressConfig.class);
+
+    /** Singelton config object.  */
+    private static SimpleAddressConfig s_conf;
+
+    /**
+     * Gain a UIConfig object.
+     *
+     * Singelton pattern, don't instantiate a lifecacle object using the
+     * constructor directly!
+     * @return
+     */
+    public static synchronized SimpleAddressConfig getConfig() {
+        if (s_conf == null) {
+            s_conf = new SimpleAddressConfig();
+            s_conf.load();
+        }
+
+        return s_conf;
+    }
+
+    // set of configuration parameters
+    /** Hide the country selection step in authoring form */
+    private final Parameter m_hideCountryCodeSelection =
+            new BooleanParameter(
+			    "cms.contenttypes.simpleaddress.hide_country_code_selection",
+                Parameter.REQUIRED,
+                new Boolean(false));
+    /** Hide the postal code entry step in authoring form */
+    private final Parameter m_hidePostalCode =
+	        new BooleanParameter(
+			    "cms.contenttypes.simpleaddress.hide_postal_code",
+			    Parameter.REQUIRED,
+			    new Boolean(false));
+
+    /** 
+     * Constructor
+     */
     public SimpleAddressConfig() {
-        m_hideCountryCodeSelection = new BooleanParameter(
+
-			"com.arsdigita.cms.contenttypes.address.hide_country_code_selection",
-			Parameter.REQUIRED,
-			new Boolean(false));
-	
-	m_hidePostalCode = new BooleanParameter(
-			"com.arsdigita.cms.contenttypes.address.hide_postal_code",
-			Parameter.REQUIRED,
-			new Boolean(false));
-	
-	
         register(m_hideCountryCodeSelection);
-	register(m_hidePostalCode);
+        register(m_hidePostalCode);
 
         loadInfo();
     }

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressConfig_parameter.properties

@@ -0,0 +1,9 @@
+cms.contenttypes.address.hide_country_code_selection.title=Hide ISO Country Code 
+cms.contenttypes.address.hide_country_code_selection.purpose=Hide the ISO country code selection box
+cms.contenttypes.address.hide_country_code_selection.example=false
+cms.contenttypes.address.hide_country_code_selection.format=[boolean]
+
+cms.contenttypes.address.hide_postal_code.title=Hide Postal Code
+cms.contenttypes.address.hide_postal_code.purpose=Hide the the postal code entry field
+cms.contenttypes.address.hide_postal_code.example=false
+cms.contenttypes.address.hide_postal_code.format=[boolean]

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressInitializer.java

@@ -33,13 +33,14 @@ import org.apache.log4j.Logger;
  */
 public class SimpleAddressInitializer extends ContentTypeInitializer {
 
+    /** Private logger instance for debugging purpose  */
     private static final Logger s_log = Logger.getLogger(SimpleAddressInitializer.class);
 
     /**
      * Constructor
      */
     public SimpleAddressInitializer() {
-        super("ccm-cms-types-oldaddress.pdl.mf",
+        super("ccm-cms-types-simpleaddress.pdl.mf",
               SimpleAddress.BASE_DATA_OBJECT_TYPE);
     }
 
@@ -47,6 +48,7 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
      * Initializer
      * @param evt
      */
+    @Override
     public void init(DomainInitEvent evt) {
         super.init(evt);
         
@@ -56,6 +58,7 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
                 public DomainObject doNewInstance(DataObject dataObject) {
                     return new IsoCountry(dataObject);
                 }
+                @Override
                 public DomainObjectInstantiator resolveInstantiator(DataObject obj) {
                     return this;
                 }
@@ -68,10 +71,13 @@ public class SimpleAddressInitializer extends ContentTypeInitializer {
 
     /**
      * Provides location of the stylesheets assoziated with this content type.
+     * (As of 6.6.x it is really used tp locate the content type stylesheet,
+     * in distinction from location of applications stylesheets.)
      * @return
      */
+    @Override
     public String[] getStylesheets() {
         return new String[] {
-            "/static/content-types/com/arsdigita/cms/contenttypes/Address.xsl" };
+            "/static/content-types/com/arsdigita/cms/contenttypes/SimpleAddress.xsl" };
     }
 }

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressLoader.java

@@ -31,10 +31,11 @@ import org.apache.log4j.Logger;
  */
 public class SimpleAddressLoader extends AbstractContentTypeLoader {
 
+    /** Private logger instance for debugging purpose  */
     private static final Logger s_log = Logger.getLogger(SimpleAddressLoader.class);
 
     private static final String[] TYPES = {
-        "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Address.xml"
+        "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SimpleAddress.xml"
     };
 
     public String[] getTypes() {

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressResources.properties

@@ -1,18 +1,16 @@
-address.authoring.basic_properties.title=Address Properties
+simpleaddress.authoring.basic_properties.title=Address Properties
-address.authoring.basic_properties.description=Edit the basic address properties
+simpleaddress.authoring.basic_properties.description=Edit the basic address properties
-address.authoring.categories.title=Assign categories
+cms.contenttypes.ui.simpleaddress.address=Address
-address.authoring.categories.description=Assign categories
+cms.contenttypes.ui.simpleaddress.email=Email
-cms.contenttypes.ui.address.address=Address
+cms.contenttypes.ui.simpleaddress.fax=Fax
-cms.contenttypes.ui.address.email=Email
+cms.contenttypes.ui.simpleaddress.iso_country_code=Country
-cms.contenttypes.ui.address.fax=Fax
+cms.contenttypes.ui.simpleaddress.mobile=Mobile
-cms.contenttypes.ui.address.iso_country_code=Country
+cms.contenttypes.ui.simpleaddress.phone=Phone
-cms.contenttypes.ui.address.mobile=Mobile
+cms.contenttypes.ui.simpleaddress.postal_code=Postal Code
-cms.contenttypes.ui.address.phone=Phone
+cms.contenttypes.ui.simpleaddress.email_desc=Means of contacting someone at this address
-cms.contenttypes.ui.address.postal_code=Postal Code
+cms.contenttypes.ui.simpleaddress.email_hint=Means of contacting someone at this address
-cms.contenttypes.ui.address.email_desc=Means of contacting someone at this address
+cms.contenttypes.ui.simpleaddress.notes=Notes
-cms.contenttypes.ui.address.email_hint=Means of contacting someone at this address
+cms.contenttypes.ui.simpleaddress.uri=URL
-cms.contenttypes.ui.address.notes=Notes
+cms.contenttypes.ui.simpleaddress.uri_desc=A URL to find more information about this Address
-cms.contenttypes.ui.address.uri=URL
+cms.contenttypes.ui.simpleaddress.uri_hint=A URL to find more information about this Address
-cms.contenttypes.ui.address.uri_desc=A URL to find more information about this Address
+cms.contenttypes.ui.simpleaddress.error_iso_country=You must select a country
-cms.contenttypes.ui.address.uri_hint=A URL to find more information about this Address
-cms.contenttypes.ui.address.error_iso_country=You must select a country

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/SimpleAddressResources_de.properties

@@ -1,22 +1,20 @@
 # AddressResources_de.properties
 # Alle deutschem Umlaute muessen als UTF-8 eingetragen werden:
-# ä = \u00c4  ü = \u00fc 
+# \u00c3\u00a4 = \u00c4  \u00c3\u00bc = \u00fc 
-# ö = \u00f6
+# \u00c3\u00b6 = \u00f6
-address.authoring.basic_properties.title=Eigenschaften von Adressen
+simpleaddress.authoring.basic_properties.title=Eigenschaften von Adressen
-address.authoring.basic_properties.description=Bearbeiten der Basisangaben
+simpleaddress.authoring.basic_properties.description=Bearbeiten der Basisangaben
-address.authoring.categories.title=Kategorien zuordnen
+cms.contenttypes.ui.simpleaddress.address=Adresse:
-address.authoring.categories.description=Kategorien zuordnen
+cms.contenttypes.ui.simpleaddress.email=Email:
-cms.contenttypes.ui.address.address=Adresse:
+cms.contenttypes.ui.simpleaddress.fax=Fax:
-cms.contenttypes.ui.address.email=Email:
+cms.contenttypes.ui.simpleaddress.iso_country_code=Landescode:
-cms.contenttypes.ui.address.fax=Fax:
+cms.contenttypes.ui.simpleaddress.mobile=Mobil:
-cms.contenttypes.ui.address.iso_country_code=Landescode:
+cms.contenttypes.ui.simpleaddress.phone=Tel.:
-cms.contenttypes.ui.address.mobile=Mobil:
+cms.contenttypes.ui.simpleaddress.postal_code=Postleitzahl
-cms.contenttypes.ui.address.phone=Tel.:
+cms.contenttypes.ui.simpleaddress.email_desc=Weg, den Betreffenden zu kontaktieren
-cms.contenttypes.ui.address.postal_code=Postleitzahl
+cms.contenttypes.ui.simpleaddress.email_hint=Weg, den Betreffenden zu kontaktieren
-cms.contenttypes.ui.address.email_desc=Weg, den Betreffenden zu kontaktieren
+cms.contenttypes.ui.simpleaddress.notes=Notizen
-cms.contenttypes.ui.address.email_hint=Weg, den Betreffenden zu kontaktieren
+cms.contenttypes.ui.simpleaddress.uri=URL
-cms.contenttypes.ui.address.notes=Notizen
+cms.contenttypes.ui.simpleaddress.uri_desc=URL, um weitere Informationen zu erhalten
-cms.contenttypes.ui.address.uri=URL
+cms.contenttypes.ui.simpleaddress.uri_hint=URL, um weitere Informationen zu erhalten
-cms.contenttypes.ui.address.uri_desc=URL, um weitere Informationen zu erhalten
+cms.contenttypes.ui.simpleaddress.error_iso_country=Es muss ein Land ausgew\u00e4hlt werden
-cms.contenttypes.ui.address.uri_hint=URL, um weitere Informationen zu erhalten
-cms.contenttypes.ui.address.error_iso_country=Es muss ein Land ausgew\u00c4hlt werden

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/ui/SimpleAddressPropertiesStep.java

@@ -35,8 +35,8 @@ import com.arsdigita.cms.contenttypes.util.SimpleAddressGlobalizationUtil;
 import java.text.DateFormat;
 
 /**
- * Authoring step to edit the simple attributes of the SimpleAddress content type (and
+ * Authoring step to edit the simple attributes of the SimpleAddress content type
- * its subclasses). This authoring step replaces the
+ * (and its subclasses). This authoring step replaces the
  * <code>com.arsdigita.ui.authoring.PageEdit</code> step for this type.
  *
  * @author <a href="mailto:dominik@redhat.com">Dominik Kacprzak</a>
@@ -64,8 +64,8 @@ public class SimpleAddressPropertiesStep extends SimpleEditStep {
     }
 
     /**
-     * Returns a component that displays the properties of the SimpleAddress specified
+     * Returns a component that displays the properties of the SimpleAddress
-     * by the ItemSelectionModel passed in.
+     * specified by the ItemSelectionModel passed in.
      *
      * @param itemModel The ItemSelectionModel to use
      * @pre itemModel != null
@@ -95,18 +95,19 @@ public class SimpleAddressPropertiesStep extends SimpleEditStep {
                                  return DateFormat.getDateInstance(DateFormat.LONG)
                                      .format(page.getLaunchDate());
                              } else {
-                                 return (String)SimpleAddressGlobalizationUtil.globalize
+                                 return (String)SimpleAddressGlobalizationUtil
-                                        ("cms.ui.unknown").localize();
+                                         .globalize("cms.ui.unknown").localize();
                              }
                          }
                      });
         }
         sheet.add( (String) SimpleAddressGlobalizationUtil.globalize
-                   ("cms.contenttypes.ui.address.address").localize(), 
+                   ("cms.contenttypes.ui.simpleaddress.address").localize(),
                    SimpleAddress.ADDRESS);
         if (!SimpleAddress.getConfig().getHideCountryCodeSelection()) {
             sheet.add( (String) SimpleAddressGlobalizationUtil.globalize
-                       ("cms.contenttypes.ui.address.iso_country_code").localize(),
+                       ("cms.contenttypes.ui.simpleaddress.iso_country_code")
+                       .localize(),
                        SimpleAddress.ISO_COUNTRY_CODE,
                        new DomainObjectPropertySheet.AttributeFormatter() {
                            public String format( DomainObject item,
@@ -116,7 +117,8 @@ public class SimpleAddressPropertiesStep extends SimpleEditStep {
                               if ( address.getCountryIsoCode() != null ) {
                                   return address.getCountryIsoCode();
                               } else {
-                                  return (String)SimpleAddressGlobalizationUtil.globalize
+                                  return (String)SimpleAddressGlobalizationUtil
+                                                 .globalize
                                          ("cms.ui.unknown").localize();
                               }
                            }
@@ -124,28 +126,28 @@ public class SimpleAddressPropertiesStep extends SimpleEditStep {
         }
         if (!SimpleAddress.getConfig().getHidePostalCode()) {
             sheet.add( (String) SimpleAddressGlobalizationUtil.globalize
-                       ("cms.contenttypes.ui.address.postal_code").localize(), 
+                       ("cms.contenttypes.ui.simpleaddress.postal_code").localize(),
                        SimpleAddress.POSTAL_CODE);
         }
         sheet.add((String) SimpleAddressGlobalizationUtil
-                  .globalize("cms.contenttypes.ui.address.phone").localize(), 
+                  .globalize("cms.contenttypes.ui.simpleaddress.phone").localize(),
                   SimpleAddress.PHONE);
         sheet.add((String) SimpleAddressGlobalizationUtil.globalize
-                  ("cms.contenttypes.ui.address.mobile").localize(), 
+                  ("cms.contenttypes.ui.simpleaddress.mobile").localize(),
                   SimpleAddress.MOBILE);
         sheet.add((String) SimpleAddressGlobalizationUtil.globalize
-                  ("cms.contenttypes.ui.address.fax").localize(), 
+                  ("cms.contenttypes.ui.simpleaddress.fax").localize(),
                   SimpleAddress.FAX);
         sheet.add((String) SimpleAddressGlobalizationUtil.globalize
-                  ("cms.contenttypes.ui.address.email").localize(), 
+                  ("cms.contenttypes.ui.simpleaddress.email").localize(),
                   SimpleAddress.EMAIL);
 
         sheet.add((String) SimpleAddressGlobalizationUtil.globalize
-                  ("cms.contenttypes.ui.address.uri").localize(), 
+                  ("cms.contenttypes.ui.simpleaddress.uri").localize(),
                   SimpleAddress.URI);
 
         sheet.add((String) SimpleAddressGlobalizationUtil.globalize
-                  ("cms.contenttypes.ui.address.notes").localize(), 
+                  ("cms.contenttypes.ui.simpleaddress.notes").localize(),
                   SimpleAddress.NOTES);
 
         return sheet;

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/ui/SimpleAddressPropertyForm.java

@@ -112,11 +112,12 @@ public class SimpleAddressPropertyForm extends BasicPageForm
     /**
      * Adds widgets to the form.
      **/
+    @Override
     protected void addWidgets() {
         super.addWidgets();
         
         add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                 ( "cms.contenttypes.ui.address.address" ).localize() ) );
+                 ( "cms.contenttypes.ui.simpleaddress.address" ).localize() ) );
         ParameterModel addressBodyParam = new StringParameter( ADDRESS );
         addressBodyParam.addParameterListener( new NotNullValidationListener( ) );
 	addressBodyParam.addParameterListener( new StringInRangeValidationListener(0, 1000) );
@@ -127,11 +128,12 @@ public class SimpleAddressPropertyForm extends BasicPageForm
         
         if (!SimpleAddress.getConfig().getHideCountryCodeSelection()) {
             add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                     ( "cms.contenttypes.ui.address.iso_country_code" ).localize() ) );
+                     ( "cms.contenttypes.ui.simpleaddress.iso_country_code" ).localize() ) );
             ParameterModel isoCountryCodeParam = new StringParameter( ISO_COUNTRY_CODE );
             //isoCountryCodeParam.addParameterListener( new NotNullValidationListener( ) );
 	        // Don't assume submission via drop-down menu isoCountryCode
-	        isoCountryCodeParam.addParameterListener( new StringInRangeValidationListener(0, 2) );
+	        isoCountryCodeParam.addParameterListener(
+                                new StringInRangeValidationListener(0, 2) );
             SingleSelect isoCountryCode = new SingleSelect( isoCountryCodeParam );
 
             isoCountryCode.addOption( new Option( "", 
@@ -157,7 +159,8 @@ public class SimpleAddressPropertyForm extends BasicPageForm
                         if (isoCode == null || isoCode.length() == 0) {
                             data.addError(
                                 (String)SimpleAddressGlobalizationUtil.globalize(
-                                    "cms.contenttypes.ui.address.error_iso_country").localize());
+                                    "cms.contenttypes.ui.simpleaddress.error_iso_country")
+                                    .localize());
                         }
                     }});
 
@@ -166,25 +169,27 @@ public class SimpleAddressPropertyForm extends BasicPageForm
                 
         if (!SimpleAddress.getConfig().getHidePostalCode()) {
             add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                     ( "cms.contenttypes.ui.address.postal_code" ).localize() ) );
+                     ( "cms.contenttypes.ui.simpleaddress.postal_code" ).localize() ) );
             ParameterModel postalCodeParam = new StringParameter( POSTAL_CODE );
             //  postalCodeParam.addParameterListener( new NotNullValidationListener( ) );
-     	        postalCodeParam.addParameterListener( new StringInRangeValidationListener(0, 20) );
+     	        postalCodeParam.addParameterListener(
+                                new StringInRangeValidationListener(0, 20) );
             TextField postalCode = new TextField( postalCodeParam );
             postalCode.setMaxLength( 20 );
             add( postalCode );        
         }
         
-        add( new Label( SimpleAddressGlobalizationUtil.globalize( "cms.contenttypes.ui.address.phone" ) ) );
+        add( new Label( SimpleAddressGlobalizationUtil.globalize(
+                                "cms.contenttypes.ui.simpleaddress.phone" ) ) );
         ParameterModel phoneParam = new StringParameter( PHONE );
-	    phoneParam.addParameterListener( new StringInRangeValidationListener(0, 20) );
+	    phoneParam.addParameterListener( new StringInRangeValidationListener(0,20) );
         TextField phone = new TextField( phoneParam );
         phone.setSize(20);
         phone.setMaxLength( 20 );
         add( phone );        
 
         add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                 ( "cms.contenttypes.ui.address.mobile" ).localize() ) );
+                 ( "cms.contenttypes.ui.simpleaddress.mobile" ).localize() ) );
         ParameterModel mobileParam = new StringParameter( MOBILE );
 	    mobileParam.addParameterListener( new StringInRangeValidationListener(0, 20) );
         TextField mobile = new TextField( mobileParam );
@@ -193,7 +198,7 @@ public class SimpleAddressPropertyForm extends BasicPageForm
         add( mobile );
         
         add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                 ( "cms.contenttypes.ui.address.fax" ).localize() ) );
+                 ( "cms.contenttypes.ui.simpleaddress.fax" ).localize() ) );
         ParameterModel faxParam = new StringParameter( FAX );
 	    faxParam.addParameterListener( new StringInRangeValidationListener(0, 20) );
         TextField fax = new TextField( faxParam );
@@ -202,25 +207,28 @@ public class SimpleAddressPropertyForm extends BasicPageForm
         add( fax );
         
         add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                 ( "cms.contenttypes.ui.address.email" ).localize() ) );
+                 ( "cms.contenttypes.ui.simpleaddress.email" ).localize() ) );
         ParameterModel emailParam = new StringParameter( EMAIL );
 	    emailParam.addParameterListener( new StringInRangeValidationListener(0, 75) );
         TextField email = new TextField( emailParam );
         email.setSize(25);
         email.setMaxLength( 75 );
         email.setHint(SimpleAddressGlobalizationUtil.globalize
-                     ( "cms.contenttypes.ui.address.email_hint").localize().toString());
+                     ( "cms.contenttypes.ui.simpleaddress.email_hint")
+                     .localize().toString());
         add( email );
         add(new Label(""));
         add(new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                     ( "cms.contenttypes.ui.address.email_desc" ).localize() ) );
+                     ( "cms.contenttypes.ui.simpleaddress.email_desc" )
+                     .localize() ) );
         
         add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                 ( "cms.contenttypes.ui.address.uri" ).localize() ) );
+                 ( "cms.contenttypes.ui.simpleaddress.uri" ).localize() ) );
         ParameterModel uriParam = new StringParameter( URI );
-	    uriParam.addParameterListener( new StringInRangeValidationListener(0, 250) );
+	    uriParam.addParameterListener( new StringInRangeValidationListener(0,250) );
         TextField uri = new TextField( uriParam );
         uri.addValidationListener(new URLValidationListener(){
+            @Override
 			public void validate(ParameterEvent e)throws FormProcessException{
 				ParameterData d = e.getParameterData();
 				String value = (String)d.getValue();
@@ -233,14 +241,15 @@ public class SimpleAddressPropertyForm extends BasicPageForm
         uri.setSize(30);
         uri.setMaxLength( 250 );
         uri.setHint(SimpleAddressGlobalizationUtil.globalize
-                   ( "cms.contenttypes.ui.address.uri_hint").localize().toString());
+                   ( "cms.contenttypes.ui.simpleaddress.uri_hint")
+                   .localize().toString());
         add( uri );
         add(new Label(""));
         add(new Label((String)SimpleAddressGlobalizationUtil.globalize
-                ( "cms.contenttypes.ui.address.uri_desc" ).localize() ) );
+                ( "cms.contenttypes.ui.simpleaddress.uri_desc" ).localize() ) );
 
         add( new Label( (String)SimpleAddressGlobalizationUtil.globalize
-                 ( "cms.contenttypes.ui.address.notes" ).localize() ) );
+                 ( "cms.contenttypes.ui.simpleaddress.notes" ).localize() ) );
         ParameterModel notesParam = new StringParameter( NOTES );
         TextArea notes = new TextArea( notesParam );
         notes.setRows(8);
@@ -318,7 +327,8 @@ public class SimpleAddressPropertyForm extends BasicPageForm
             address.setEmail( ( String ) data.get( EMAIL ) );
             address.setURI( ( String ) data.get( URI ) );
             address.setNotes( ( String ) data.get( NOTES ) );
-            // address.setNotes( data.get( NOTES )!= "" ? ( String )data.get( NOTES ) : ( String )"dummy" );
+            // address.setNotes( data.get( NOTES )!=
+            //           "" ? ( String )data.get( NOTES ) : ( String )"dummy" );
             address.save();
         }
         if (m_step != null) {

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/util/SimpleAddressGlobalizationUtil.java

@@ -33,7 +33,7 @@ import com.arsdigita.globalization.GlobalizedMessage;
 public class SimpleAddressGlobalizationUtil {
     
     final public static String BUNDLE_NAME = 
-        "com.arsdigita.cms.contenttypes.util.AddressResourceBundle";
+        "com.arsdigita.cms.contenttypes.util.SimpleAddressResourceBundle";
 
     /**
      *  This returns a globalized message using the type specific bundle,

ccm-cms-types-simpleaddress/src/com/arsdigita/cms/contenttypes/util/SimpleAddressResourceBundle.java

@@ -28,10 +28,11 @@ import com.arsdigita.cms.CMSGlobalized;
  * @author Shashin Shinde <a href="mailto:sshinde@redhat.com">sshinde@redhat.com</a>
  * 
  */
-public class SimpleAddressResourceBundle extends ChainedResourceBundle implements CMSGlobalized {
+public class SimpleAddressResourceBundle extends ChainedResourceBundle
+                                         implements CMSGlobalized {
     
     public final static String ADDRESS_BUNDLE_NAME = 
-        "com.arsdigita.cms.contenttypes.AddressResources";
+        "com.arsdigita.cms.contenttypes.SimpleAddressResources";
 
     public SimpleAddressResourceBundle() {
         super();

ccm-cms-types-simpleaddress/web/static/content-types/com/arsdigita/cms/contenttypes/SimpleAddress.xsl

@@ -6,8 +6,9 @@
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 version="1.0">
 
-  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Address']" mode="cms:CT_graphics"
+  <xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleAddress']"
-    name="cms:CT_graphics_com_arsdigita_cms_contenttypes_Address">
+                 mode="cms:CT_graphics"
+                 name="cms:CT_graphics_com_arsdigita_cms_contenttypes_SimpleAddress">
     <table width="435" border="0" cellspacing="0" cellpadding="0">
       <tr>
         <td class="contentTitle" align="left" valign="top">

ccm-cms/src/com/arsdigita/cms/contenttypes/ContentTypeInitializer.java

@@ -186,10 +186,15 @@ public abstract class ContentTypeInitializer extends CompoundInitializer {
      * 
      * @return List (array) of fully qualified file names (relative to docuemnt /
      *         context root) to content types style sheets.
-     * @deprecated without replacement.
+     * //@deprecated without replacement.
      *   Since a long time {@link com.arsdigita.templating.PatternStylesheetResolver
      *   PatternStylesheetResolver} is used to locate stylesheets based on a
      *   file patterns. Not used anymore (pb 2011.01.20)
+     *
+     *   Correction:
+     *   As of 6.6.x it is really used tp locate the content type stylesheet,
+     *   in distinction from location of applications stylesheets.
+     *
      */
     public String[] getStylesheets() {
         return EMPTY_ARRAY;

ccm-user-preferences/src/com/arsdigita/london/userprefs/Initializer.java

@@ -18,7 +18,6 @@ package com.arsdigita.london.userprefs;
 
 import com.arsdigita.db.DbHelper;
 import com.arsdigita.persistence.pdl.ManifestSource;
-import com.arsdigita.persistence.pdl.ManifestSource;
 import com.arsdigita.persistence.pdl.NameFilter;
 import com.arsdigita.runtime.CompoundInitializer;
 import com.arsdigita.runtime.DomainInitEvent;

ccm-webpage/src/com/arsdigita/cms/webpage/Webpage.java

@@ -4,8 +4,8 @@ import com.arsdigita.cms.util.GlobalizationUtil;
 
 import com.arsdigita.categorization.Category;
 import com.arsdigita.categorization.CategoryCollection;
-import com.arsdigita.cms.ContentBundle;
+// import com.arsdigita.cms.ContentBundle;
-import com.arsdigita.cms.ContentItem;
+// import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.cms.Folder;