diff --git a/ccm-cms/pdl/com/arsdigita/content-section/CMSTask.pdl b/ccm-cms/pdl/com/arsdigita/content-section/CMSTask.pdl
index 1742f8618..4dbe76238 100755
--- a/ccm-cms/pdl/com/arsdigita/content-section/CMSTask.pdl
+++ b/ccm-cms/pdl/com/arsdigita/content-section/CMSTask.pdl
@@ -11,7 +11,7 @@
// or implied. See the License for the specific language governing
// rights and limitations under the License.
//
-// $Id: CMSTask.pdl 1288 2006-08-18 09:39:56Z sskracic $
+// $Id: CMSTask.pdl 1637 2007-09-17 10:14:27Z chrisg23 $
model com.arsdigita.cms.workflow;
import com.arsdigita.workflow.simple.*;
diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql
index 9b6ee115b..ce3f8170e 100644
--- a/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql
+++ b/ccm-cms/sql/ccm-cms/default/upgrade/6.5.2-6.5.3/cms_task_url_generators_upgrade.sql
@@ -1,6 +1,6 @@
-alter table CMS_TASK_URL_GENERATORS
-add (content_type INTEGER);
+alter table cms_task_url_generators
+ add column content_type INTEGER;
-alter table cms_task_url_generators add
- constraint cms_tas_url_gen_con_ty_f_lz1y5 foreign key (content_type)
- references content_types(type_id);
+alter table cms_task_url_generators
+ add constraint cms_tas_url_gen_con_ty_f_lz1y5 foreign key (content_type)
+ references content_types(type_id);
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentItem.java b/ccm-cms/src/com/arsdigita/cms/ContentItem.java
index 626b5d1cd..fc641c155 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentItem.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentItem.java
@@ -198,12 +198,12 @@ import java.util.Set;
* @author Michael Pih
* @author Stanislav Freidin <sfreidin@redhat.com>
*
- * @version $Id: ContentItem.java 1374 2006-11-13 13:23:09Z chrisgilbert23 $
+ * @version $Id: ContentItem.java 1621 2007-09-13 12:43:12Z chrisg23 $
*/
public class ContentItem extends VersionedACSObject implements CustomCopy {
public static final String versionId =
- "$Id: ContentItem.java 1374 2006-11-13 13:23:09Z chrisgilbert23 $" +
- "$Author: chrisgilbert23 $" +
+ "$Id: ContentItem.java 1621 2007-09-13 12:43:12Z chrisg23 $" +
+ "$Author: chrisg23 $" +
"$DateTime: $";
private static final Logger s_log = Logger.getLogger(ContentItem.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
index 8f0b5f563..492ec736d 100755
--- a/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
+++ b/ccm-cms/src/com/arsdigita/cms/ContentSectionConfig.java
@@ -66,12 +66,12 @@ import com.arsdigita.util.StringUtils;
* @see ContentSection#getConfig()
*
* @author Justin Ross <jross@redhat.com>
- * @version $Id: ContentSectionConfig.java 1583 2007-05-25 15:32:13Z chrisgilbert23 $
+ * @version $Id: ContentSectionConfig.java 1689 2007-10-26 11:06:23Z chrisg23 $
*/
public final class ContentSectionConfig extends AbstractConfig {
public static final String versionId =
- "$Id: ContentSectionConfig.java 1583 2007-05-25 15:32:13Z chrisgilbert23 $" +
- "$Author: chrisgilbert23 $" +
+ "$Id: ContentSectionConfig.java 1689 2007-10-26 11:06:23Z chrisg23 $" +
+ "$Author: chrisg23 $" +
"$DateTime: $";
private static final Logger s_log = Logger.getLogger(ContentSectionConfig.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/Folder.java b/ccm-cms/src/com/arsdigita/cms/Folder.java
index 54c0e9bc0..1d15cc426 100755
--- a/ccm-cms/src/com/arsdigita/cms/Folder.java
+++ b/ccm-cms/src/com/arsdigita/cms/Folder.java
@@ -67,12 +67,12 @@ import java.util.Iterator;
* @author Jack Chung
* @author Michael Pih
* @author David Lutterkort
- * @version $Id: Folder.java 1317 2006-09-07 08:47:15Z sskracic $
+ * @version $Id: Folder.java 1639 2007-09-17 13:20:13Z chrisg23 $
*/
public class Folder extends ContentItem {
public static final String versionId =
- "$Id: Folder.java 1317 2006-09-07 08:47:15Z sskracic $" +
- "$Author: sskracic $" +
+ "$Id: Folder.java 1639 2007-09-17 13:20:13Z chrisg23 $" +
+ "$Author: chrisg23 $" +
"$DateTime: 2004/08/17 23:15:09 $";
private static final Logger s_log = Logger.getLogger(Folder.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java
index b35d797c4..aa25d27a8 100755
--- a/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java
+++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/SimpleXMLGenerator.java
@@ -54,7 +54,7 @@ import java.util.Iterator;
*/
public class SimpleXMLGenerator implements XMLGenerator {
- public static final String versionId = "$Id: SimpleXMLGenerator.java 1473 2007-03-12 15:16:39Z chrisgilbert23 $ by $Author: chrisgilbert23 $, $DateTime: 2004/08/17 23:15:09 $";
+ public static final String versionId = "$Id: SimpleXMLGenerator.java 1651 2007-09-18 10:30:06Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $";
private static Logger s_log =
Logger.getLogger(SimpleXMLGenerator.class);
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_de.properties b/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_de.properties
index 062d66cbf..9020ebea8 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_de.properties
+++ b/ccm-cms/src/com/arsdigita/cms/ui/CMSResources_de.properties
@@ -82,7 +82,7 @@ cms.contenttypes.ui.link_to_map=Link to Map:
cms.contenttypes.ui.location=Ort:
cms.contenttypes.ui.main_contributor=Hauptredner\:
cms.contenttypes.ui.name=Name:
-cms.contenttypes.ui.opening_times=\u00f6ffnungszeiten:
+cms.contenttypes.ui.opening_times=\u00D6ffnungszeiten\:
cms.contenttypes.ui.person_specification=Person Specification:
cms.contenttypes.ui.ref_code=Ref. Code:
@@ -237,7 +237,7 @@ cms.ui.authoring.file_upload.auto_detect=(automatisch)
cms.ui.authoring.file_upload.file_type=Dateityp:
cms.ui.file=Datei:
cms.ui.authoring.none=niemand
-cms.ui.authoring.workflow=Arbeitsablauf w\u00c4hlen
+cms.ui.authoring.workflow=Arbeitsablauf w\u00E4hlen
cms.ui.authoring_kit_has_more_than_one_step=Dieses Authorenkit hat mehr als einen Schritt:
cms.ui.authoring_kit_has_no_steps=Dieses Authorenkit hat keine Schritte:
cms.ui.authoringkit.authoring_kit_for=Authorenkit f\u00fcr
@@ -395,7 +395,7 @@ cms.ui.item.history=Historie
cms.ui.item.invalid_end_date_please_try_again=Ung\u00fcltiges Enddatum, bitte erneut versuchen
cms.ui.item.invalid_start_date_please_try_again=Un\u00fcltiges Anfangsdatum, bitte erneut versuchen
cms.ui.item.language.add=Sprache hinzuf\u00fcgen
-cms.ui.item.language.change=Sprache \u00c4ndern
+cms.ui.item.language.change=Sprache \u00E4ndern
cms.ui.item.languages=Sprachen
cms.ui.item.lifecycle.apply=Anzuwendenden Lebenszyklus ausw\u00E4hlen
cms.ui.item.lifecycle.end_date=Enddatum
@@ -597,7 +597,7 @@ cms.ui.templates.dummy=dummy
cms.ui.templates.label=Etikett\:
cms.ui.templates.name=Name:
cms.ui.templates.no_templates=Keine Muster
-cms.ui.templates.not_implemented=Nicht Omplementiert
+cms.ui.templates.not_implemented=Nicht Implementiert
cms.ui.templates.preview=Vorschau
cms.ui.templates.remove=Entfernen
cms.ui.templates.set_as_default=Als Vorgabe festlegen
@@ -630,7 +630,7 @@ cms.ui.type.invalid=Ung\u00fcltiger Inhaltstyp
cms.ui.type.label=Label
cms.ui.type.lifecycle.none=This content type has no default lifecycle
cms.ui.type.lifecycle=Voreingestellter Zyklus
-cms.ui.type.maximum_length=Maximale L\u00c4nge
+cms.ui.type.maximum_length=Maximale L\u00E4nge
cms.ui.type.name_has_whitespace=Der Name darf keine Leerzeichen enthalten
cms.ui.type.name_not_alphanumeric=Der Name darf nur aus Buchstaben und Zahlen bestehen, keine Satzzeichen
cms.ui.type.name_not_unique=Dieser Inhaltstyp hat bereits ein Element mit dem Namen
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java
index 587f4ffbf..7a1bc9dac 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/NewItemForm.java
@@ -56,7 +56,7 @@ import java.math.BigDecimal;
*/
public abstract class NewItemForm extends Form {
- public static final String versionId = "$Id: NewItemForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
+ public static final String versionId = "$Id: NewItemForm.java 1652 2007-09-18 10:35:42Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $";
public static final String RESOURCE_BUNDLE =
"com.arsdigita.cms.ui.authoring.AuthoringResources";
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java
index 7c9d06b17..996166e50 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/SimpleEditStep.java
@@ -58,7 +58,7 @@ public class SimpleEditStep extends SecurityPropertyEditor
private static final Logger s_log =
Logger.getLogger( SimpleEditStep.class );
- public static final String versionId = "$Id: SimpleEditStep.java 754 2005-09-02 13:26:17Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
+ public static final String versionId = "$Id: SimpleEditStep.java 1638 2007-09-17 11:48:34Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $";
private AuthoringKitWizard m_parent;
private ItemSelectionModel m_itemModel;
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java
index c2a646caa..adb44aa76 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/authoring/TextPageBody.java
@@ -44,11 +44,11 @@ import com.arsdigita.util.Assert;
* this class.
*
* @author Stanislav Freidin (sfreidin@arsdigita.com)
- * @version $Id: TextPageBody.java 287 2005-02-22 00:29:02Z sskracic $
+ * @version $Id: TextPageBody.java 1621 2007-09-13 12:43:12Z chrisg23 $
*/
public class TextPageBody extends TextAssetBody {
- public static final String versionId = "$Id: TextPageBody.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/17 23:15:09 $";
+ public static final String versionId = "$Id: TextPageBody.java 1621 2007-09-13 12:43:12Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/17 23:15:09 $";
private AuthoringKitWizard m_parent;
private ItemSelectionModel m_itemModel;
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java b/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java
index b7c926d46..4687ae198 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/category/BaseCategoryForm.java
@@ -58,7 +58,9 @@ class BaseCategoryForm extends BaseForm {
final TextField m_url;
final RadioGroup m_isAbstract;
final RadioGroup m_isEnabled;
- private Label m_script = new Label("", false);
+ private Label m_script = new Label("", false);
+
+
private final static String NAME = "name";
private final static String DESCRIPTION = "description";